diff --git a/packages/insomnia-app/app/ui/components/modals/export-requests-modal.js b/packages/insomnia-app/app/ui/components/modals/export-requests-modal.js index 2e8910a0e6..1a1c852c13 100644 --- a/packages/insomnia-app/app/ui/components/modals/export-requests-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/export-requests-modal.js @@ -95,7 +95,7 @@ class ExportRequestsModal extends PureComponent { collapsed: false, children: children, totalRequests: totalRequests, - selectedRequests: 0, + selectedRequests: totalRequests, // Default select all }, }); } @@ -113,7 +113,7 @@ class ExportRequestsModal extends PureComponent { collapsed: false, children: children, totalRequests: totalRequests, - selectedRequests: 0, + selectedRequests: totalRequests, // Default select all }; } @@ -189,7 +189,7 @@ class ExportRequestsModal extends PureComponent { const isExportDisabled = treeRoot != null ? treeRoot.selectedRequests === 0 : false; return ( - Export Requests + Select Requests to Export
@@ -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, diff --git a/packages/insomnia-app/app/ui/components/settings/import-export.js b/packages/insomnia-app/app/ui/components/settings/import-export.js index 3a2e99a99e..490febcedc 100644 --- a/packages/insomnia-app/app/ui/components/settings/import-export.js +++ b/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 (

- Import format will be automatically detected ( - Insomnia, Postman v2, HAR, Curl, Swagger - ) + Import format will be automatically detected ( + Insomnia, Postman v2, HAR, Curl, Swagger)

Don't see your format here?{' '} Add Your Own - . + + .

@@ -46,13 +41,9 @@ class ImportExport extends PureComponent { Export Data Choose Export Type - - - Current Workspace - - Current Workspace's Requests + Current Workspace @@ -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; diff --git a/packages/insomnia-app/app/ui/components/wrapper.js b/packages/insomnia-app/app/ui/components/wrapper.js index 20a15d1bde..a25d813d12 100644 --- a/packages/insomnia-app/app/ui/components/wrapper.js +++ b/packages/insomnia-app/app/ui/components/wrapper.js @@ -258,10 +258,6 @@ class Wrapper extends React.PureComponent { 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 {