Merge branch 'master' into develop

packages/web/src/buttons/ToolStripCommandButton.svelte

@@ -16,6 +16,7 @@
   export let command;
   export let component = ToolStripButton;
   export let hideDisabled = false;
+  export let buttonLabel = null;
 
   $: cmd = Object.values($commandsCustomized).find((x: any) => x.id == command) as any;
 </script>
@@ -29,6 +30,6 @@
     disabled={!cmd.enabled}
     {...$$restProps}
   >
-    {cmd.toolbarName || cmd.name}
+    {buttonLabel || cmd.toolbarName || cmd.name}
   </svelte:component>
 {/if}

packages/web/src/buttons/ToolStripCommandSplitButton.svelte

@@ -5,7 +5,16 @@
   import ToolStripSplitDropDownButton from './ToolStripSplitDropDownButton.svelte';
 
   export let commands;
-  $: menu = _.compact(commands).map(command => ({ command }));
+  export let hideDisabled = false;
+  export let buttonLabel = null;
+
+  $: menu = _.compact(commands).map(command => (_.isString(command) ? { command } : command));
 </script>
 
-<ToolStripCommandButton command={commands[0]} component={ToolStripSplitDropDownButton} {menu} />
+<ToolStripCommandButton
+  command={commands[0]}
+  component={ToolStripSplitDropDownButton}
+  {menu}
+  {hideDisabled}
+  {buttonLabel}
+/>

packages/web/src/datagrid/DataGridCore.svelte

@@ -5,7 +5,7 @@
     id: 'dataGrid.refresh',
     category: 'Data grid',
     name: 'Refresh',
-    keyText: 'F5',
+    keyText: 'F5 | CtrlOrCommand+R',
     toolbar: true,
     isRelatedToTab: true,
     icon: 'icon reload',
@@ -17,7 +17,7 @@
     id: 'dataGrid.revertRowChanges',
     category: 'Data grid',
     name: 'Revert row changes',
-    keyText: 'CtrlOrCommand+R',
+    keyText: 'CtrlOrCommand+U',
     testEnabled: () => getCurrentDataGrid()?.getGrider()?.containsChanges,
     onClick: () => getCurrentDataGrid().revertRowChanges(),
   });
@@ -52,6 +52,16 @@
     onClick: () => getCurrentDataGrid().insertNewRow(),
   });
 
