Merge branch 'moveprem'

2026-04-19 18:56:00 +00:00 · 2025-10-31 10:47:34 +01:00
parent 5c7ab3793f 391d04b45c
commit f846af75e8
12 changed files with 59 additions and 36 deletions
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -468,12 +468,14 @@ await dbgateApi.executeQuery(${JSON.stringify(

      { divider: true },
      isSqlOrDoc &&
+        isProApp() &&
        !connection.isReadOnly &&
        hasPermission(`dbops/import`) && {
          onClick: handleImport,
          text: _t('database.import', { defaultMessage: 'Import' }),
        },
      isSqlOrDoc &&
+        isProApp() &&
        hasPermission(`dbops/export`) && {
          onClick: handleExport,
          text: _t('database.export', { defaultMessage: 'Export' }),
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -691,7 +691,7 @@ registerCommand({
  name: 'Export database',
  toolbar: true,
  icon: 'icon export',
-  testEnabled: () => getCurrentDatabase() != null && hasPermission(`dbops/export`),
+  testEnabled: () => getCurrentDatabase() != null && hasPermission(`dbops/export`) && isProApp(),
  onClick: () => {
    openImportExportTab({
      targetStorageType: getDefaultFileFormat(getExtensions()).storageType,
--- a/packages/web/src/datagrid/ColumnHeaderControl.svelte
+++ b/packages/web/src/datagrid/ColumnHeaderControl.svelte
@@ -12,6 +12,7 @@
  import { showModal } from '../modals/modalTools';
  import DefineDictionaryDescriptionModal from '../modals/DefineDictionaryDescriptionModal.svelte';
  import { sleep } from '../utility/common';
+  import { isProApp } from '../utility/proTools';

  export let column;
  export let conid = undefined;
@@ -72,29 +73,35 @@

      column.foreignKey && [{ divider: true }, { onClick: openReferencedTable, text: column.foreignKey.refTableName }],

-      setGrouping && { divider: true },
-      setGrouping && { onClick: () => setGrouping('GROUP'), text: 'Group by' },
-      setGrouping && { onClick: () => setGrouping('MAX'), text: 'MAX' },
-      setGrouping && { onClick: () => setGrouping('MIN'), text: 'MIN' },
-      setGrouping && { onClick: () => setGrouping('SUM'), text: 'SUM' },
-      setGrouping && { onClick: () => setGrouping('AVG'), text: 'AVG' },
-      setGrouping && { onClick: () => setGrouping('COUNT'), text: 'COUNT' },
-      setGrouping && { onClick: () => setGrouping('COUNT DISTINCT'), text: 'COUNT DISTINCT' },
+      isProApp() &&
+        setGrouping && [
+          { divider: true },
+          { onClick: () => setGrouping('GROUP'), text: 'Group by' },
+          { onClick: () => setGrouping('MAX'), text: 'MAX' },
+          { onClick: () => setGrouping('MIN'), text: 'MIN' },
+          { onClick: () => setGrouping('SUM'), text: 'SUM' },
+          { onClick: () => setGrouping('AVG'), text: 'AVG' },
+          { onClick: () => setGrouping('COUNT'), text: 'COUNT' },
+          { onClick: () => setGrouping('COUNT DISTINCT'), text: 'COUNT DISTINCT' },
+        ],

-      isTypeDateTime(column.dataType) && [
-        { divider: true },
-        { onClick: () => setGrouping('GROUP:YEAR'), text: 'Group by YEAR' },
-        { onClick: () => setGrouping('GROUP:MONTH'), text: 'Group by MONTH' },
-        { onClick: () => setGrouping('GROUP:DAY'), text: 'Group by DAY' },
-      ],
+      isProApp() &&
+        isTypeDateTime(column.dataType) && [
+          { divider: true },
+          { onClick: () => setGrouping('GROUP:YEAR'), text: 'Group by YEAR' },
+          { onClick: () => setGrouping('GROUP:MONTH'), text: 'Group by MONTH' },
+          { onClick: () => setGrouping('GROUP:DAY'), text: 'Group by DAY' },
+        ],

      { divider: true },

-      allowDefineVirtualReferences && { onClick: handleDefineVirtualForeignKey, text: 'Define virtual foreign key' },
-      column.foreignKey && {
-        onClick: handleCustomizeDescriptions,
-        text: 'Customize description',
-      },
+      isProApp() &&
+        allowDefineVirtualReferences && { onClick: handleDefineVirtualForeignKey, text: 'Define virtual foreign key' },
+      column.foreignKey &&
+        isProApp() && {
+          onClick: handleCustomizeDescriptions,
+          text: 'Customize description',
+        },
    ];
  }
 </script>
--- a/packages/web/src/datagrid/ColumnManagerRow.svelte
+++ b/packages/web/src/datagrid/ColumnManagerRow.svelte
@@ -7,6 +7,7 @@
  import { showModal } from '../modals/modalTools';
  import ColumnEditorModal from '../tableeditor/ColumnEditorModal.svelte';
  import { editorDeleteColumn } from 'dbgate-tools';
+  import { isProApp } from '../utility/proTools';

  export let column;
  export let display;
@@ -59,13 +60,17 @@
  on:mouseup
 >
  <div>
-    <span class="expandColumnIcon" style={`margin-right: ${5 + (column.uniquePath.length - 1) * 10}px`}>
-      <FontIcon
-        icon={column.isExpandable ? plusExpandIcon(display.isExpandedColumn(column.uniqueName)) : 'icon invisible-box'}
-        on:click={() => display.toggleExpandedColumn(column.uniqueName)}
-        data-testid="ColumnManagerRow_expand_{column.uniqueName}"
-      />
-    </span>
+    {#if isProApp()}
+      <span class="expandColumnIcon" style={`margin-right: ${5 + (column.uniquePath.length - 1) * 10}px`}>
+        <FontIcon
+          icon={column.isExpandable
+            ? plusExpandIcon(display.isExpandedColumn(column.uniqueName))
+            : 'icon invisible-box'}
+          on:click={() => display.toggleExpandedColumn(column.uniqueName)}
+          data-testid="ColumnManagerRow_expand_{column.uniqueName}"
+        />
+      </span>
+    {/if}
    {#if isJsonView}
      <FontIcon icon="img column" />
    {:else}
--- a/packages/web/src/datagrid/DataGrid.svelte
+++ b/packages/web/src/datagrid/DataGrid.svelte
@@ -68,6 +68,7 @@
  import registerCommand from '../commands/registerCommand';
  import { registerMenu } from '../utility/contextMenu';
  import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
+  import { isProApp } from '../utility/proTools';

  export let config;
  export let setConfig;
@@ -205,7 +206,7 @@
        name="references"
        height="30%"
        collapsed={isDetailView}
-        skip={!(showReferences && display?.hasReferences)}
+        skip={!(showReferences && display?.hasReferences && isProApp())}
        data-testid="DataGrid_itemReferences"
      >
        <ReferenceManager {...$$props} {managerSize} />
@@ -214,7 +215,7 @@
      <WidgetColumnBarItem
        title="Macros"
        name="macros"
-        skip={!showMacros}
+        skip={!(showMacros && isProApp())}
        collapsed={!expandMacros}
        data-testid="DataGrid_itemMacros"
      >
--- a/packages/web/src/datagrid/TableDataGrid.svelte
+++ b/packages/web/src/datagrid/TableDataGrid.svelte
@@ -30,6 +30,7 @@
  import SqlFormView from '../formview/SqlFormView.svelte';
  import { getBoolSettingsValue } from '../settings/settingsTools';
  import { getDictionaryDescription } from '../utility/dictionaryDescriptionTools';
+  import { isProApp } from '../utility/proTools';

  export let conid;
  export let database;
@@ -82,7 +83,8 @@
            extendedDbInfo?.tables?.find(x => x.pureName == pureName && x.schemaName == schemaName)
              ?.tablePermissionRole == 'read',
          isRawMode,
-          $settingsValue
+          $settingsValue,
+          isProApp()
        )
      : null;

--- a/packages/web/src/modals/NewObjectModal.svelte
+++ b/packages/web/src/modals/NewObjectModal.svelte
@@ -94,6 +94,7 @@
      title: 'Export database',
      description: 'Export to file like CSV, JSON, Excel, or other DB',
      command: 'database.export',
+      isProFeature: true,
      testid: 'NewObjectModal_databaseExport',
      disabledMessage: 'Export is not available for current database',
    },
--- a/packages/web/src/utility/createQuickExportMenu.ts
+++ b/packages/web/src/utility/createQuickExportMenu.ts
@@ -1,11 +1,12 @@
 import type { QuickExportDefinition } from 'dbgate-types';
 import { currentArchive, getCurrentArchive, getExtensions } from '../stores';
 import hasPermission from './hasPermission';
+import { isProApp } from './proTools';

 export function createQuickExportMenuItems(handler: (fmt: QuickExportDefinition) => Function, advancedExportMenuItem) {
  const extensions = getExtensions();
  return [
-    {
+    isProApp() && {
      text: 'Export advanced...',
      ...advancedExportMenuItem,
    },
@@ -15,7 +16,7 @@ export function createQuickExportMenuItems(handler: (fmt: QuickExportDefinition)
      onClick: handler(fmt),
    })),
    { divider: true },
-    {
+    isProApp() && {
      text: 'Current archive',
      onClick: handler({
        extension: 'jsonl',
--- a/packages/web/src/widgets/StatusBar.svelte
+++ b/packages/web/src/widgets/StatusBar.svelte
@@ -27,6 +27,7 @@
  import { useConnectionColor } from '../utility/useConnectionColor';
  import { apiCall } from '../utility/api';
  import { statusBarTabInfo } from '../utility/statusBarStore';
+  import { isProApp } from '../utility/proTools';

  $: databaseName = $currentDatabase && $currentDatabase.name;
  $: connection = $currentDatabase && $currentDatabase.connection;
@@ -155,7 +156,7 @@
        </div>
      </div>
    {/if}
-    {#if $currentArchive && $currentArchive != 'default'}
+    {#if isProApp() && $currentArchive && $currentArchive != 'default'}
      <div
        class="item flex clickable"
        title="Current archive"
--- a/packages/web/src/widgets/WidgetContainer.svelte
+++ b/packages/web/src/widgets/WidgetContainer.svelte
@@ -11,6 +11,7 @@
  import PublicCloudWidget from './PublicCloudWidget.svelte';
  import PrivateCloudWidget from './PrivateCloudWidget.svelte';
  import hasPermission from '../utility/hasPermission';
+  import { isProApp } from '../utility/proTools';
 </script>

 {#if hasPermission('widgets/database')}
@@ -22,7 +23,7 @@
 {#if $visibleSelectedWidget == 'history' && hasPermission('widgets/history')}
  <HistoryWidget />
 {/if}
-{#if $visibleSelectedWidget == 'archive' && hasPermission('widgets/archive')}
+{#if $visibleSelectedWidget == 'archive' && hasPermission('widgets/archive') && isProApp()}
  <ArchiveWidget />
 {/if}
 {#if $visibleSelectedWidget == 'plugins' && hasPermission('widgets/plugins')}
--- a/packages/web/src/widgets/WidgetIconPanel.svelte
+++ b/packages/web/src/widgets/WidgetIconPanel.svelte
@@ -61,7 +61,7 @@
      name: 'history',
      title: 'Query history & Closed tabs',
    },
-    {
+    isProApp() && {
      icon: 'icon archive',
      name: 'archive',
      title: 'Archive (saved tabular data)',