renamed singleDatabaseMode to lockedDatabaseMode

This commit is contained in:
Jan Prochazka
2022-12-25 17:32:14 +01:00
parent 3792f1001e
commit a6fa116b5e
6 changed files with 26 additions and 26 deletions

View File

@@ -40,8 +40,8 @@
'icon columns': 'mdi mdi-view-column', 'icon columns': 'mdi mdi-view-column',
'icon columns-outline': 'mdi mdi-view-column-outline', 'icon columns-outline': 'mdi mdi-view-column-outline',
'icon single-database-mode': 'mdi mdi-database-lock', 'icon locked-database-mode': 'mdi mdi-database-lock',
'icon multi-database-mode': 'mdi mdi-database-eye', 'icon unlocked-database-mode': 'mdi mdi-database-eye',
'icon database': 'mdi mdi-database', 'icon database': 'mdi mdi-database',
'icon server': 'mdi mdi-server', 'icon server': 'mdi mdi-server',

View File

@@ -24,7 +24,7 @@
currentEditorTheme, currentEditorTheme,
extensions, extensions,
selectedWidget, selectedWidget,
singleDatabaseMode, lockedDatabaseMode,
visibleWidgetSideBar, visibleWidgetSideBar,
} from '../stores'; } from '../stores';
import { isMac } from '../utility/common'; import { isMac } from '../utility/common';
@@ -115,11 +115,11 @@ ORDER BY
type="checkbox" type="checkbox"
labelProps={{ labelProps={{
onClick: () => { onClick: () => {
$singleDatabaseMode = !$singleDatabaseMode; $lockedDatabaseMode = !$lockedDatabaseMode;
}, },
}} }}
> >
<CheckboxField checked={$singleDatabaseMode} on:change={e => ($singleDatabaseMode = e.target.checked)} /> <CheckboxField checked={$lockedDatabaseMode} on:change={e => ($lockedDatabaseMode = e.target.checked)} />
</FormFieldTemplateLarge> </FormFieldTemplateLarge>
<FormCheckboxField <FormCheckboxField

View File

