diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index df3fb8ae2..32368740a 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -313,8 +313,8 @@ { divider: true }, isSqlOrDoc && !connection.isReadOnly && - hasPermission(`dbops/import`) && { onClick: handleImport, text: 'Import wizard' }, - isSqlOrDoc && hasPermission(`dbops/export`) && { onClick: handleExport, text: 'Export wizard' }, + hasPermission(`dbops/import`) && { onClick: handleImport, text: 'Import' }, + isSqlOrDoc && hasPermission(`dbops/export`) && { onClick: handleExport, text: 'Export' }, driver?.databaseEngineTypes?.includes('sql') && hasPermission(`dbops/sql-dump/import`) && !connection.isReadOnly && { onClick: handleSqlRestore, text: 'Restore/import SQL dump' }, diff --git a/packages/web/src/utility/createQuickExportMenu.ts b/packages/web/src/utility/createQuickExportMenu.ts index 10c575257..6f52aa504 100644 --- a/packages/web/src/utility/createQuickExportMenu.ts +++ b/packages/web/src/utility/createQuickExportMenu.ts @@ -5,6 +5,11 @@ import hasPermission from './hasPermission'; export function createQuickExportMenuItems(handler: (fmt: QuickExportDefinition) => Function, advancedExportMenuItem) { const extensions = getExtensions(); return [ + { + text: 'Export advanced...', + ...advancedExportMenuItem, + }, + { divider: true }, ...extensions.quickExports.map(fmt => ({ text: fmt.label, onClick: handler(fmt), @@ -25,11 +30,6 @@ export function createQuickExportMenuItems(handler: (fmt: QuickExportDefinition) }), }), }, - { divider: true }, - { - text: 'More...', - ...advancedExportMenuItem, - }, ]; }