diff --git a/packages/web/src/datagrid/DataGrid.svelte b/packages/web/src/datagrid/DataGrid.svelte index 93b8dc3a9..db66df808 100644 --- a/packages/web/src/datagrid/DataGrid.svelte +++ b/packages/web/src/datagrid/DataGrid.svelte @@ -165,7 +165,7 @@ >
- + @@ -173,7 +173,7 @@ title="Filters" name="filters" height={showReferences && display?.hasReferences && !isFormView ? '15%' : '30%'} - show={display?.filterable} + skip={!display?.filterable} collapsed={isDetailView} > diff --git a/packages/web/src/widgets/DatabaseWidget.svelte b/packages/web/src/widgets/DatabaseWidget.svelte index da96f0e4b..a7bd5f3b1 100644 --- a/packages/web/src/widgets/DatabaseWidget.svelte +++ b/packages/web/src/widgets/DatabaseWidget.svelte @@ -50,9 +50,11 @@ title={driver?.databaseEngineTypes?.includes('document') ? 'Collections' : 'Tables, views, functions'} name="dbObjects" storageName="dbObjectsWidget" - show={conid && + skip={!( + conid && (database || singleDatabase) && - (driver?.databaseEngineTypes?.includes('sql') || driver?.databaseEngineTypes?.includes('document'))} + (driver?.databaseEngineTypes?.includes('sql') || driver?.databaseEngineTypes?.includes('document')) + )} > @@ -61,7 +63,7 @@ title={'Keys'} name="dbObjects" storageName="dbObjectsWidget" - show={conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue')} + skip={!(conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue'))} > diff --git a/packages/web/src/widgets/WidgetColumnBarItem.svelte b/packages/web/src/widgets/WidgetColumnBarItem.svelte index 47c6828c8..e0c0d5edb 100644 --- a/packages/web/src/widgets/WidgetColumnBarItem.svelte +++ b/packages/web/src/widgets/WidgetColumnBarItem.svelte @@ -12,7 +12,6 @@ export let title; export let name; export let skip = false; - export let show = true; export let height = null; export let collapsed = null; @@ -32,12 +31,12 @@ { collapsed, height, - skip: skip || !show, + skip, }, dynamicProps ); - $: updateWidgetItemDefinition(widgetItemIndex, { collapsed: !visible, height, skip: skip || !show }); + $: updateWidgetItemDefinition(widgetItemIndex, { collapsed: !visible, height, skip }); $: setInitialSize(height, $widgetColumnBarHeight); @@ -67,7 +66,7 @@ $: collapsible = $dynamicProps.visibleItemsCount != 1 || !visible; -{#if !skip && show} +{#if !skip} (visible = !visible) : null}>{title} {#if visible}