diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 7523c6f67..e20b8ca1f 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -21,6 +21,7 @@ hideColumns?: boolean; allowNoColumns?: boolean; showAnyway?: boolean; + disableButton?: boolean; } let { @@ -32,7 +33,8 @@ hideView = false, hideColumns = false, allowNoColumns = false, - showAnyway = false + showAnyway = false, + disableButton = false }: Props = $props(); let showCountBadge = $state(false); @@ -70,7 +72,7 @@ icon={onlyIcon} onclick={toggle} variant="secondary" - disabled={!$columns.length && showAnyway} + disabled={(!$columns.length && showAnyway) || disableButton} class={onlyIcon && !$isSmallViewport ? 'width-fix' : undefined} badge={showCountBadge ? selectedColumnsNumber.toString() : undefined}> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte index d8991e516..22839e48a 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte @@ -1773,9 +1773,10 @@ }}> {#if !column.custom && row} {@const rowData = row[column.id]} + {@const isActions = column.id === 'actions'} {@const isNullOrUndefined = rowData === null || typeof rowData === 'undefined'} - {#if isNullOrUndefined} + {#if isNullOrUndefined && !isActions} {:else} {rowData} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte index 1a5a2e13a..bc556e3ed 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte @@ -99,6 +99,8 @@ $tableColumnSuggestions.table && $tableColumnSuggestions.table.id === page.params.table; + $: disableButton = canShowSuggestionsSheet; + async function onSelect(file: Models.File, localFile = false) { $isCsvImportInProgress = true; @@ -146,7 +148,8 @@ columns={tableColumns} hideView showAnyway - isCustomTable /> + isCustomTable + {disableButton} /> Columns @@ -157,7 +160,7 @@ onlyIcon query={data.query} columns={filterColumns} - disabled={!(hasColumns && hasValidColumns)} + disabled={!(hasColumns && hasValidColumns) || disableButton} analyticsSource="database_tables" /> Filters @@ -176,7 +179,7 @@ @@ -184,7 +187,7 @@