diff --git a/app/components/RequestSwitcherModal.js b/app/components/RequestSwitcherModal.js index da8f30fa08..bf331c5e3d 100644 --- a/app/components/RequestSwitcherModal.js +++ b/app/components/RequestSwitcherModal.js @@ -38,7 +38,7 @@ class RequestSwitcherModal extends ModalComponent { } else { // Create the request if nothing matched const name = this.state.searchString; - const parentId = this.props.newRequestParentID; + const parentId = this.props.newRequestParentId; db.requestCreate({name, parentId}).then(request => { this._activateRequest(request); diff --git a/app/components/RequestUrlBar.js b/app/components/RequestUrlBar.js index 4d17fd23bf..d7c7600884 100644 --- a/app/components/RequestUrlBar.js +++ b/app/components/RequestUrlBar.js @@ -60,7 +60,7 @@ class RequestUrlBar extends Component { this._handleUrlChange(url)}/> diff --git a/app/components/ResponsePane.js b/app/components/ResponsePane.js index 86ee15e3f7..301f5d2b1d 100644 --- a/app/components/ResponsePane.js +++ b/app/components/ResponsePane.js @@ -51,6 +51,14 @@ class ResponsePane extends Component { ) } + if (!request) { + return ( +
+
+
+
+ ) + } if (!response) { return ( diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js index 51cf10cd5b..6abb23e04a 100644 --- a/app/components/Sidebar.js +++ b/app/components/Sidebar.js @@ -81,6 +81,7 @@ class Sidebar extends Component { key={requestGroup._id} isActive={isActive} moveRequestGroup={moveRequestGroup} + moveRequest={moveRequest} toggleRequestGroup={toggleRequestGroup} addRequestToRequestGroup={addRequestToRequestGroup} numChildren={child.children.length} diff --git a/app/components/SidebarRequestGroupRow.js b/app/components/SidebarRequestGroupRow.js index dd853530f9..f7ef1d0ff7 100644 --- a/app/components/SidebarRequestGroupRow.js +++ b/app/components/SidebarRequestGroupRow.js @@ -22,10 +22,10 @@ class SidebarRequestGroupRow extends Component { } render () { - const { connectDragSource, connectDropTarget, + moveRequest, children, requestGroup, isActive, @@ -73,10 +73,8 @@ class SidebarRequestGroupRow extends Component { diff --git a/app/css/components/requestswitcher.scss b/app/css/components/requestswitcher.scss index 235caf00ed..01ec8ba368 100644 --- a/app/css/components/requestswitcher.scss +++ b/app/css/components/requestswitcher.scss @@ -11,8 +11,9 @@ } .tag { - width: 4.5em; - border: 1px solid !important; - padding: $padding-xxs !important; + width: 4em; + padding-left: 0; + margin-right: 0; + text-align: left; } } diff --git a/app/database/index.js b/app/database/index.js index 939cf88183..e363f8cc92 100644 --- a/app/database/index.js +++ b/app/database/index.js @@ -294,13 +294,13 @@ function docCreate (type, idPrefix, patch = {}) { export function requestCreateAndActivate (workspace, patch = {}) { return requestCreate(patch).then(r => { - workspaceUpdate(workspace, {activeRequestId: r._id}); + workspaceUpdate(workspace, {metaActiveRequestId: r._id}); }) } export function requestCopyAndActivate (workspace, request) { return requestCopy(request).then(r => { - workspaceUpdate(workspace, {activeRequestId: r._id}); + workspaceUpdate(workspace, {metaActiveRequestId: r._id}); }) }