diff --git a/package.json b/package.json index 539b387e0..5e4f33b17 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@9f28c76", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@59e81f6", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 84fd8540b..fb50c06c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@9f28c76 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@9f28c76(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@36dc3f2 + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@36dc3f2(svelte@5.25.3) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.0 @@ -284,8 +284,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@9f28c76': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@9f28c76} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@36dc3f2': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@36dc3f2} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3828,7 +3828,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@9f28c76(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@36dc3f2(svelte@5.25.3)': dependencies: '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) '@floating-ui/dom': 1.6.13 diff --git a/src/lib/components/csvImportBox.svelte b/src/lib/components/csvImportBox.svelte index 3eb45799f..c0b119a84 100644 --- a/src/lib/components/csvImportBox.svelte +++ b/src/lib/components/csvImportBox.svelte @@ -11,6 +11,10 @@ import { Layout, Typography } from '@appwrite.io/pink-svelte'; import { type Models, type Payload, Query } from '@appwrite.io/console'; + // re-render the key for sheet UI. + import { hash } from '$lib/helpers/string'; + import { spreadsheetRenderKey } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store'; + type ImportItem = { status: string; table?: string; @@ -58,6 +62,7 @@ if (isSuccess) { await invalidate(Dependencies.ROWS); + $spreadsheetRenderKey = hash(Date.now().toString()); } } @@ -75,7 +80,10 @@ try { const table = await sdk .forProject(page.params.region, page.params.project) - .grids.getTable(databaseId, tableId); + .grids.getTable({ + databaseId, + tableId + }); tableName = table.name; } catch { tableName = null; @@ -142,10 +150,12 @@ onMount(() => { sdk.forProject(page.params.region, page.params.project) - .migrations.list([ - Query.equal('source', 'CSV'), - Query.equal('status', ['pending', 'processing']) - ]) + .migrations.list({ + queries: [ + Query.equal('source', 'CSV'), + Query.equal('status', ['pending', 'processing']) + ] + }) .then((migrations) => { migrations.migrations.forEach(updateOrAddItem); }); @@ -186,36 +196,52 @@ - {#each [...$importItems.entries()] as [key, value] (key)} -
- -
- {/each} +
+ {#each [...$importItems.entries()] as [key, value] (key)} +
+ +
+ {/each} +
{/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts index 28ecf21d0..0b410a0ab 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts @@ -30,13 +30,11 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) => view, query, currentSort, - rows: await sdk - .forProject(params.region, params.project) - .grids.listRows( - params.database, - params.table, - buildGridQueries(limit, offset, parsedQueries, table) - ) + rows: await sdk.forProject(params.region, params.project).grids.listRows({ + databaseId: params.database, + tableId: params.table, + queries: buildGridQueries(limit, offset, parsedQueries, table) + }) }; }; 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 411815df4..24f57643a 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 @@ -41,13 +41,13 @@ IconLockClosed, IconFingerPrint } from '@appwrite.io/pink-icons-svelte'; - import { type ComponentProps, onDestroy, onMount, tick } from 'svelte'; + import { type ComponentProps, onDestroy, onMount } from 'svelte'; import { Click, trackEvent } from '$lib/actions/analytics'; import CsvDisabled from '../csvDisabled.svelte'; import { isSmallViewport } from '$lib/stores/viewport'; import SideSheet from '../layout/sidesheet.svelte'; import SpreadsheetContainer from '../layout/spreadsheet.svelte'; - import { showCreateAttributeSheet } from '../store'; + import { showCreateColumnSheet } from '../store'; import { type Models } from '@appwrite.io/console'; import { preferences } from '$lib/stores/preferences'; import { page } from '$app/state'; @@ -61,7 +61,7 @@ name: 'ID', selectable: false, system: true - } as Models.AttributeString & { + } as Models.ColumnString & { name: string; selectable: boolean; system: boolean; @@ -74,7 +74,7 @@ name: 'createdAt', selectable: false, system: true - } as Models.AttributeDatetime & { + } as Models.ColumnDatetime & { name: string; selectable: boolean; system: boolean; @@ -86,7 +86,7 @@ name: 'updatedAt', selectable: false, system: true - } as Models.AttributeDatetime & { + } as Models.ColumnDatetime & { name: string; selectable: boolean; system: boolean; @@ -153,7 +153,7 @@ } } - onDestroy(() => ($showCreateAttributeSheet.show = false)); + onDestroy(() => ($showCreateColumnSheet.show = false)); $effect(() => { if (!$showCreateIndexSheet.show && $showCreateIndexSheet.column) { @@ -178,7 +178,7 @@ size="s" secondary disabled={$isCsvImportInProgress} - on:click={() => ($showCreateAttributeSheet.show = true)} + on:click={() => ($showCreateColumnSheet.show = true)} event="create_attribute"> Create column @@ -202,7 +202,7 @@ { id: 'default', width: { min: 200 } }, { id: 'actions', width: 40, isAction: true } ]} - bottomActionClick={() => ($showCreateAttributeSheet.show = true)}> + bottomActionClick={() => ($showCreateColumnSheet.show = true)}> Column name Indexed diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte index f47be779f..2ef4f5e99 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte @@ -77,6 +77,7 @@ onSubmit={handleDelete} title="Delete column" bind:error + confirmDeletion disabled={isDeleteBtnDisabled}> {#if selectedColumns.length === 1}

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte index f00d59a0e..8eb595253 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte @@ -10,10 +10,10 @@ import { option, columnOptions, type Option } from './columns/store'; import type { Column } from '$lib/helpers/types'; import { preferences } from '$lib/stores/preferences'; + import { onMount } from 'svelte'; let { direction = null, - showCreate = false, column = null, columns = $bindable(null), columnId = $bindable(null), @@ -21,7 +21,6 @@ selectedOption = $bindable('String'), onColumnsReorder = null }: { - showCreate: boolean; column?: Columns; columnId?: string; columns?: Column[]; @@ -46,6 +45,20 @@ columnOptions.find((option) => option.name === selectedOption).component ); + function init() { + key = null; + $option = null; + data = { + required: false, + array: false, + default: null + }; + + /* default to string */ + selectedOption = 'String'; + $option = columnOptions[0]; + } + function insertColumnInOrder() { if (!key) return; @@ -144,6 +157,8 @@ } } + onMount(init); + $effect(() => { columnId; /* silences lint check, variable not read */ @@ -151,18 +166,6 @@ if (selectedOption) { $option = columnOptions.find((option) => option.name === selectedOption); } - - // cleanup - if (!showCreate) { - key = null; - $option = null; - selectedOption = null; - data = { - required: false, - array: false, - default: null - }; - } }); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte index ccf0afb5c..2e52e82f9 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte @@ -122,6 +122,7 @@ &.collapsed { opacity: 0; + pointer-events: none; & :global([role='tab']) { cursor: default; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte index a572d3f4a..53a4327e9 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte @@ -32,7 +32,7 @@ import SpreadsheetContainer from '../layout/spreadsheet.svelte'; import SideSheet from '../layout/sidesheet.svelte'; import type { PageData } from './$types'; - import { showCreateAttributeSheet } from '../store'; + import { showCreateColumnSheet } from '../store'; import { isSmallViewport } from '$lib/stores/viewport'; let { @@ -74,7 +74,7 @@ } } - onDestroy(() => ($showCreateAttributeSheet.show = false)); + onDestroy(() => ($showCreateColumnSheet.show = false)); const emptyCellsLimit = $derived($isSmallViewport ? 14 : 17); const emptyCellsCount = $derived( @@ -165,10 +165,11 @@ - + { + toggle(); selectedIndex = index; showOverview = true; }}>Overview @@ -181,8 +182,9 @@ status="danger" leadingIcon={IconTrash} on:click={() => { - selectedIndex = index; + toggle(); showDelete = true; + selectedIndex = index; trackEvent(Click.DatabaseIndexDelete); }}>Delete @@ -224,7 +226,7 @@ primary: { text: 'Create columns', onClick: async () => { - $showCreateAttributeSheet.show = true; + $showCreateColumnSheet.show = true; } } }} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte index 08e1b7445..b0d5b08ec 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte @@ -14,14 +14,14 @@ import { tableColumns, columnsOrder, - showCreateAttributeSheet, + showCreateColumnSheet, spreadsheetLoading, expandTabs } from '../store'; import { onMount } from 'svelte'; import SpreadsheetContainer from './spreadsheet.svelte'; - type Mode = 'rows' | 'indexes'; + type Mode = 'rows' | 'rows-filtered' | 'indexes'; interface Action { text?: string; @@ -165,10 +165,10 @@ style:cursor={columnActionsById ? 'pointer' : null} onclick={() => { if (columnActionsById && mode === 'rows') { - $showCreateAttributeSheet.show = true; - $showCreateAttributeSheet.title = 'Create column'; - $showCreateAttributeSheet.columns = $tableColumns; - $showCreateAttributeSheet.columnsOrder = $columnsOrder; + $showCreateColumnSheet.show = true; + $showCreateColumnSheet.title = 'Create column'; + $showCreateColumnSheet.columns = $tableColumns; + $showCreateColumnSheet.columnsOrder = $columnsOrder; } }}> {#if column.isAction} - { - console.log('dank'); - }}> + {:else if column.id === 'actions' || column.id === 'empty'} @@ -217,6 +212,7 @@ {#if !$spreadsheetLoading} +

- - - {actions?.primary?.text ?? `Create ${mode}`} - + direction={$isSmallViewport ? 'column' : 'row'}> + {#if mode !== 'rows-filtered'} + + + {actions?.primary?.text ?? `Create ${mode}`} + - {#if mode === 'rows'} + {#if mode === 'rows'} + + {actions?.random?.text ?? `Generate sample data`} + + {/if} + {:else} - {actions?.random?.text ?? `Generate sample data`} + disabled={actions?.primary?.disabled} + onclick={actions?.primary?.onClick}> + {actions?.primary?.text} {/if} @@ -334,10 +340,12 @@ .empty-actions { bottom: 30%; position: fixed; + transform: translateX(-40%); @media (min-width: 1024px) { left: 50%; bottom: 40%; + transform: unset !important; } } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte index 5f7e9cb30..185f2aec7 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte @@ -1,7 +1,7 @@