diff --git a/src/lib/components/customPagination.svelte b/src/lib/components/customPagination.svelte index c40109ef4..244ea6896 100644 --- a/src/lib/components/customPagination.svelte +++ b/src/lib/components/customPagination.svelte @@ -1,5 +1,5 @@ diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index c7a8f8bf5..8bd7be13a 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -14,6 +14,7 @@ }; export let columns: Writable; + export let showToggle = true; const pathname = $page.url.pathname; let showSelectColumns = false; @@ -46,7 +47,7 @@ {#if $prefs?.preferredView === 'list'} @@ -62,27 +63,29 @@ {/if} -
- -
+{#if showToggle} +
+ +
+{/if} diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index dc7b0c9e7..d60c8c4ee 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -1,7 +1,26 @@ +import { goto } from '$app/navigation'; + export function pageToOffset(page: number, limit: number): number { return page ? page * limit - limit : 0; } +export async function redirectOnOffsetOverflow( + offset: number, + page: number, + total: number, + project: string, + path: string, + search: string +) { + if (offset > total) { + if (page <= 2) { + await goto(`/console/project-${project}/${path}?${search}`); + } else { + await goto(`/console/project-${project}/${path}/${page - 1}?${search}`); + } + } +} + type TabElement = { href: string; title: string; hasChildren?: boolean }; export function isTabSelected( diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 3d3138661..759e80590 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,13 +1,13 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { pageToOffset, redirectOnOffsetOverflow } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; import { customPageLimit } from '$lib/stores/layout'; import { get } from 'svelte/store'; import { prefs } from '$lib/stores/user'; -export const load: PageLoad = async ({ params, parent, depends }) => { +export const load: PageLoad = async ({ params, parent, depends, url }) => { await parent(); depends(Dependencies.DATABASES); @@ -16,12 +16,23 @@ export const load: PageLoad = async ({ params, parent, depends }) => { const offset = pageToOffset(page, limit); + const databases = await sdkForProject.databases.list([ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc('$createdAt') + ]); + + await redirectOnOffsetOverflow( + offset, + page, + databases.total, + params.project, + 'databases', + url.search + ); + return { offset, - databases: await sdkForProject.databases.list([ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc('$createdAt') - ]) + databases }; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte index 60debea9d..3e684af21 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte @@ -11,7 +11,7 @@ import GridView from './gridView.svelte'; import TableView from './tableView.svelte'; import { prefs } from '$lib/stores/user'; - import { columns } from '../../[[page]]/store'; + import { columns } from './store'; export let data: PageData; let showCreate = false; diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts index cc0a16a03..c60704f26 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts @@ -1,6 +1,6 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { pageToOffset, redirectOnOffsetOverflow } from '$lib/helpers/load'; import { CARD_LIMIT, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; import { get } from 'svelte/store'; @@ -8,17 +8,28 @@ import { prefs } from '$lib/stores/user'; const limit = get(prefs)?.prefferedView === 'list' ? PAGE_LIMIT : CARD_LIMIT; -export const load: PageLoad = async ({ params, parent }) => { +export const load: PageLoad = async ({ params, parent, url }) => { await parent(); const page = Number(params.page); const offset = pageToOffset(page, limit); + const collections = await sdkForProject.databases.listCollections(params.database, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc('$createdAt') + ]); + + await redirectOnOffsetOverflow( + offset, + page, + collections.total, + params.project, + `databases/database-${params.database}`, + url.search + ); + return { offset, - collections: await sdkForProject.databases.listCollections(params.database, [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc('$createdAt') - ]) + collections }; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/store.ts b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/store.ts new file mode 100644 index 000000000..868cd0c4d --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/store.ts @@ -0,0 +1,15 @@ +import { writable } from 'svelte/store'; + +export type Column = { + id: string; + name: string; + show: boolean; + width?: number; +}; + +export const columns = writable([ + { id: '$id', name: 'Database ID', show: true, width: 50 }, + { id: 'name', name: 'Name', show: true, width: 120 }, + { id: '$createdAt', name: 'Created', show: true, width: 120 }, + { id: '$updatedAt', name: 'Updated', show: true, width: 120 } +]); diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte index 1bb1f1e54..b68a0cdb5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte @@ -16,16 +16,10 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import type { Writable } from 'svelte/store'; import type { PageData } from './$types'; + import type { Column } from './store'; export let data: PageData; - export let columns: Writable< - { - id: string; - name: string; - width: number; - show: boolean; - }[] - >; + export let columns: Writable; const project = $page.params.project; const databaseId = $page.params.database;