From cd5c781e5fc22ae7e8971c44b20dc8fca64357fa Mon Sep 17 00:00:00 2001 From: Darshan Date: Mon, 29 Sep 2025 20:02:28 +0530 Subject: [PATCH] remove: duplicate components. --- .../(entity)/views/indexes/view.svelte | 10 +- .../(suggestions)/empty.svelte | 2 +- .../(suggestions)/options.svelte | 2 +- .../table-[table]/+layout.svelte | 2 +- .../table-[table]/columns/+page.svelte | 3 +- .../table-[table]/indexes/+page.svelte | 13 +- .../table-[table]/layout/emptySheet.svelte | 2 +- .../table-[table]/layout/sidesheet.svelte | 174 ------------------ .../table-[table]/layout/spreadsheet.svelte | 123 ------------- .../table-[table]/rows/create.svelte | 2 +- .../table-[table]/settings/+page.svelte | 8 +- .../table-[table]/spreadsheet.svelte | 2 +- 12 files changed, 22 insertions(+), 321 deletions(-) delete mode 100644 src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte delete mode 100644 src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte index 4a2873d12..1b06399dc 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte @@ -25,7 +25,7 @@ IconPlus, IconTrash } from '@appwrite.io/pink-icons-svelte'; - import { type ComponentProps, onDestroy, type Snippet } from 'svelte'; + import { type ComponentProps, type Snippet } from 'svelte'; import { Click, trackEvent } from '$lib/actions/analytics'; import { isSmallViewport } from '$lib/stores/viewport'; import { type Entity, EntityContainer } from '$database/(entity)'; @@ -36,18 +36,16 @@ let { entity, - showCreateColumnSheet = $bindable(), onCreateIndex, onDeleteIndexes, emptyIndexesSheetView, emptyColumnsSheetView }: { entity: Entity; - showCreateColumnSheet: boolean; onCreateIndex: (index: CreateIndexesCallbackType) => Promise; onDeleteIndexes: (indexKeys: string[]) => Promise; emptyIndexesSheetView: Snippet<[() => void]>; - emptyColumnsSheetView?: Snippet<[() => void]>; + emptyColumnsSheetView?: Snippet; } = $props(); let showCreateIndex = $state(false); @@ -83,8 +81,6 @@ } } - onDestroy(() => (showCreateColumnSheet = false)); - const emptyCellsLimit = $derived($isSmallViewport ? 14 : 17); const emptyCellsCount = $derived( entity.indexes.length >= emptyCellsLimit ? 0 : emptyCellsLimit - entity.indexes.length @@ -237,7 +233,7 @@ {@render emptyIndexesSheetView(() => (showCreateIndex = true))} {/if} {:else} - {@render emptyColumnsSheetView(() => (showCreateColumnSheet = true))} + {@render emptyColumnsSheetView()} {/if} {#if selectedIndexes.length > 0} 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 38ee34a9a..2fce68c9d 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 @@ -14,7 +14,7 @@ import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport'; import type { Column } from '$lib/helpers/types'; import { expandTabs } from '../table-[table]/store'; - import SpreadsheetContainer from '../table-[table]/layout/spreadsheet.svelte'; + import { SpreadsheetContainer } from '$database/(entity)/views/(layouts)'; import { onDestroy, onMount, tick } from 'svelte'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte index 9f6ca1691..5f77a5b35 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte @@ -2,7 +2,7 @@ import type { Snippet } from 'svelte'; import { Popover } from '@appwrite.io/pink-svelte'; import { isSmallViewport } from '$lib/stores/viewport'; - import SideSheet from '../table-[table]/layout/sidesheet.svelte'; + import { SideSheet } from '$database/(entity)/views/(layouts)'; let { children, 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 6c8a262c2..5f475cc9e 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 @@ -46,7 +46,7 @@ import { base } from '$app/paths'; import { canWriteTables } from '$lib/stores/roles'; import { IconEye, IconLockClosed, IconPlus, IconPuzzle } from '@appwrite.io/pink-icons-svelte'; - import SideSheet from './layout/sidesheet.svelte'; + import { SideSheet } from '$database/(entity)/views/(layouts)'; import EditRow from './rows/edit.svelte'; import EditRelatedRow from './rows/editRelated.svelte'; import EditColumn from './columns/edit.svelte'; 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 fc6e021ca..1694c7f1c 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 @@ -45,8 +45,7 @@ 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 { SideSheet, SpreadsheetContainer } from '$database/(entity)/views/(layouts)'; import { showCreateColumnSheet } from '../store'; import { type Models } from '@appwrite.io/console'; import { preferences } from '$lib/stores/preferences'; 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 fe838a1fa..c6a047835 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 @@ -5,6 +5,7 @@ import EmptySheet from '../layout/emptySheet.svelte'; import { showCreateColumnSheet } from '$database/table-[table]/store'; import { type CreateIndexesCallbackType, Indexes } from '$database/(entity)'; + import { onDestroy } from 'svelte'; let { data }: PageProps = $props(); @@ -36,13 +37,11 @@ ) ); } + + onDestroy(() => ($showCreateColumnSheet.show = false)); - + {#snippet emptyIndexesSheetView(toggle)} {/snippet} - {#snippet emptyColumnsSheetView(toggle)} + {#snippet emptyColumnsSheetView()} ($showCreateColumnSheet.show = true) } }} /> {/snippet} 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 bdc92fb75..440bebdc8 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 @@ -18,7 +18,7 @@ spreadsheetLoading, expandTabs } from '../store'; - import SpreadsheetContainer from './spreadsheet.svelte'; + import { SpreadsheetContainer } from '$database/(entity)/views/(layouts)'; import { onDestroy, onMount } from 'svelte'; import { debounce } from '$lib/helpers/debounce'; import { columnOptions } from '../columns/store'; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte deleted file mode 100644 index 68b981d3a..000000000 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte +++ /dev/null @@ -1,174 +0,0 @@ - - -
- -
- - - {title} - {#if titleBadge} - - {/if} - - {#if topAction && topAction.text && topAction.show} - {#if topAction.mode === 'copy-tag'} - - - {topAction.text} - - - {:else} - - {/if} - {/if} - - -
- - -
{ - try { - const keepOpen = await submit?.onClick?.(); - if (!keepOpen) { - show = false; - } - } catch (error) { - // error occurred, dont close the sidebar - } - }}> - - {@render children?.()} - -
- - {#if submit} - - {/if} -
-
-
- - 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 deleted file mode 100644 index 185f2aec7..000000000 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte +++ /dev/null @@ -1,123 +0,0 @@ - - -
- {@render children()} -
- - diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte index b1fa02ce4..c665fb50a 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte @@ -10,7 +10,7 @@ import { type Columns, spreadsheetRenderKey } from '../store'; import { ID, type Models } from '@appwrite.io/console'; import { Alert, Layout, Typography, Selector } from '@appwrite.io/pink-svelte'; - import SideSheet from '../layout/sidesheet.svelte'; + import { SideSheet } from '$database/(entity)/views/(layouts)'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { tick } from 'svelte'; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte index 90d4eb3c0..fb37af442 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte @@ -21,7 +21,9 @@ }); async function deleteTable() { - await sdk.forProject(page.params.region, page.params.project).tablesDB.deleteTable({ ...params }); + await sdk + .forProject(page.params.region, page.params.project) + .tablesDB.deleteTable({ ...params }); } async function updateTable( @@ -32,7 +34,9 @@ rowSecurity: boolean; }> ) { - await sdk.forProject(page.params.region, page.params.project).tablesDB.updateTable({ ...params, ...updates }); + await sdk + .forProject(page.params.region, page.params.project) + .tablesDB.updateTable({ ...params, ...updates }); } 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 9fea5d2a6..3cbad674c 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 @@ -83,7 +83,7 @@ import type { HeaderCellAction, RowCellAction } from './sheetOptions.svelte'; import SheetOptions from './sheetOptions.svelte'; import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport'; - import SpreadsheetContainer from './layout/spreadsheet.svelte'; + import { SpreadsheetContainer } from '$database/(entity)/views/(layouts)'; import EditRowCell from './rows/cell/edit.svelte'; import { copy } from '$lib/helpers/copy'; import { writable } from 'svelte/store';