SYNC: settings storage changed

packages/web/src/settings/ConnectionSettings.svelte

@@ -1,81 +1,64 @@
 <script lang="ts">
-  import CheckboxField from "../forms/CheckboxField.svelte";
-  import FormCheckboxField from "../forms/FormCheckboxField.svelte";
-  import FormFieldTemplateLarge from "../forms/FormFieldTemplateLarge.svelte";
-  import FormSelectField from "../forms/FormSelectField.svelte";
-  import FormTextField from "../forms/FormTextField.svelte";
-  import FormValues from "../forms/FormValues.svelte";
-  import { lockedDatabaseMode } from "../stores";
-  import { _t } from "../translations";
-
-    
+  import CheckboxField from '../forms/CheckboxField.svelte';
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+  import FormFieldTemplateLarge from '../forms/FormFieldTemplateLarge.svelte';
+  import FormSelectField from '../forms/FormSelectField.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import FormValues from '../forms/FormValues.svelte';
+  import { lockedDatabaseMode } from '../stores';
+  import { _t } from '../translations';
 </script>
 
 <div class="wrapper">
-<FormValues let:values>
+  <FormValues let:values>
     <div class="heading">{_t('settings.connection', { defaultMessage: 'Connection' })}</div>
 
-    <FormFieldTemplateLarge
-    label={_t('settings.connection.showOnlyTabsFromSelectedDatabase', {
-        defaultMessage: 'Show only tabs from selected database',
-    })}
-    type="checkbox"
-    labelProps={{
-        onClick: () => {
-        $lockedDatabaseMode = !$lockedDatabaseMode;
-        },
-    }}
-    >
-    <CheckboxField checked={$lockedDatabaseMode} on:change={e => ($lockedDatabaseMode = e.target.checked)} data-testid="ConnectionSettings_lockedDatabaseMode"/>
-    </FormFieldTemplateLarge>
-
     <FormCheckboxField
-    name="connection.autoRefresh"
-    label={_t('settings.connection.autoRefresh', {
+      name="connection.autoRefresh"
+      label={_t('settings.connection.autoRefresh', {
         defaultMessage: 'Automatic refresh of database model on background',
-    })}
-    defaultValue={false}
+      })}
+      defaultValue={false}
     />
     <FormTextField
-    name="connection.autoRefreshInterval"
-    label={_t('settings.connection.autoRefreshInterval', {
+      name="connection.autoRefreshInterval"
+      label={_t('settings.connection.autoRefreshInterval', {
         defaultMessage: 'Interval between automatic DB structure reloads in seconds',
-    })}
-    defaultValue="30"
-    disabled={values['connection.autoRefresh'] === false}
+      })}
+      defaultValue="30"
+      disabled={values['connection.autoRefresh'] === false}
     />
     <FormSelectField
-    label={_t('settings.connection.sshBindHost', { defaultMessage: 'Local host address for SSH connections' })}
-    name="connection.sshBindHost"
-    isNative
-    defaultValue="127.0.0.1"
-    options={[
+      label={_t('settings.connection.sshBindHost', { defaultMessage: 'Local host address for SSH connections' })}
+      name="connection.sshBindHost"
+      isNative
+      defaultValue="127.0.0.1"
+      options={[
         { value: '127.0.0.1', label: '127.0.0.1 (IPv4)' },
         { value: '::1', label: '::1  (IPv6)' },
         { value: 'localhost', label: 'localhost (domain name)' },
-    ]}
+      ]}
     />
 
     <div class="heading">{_t('settings.session', { defaultMessage: 'Query sessions' })}</div>
     <FormCheckboxField
-    name="session.autoClose"
-    label={_t('settings.session.autoClose', {
+      name="session.autoClose"
+      label={_t('settings.session.autoClose', {
         defaultMessage: 'Automatic close query sessions after period without any activity',
-    })}
-    defaultValue={true}
+      })}
+      defaultValue={true}
     />
     <FormTextField
-    name="session.autoCloseTimeout"
-    label={_t('settings.session.autoCloseTimeout', {
+      name="session.autoCloseTimeout"
+      label={_t('settings.session.autoCloseTimeout', {
         defaultMessage: 'Interval, after which query session without activity is closed (in minutes)',
-    })}
-    defaultValue="15"
-    disabled={values['session.autoClose'] === false}
+      })}
+      defaultValue="15"
+      disabled={values['session.autoClose'] === false}
     />
-</FormValues>
+  </FormValues>
 </div>
 
-
 <style>
   .heading {
     font-size: 20px;
@@ -84,12 +67,11 @@
     margin-top: var(--dim-large-form-margin);
   }
 
-  .wrapper :global(input){
+  .wrapper :global(input) {
     max-width: 400px;
   }
 
-  .wrapper :global(select){
+  .wrapper :global(select) {
     max-width: 400px;
   }
-
-</style>
+</style>

packages/web/src/settings/GeneralSettings.svelte

@@ -10,6 +10,9 @@
   import { isMac } from '../utility/common';
   import getElectron from '../utility/getElectron';
   import ConfirmModal from '../modals/ConfirmModal.svelte';
+  import hasPermission from '../utility/hasPermission';
+  import CheckboxField from '../forms/CheckboxField.svelte';
+  import { lockedDatabaseMode } from '../stores';
 
   const electron = getElectron();
   let restartWarning = false;
@@ -78,6 +81,24 @@
     />
   {/if}
 
+  <FormFieldTemplateLarge
+    label={_t('settings.connection.showOnlyTabsFromSelectedDatabase', {
+      defaultMessage: 'Show only tabs from selected database',
+    })}
+    type="checkbox"
+    labelProps={{
+      onClick: () => {
+        $lockedDatabaseMode = !$lockedDatabaseMode;
+      },
+    }}
+  >
+    <CheckboxField
+      checked={$lockedDatabaseMode}
+      on:change={e => ($lockedDatabaseMode = e.target['checked'])}
+      data-testid="ConnectionSettings_lockedDatabaseMode"
+    />
+  </FormFieldTemplateLarge>
+
   <div class="heading">{_t('settings.appearance', { defaultMessage: 'Appearance' })}</div>
 
   {#if electron}
@@ -106,6 +127,7 @@
       defaultMessage: 'Show server name alongside database name in title of the tab group',
     })}
     defaultValue={false}
+    disabled={!hasPermission('settings/change')}
   />
 </div>
 

packages/web/src/settings/settingsTools.ts

@@ -29,6 +29,13 @@ export function getStringSettingsValue(name, defaultValue) {
   return res;
 }
 
+export function getObjectSettingsValue(name, defaultValue) {
+  const settings = getCurrentSettings();
+  const res = settings[name];
+  if (res == null) return defaultValue;
+  return res;
+}
+
 export function getConnectionClickActionSetting(): 'connect' | 'openDetails' | 'none' {
   return getStringSettingsValue('defaultAction.connectionClick', 'connect');
 }