dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-17 23:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

SYNC: widget column bar update

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-12-10 15:48:07 +01:00
committed by Diflow
parent fbf34fb730
commit b12c79462e
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/web/src/widgets/DatabaseWidgetDetailContent.svelte
View File

@@ -46,7 +46,7 @@
title={driver?.databaseEngineTypes?.includes('document') title={driver?.databaseEngineTypes?.includes('document')
? _t('widget.collectionsContainers', { defaultMessage: 'Collections/containers' }) ? _t('widget.collectionsContainers', { defaultMessage: 'Collections/containers' })
: _t('widget.tablesViewsFunctions', { defaultMessage: 'Tables, views, functions' })} : _t('widget.tablesViewsFunctions', { defaultMessage: 'Tables, views, functions' })}
name="dbObjects" name="dbObjectsSql"
storageName="dbObjectsWidget" storageName="dbObjectsWidget"
skip={!( skip={!(
conid && conid &&
@@ -60,7 +60,7 @@
<WidgetColumnBarItem <WidgetColumnBarItem
title={_t('widget.keys', { defaultMessage: 'Keys' })} title={_t('widget.keys', { defaultMessage: 'Keys' })}
name="dbObjects" name="dbObjectsKeyValue"
storageName="dbObjectsWidget" storageName="dbObjectsWidget"
skip={!(conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue'))} skip={!(conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue'))}
positiveCondition={correctCloudStatus} positiveCondition={correctCloudStatus}
@@ -70,7 +70,7 @@
<WidgetColumnBarItem <WidgetColumnBarItem
title={_t('widget.databaseContent', { defaultMessage: 'Database content' })} title={_t('widget.databaseContent', { defaultMessage: 'Database content' })}
name="dbObjects" name="dbObjectsFocused"
storageName="dbObjectsWidget" storageName="dbObjectsWidget"
skip={conid && (database || singleDatabase)} skip={conid && (database || singleDatabase)}
positiveCondition={correctCloudStatus} positiveCondition={correctCloudStatus}
@@ -84,7 +84,7 @@
<WidgetColumnBarItem <WidgetColumnBarItem
title={_t('widget.databaseContent', { defaultMessage: 'Database content' })} title={_t('widget.databaseContent', { defaultMessage: 'Database content' })}
name="dbObjects" name="dbObjectsError"
storageName="dbObjectsWidget" storageName="dbObjectsWidget"
skip={!(conid && (database || singleDatabase) && !driver)} skip={!(conid && (database || singleDatabase) && !driver)}
positiveCondition={correctCloudStatus} positiveCondition={correctCloudStatus}

14
packages/web/src/widgets/WidgetColumnBar.svelte
View File

@@ -4,9 +4,11 @@
import _ from 'lodash'; import _ from 'lodash';
export let hidden = false; export let hidden = false;
export let storageName = null;
let definitions = []; let definitions = {};
let clientHeight; let clientHeight;
let definitionCount = 0;
// const widgetColumnBarHeight = writable(0); // const widgetColumnBarHeight = writable(0);
const widgetColumnBarComputed = writable({}); const widgetColumnBarComputed = writable({});
@@ -19,11 +21,13 @@
[name]: { [name]: {
...item, ...item,
name, name,
index: definitions.length, index: definitionCount,
}, },
}; };
definitionCount += 1;
}); });
setContext('updateWidgetItemDefinition', (name, item) => { setContext('updateWidgetItemDefinition', (name, item) => {
// console.log('WidgetColumnBar updateWidgetItemDefinition', name, item);
definitions = { definitions = {
...definitions, ...definitions,
[name]: { ...definitions[name], ...item }, [name]: { ...definitions[name], ...item },
@@ -43,8 +47,8 @@
$: recompute(definitions); $: recompute(definitions);
function recompute(defs: any) { function recompute(defs: any) {
const visibleItems = _.values(defs) const visibleItems = _.orderBy(_.values(defs), ['index'])
.filter(x => !x.collapsed && !x.skip) .filter(x => !x.collapsed && !x.skip && x.positiveCondition)
.map(x => x.name); .map(x => x.name);
const visibleItemsCount = visibleItems.length; const visibleItemsCount = visibleItems.length;
@@ -88,6 +92,8 @@
visibleIndex++; visibleIndex++;
} }
// console.log('WidgetColumnBar definitions', defs);
// console.log('WidgetColumnBar recompute', computed);
$widgetColumnBarComputed = computed; $widgetColumnBarComputed = computed;
} }