From 49f8fb71e478ce25e4ee5f89ccef19c78e79d347 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sun, 18 Apr 2021 11:11:06 +0200
Subject: [PATCH] show toolbar settings

---
 packages/web/src/commands/stdCommands.ts      |  4 +-
 .../web/src/settings/SettingsModal.svelte     | 52 ++++++++++++-------
 packages/web/src/stores.ts                    |  2 +-
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 6ed9e6cf..f8502dc3 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -46,7 +46,7 @@ registerCommand({
   id: 'toolbar.show',
   category: 'Toolbar',
   name: 'Show',
-  onClick: () => visibleToolbar.set(1),
+  onClick: () => visibleToolbar.set(true),
   testEnabled: () => !getVisibleToolbar(),
 });
 
@@ -54,7 +54,7 @@ registerCommand({
   id: 'toolbar.hide',
   category: 'Toolbar',
   name: 'Hide',
-  onClick: () => visibleToolbar.set(0),
+  onClick: () => visibleToolbar.set(false),
   testEnabled: () => getVisibleToolbar(),
 });
 
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index ce824de8..fd14956f 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import _ from 'lodash';
+
   import FormButton from '../forms/FormButton.svelte';
   import FormCheckboxField from '../forms/FormCheckboxField.svelte';
 
@@ -8,34 +10,46 @@
 
   import ModalBase from '../modals/ModalBase.svelte';
   import { closeCurrentModal } from '../modals/modalTools';
+  import { getCurrentSettings, getVisibleToolbar, visibleToolbar } from '../stores';
   import axiosInstance from '../utility/axiosInstance';
-  import { useSettings } from '../utility/metadataLoaders';
-
-  const settings = useSettings();
 
   function handleOk(e) {
-    axiosInstance.post('config/update-settings', e.detail);
+    axiosInstance.post(
+      'config/update-settings',
+      _.omitBy(e.detail, (v, k) => k.startsWith(':'))
+    );
+    visibleToolbar.set(!!e.detail[':visibleToolbar']);
     closeCurrentModal();
   }
 </script>
 
-{#if $settings}
-  <FormProvider initialValues={$settings}>
-    <ModalBase {...$$restProps}>
-      <div slot="header">Settings</div>
+<FormProvider
+  initialValues={{
+    ...getCurrentSettings(),
+    ':visibleToolbar': getVisibleToolbar(),
+  }}
+>
+  <ModalBase {...$$restProps}>
+    <div slot="header">Settings</div>
 
-      <div class="heading">Data grid</div>
-      <FormCheckboxField name="dataGrid.hideLeftColumn" label="Hide left column by default" />
-      <FormTextField name="dataGrid.pageSize" label="Page size (number of rows for incremental loading)" defaultValue="100" />
-      <FormCheckboxField name="dataGrid.showHintColumns" label="Show foreign key hints" defaultValue={true} />
+    <div class="heading">Appearance</div>
+    <FormCheckboxField name=":visibleToolbar" label="Show toolbar" defaultValue={true} />
 
-      <div slot="footer">
-        <FormSubmit value="OK" on:click={handleOk} />
-        <FormButton value="Cancel" on:click={closeCurrentModal} />
-      </div>
-    </ModalBase>
-  </FormProvider>
-{/if}
+    <div class="heading">Data grid</div>
+    <FormCheckboxField name="dataGrid.hideLeftColumn" label="Hide left column by default" />
+    <FormTextField
+      name="dataGrid.pageSize"
+      label="Page size (number of rows for incremental loading)"
+      defaultValue="100"
+    />
+    <FormCheckboxField name="dataGrid.showHintColumns" label="Show foreign key hints" defaultValue={true} />
+
+    <div slot="footer">
+      <FormSubmit value="OK" on:click={handleOk} />
+      <FormButton value="Cancel" on:click={closeCurrentModal} />
+    </div>
+  </ModalBase>
+</FormProvider>
 
 <style>
   .heading {
diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts
index 53fcd7d7..36e3880b 100644
--- a/packages/web/src/stores.ts
+++ b/packages/web/src/stores.ts
@@ -51,7 +51,7 @@ export const commandsCustomized = derived([commands, commandsSettings], ([$comma
   }))
 );
 
-export const visibleToolbar = writableWithStorage(1, 'visibleToolbar');
+export const visibleToolbar = writableWithStorage(true, 'visibleToolbar');
 export const leftPanelWidth = writable(300);
 export const currentDropDownMenu = writable(null);
 export const openedModals = writable([]);