From f3a7e3af74d780f4aa80747664c4b0a9963cbb4f Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sun, 7 Aug 2022 11:21:08 +0200
Subject: [PATCH] option to skip table save confirmation #329

---
 .../datagrid/CollectionDataGridCore.svelte    |  6 ----
 .../src/forms/TemplatedCheckboxField.svelte   | 36 +++++++++++++++++++
 .../web/src/modals/ConfirmNoSqlModal.svelte   | 22 ++++++++++--
 .../web/src/modals/ConfirmSqlModal.svelte     | 20 ++++++++++-
 .../web/src/settings/SettingsModal.svelte     | 12 ++++++-
 .../web/src/tabs/CollectionDataTab.svelte     | 20 ++++++-----
 packages/web/src/tabs/TableDataTab.svelte     | 19 ++++++----
 7 files changed, 109 insertions(+), 26 deletions(-)
 create mode 100644 packages/web/src/forms/TemplatedCheckboxField.svelte

diff --git a/packages/web/src/datagrid/CollectionDataGridCore.svelte b/packages/web/src/datagrid/CollectionDataGridCore.svelte
index 9015ef012..6f2bae2a0 100644
--- a/packages/web/src/datagrid/CollectionDataGridCore.svelte
+++ b/packages/web/src/datagrid/CollectionDataGridCore.svelte
@@ -105,19 +105,13 @@
 </script>
 
 <script lang="ts">
-  import { changeSetToSql, createChangeSet } from 'dbgate-datalib';
   import { parseFilter } from 'dbgate-filterparser';
-  import { scriptToSql } from 'dbgate-sqltree';
   import _ from 'lodash';
   import { registerQuickExportHandler } from '../buttons/ToolStripExportButton.svelte';
   import registerCommand from '../commands/registerCommand';
-  import ErrorInfo from '../elements/ErrorInfo.svelte';
   import { extractShellConnection } from '../impexp/createImpExpScript';
-  import ConfirmNoSqlModal from '../modals/ConfirmNoSqlModal.svelte';
-  import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
   import ImportExportModal from '../modals/ImportExportModal.svelte';
   import { showModal } from '../modals/modalTools';
-  import { extensions } from '../stores';
   import { apiCall } from '../utility/api';
 
   import { registerMenu } from '../utility/contextMenu';
diff --git a/packages/web/src/forms/TemplatedCheckboxField.svelte b/packages/web/src/forms/TemplatedCheckboxField.svelte
new file mode 100644
index 000000000..a6d96f73d
--- /dev/null
+++ b/packages/web/src/forms/TemplatedCheckboxField.svelte
@@ -0,0 +1,36 @@
+<script lang="ts">
+  import { getFormContext } from './FormProviderCore.svelte';
+  import { createEventDispatcher } from 'svelte';
+
+  export let label;
+  export let name;
+  export let disabled = false;
+  export let templateProps = {};
+  export let checked: boolean;
+
+  let refInput;
+
+  const { template, setFieldValue, values } = getFormContext();
+  const dispatch = createEventDispatcher();
+
+  function handleChange() {
+    dispatch('change', refInput.checked);
+  }
+</script>
+
+<svelte:component
+  this={template}
+  type="checkbox"
+  {label}
+  {disabled}
+  {...templateProps}
+  labelProps={disabled
+    ? { disabled: true }
+    : {
+        onClick: () => {
+          dispatch('change', !refInput.checked);
+        },
+      }}
+>
+  <input bind:this={refInput} {checked} type="checkbox" {...$$restProps} on:change={handleChange} />
+</svelte:component>
diff --git a/packages/web/src/modals/ConfirmNoSqlModal.svelte b/packages/web/src/modals/ConfirmNoSqlModal.svelte
index c288200b0..fdabe8f6a 100644
--- a/packages/web/src/modals/ConfirmNoSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmNoSqlModal.svelte
@@ -2,15 +2,19 @@
   import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
-  import JSONTree from '../jsontree/JSONTree.svelte';
+  import TemplatedCheckboxField from '../forms/TemplatedCheckboxField.svelte';
   import AceEditor from '../query/AceEditor.svelte';
-import newQuery from '../query/newQuery';
+  import newQuery from '../query/newQuery';
+  import { apiCall } from '../utility/api';
 
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
 
   export let script;
   export let onConfirm;
+  export let skipConfirmSettingKey = null;
+
+  let dontAskAgain;
 </script>
 
 <FormProvider>
@@ -21,6 +25,20 @@ import newQuery from '../query/newQuery';
       <AceEditor mode="javascript" readOnly value={script} />
     </div>
 
