From 0b81ea8f4ebb3c526779998ffa12cf77aef8a586 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 30 Dec 2021 17:36:46 +0100
Subject: [PATCH] collapsed left column - moved from settings to storage

---
 packages/web/src/datagrid/DataGrid.svelte      | 3 ++-
 packages/web/src/settings/SettingsModal.svelte | 1 -
 packages/web/src/tabs/CollectionDataTab.svelte | 6 ++++--
 packages/web/src/tabs/FreeTableTab.svelte      | 4 +++-
 packages/web/src/tabs/TableDataTab.svelte      | 4 +++-
 packages/web/src/tabs/ViewDataTab.svelte       | 4 +++-
 packages/web/src/utility/storageCache.js       | 4 ++--
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/web/src/datagrid/DataGrid.svelte b/packages/web/src/datagrid/DataGrid.svelte
index a07158311..aca02caff 100644
--- a/packages/web/src/datagrid/DataGrid.svelte
+++ b/packages/web/src/datagrid/DataGrid.svelte
@@ -67,6 +67,7 @@
   import registerCommand from '../commands/registerCommand';
   import { registerMenu } from '../utility/contextMenu';
   import { getBoolSettingsValue } from '../settings/settingsTools';
+  import { getLocalStorage } from '../utility/storageCache';
 
   export let config;
   export let setConfig;
@@ -100,7 +101,7 @@
 
   let managerSize;
   const collapsedLeftColumnStore =
-    getContext('collapsedLeftColumnStore') || writable(!getBoolSettingsValue('dataGrid.showLeftColumn', false));
+    getContext('collapsedLeftColumnStore') || writable(getLocalStorage('dataGrid_collapsedLeftColumn', false));
 
   $: isFormView = !!(formDisplay && formDisplay.config && formDisplay.config.isFormView);
   $: isJsonView = !!config?.isJsonView;
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 159428e0d..01f8fe3a6 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -53,7 +53,6 @@
       />
 
       <div class="heading">Data grid</div>
-      <FormCheckboxField name="dataGrid.showLeftColumn" label="Show left column by default" />
       <FormTextField
         name="dataGrid.pageSize"
         label="Page size (number of rows for incremental loading, must be between 5 and 1000)"
diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte
index 8eaf6a0a2..0361e5da2 100644
--- a/packages/web/src/tabs/CollectionDataTab.svelte
+++ b/packages/web/src/tabs/CollectionDataTab.svelte
@@ -49,7 +49,8 @@
   import ChangeSetGrider from '../datagrid/ChangeSetGrider';
   import { setContext } from 'svelte';
   import _ from 'lodash';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
+  import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
 
   export let tabid;
   export let conid;
@@ -133,8 +134,9 @@ import { apiCall } from '../utility/api';
 
   registerMenu({ command: 'collectionTable.save', tag: 'save' });
 
-  const collapsedLeftColumnStore = writable(false);
+  const collapsedLeftColumnStore = writable(getLocalStorage('collection_collapsedLeftColumn', false));
   setContext('collapsedLeftColumnStore', collapsedLeftColumnStore);
+  $: setLocalStorage('collection_collapsedLeftColumn', $collapsedLeftColumnStore);
 </script>
 
 <DataGrid
diff --git a/packages/web/src/tabs/FreeTableTab.svelte b/packages/web/src/tabs/FreeTableTab.svelte
index 3915f1252..9c92c4675 100644
--- a/packages/web/src/tabs/FreeTableTab.svelte
+++ b/packages/web/src/tabs/FreeTableTab.svelte
@@ -47,6 +47,7 @@
   import { registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import createUndoReducer from '../utility/createUndoReducer';
+  import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
   import useGridConfig from '../utility/useGridConfig';
 
   export let tabid;
@@ -99,8 +100,9 @@
     dispatchModel({ type: 'set', value: newModel });
   }
 
-  const collapsedLeftColumnStore = writable(false);
+  const collapsedLeftColumnStore = writable(getLocalStorage('freeTable_collapsedLeftColumn', false));
   setContext('collapsedLeftColumnStore', collapsedLeftColumnStore);
+  $: setLocalStorage('freeTable_collapsedLeftColumn', $collapsedLeftColumnStore);
 
   export function toggleDynamicStructure() {
     let structure = $modelState.value.structure;
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index 4aa699f21..69ea8a463 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -53,6 +53,7 @@
   import { getBoolSettingsValue } from '../settings/settingsTools';
   import { setContext } from 'svelte';
   import { apiCall } from '../utility/api';
+  import { getLocalStorage, setLocalStorage, setLocalStorage } from '../utility/storageCache';
 
   export let tabid;
   export let conid;
@@ -110,8 +111,9 @@
 
   registerMenu({ command: 'tableData.save', tag: 'save' });
 
-  const collapsedLeftColumnStore = writable(!getBoolSettingsValue('dataGrid.showLeftColumn', false));
+  const collapsedLeftColumnStore = writable(getLocalStorage('dataGrid_collapsedLeftColumn', false));
   setContext('collapsedLeftColumnStore', collapsedLeftColumnStore);
+  $: setLocalStorage('dataGrid_collapsedLeftColumn', $collapsedLeftColumnStore);
 </script>
 
 <TableDataGrid
diff --git a/packages/web/src/tabs/ViewDataTab.svelte b/packages/web/src/tabs/ViewDataTab.svelte
index 827b1a6b9..737901d2f 100644
--- a/packages/web/src/tabs/ViewDataTab.svelte
+++ b/packages/web/src/tabs/ViewDataTab.svelte
@@ -14,6 +14,7 @@
   import { getBoolSettingsValue } from '../settings/settingsTools';
   import { extensions } from '../stores';
   import { useConnectionInfo, useDatabaseServerVersion, useViewInfo } from '../utility/metadataLoaders';
+  import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
   import useGridConfig from '../utility/useGridConfig';
   import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte';
 
@@ -44,8 +45,9 @@
         )
       : null;
 
-  const collapsedLeftColumnStore = writable(!getBoolSettingsValue('dataGrid.showLeftColumn', false));
+  const collapsedLeftColumnStore = writable(getLocalStorage('dataGrid_collapsedLeftColumn', false));
   setContext('collapsedLeftColumnStore', collapsedLeftColumnStore);
+  $: setLocalStorage('dataGrid_collapsedLeftColumn', $collapsedLeftColumnStore);
 </script>
 
 {#if display}
diff --git a/packages/web/src/utility/storageCache.js b/packages/web/src/utility/storageCache.js
index 17cc0723c..d99048578 100644
--- a/packages/web/src/utility/storageCache.js
+++ b/packages/web/src/utility/storageCache.js
@@ -1,6 +1,6 @@
 const cache = {};
 
-export function getLocalStorage(key) {
+export function getLocalStorage(key, defaultValue = undefined) {
   if (key in cache) return cache[key];
   const item = localStorage.getItem(key);
   if (item) {
@@ -8,7 +8,7 @@ export function getLocalStorage(key) {
     cache[key] = res;
     return res;
   }
-  return undefined;
+  return defaultValue;
 }
 
 export function setLocalStorage(key, value) {