From 60d993a532c0db9297f89cfe10811ade3cf4bc7e Mon Sep 17 00:00:00 2001 From: Darshan Date: Mon, 22 Sep 2025 18:32:59 +0530 Subject: [PATCH] add: column suggestions. --- src/lib/actions/analytics.ts | 3 + src/lib/stores/sdk.ts | 3 +- .../(suggestions)/empty.svelte | 52 ++- .../(suggestions)/index.ts | 1 + .../(suggestions)/review.svelte | 348 ++++++++++++++++++ .../(suggestions)/store.ts | 56 ++- .../database-[database]/+layout.svelte | 18 +- .../database-[database]/createTable.svelte | 58 +-- .../table-[table]/+layout.svelte | 2 + .../table-[table]/+page.svelte | 22 +- .../table-[table]/columns/+page.svelte | 1 - .../table-[table]/createColumn.svelte | 3 +- 12 files changed, 508 insertions(+), 59 deletions(-) create mode 100644 src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/review.svelte diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 1f4722965..b511e59c8 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -274,9 +274,12 @@ export enum Submit { DatabaseDelete = 'submit_database_delete', DatabaseUpdateName = 'submit_database_update_name', DatabaseImportCsv = 'submit_database_import_csv', + ColumnCreate = 'submit_column_create', ColumnUpdate = 'submit_column_update', ColumnDelete = 'submit_column_delete', + ColumnSuggestions = 'submit_column_suggestions', + RowCreate = 'submit_row_create', RowDelete = 'submit_row_delete', RowUpdate = 'submit_row_update', diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 20ec5b83c..3ea68fa62 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -126,7 +126,8 @@ const sdkForProject = { proxy: new Proxy(clientProject), migrations: new Migrations(clientProject), sites: new Sites(clientProject), - tablesDB: new TablesDB(clientProject) + tablesDB: new TablesDB(clientProject), + console: new Console(clientProject) // for suggestions API }; export const realtime = { 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 cf28ca0ea..e25d3105b 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 @@ -12,21 +12,25 @@ import { isSmallViewport } from '$lib/stores/viewport'; import { SortButton } from '$lib/components'; import type { Column } from '$lib/helpers/types'; - import { type Columns, expandTabs } from '../table-[table]/store'; + import { expandTabs } from '../table-[table]/store'; import SpreadsheetContainer from '../table-[table]/layout/spreadsheet.svelte'; import { onDestroy, onMount } from 'svelte'; import { debounce } from '$lib/helpers/debounce'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; - import { tableColumnSuggestions } from './store'; - import type { Models } from '@appwrite.io/console'; + import { + type ColumnInput, + mapSuggestedColumns, + type SuggestedColumnSchema, + tableColumnSuggestions + } from './store'; + import { addNotification } from '$lib/stores/notifications'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; const { onColumnsFinalized = undefined }: { - onColumnsFinalized?: ( - columns: Exclude[] - ) => Promise; + onColumnsFinalized?: (columns: SuggestedColumnSchema[]) => void | Promise; } = $props(); /** @@ -216,29 +220,37 @@ }); async function suggestColumns() { - console.log('tableColumnSuggestions', $tableColumnSuggestions.enabled); - - if (!$tableColumnSuggestions.enabled) return; - $tableColumnSuggestions.thinking = true; try { - const suggestedColumns = await sdk - .forConsoleIn(page.params.repository) + const suggestedColumns = (await sdk + .forProject(page.params.region, page.params.project) .console.suggestColumns({ databaseId: page.params.database, tableId: page.params.table, - context: $tableColumnSuggestions.context - }); + context: $tableColumnSuggestions.context ?? undefined + })) as unknown as { + total: number; + columns: ColumnInput[]; + }; - console.log(JSON.stringify(suggestedColumns, null, 2)); + trackEvent(Submit.ColumnSuggestions, { + total: suggestedColumns.total, + tableName: $tableColumnSuggestions.table?.name ?? undefined + }); - await onColumnsFinalized?.(suggestedColumns.columns); - } catch (e) { - // `null` means - // we couldn't make columns! - await onColumnsFinalized?.(null); + await onColumnsFinalized(mapSuggestedColumns(suggestedColumns.columns)); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + + trackError(error, Submit.ColumnSuggestions); } finally { + $tableColumnSuggestions.table = null; + $tableColumnSuggestions.context = null; + $tableColumnSuggestions.enabled = false; $tableColumnSuggestions.thinking = false; } } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/index.ts index 6a0f6f7d8..80654e522 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/index.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/index.ts @@ -1,3 +1,4 @@ export * from './store'; export { default as Empty } from './empty.svelte'; export { default as Input } from './input.svelte'; +export { default as Review } from './review.svelte'; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/review.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/review.svelte new file mode 100644 index 000000000..e95462724 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/review.svelte @@ -0,0 +1,348 @@ + + + + + Review and edit suggested columns before applying + + + + {#each draft as column, index (index)} + + + + { + draft[index] = normalizeColumnType(event.detail, draft[index]); + draft = [...draft]; + }} /> + + + + + {#if index !== draft.length - 1} + + {/if} + {/each} + + + + + + + + + + + + + + + + { + resetDraft(); + show = false; + columns = null; + }}> + Are you sure you want to dismiss these columns suggested by AI? This action is irreversible. + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts index cb042cf76..67bd268ba 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts @@ -3,11 +3,63 @@ import { writable } from 'svelte/store'; export type TableColumnSuggestions = { enabled: boolean; thinking: boolean; - context?: string | null; + context?: string | undefined; + + /* for safety when in tables page */ + table: { + id: string; + name: string; + }; +}; + +export type SuggestedColumnSchema = { + key: string; + type: string; + required: boolean; + default?: string | number | boolean | number[] | number[][] | number[][][] | null; + size?: number; + min?: number; + max?: number; + format?: string | null; }; export const tableColumnSuggestions = writable({ enabled: false, context: null, - thinking: false + thinking: false, + table: null }); + +export type ColumnInput = { + name: string; + type: string; + required?: boolean; + default?: string | number | boolean | number[] | number[][] | number[][][] | null; + size?: number; + min?: number; + max?: number; + format?: string; + formatOptions?: { + min?: number; + max?: number; + }; +}; + +export function mapSuggestedColumns(columns: T[]): SuggestedColumnSchema[] { + return columns.map((col) => ({ + key: col.name, + type: col.type, + required: col.required ?? false, + default: col.default ?? null, + size: col.type === 'string' ? (col.size ?? undefined) : undefined, + min: + col.type === 'integer' || col.type === 'double' + ? (col.min ?? col.formatOptions?.min ?? undefined) + : undefined, + max: + col.type === 'integer' || col.type === 'double' + ? (col.max ?? col.formatOptions?.max ?? undefined) + : undefined, + format: col.format ?? null + })); +} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte index c4b66e957..dc39232b0 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte @@ -10,7 +10,6 @@ } from '$lib/commandCenter'; import { tablesSearcher } from '$lib/commandCenter/searchers'; import { Dependencies } from '$lib/constants'; - import type { Models } from '@appwrite.io/console'; import CreateTable from './createTable.svelte'; import { showCreateTable } from './store'; import { TablesPanel } from '$lib/commandCenter/panels'; @@ -24,14 +23,6 @@ const project = page.params.project; const databaseId = page.params.database; - async function handleCreate(event: CustomEvent) { - $showCreateTable = false; - await invalidate(Dependencies.DATABASE); - await goto( - `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/table-${event.detail.$id}` - ); - } - $: $registerCommands([ { label: 'Create table', @@ -152,4 +143,11 @@ - + { + await invalidate(Dependencies.DATABASE); + await goto( + `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/table-${table.$id}` + ); + }} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte index f354cbcce..0f545f890 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte @@ -6,26 +6,28 @@ import { Button, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { ID } from '@appwrite.io/console'; - import { createEventDispatcher } from 'svelte'; + import { ID, type Models } from '@appwrite.io/console'; import { subNavigation } from '$lib/stores/database'; - import { Input as SuggestionsInput } from './(suggestions)/index'; + import { Input as SuggestionsInput, tableColumnSuggestions } from './(suggestions)/index'; let { - showCreate = $bindable(false) + showCreate = $bindable(false), + onTableCreated }: { showCreate: boolean; + onTableCreated: (table: Models.Table) => void | Promise; } = $props(); const databaseId = page.params.database; - const dispatch = createEventDispatcher(); let name = $state(''); let id: string = $state(null); let touchedId = $state(false); let error: string = $state(null); - const create = async () => { + let creatingTable = $state(false); + + async function createTable() { error = null; try { const table = await sdk @@ -36,23 +38,35 @@ name }); - showCreate = false; - subNavigation.update(); + $tableColumnSuggestions.table = { + id: table.$id, + name: table.name + }; - dispatch('created', table); - addNotification({ - type: 'success', - message: `${name} has been created` - }); - name = id = null; - trackEvent(Submit.TableCreate, { - customId: !!id - }); + updateAndCleanup(); + + await onTableCreated(table); + + showCreate = false; + creatingTable = false; } catch (e) { error = e.message; trackError(e, Submit.TableCreate); } - }; + } + + function updateAndCleanup() { + subNavigation.update(); + + addNotification({ + type: 'success', + message: `${name} has been created` + }); + + trackEvent(Submit.TableCreate, { customId: !!id }); + + name = id = null; + } function toIdFormat(str: string): string { return str @@ -79,7 +93,7 @@ }); - + - - + + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte index cc755911b..fcc995b71 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte @@ -62,6 +62,7 @@ import { preferences } from '$lib/stores/preferences'; import { buildRowUrl, isRelationship } from './rows/store'; import { chunks } from '$lib/helpers/array'; + import { Submit, trackEvent } from '$lib/actions/analytics'; let editRow: EditRow; let editRelatedRow: EditRelatedRow; @@ -256,6 +257,7 @@ columns = await generateColumns($project, page.params.database, page.params.table); await invalidate(Dependencies.TABLE); + trackEvent(Submit.ColumnCreate, { type: 'faker' }); } catch (e) { addNotification({ type: 'error', 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 e62eda0d5..f625e72a7 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 @@ -31,12 +31,20 @@ import EmptySheet from './layout/emptySheet.svelte'; import CreateRow from './rows/create.svelte'; import { onDestroy } from 'svelte'; - import { Empty as SuggestionsEmptySheet, tableColumnSuggestions } from '../(suggestions)'; + import { + Review as ReviewColumns, + Empty as SuggestionsEmptySheet, + type SuggestedColumnSchema, + tableColumnSuggestions + } from '../(suggestions)'; export let data: PageData; let showImportCSV = false; + let showSuggestionsModal = false; + let columnSuggestionsSchema: SuggestedColumnSchema[] = []; + // todo: might need a type fix here. const filterColumns = writable([]); @@ -216,8 +224,12 @@ } }} /> {/if} - {:else if $tableColumnSuggestions.thinking} - + {:else if $tableColumnSuggestions.enabled && $tableColumnSuggestions.table && $tableColumnSuggestions.table.id === page.params.table} + { + showSuggestionsModal = true; + columnSuggestionsSchema = columns; + }} /> {:else} +{#if showSuggestionsModal && columnSuggestionsSchema} + +{/if} +