Simplify export flow

packages/insomnia-app/app/ui/components/modals/export-requests-modal.js

@@ -95,7 +95,7 @@ class ExportRequestsModal extends PureComponent<Props, State> {
         collapsed: false,
         children: children,
         totalRequests: totalRequests,
-        selectedRequests: 0,
+        selectedRequests: totalRequests, // Default select all
       },
     });
   }
@@ -113,7 +113,7 @@ class ExportRequestsModal extends PureComponent<Props, State> {
       collapsed: false,
       children: children,
       totalRequests: totalRequests,
-      selectedRequests: 0,
+      selectedRequests: totalRequests, // Default select all
     };
   }
 
@@ -189,7 +189,7 @@ class ExportRequestsModal extends PureComponent<Props, State> {
     const isExportDisabled = treeRoot != null ? treeRoot.selectedRequests === 0 : false;
     return (
       <Modal ref={this.setModalRef} tall freshState {...this.props}>
-        <ModalHeader>Export Requests</ModalHeader>
+        <ModalHeader>Select Requests to Export</ModalHeader>
         <ModalBody>
           <div className="requests-tree">
             <Tree

packages/insomnia-app/app/ui/components/modals/settings-modal.js

@@ -48,11 +48,6 @@ class SettingsModal extends PureComponent {
     this.modal.hide();
   }
 
-  _handleExportWorkspace() {
-    this.props.handleExportWorkspaceToFile();
-    this.modal.hide();
-  }
-
   _handleImportFile() {
     this.props.handleImportFile();
     this.modal.hide();
@@ -134,7 +129,6 @@ class SettingsModal extends PureComponent {
               <ImportExport
                 handleExportAll={this._handleExportAllToFile}
                 handleShowExportRequestsModal={this._handleShowExportRequestsModal}
-                handleExportWorkspace={this._handleExportWorkspace}
                 handleImportFile={this._handleImportFile}
                 handleImportUri={this._handleImportUri}
               />
@@ -163,7 +157,6 @@ class SettingsModal extends PureComponent {
 
 SettingsModal.propTypes = {
   // Functions
-  handleExportWorkspaceToFile: PropTypes.func.isRequired,
   handleShowExportRequestsModal: PropTypes.func.isRequired,
   handleExportAllToFile: PropTypes.func.isRequired,
   handleImportFile: PropTypes.func.isRequired,

packages/insomnia-app/app/ui/components/settings/import-export.js

@@ -20,25 +20,20 @@ class ImportExport extends PureComponent {
   }
 
   render() {
-    const {
-      handleImportFile,
-      handleExportAll,
-      handleShowExportRequestsModal,
-      handleExportWorkspace,
-    } = this.props;
+    const { handleImportFile, handleExportAll, handleShowExportRequestsModal } = this.props;
 
     return (
       <div>
         <p className="no-margin-top">
-          Import format will be automatically detected (<strong>
-            Insomnia, Postman v2, HAR, Curl, Swagger
-          </strong>)
+          Import format will be automatically detected (
+          <strong>Insomnia, Postman v2, HAR, Curl, Swagger</strong>)
         </p>
         <p>
           Don't see your format here?{' '}
           <Link href="https://support.insomnia.rest/article/52-importing-and-exporting-data">
             Add Your Own
-          </Link>.
+          </Link>
+          .
         </p>
         <div className="pad-top">
           <Dropdown outline>
@@ -46,13 +41,9 @@ class ImportExport extends PureComponent {
               Export Data <i className="fa fa-caret-down" />
             </DropdownButton>
             <DropdownDivider>Choose Export Type</DropdownDivider>
-            <DropdownItem onClick={handleExportWorkspace}>
-              <i className="fa fa-home" />
-              Current Workspace
-            </DropdownItem>
             <DropdownItem onClick={handleShowExportRequestsModal}>
               <i className="fa fa-home" />
-              Current Workspace's Requests
+              Current Workspace
             </DropdownItem>
             <DropdownItem onClick={handleExportAll}>
               <i className="fa fa-empty" />
@@ -86,7 +77,6 @@ ImportExport.propTypes = {
   handleImportUri: PropTypes.func.isRequired,
   handleExportAll: PropTypes.func.isRequired,
   handleShowExportRequestsModal: PropTypes.func.isRequired,
-  handleExportWorkspace: PropTypes.func.isRequired,
 };
 
 export default ImportExport;

packages/insomnia-app/app/ui/components/wrapper.js

@@ -258,10 +258,6 @@ class Wrapper extends React.PureComponent<Props, State> {
     this.props.handleImportUriToWorkspace(this.props.activeWorkspace._id, uri);
   }
 
-  _handleExportWorkspaceToFile(): void {
-    this.props.handleExportFile(this.props.activeWorkspace._id);
-  }
-
   _handleSetActiveResponse(responseId: string | null): void {
     if (!this.props.activeRequest) {
       console.warn('Tried to set active response when request not active');
@@ -540,7 +536,6 @@ class Wrapper extends React.PureComponent<Props, State> {
 
           <SettingsModal
             ref={registerModal}
-            handleExportWorkspaceToFile={this._handleExportWorkspaceToFile}
             handleShowExportRequestsModal={handleShowExportRequestsModal}
             handleExportAllToFile={handleExportFile}
             handleImportFile={this._handleImportFile}