diff --git a/packages/web/src/appobj/ArchiveFolderAppObject.svelte b/packages/web/src/appobj/ArchiveFolderAppObject.svelte index ca463e54e..2e005264d 100644 --- a/packages/web/src/appobj/ArchiveFolderAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFolderAppObject.svelte @@ -18,6 +18,7 @@ import ErrorMessageModal from '../modals/ErrorMessageModal.svelte'; import { apiCall } from '../utility/api'; import hasPermission from '../utility/hasPermission'; + import { isProApp } from '../utility/proTools'; export let data; @@ -142,6 +143,7 @@ await dbgateApi.deployDb(${JSON.stringify( data.name != 'default' && hasPermission('dbops/model/compare') && + isProApp() && _.get($currentDatabase, 'connection._id') && { onClick: handleCompareWithCurrentDb, text: `Compare with ${_.get($currentDatabase, 'name')}`, diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index 7285f8b6e..15f59ef9e 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -333,6 +333,7 @@ isSqlOrDoc && _.get($currentDatabase, 'connection._id') && hasPermission('dbops/model/compare') && + isProApp() && (_.get($currentDatabase, 'connection._id') != _.get(connection, '_id') || (_.get($currentDatabase, 'connection._id') == _.get(connection, '_id') && _.get($currentDatabase, 'name') != _.get(connection, 'name'))) && { @@ -406,6 +407,7 @@ import { openImportExportTab } from '../utility/importExportTools'; import newTable from '../tableeditor/newTable'; import { loadSchemaList, switchCurrentDatabase } from '../utility/common'; + import { isProApp } from '../utility/proTools'; export let data; export let passProps; diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index 7163b9e72..e98443212 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -45,6 +45,7 @@ import ConfirmModal from '../modals/ConfirmModal.svelte'; import localforage from 'localforage'; import { openImportExportTab } from '../utility/importExportTools'; import newTable from '../tableeditor/newTable'; +import { isProApp } from '../utility/proTools'; // function themeCommand(theme: ThemeDefinition) { // return { @@ -298,20 +299,22 @@ registerCommand({ }, }); -registerCommand({ - id: 'new.modelCompare', - category: 'New', - icon: 'icon compare', - name: 'Compare DB', - toolbar: true, - onClick: () => { - openNewTab({ - title: 'Compare', - icon: 'img compare', - tabComponent: 'CompareModelTab', - }); - }, -}); +if (isProApp()) { + registerCommand({ + id: 'new.modelCompare', + category: 'New', + icon: 'icon compare', + name: 'Compare DB', + toolbar: true, + onClick: () => { + openNewTab({ + title: 'Compare', + icon: 'img compare', + tabComponent: 'CompareModelTab', + }); + }, + }); +} registerCommand({ id: 'new.jsonl', diff --git a/packages/web/src/tabs/CompareModelTab.svelte b/packages/web/src/tabs/CompareModelTab.svelte deleted file mode 100644 index ebff38421..000000000 --- a/packages/web/src/tabs/CompareModelTab.svelte +++ /dev/null @@ -1,609 +0,0 @@ - - - - - -
- -
- -
-
- -
-
- {#if $values?.sourceConid == '__model'} - ({ label: x.name, value: `archive:${x.name}` }))} - notSelected - /> - {:else} - - {/if} -
-
- -
- -
- Deploy (experimental) -
-
-
- -
-
- -
-
-
- - - x.state == 'added'), - $values, - 'added' - ).length} - /> - x.state == 'removed'), - $values, - 'removed' - ).length} - /> - x.state == 'changed'), - $values, - 'changed' - ).length} - /> - x.state == 'equal'), - $values, - 'equal' - ).length} - /> - - {#each _.keys(DbDiffCompareDefs) as objectTypeField} - x.objectTypeField == objectTypeField), - $values, - objectTypeField - ).length} - /> - {/each} -
-
- -
- - { - // @ts-ignore - $values = { ...$values, [`isChecked_${row.identifier}`]: e.target.checked }; - }} - /> - - - - - - - - {row.typeName} - - -
-
- - - - - - - - - - - - - - - - - - - -
-
- - - - - - -
- - diff --git a/packages/web/src/tabs/index.js b/packages/web/src/tabs/index.js index 2049232a7..2e35ac00e 100644 --- a/packages/web/src/tabs/index.js +++ b/packages/web/src/tabs/index.js @@ -16,7 +16,6 @@ import * as CommandListTab from './CommandListTab.svelte'; import * as YamlEditorTab from './YamlEditorTab.svelte'; import * as JsonEditorTab from './JsonEditorTab.svelte'; import * as JsonLinesEditorTab from './JsonLinesEditorTab.svelte'; -import * as CompareModelTab from './CompareModelTab.svelte'; import * as JsonTab from './JsonTab.svelte'; import * as ChangelogTab from './ChangelogTab.svelte'; import * as DiagramTab from './DiagramTab.svelte'; @@ -51,7 +50,6 @@ export default { YamlEditorTab, JsonEditorTab, JsonLinesEditorTab, - CompareModelTab, JsonTab, ChangelogTab, DiagramTab,