+  registerCommand({
+    id: 'dataGrid.cloneRows',
+    category: 'Data grid',
+    name: 'Clone rows',
+    toolbarName: 'Clone',
+    keyText: 'CtrlOrCommand+Shift+C',
+    testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
+    onClick: () => getCurrentDataGrid().cloneRows(),
+  });
+
   registerCommand({
     id: 'dataGrid.setNull',
     category: 'Data grid',
@@ -418,16 +428,44 @@
   }
 
   export async function insertNewRow() {
-    if (grider.canInsert) {
-      const rowIndex = grider.insertRow();
-      const cell = [rowIndex, (currentCell && currentCell[1]) || 0];
-      // @ts-ignore
-      currentCell = cell;
-      // @ts-ignore
-      selectedCells = [cell];
-      await tick();
-      scrollIntoView(cell);
+    if (!grider.canInsert) return;
+    const rowIndex = grider.insertRow();
+    const cell = [rowIndex, (currentCell && currentCell[1]) || 0];
+    // @ts-ignore
+    currentCell = cell;
+    // @ts-ignore
+    selectedCells = [cell];
+    await tick();
+    scrollIntoView(cell);
+  }
+
+  export async function cloneRows() {
+    if (!grider.canInsert) return;
+
+    let rowIndex = null;
+    grider.beginUpdate();
+    for (const index of _.sortBy(getSelectedRowIndexes(), x => x)) {
+      if (_.isNumber(index)) {
+        rowIndex = grider.insertRow();
+
+        for (const column of display.columns) {
+          if (column.uniquePath.length > 1) continue;
+          if (column.autoIncrement) continue;
+
+          grider.setCellValue(rowIndex, column.uniqueName, grider.getRowData(index)[column.uniqueName]);
+        }
+      }
     }
+    grider.endUpdate();
+
+    if (rowIndex == null) return;
+    const cell = [rowIndex, (currentCell && currentCell[1]) || 0];
+    // @ts-ignore
+    currentCell = cell;
+    // @ts-ignore
+    selectedCells = [cell];
+    await tick();
+    scrollIntoView(cell);
   }
 
   export function setFixedValue(value) {
@@ -1171,7 +1209,20 @@
 
     handleCursorMove(event);
 
-    if (event.shiftKey && event.keyCode != keycodes.shift && event.keyCode != keycodes.tab) {
+    if (
+      event.shiftKey &&
+      event.keyCode != keycodes.shift &&
+      event.keyCode != keycodes.tab &&
+      event.keyCode != keycodes.ctrl &&
+      event.keyCode != keycodes.leftWindowKey &&
+      event.keyCode != keycodes.rightWindowKey &&
+      !(
+        (event.keyCode >= keycodes.a && event.keyCode <= keycodes.z) ||
+        (event.keyCode >= keycodes.n0 && event.keyCode <= keycodes.n9) ||
+        (event.keyCode >= keycodes.numPad0 && event.keyCode <= keycodes.numPad9) ||
+        event.keyCode == keycodes.dash
+      )
+    ) {
       selectedCells = getCellRange(shiftDragStartCell || currentCell, currentCell);
     }
   }
@@ -1432,6 +1483,7 @@
     { command: 'dataGrid.revertAllChanges', hideDisabled: true },
     { command: 'dataGrid.deleteSelectedRows' },
     { command: 'dataGrid.insertNewRow' },
+    { command: 'dataGrid.cloneRows' },
     { command: 'dataGrid.setNull' },
     { placeTag: 'edit' },
     { divider: true },
@@ -1498,12 +1550,16 @@
   <div>
     <ErrorInfo
       alignTop
-      message="No rows loaded, check filter or add new documents. You could copy documents from ohter collections/tables with Copy advanved/Copy as JSON command."
+      message={grider.editable
+        ? 'No rows loaded, check filter or add new documents. You could copy documents from ohter collections/tables with Copy advanved/Copy as JSON command.'
+        : 'No rows loaded'}
     />
     {#if display.filterCount > 0}
       <FormStyledButton value="Reset filter" on:click={() => display.clearFilters()} />
     {/if}
-    <FormStyledButton value="Add document" on:click={addJsonDocument} />
+    {#if grider.editable}
+      <FormStyledButton value="Add document" on:click={addJsonDocument} />
+    {/if}
   </div>
 {:else if grider.errors && grider.errors.length > 0}
   <div>

packages/web/src/formview/FormView.svelte

@@ -16,7 +16,7 @@
     id: 'dataForm.refresh',
     category: 'Data form',
     name: 'Refresh',
-    keyText: 'F5',
+    keyText: 'F5 | CtrlOrCommand+R',
     toolbar: true,
     isRelatedToTab: true,
     icon: 'icon reload',
@@ -38,7 +38,7 @@
     id: 'dataForm.revertRowChanges',
     category: 'Data form',
     name: 'Revert row changes',
-    keyText: 'CtrlOrCommand+R',
+    keyText: 'CtrlOrCommand+U',
     testEnabled: () => getCurrentDataForm()?.getFormer()?.containsChanges,
     onClick: () => getCurrentDataForm().getFormer().revertRowChanges(),
   });

packages/web/src/settings/ConnectionDriverFields.svelte

@@ -168,6 +168,10 @@
   <FormCheckboxField label="Is read only" name="isReadOnly" disabled={isConnected} />
 {/if}
 
+{#if driver?.showConnectionField('trustServerCertificate', $values)}
+  <FormCheckboxField label="Trust server certificate" name="trustServerCertificate" disabled={isConnected} />
+{/if}
+
 {#if driver?.showConnectionField('defaultDatabase', $values)}
   <FormTextField label="Default database" name="defaultDatabase" disabled={isConnected} />
 {/if}

packages/web/src/settings/SettingsModal.svelte

@@ -91,6 +91,12 @@ ORDER BY
 
           <FormCheckboxField name="dataGrid.thousandsSeparator" label="Use thousands separator for numbers" />
 
+          <FormTextField
+            name="dataGrid.defaultAutoRefreshInterval"
+            label="Default grid auto refresh interval in seconds"
+            defaultValue="10"
+          />
+
           <div class="heading">Connection</div>
           <FormCheckboxField
             name="connection.autoRefresh"
@@ -99,7 +105,7 @@ ORDER BY
           />
           <FormTextField
             name="connection.autoRefreshInterval"
-            label="Interval between automatic refreshes in seconds"
+            label="Interval between automatic DB structure reloads in seconds"
             defaultValue="30"
             disabled={values['connection.autoRefresh'] === false}
           />

packages/web/src/stores.ts

@@ -29,7 +29,11 @@ export function writableWithStorage<T>(defaultValue: T, storageName) {
 }
 
 export function writableSettingsValue<T>(defaultValue: T, storageName) {
-  const res = derived(useSettings(), $settings => ($settings || {})[storageName] ?? defaultValue);
+  const res = derived(useSettings(), $settings => {
+    const obj = $settings || {};
+    // console.log('GET SETTINGS', $settings, storageName, obj[storageName]);
+    return obj[storageName] ?? defaultValue;
+  });
   return {
     ...res,
     set: value => apiCall('config/update-settings', { [storageName]: value }),

packages/web/src/tabs/ConnectionTab.svelte

@@ -167,7 +167,7 @@
 
   $: isConnected = $openedConnections.includes($values._id) || $openedSingleDatabaseConnections.includes($values._id);
 
-  $: console.log('CONN VALUES', $values);
+  // $: console.log('CONN VALUES', $values);
 </script>
 
 <FormProviderCore template={FormFieldTemplateLarge} {values}>

packages/web/src/tabs/TableDataTab.svelte

@@ -1,5 +1,6 @@
 <script lang="ts" context="module">
   const getCurrentEditor = () => getActiveComponent('TableDataTab');
+  const INTERVALS = [5, 10, 15, 13, 60];
 
   registerCommand({
     id: 'tableData.save',
@@ -14,6 +15,46 @@
     onClick: () => getCurrentEditor().save(),
   });
 
+  registerCommand({
+    id: 'tableData.setAutoRefresh.1',
+    category: 'Data grid',
+    name: 'Refresh every 1 second',
+    isRelatedToTab: true,
+    testEnabled: () => !!getCurrentEditor(),
+    onClick: () => getCurrentEditor().setAutoRefresh(1),
+  });
+
+  for (const seconds of INTERVALS) {
+    registerCommand({
+      id: `tableData.setAutoRefresh.${seconds}`,
+      category: 'Data grid',
+      name: `Refresh every ${seconds} seconds`,
+      isRelatedToTab: true,
+      testEnabled: () => !!getCurrentEditor(),
+      onClick: () => getCurrentEditor().setAutoRefresh(seconds),
+    });
+  }
+
+  registerCommand({
+    id: 'tableData.stopAutoRefresh',
+    category: 'Data grid',
+    name: 'Stop auto refresh',
+    isRelatedToTab: true,
+    keyText: 'CtrlOrCommand+Shift+R',
+    testEnabled: () => getCurrentEditor()?.isAutoRefresh() === true,
+    onClick: () => getCurrentEditor().stopAutoRefresh(null),
+  });
+
+  registerCommand({
+    id: 'tableData.startAutoRefresh',
+    category: 'Data grid',
+    name: 'Start auto refresh',
+    isRelatedToTab: true,
+    keyText: 'CtrlOrCommand+Shift+R',
+    testEnabled: () => getCurrentEditor()?.isAutoRefresh() === false,
+    onClick: () => getCurrentEditor().startAutoRefresh(),
+  });
+
   export const matchingProps = ['conid', 'database', 'schemaName', 'pureName'];
   export const allowAddToFavorites = props => true;
 </script>
@@ -50,12 +91,14 @@
   import { showSnackbarSuccess } from '../utility/snackbar';
   import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte';
   import openNewTab from '../utility/openNewTab';
-  import { setContext } from 'svelte';
+  import { onDestroy, setContext } from 'svelte';
   import { apiCall } from '../utility/api';
   import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
   import ToolStripContainer from '../buttons/ToolStripContainer.svelte';
   import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
   import ToolStripExportButton, { createQuickExportHandlerRef } from '../buttons/ToolStripExportButton.svelte';
+  import ToolStripCommandSplitButton from '../buttons/ToolStripCommandSplitButton.svelte';
+  import { getIntSettingsValue } from '../settings/settingsTools';
 
   export let tabid;
   export let conid;
@@ -68,6 +111,11 @@
   const config = useGridConfig(tabid);
   const cache = writable(createGridCache());
   const dbinfo = useDatabaseInfo({ conid, database });
+
+  let autoRefreshInterval = getIntSettingsValue('dataGrid.defaultAutoRefreshInterval', 10, 1, 3600);
+  let autoRefreshStarted = false;
+  let autoRefreshTimer = null;
+
   $: connection = useConnectionInfo({ conid });
 
   const [changeSetStore, dispatchChangeSet] = createUndoReducer(createChangeSet());
@@ -106,6 +154,38 @@
     return changeSetContainsChanges($changeSetStore?.value);
   }
 
+  export function setAutoRefresh(interval) {
+    autoRefreshInterval = interval;
+    startAutoRefresh();
+    invalidateCommands();
+  }
+
+  export function isAutoRefresh() {
+    return autoRefreshStarted;
+  }
+
+  export function startAutoRefresh() {
+    closeRefreshTimer();
+    autoRefreshTimer = setInterval(() => {
+      cache.update(reloadDataCacheFunc);
+    }, autoRefreshInterval * 1000);
+    autoRefreshStarted = true;
+    invalidateCommands();
+  }
+
+  export function stopAutoRefresh() {
+    closeRefreshTimer();
+    autoRefreshStarted = false;
+    invalidateCommands();
+  }
+
+  function closeRefreshTimer() {
+    if (autoRefreshTimer) {
+      clearInterval(autoRefreshTimer);
+      autoRefreshTimer = null;
+    }
+  }
+
   $: {
     $changeSetStore;
     invalidateCommands();
@@ -117,7 +197,21 @@
   setContext('collapsedLeftColumnStore', collapsedLeftColumnStore);
   $: setLocalStorage('dataGrid_collapsedLeftColumn', $collapsedLeftColumnStore);
 
+  onDestroy(() => {
+    closeRefreshTimer();
+  });
+
   const quickExportHandlerRef = createQuickExportHandlerRef();
+
+  function createAutoRefreshMenu() {
+    return [
+      { divider: true },
+      { command: 'tableData.stopAutoRefresh', hideDisabled: true },
+      { command: 'tableData.startAutoRefresh', hideDisabled: true },
+      'tableData.setAutoRefresh.1',
+      ...INTERVALS.map(seconds => ({ command: `tableData.setAutoRefresh.${seconds}`, text: `...${seconds} seconds` })),
+    ];
+  }
 </script>
 
 <ToolStripContainer>
@@ -134,8 +228,19 @@
   />
 
   <svelte:fragment slot="toolstrip">
-    <ToolStripCommandButton command="dataGrid.refresh" hideDisabled />
-    <ToolStripCommandButton command="dataForm.refresh" hideDisabled />
+    <ToolStripCommandSplitButton
+      buttonLabel={autoRefreshStarted ? `Refresh (every ${autoRefreshInterval}s)` : null}
+      commands={['dataGrid.refresh', ...createAutoRefreshMenu()]}
+      hideDisabled
+    />
+    <ToolStripCommandSplitButton
+      buttonLabel={autoRefreshStarted ? `Refresh (every ${autoRefreshInterval}s)` : null}
+      commands={['dataForm.refresh', ...createAutoRefreshMenu()]}
+      hideDisabled
+    />
+
+    <!-- <ToolStripCommandButton command="dataGrid.refresh" hideDisabled />
+    <ToolStripCommandButton command="dataForm.refresh" hideDisabled /> -->
     <ToolStripCommandButton command="tableData.save" />
     <ToolStripCommandButton command="dataGrid.insertNewRow" hideDisabled />
     <ToolStripCommandButton command="dataGrid.deleteSelectedRows" hideDisabled />

packages/web/src/utility/keycodes.js

@@ -56,8 +56,8 @@ export default {
   y: 89,
   z: 90,
   leftWindowKey: 91,
-  rightWindowKey: 92,
-  selectKey: 93,
+  rightWindowKey: 93,
+  // selectKey: 93,
   numPad0: 96,
   numPad1: 97,
   numPad2: 98,

packages/web/src/utility/metadataLoaders.ts

@@ -189,25 +189,29 @@ async function getCore(loader, args) {
 function useCore(loader, args) {
   const { url, params, reloadTrigger, transform, onLoaded } = loader(args);
   const cacheKey = stableStringify({ url, ...params });
-  let closed = false;
+  let openedCount = 0;
 
   return {
     subscribe: onChange => {
       async function handleReload() {
         const res = await getCore(loader, args);
-        if (!closed) {
+        if (openedCount > 0) {
           onChange(res);
         }
       }
-
+      openedCount += 1;
       handleReload();
 
       if (reloadTrigger) {
         subscribeCacheChange(reloadTrigger, cacheKey, handleReload);
         return () => {
-          closed = true;
+          openedCount -= 1;
           unsubscribeCacheChange(reloadTrigger, cacheKey, handleReload);
         };
+      } else {
+        return () => {
+          openedCount -= 1;
+        };
       }
     },
   };