From 552cde048226ffc6c56e10bd3dcc186aa6e66fed Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 27 Oct 2022 11:25:59 +0200 Subject: [PATCH] fix: database pagination --- src/lib/actions/analytics.ts | 10 ++++++---- src/lib/layout/navigation.svelte | 13 ++++++++++++- .../project-[project]/databases/[[page]]/+page.ts | 6 +++--- .../databases/database-[database]/[[page]]/+page.ts | 6 +++--- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 92b3b3e0e..5ba64ae04 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -3,21 +3,23 @@ import type { Action } from 'svelte/action'; export type AnalyticsActionParam = { name: string; action: string; + category?: string; + label?: string; parameters?: Record; event?: keyof HTMLElementEventMap; }; -export const event: Action = (node, param) => { +export const event: Action> = (node, param) => { if (!isTrackingAllowed()) { return; } - node.addEventListener(param.event ?? 'click', () => + node.addEventListener(param.event ?? 'click', () => { gtag('event', param.name, { ...param.parameters, action: param.action - }) - ); + }); + }); }; const isTrackingAllowed = () => { diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index 056017792..be56f170f 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -1,9 +1,16 @@
@@ -15,7 +22,11 @@ + href={path} + use:event={{ + ...defaultEventOptions, + label: 'Home Link' + }}> diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 7bea51ef7..47cc014c6 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,18 +1,18 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; -import { PAGE_LIMIT } from '$lib/constants'; +import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const page = Number(params.page); - const offset = pageToOffset(page, PAGE_LIMIT); + const offset = pageToOffset(page, CARD_LIMIT); return { offset, databases: await sdkForProject.databases.list([ - Query.limit(PAGE_LIMIT), + Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') ]) 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 c5d1f8d04..d7c69f3ca 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,18 +1,18 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; -import { PAGE_LIMIT } from '$lib/constants'; +import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const page = Number(params.page); - const offset = pageToOffset(page, PAGE_LIMIT); + const offset = pageToOffset(page, CARD_LIMIT); return { offset, collections: await sdkForProject.databases.listCollections(params.database, [ - Query.limit(PAGE_LIMIT), + Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') ])