@@ -50,7 +50,7 @@ function subscribeCssVariable(store, transform, cssVariable) {
} }
export const selectedWidget = writableWithStorage('database', 'selectedWidget'); export const selectedWidget = writableWithStorage('database', 'selectedWidget');
export const singleDatabaseMode = writableWithStorage<boolean>(false, 'singleDatabaseMode'); export const lockedDatabaseMode = writableWithStorage<boolean>(false, 'lockedDatabaseMode');
export const visibleWidgetSideBar = writableWithStorage(true, 'visibleWidgetSideBar'); export const visibleWidgetSideBar = writableWithStorage(true, 'visibleWidgetSideBar');
export const visibleSelectedWidget = derived( export const visibleSelectedWidget = derived(
[selectedWidget, visibleWidgetSideBar], [selectedWidget, visibleWidgetSideBar],
@@ -138,7 +138,7 @@ subscribeCssVariable(visibleSelectedWidget, x => (x ? 1 : 0), '--dim-visible-lef
// subscribeCssVariable(visibleToolbar, x => (x ? 1 : 0), '--dim-visible-toolbar'); // subscribeCssVariable(visibleToolbar, x => (x ? 1 : 0), '--dim-visible-toolbar');
subscribeCssVariable(leftPanelWidth, x => `${x}px`, '--dim-left-panel-width'); subscribeCssVariable(leftPanelWidth, x => `${x}px`, '--dim-left-panel-width');
subscribeCssVariable(visibleTitleBar, x => (x ? 1 : 0), '--dim-visible-titlebar'); subscribeCssVariable(visibleTitleBar, x => (x ? 1 : 0), '--dim-visible-titlebar');
subscribeCssVariable(singleDatabaseMode, x => (x ? 0 : 1), '--dim-visible-tabs-databases'); subscribeCssVariable(lockedDatabaseMode, x => (x ? 0 : 1), '--dim-visible-tabs-databases');
let activeTabIdValue = null; let activeTabIdValue = null;
activeTabId.subscribe(value => { activeTabId.subscribe(value => {
@@ -200,11 +200,11 @@ pinnedDatabases.subscribe(value => {
}); });
export const getPinnedDatabases = () => _.compact(pinnedDatabasesValue); export const getPinnedDatabases = () => _.compact(pinnedDatabasesValue);
let singleDatabaseModeValue = null; let lockedDatabaseModeValue = null;
singleDatabaseMode.subscribe(value => { lockedDatabaseMode.subscribe(value => {
singleDatabaseModeValue = value; lockedDatabaseModeValue = value;
}); });
export const getSingleDatabaseMode = () => singleDatabaseModeValue; export const getLockedDatabaseMode = () => lockedDatabaseModeValue;
let currentDatabaseValue = null; let currentDatabaseValue = null;
currentDatabase.subscribe(value => { currentDatabase.subscribe(value => {

View File

@@ -1,5 +1,5 @@
import _ from 'lodash'; import _ from 'lodash';
import { currentDatabase, getCurrentDatabase, getSingleDatabaseMode, openedTabs } from '../stores'; import { currentDatabase, getCurrentDatabase, getLockedDatabaseMode, openedTabs } from '../stores';
import { shouldShowTab } from '../widgets/TabsPanel.svelte'; import { shouldShowTab } from '../widgets/TabsPanel.svelte';
import { callWhenAppLoaded } from './appLoadManager'; import { callWhenAppLoaded } from './appLoadManager';
import { getConnectionInfo } from './metadataLoaders'; import { getConnectionInfo } from './metadataLoaders';
@@ -9,7 +9,7 @@ let lastCurrentTab = null;
openedTabs.subscribe(value => { openedTabs.subscribe(value => {
const newCurrentTab = (value || []).find(x => x.selected); const newCurrentTab = (value || []).find(x => x.selected);
if (newCurrentTab == lastCurrentTab) return; if (newCurrentTab == lastCurrentTab) return;
if (getSingleDatabaseMode() && getCurrentDatabase()) return; if (getLockedDatabaseMode() && getCurrentDatabase()) return;
const lastTab = lastCurrentTab; const lastTab = lastCurrentTab;
lastCurrentTab = newCurrentTab; lastCurrentTab = newCurrentTab;
@@ -31,7 +31,7 @@ openedTabs.subscribe(value => {
}); });
currentDatabase.subscribe(currentDb => { currentDatabase.subscribe(currentDb => {
if (!getSingleDatabaseMode()) return; if (!getLockedDatabaseMode()) return;
openedTabs.update(tabs => { openedTabs.update(tabs => {
const newTabs = tabs.map(tab => ({ const newTabs = tabs.map(tab => ({
...tab, ...tab,

View File

@@ -1,11 +1,11 @@
<script lang="ts" context="module"> <script lang="ts" context="module">
const getCurrentValueMarker: any = {}; const getCurrentValueMarker: any = {};
export function shouldShowTab(tab, singleDbMode = getCurrentValueMarker, currentDb = getCurrentValueMarker) { export function shouldShowTab(tab, lockedDbMode = getCurrentValueMarker, currentDb = getCurrentValueMarker) {
if (singleDbMode == getCurrentValueMarker) { if (lockedDbMode == getCurrentValueMarker) {
singleDbMode = getSingleDatabaseMode(); lockedDbMode = getLockedDatabaseMode();
} }
if (singleDbMode) { if (lockedDbMode) {
if (currentDb == getCurrentValueMarker) { if (currentDb == getCurrentValueMarker) {
currentDb = getCurrentDatabase(); currentDb = getCurrentDatabase();
} }
@@ -250,8 +250,8 @@
activeTabId, activeTabId,
getActiveTabId, getActiveTabId,
getCurrentDatabase, getCurrentDatabase,
singleDatabaseMode, lockedDatabaseMode,
getSingleDatabaseMode, getLockedDatabaseMode,
} from '../stores'; } from '../stores';
import tabs from '../tabs'; import tabs from '../tabs';
import { setSelectedTab } from '../utility/common'; import { setSelectedTab } from '../utility/common';
@@ -264,7 +264,7 @@
import TabCloseButton from '../elements/TabCloseButton.svelte'; import TabCloseButton from '../elements/TabCloseButton.svelte';
import CloseTabModal from '../modals/CloseTabModal.svelte'; import CloseTabModal from '../modals/CloseTabModal.svelte';
$: showTabFilterFunc = tab => shouldShowTab(tab, $singleDatabaseMode, $currentDatabase); $: showTabFilterFunc = tab => shouldShowTab(tab, $lockedDatabaseMode, $currentDatabase);
$: connectionList = useConnectionList(); $: connectionList = useConnectionList();
$: currentDbKey = $: currentDbKey =
@@ -443,7 +443,7 @@
<div class="tabs" on:wheel={handleTabsWheel} bind:this={domTabs}> <div class="tabs" on:wheel={handleTabsWheel} bind:this={domTabs}>
{#each groupedTabs as tabGroup} {#each groupedTabs as tabGroup}
<div class="db-wrapper"> <div class="db-wrapper">
{#if !$singleDatabaseMode} {#if !$lockedDatabaseMode}
<div <div
class="db-name" class="db-name"
class:selected={draggingDbGroup class:selected={draggingDbGroup

View File

@@ -7,7 +7,7 @@
visibleSelectedWidget, visibleSelectedWidget,
visibleWidgetSideBar, visibleWidgetSideBar,
visibleHamburgerMenuWidget, visibleHamburgerMenuWidget,
singleDatabaseMode, lockedDatabaseMode,
} from '../stores'; } from '../stores';
import mainMenuDefinition from '../../../../app/src/mainMenuDefinition'; import mainMenuDefinition from '../../../../app/src/mainMenuDefinition';
import hasPermission from '../utility/hasPermission'; import hasPermission from '../utility/hasPermission';
@@ -112,12 +112,12 @@
<div <div
class="wrapper" class="wrapper"
title={`Toggle whether tabs from all databases are visible. Currently - ${$singleDatabaseMode ? 'NO' : 'YES'}`} title={`Toggle whether tabs from all databases are visible. Currently - ${$lockedDatabaseMode ? 'NO' : 'YES'}`}
on:click={() => { on:click={() => {
$singleDatabaseMode = !$singleDatabaseMode; $lockedDatabaseMode = !$lockedDatabaseMode;
}} }}
> >
<FontIcon icon={$singleDatabaseMode ? 'icon single-database-mode' : 'icon multi-database-mode'} /> <FontIcon icon={$lockedDatabaseMode ? 'icon locked-database-mode' : 'icon unlocked-database-mode'} />
</div> </div>
<div class="wrapper" on:click={handleSettingsMenu} bind:this={domSettings}> <div class="wrapper" on:click={handleSettingsMenu} bind:this={domSettings}>
<FontIcon icon="icon settings" /> <FontIcon icon="icon settings" />