+    {#if skipConfirmSettingKey}
+      <div class="mt-2">
+        <TemplatedCheckboxField
+          label="Don't ask again"
+          templateProps={{ noMargin: true }}
+          checked={dontAskAgain}
+          on:change={e => {
+            dontAskAgain = e.detail;
+            apiCall('config/update-settings', { [skipConfirmSettingKey]: e.detail });
+          }}
+        />
+      </div>
+    {/if}
+
     <div slot="footer">
       <FormSubmit
         value="OK"
diff --git a/packages/web/src/modals/ConfirmSqlModal.svelte b/packages/web/src/modals/ConfirmSqlModal.svelte
index 27e972a85..3f6cf1a85 100644
--- a/packages/web/src/modals/ConfirmSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmSqlModal.svelte
@@ -17,12 +17,13 @@
 </script>
 
 <script>
-  import _, { startsWith } from 'lodash';
+  import _ from 'lodash';
   import { writable } from 'svelte/store';
   import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormCheckboxField from '../forms/FormCheckboxField.svelte';
   import FormProviderCore from '../forms/FormProviderCore.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
+  import TemplatedCheckboxField from '../forms/TemplatedCheckboxField.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import newQuery from '../query/newQuery';
   import SqlEditor from '../query/SqlEditor.svelte';
@@ -38,6 +39,9 @@
   export let engine;
   export let recreates;
   export let deleteCascadesScripts;
+  export let skipConfirmSettingKey = null;
+
+  let dontAskAgain;
 
   $: isRecreated = _.sum(_.values(recreates || {})) > 0;
   const values = writable({});
@@ -122,6 +126,20 @@
       </div>
     {/if}
 
+    {#if skipConfirmSettingKey}
+      <div class="mt-2">
+        <TemplatedCheckboxField
+          label="Don't ask again"
+          templateProps={{ noMargin: true }}
+          checked={dontAskAgain}
+          on:change={e => {
+            dontAskAgain = e.detail;
+            apiCall('config/update-settings', { [skipConfirmSettingKey]: e.detail });
+          }}
+        />
+      </div>
+    {/if}
+
     <div slot="footer">
       <FormSubmit
         value="OK"
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 6ee704da2..97e45b636 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -60,7 +60,8 @@ ORDER BY
         tabs={[
           { label: 'General', slot: 1 },
           { label: 'Themes', slot: 2 },
-          { label: 'Actions', slot: 3 },
+          { label: 'Default Actions', slot: 3 },
+          { label: 'Confirmations', slot: 4 },
         ]}
       >
         <svelte:fragment slot="1">
@@ -224,6 +225,15 @@ ORDER BY
             ]}
           />
         </svelte:fragment>
+        <svelte:fragment slot="4">
+          <div class="heading">Confirmations</div>
+
+          <FormCheckboxField name="skipConfirm.tableDataSave" label="Skip confirmation when saving table data (SQL)" />
+          <FormCheckboxField
+            name="skipConfirm.collectionDataSave"
+            label="Skip confirmation when saving collection data (NoSQL)"
+          />
+        </svelte:fragment>
       </TabControl>
     </FormValues>
 
diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte
index 2e97a5d02..a8123f3f5 100644
--- a/packages/web/src/tabs/CollectionDataTab.svelte
+++ b/packages/web/src/tabs/CollectionDataTab.svelte
@@ -25,8 +25,6 @@
   import {
     createChangeSet,
     createGridCache,
-    createGridConfig,
-    TableFormViewDisplay,
     CollectionGridDisplay,
     changeSetContainsChanges,
     runMacroOnChangeSet,
@@ -45,8 +43,6 @@
   import ConfirmNoSqlModal from '../modals/ConfirmNoSqlModal.svelte';
   import registerCommand from '../commands/registerCommand';
   import { registerMenu } from '../utility/contextMenu';
-  import EditJsonModal from '../modals/EditJsonModal.svelte';
-  import ChangeSetGrider from '../datagrid/ChangeSetGrider';
   import { setContext } from 'svelte';
   import _ from 'lodash';
   import { apiCall } from '../utility/api';
@@ -54,6 +50,7 @@
   import ToolStripContainer from '../buttons/ToolStripContainer.svelte';
   import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
   import ToolStripExportButton, { createQuickExportHandlerRef } from '../buttons/ToolStripExportButton.svelte';
+  import { getBoolSettingsValue } from '../settings/settingsTools';
 
   export let tabid;
   export let conid;
@@ -119,11 +116,16 @@
     const driver = findEngineDriver($connection, $extensions);
     const script = driver.getCollectionUpdateScript ? driver.getCollectionUpdateScript(json) : null;
     if (script) {
-      showModal(ConfirmNoSqlModal, {
-        script,
-        onConfirm: () => handleConfirmChange(json),
-        engine: display.engine,
-      });
+      if (getBoolSettingsValue('skipConfirm.collectionDataSave', false)) {
+        handleConfirmChange(json);
+      } else {
+        showModal(ConfirmNoSqlModal, {
+          script,
+          onConfirm: () => handleConfirmChange(json),
+          engine: display.engine,
+          skipConfirmSettingKey: 'skipConfirm.collectionDataSave',
+        });
+      }
     } else {
       handleConfirmChange(json);
     }
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index 82835b990..ed02a195d 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -98,7 +98,7 @@
   import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
   import ToolStripExportButton, { createQuickExportHandlerRef } from '../buttons/ToolStripExportButton.svelte';
   import ToolStripCommandSplitButton from '../buttons/ToolStripCommandSplitButton.svelte';
-  import { getIntSettingsValue } from '../settings/settingsTools';
+  import { getBoolSettingsValue, getIntSettingsValue } from '../settings/settingsTools';
 
   export let tabid;
   export let conid;
@@ -142,12 +142,17 @@
       script: scriptToSql(driver, commands),
     }));
     // console.log('deleteCascadesScripts', deleteCascadesScripts);
-    showModal(ConfirmSqlModal, {
-      sql,
-      onConfirm: sqlOverride => handleConfirmSql(sqlOverride || sql),
-      engine: driver.engine,
-      deleteCascadesScripts,
-    });
+    if (getBoolSettingsValue('skipConfirm.tableDataSave', false) && !deleteCascadesScripts?.length) {
+      handleConfirmSql(sql);
+    } else {
+      showModal(ConfirmSqlModal, {
+        sql,
+        onConfirm: sqlOverride => handleConfirmSql(sqlOverride || sql),
+        engine: driver.engine,
+        deleteCascadesScripts,
+        skipConfirmSettingKey: deleteCascadesScripts?.length ? null : 'skipConfirm.tableDataSave',
+      });
+    }
   }
 
   export function canSave() {