From 13b36fc3c2de1f00b9f7d97f0cd7a50c8cc47d80 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 14 Aug 2025 18:11:47 +0530 Subject: [PATCH] update: array empty column badge; update: colum selector <> account preferences sync, show count only after a user changed the selection; --- src/lib/components/columnSelector.svelte | 14 ++-- src/lib/components/viewSelector.svelte | 69 +++++++++++++++---- src/lib/helpers/faker.ts | 2 +- src/lib/stores/preferences.ts | 19 +++++ .../table-[table]/columns/+page.svelte | 4 +- .../table-[table]/spreadsheet.svelte | 30 ++++---- 6 files changed, 102 insertions(+), 36 deletions(-) diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte index 6092e1eea..6037717ce 100644 --- a/src/lib/components/columnSelector.svelte +++ b/src/lib/components/columnSelector.svelte @@ -20,7 +20,8 @@ ui = 'legacy', allowNoColumns = false, showAnyway = false, - children + children, + onPreferencesUpdated = null }: { columns: Writable; isCustomTable?: boolean; @@ -28,6 +29,7 @@ ui?: 'legacy' | 'new'; showAnyway?: boolean; children: Snippet<[toggle: () => void, selectedColumnsNumber: number]>; + onPreferencesUpdated?: () => void; } = $props(); let search = $state(''); @@ -60,7 +62,9 @@ const shownColumns = $columns.filter((n) => n.hide === true).map((n) => n.id); if (isCustomTable) { - preferences.setCustomTableColumns(page.params.table, shownColumns); + preferences.setCustomTableColumns(page.params.table, shownColumns).then(() => { + onPreferencesUpdated?.(); + }); } else { preferences.setColumns(shownColumns); } @@ -211,10 +215,8 @@ >Deselect all {:else} -
- - No column named "{search}" was found - +
+ No results found
{/if} diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 43fe2d773..7523c6f67 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -7,29 +7,72 @@ import ViewToggle from './viewToggle.svelte'; import ColumnSelector from './columnSelector.svelte'; import { isSmallViewport } from '$lib/stores/viewport'; + import { preferences } from '$lib/stores/preferences'; + import { page } from '$app/state'; + import { hash } from '$lib/helpers/string'; - export let onlyIcon = false; - export let ui: 'legacy' | 'new' = 'legacy'; - export let columns: Writable; - export let view: View; - export let isCustomTable = false; - export let hideView = false; - export let hideColumns = false; - export let allowNoColumns = false; - export let showAnyway = false; + interface Props { + onlyIcon?: boolean; + ui?: 'legacy' | 'new'; + columns: Writable; + view: View; + isCustomTable?: boolean; + hideView?: boolean; + hideColumns?: boolean; + allowNoColumns?: boolean; + showAnyway?: boolean; + } + + let { + onlyIcon = false, + ui = 'legacy', + columns, + view = $bindable(), + isCustomTable = false, + hideView = false, + hideColumns = false, + allowNoColumns = false, + showAnyway = false + }: Props = $props(); + + let showCountBadge = $state(false); + const preferenceKey = $derived(getPreferenceKey()); + + function getPreferenceKey(): string { + const tableId = page.params.table; + const organizationId = page.data.organization?.$id ?? page.data.project?.teamId; + return hash([organizationId, tableId].filter(Boolean).join('#')); + } + + function updateBadgeState() { + if (!preferences.getKey(preferenceKey, false)) { + showCountBadge = true; + preferences.setKey(preferenceKey, true); + } + } + + $effect(() => { + showCountBadge = !onlyIcon || !!preferences.getKey(preferenceKey, false); + }); {#if !hideColumns && view === View.Table} - + {#snippet children(toggle, selectedColumnsNumber)} + class={onlyIcon && !$isSmallViewport ? 'width-fix' : undefined} + badge={showCountBadge ? selectedColumnsNumber.toString() : undefined}> {/snippet} diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts index 4ef272745..9ff49c87c 100644 --- a/src/lib/helpers/faker.ts +++ b/src/lib/helpers/faker.ts @@ -149,7 +149,7 @@ function generateSingleValue(column: Columns): string | number | boolean | null return faker.internet.url(); } } - return '' + return ''; } else { const stringAttr = column as Models.ColumnString; const maxLength = Math.min(stringAttr.size ?? 255, 1000); diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index 42aab1cb9..1b15f23b0 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -43,6 +43,9 @@ type ConsolePreferencesStore = { columnWidths?: { [key: string]: TeamPreferences['widths']; }; + miscellaneous?: { + [key: string]: string | number | boolean; + }; } & { hideAiDisclaimer?: boolean }; async function updateConsolePreferences(store: ConsolePreferencesStore): Promise { @@ -294,6 +297,22 @@ function createPreferences() { n.tableHeaderExpanded[tableId] = expanded; return n; }); + }, + + getKey(key: string, _default: T): T { + return (preferences?.miscellaneous?.[key] ?? _default) as T; + }, + + async setKey(key: string, value: string | number | boolean) { + await updateAndSync((n) => { + if (!n?.miscellaneous) { + n ??= {}; + n.miscellaneous ??= {}; + } + + n.miscellaneous[key] = value; + return n; + }); } }; } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte index 6168afc8b..6dd2d8ff7 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte @@ -275,7 +275,9 @@ {@const minMaxSize = getMinMaxSizeForColumn(column)} {#if minMaxSize} - + {minMaxSize} {/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte index 6902121d2..e7f8bde93 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte @@ -264,18 +264,14 @@ } function formatArray(array: unknown[]) { - if (array.length === 0) return '[ ]'; + if (array.length === 0) return 'Empty'; let formattedFields: string[] = []; for (const item of array) { - if (typeof item === 'string') { - formattedFields.push(`"${item}"`); - } else { - formattedFields.push(`${item}`); - } + formattedFields.push(`${item}`); } - return `[${formattedFields.join(', ')}]`; + return `${formattedFields.join(', ')}`; } function formatColumn(column: unknown) { @@ -342,9 +338,6 @@ ); } - // trigger ui update with randomized key! - spreadsheetRenderKey.set(`sorted#${Date.now()}`); - // save > navigate > restore! spreadsheetContainer.saveGridSheetScroll(); await goto(`${url.pathname}${url.search}`); @@ -532,9 +525,13 @@ Object.entries(row).filter(([key]) => !SYSTEM_KEYS.has(key)) ); - await sdk - .forProject(page.params.region, page.params.project) - .grids.updateRow(databaseId, tableId, row.$id, onlyData, row.$permissions); + await sdk.forProject(page.params.region, page.params.project).grids.updateRow({ + databaseId, + tableId, + rowId: row.$id, + data: onlyData, + permissions: row.$permissions + }); invalidate(Dependencies.ROW); trackEvent(Submit.RowUpdate); @@ -742,8 +739,8 @@ {#if row === null} {#each $tableColumns as col} @@ -838,6 +835,7 @@ {:else} {@const value = row[columnId]} {@const formatted = formatColumn(row[columnId])} + {@const isEmptyArray = formatted === 'Empty'} {@const isDatetimeAttribute = rowColumn.type === 'datetime'} {@const isEncryptedAttribute = isString(rowColumn) && rowColumn.encrypt} @@ -868,6 +866,8 @@ {:else if formatted === 'null'} + {:else if isEmptyArray} + {:else} {formatted} @@ -1087,7 +1087,7 @@ } /* TODO: not good! */ - & :global(input) { + & :global(input[type='text']) { padding-inline: 8px !important; }