From baefe388ba971210522f99a68c9bf08d43232758 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 22 Mar 2023 15:36:41 +0100 Subject: [PATCH] feat: add limit option to all views --- src/lib/components/index.ts | 1 + src/lib/components/limit.svelte | 35 ++++++++++ src/lib/elements/forms/inputSelect.svelte | 3 +- src/lib/helpers/load.ts | 19 ++++++ src/lib/layout/activity.svelte | 8 +-- src/lib/stores/preferences.ts | 68 +++++++++++++++++++ .../console/account/activity/+page.svelte | 2 +- src/routes/console/account/activity/+page.ts | 8 +-- .../account/organizations/+page.svelte | 5 +- .../console/account/organizations/+page.ts | 8 +-- .../organization-[organization]/+page.svelte | 4 +- .../organization-[organization]/+page.ts | 8 +-- .../members/+page.svelte | 4 +- .../members/+page.ts | 8 +-- .../project-[project]/auth/+page.svelte | 9 +-- .../console/project-[project]/auth/+page.ts | 10 +-- .../project-[project]/auth/teams/+page.svelte | 11 ++- .../project-[project]/auth/teams/+page.ts | 10 +-- .../teams/team-[team]/activity/+page.svelte | 2 +- .../auth/teams/team-[team]/activity/+page.ts | 9 +-- .../teams/team-[team]/members/+page.svelte | 11 ++- .../auth/teams/team-[team]/members/+page.ts | 10 +-- .../auth/user-[user]/activity/+page.ts | 9 ++- .../project-[project]/databases/+page.svelte | 12 +++- .../project-[project]/databases/+page.ts | 8 +-- .../database-[database]/+page.svelte | 11 ++- .../databases/database-[database]/+page.ts | 8 +-- .../collection-[collection]/+page.svelte | 4 +- .../collection-[collection]/+page.ts | 8 +-- .../activity/+page.svelte | 2 +- .../collection-[collection]/activity/+page.ts | 8 +-- .../document-[document]/activity/+page.svelte | 2 +- .../document-[document]/activity/+page.ts | 8 +-- .../subNavigation.svelte | 2 +- .../project-[project]/functions/+page.svelte | 12 +++- .../project-[project]/functions/+page.ts | 8 +-- .../function-[function]/+page.svelte | 11 ++- .../functions/function-[function]/+page.ts | 8 +-- .../executions/+page.svelte | 4 +- .../function-[function]/executions/+page.ts | 8 +-- .../project-[project]/storage/+page.svelte | 12 +++- .../project-[project]/storage/+page.ts | 8 +-- .../storage/bucket-[bucket]/+page.svelte | 5 +- .../storage/bucket-[bucket]/+page.ts | 10 +-- 44 files changed, 297 insertions(+), 124 deletions(-) create mode 100644 src/lib/components/limit.svelte create mode 100644 src/lib/stores/preferences.ts diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 54b2251a5..bca844571 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -46,3 +46,4 @@ export { default as EventModal } from './eventModal.svelte'; export { default as Status } from './status.svelte'; export { default as Heading } from './heading.svelte'; export { default as Output } from './output.svelte'; +export { default as Limit } from './limit.svelte'; diff --git a/src/lib/components/limit.svelte b/src/lib/components/limit.svelte new file mode 100644 index 000000000..bc4189af4 --- /dev/null +++ b/src/lib/components/limit.svelte @@ -0,0 +1,35 @@ + + +
+ +

{name} per page. Total results: {sum}

+
diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index 5bfe2220a..ff49b8f80 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -52,7 +52,8 @@ {disabled} bind:this={element} bind:value - on:invalid={handleInvalid}> + on:invalid={handleInvalid} + on:change> {#if placeholder} {/if} diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index dc7b0c9e7..89349b187 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -1,7 +1,26 @@ +import { preferences } from '$lib/stores/preferences'; +import type { Page } from '@sveltejs/kit'; + export function pageToOffset(page: number, limit: number): number { return page ? page * limit - limit : 0; } +export function getPage(url: URL): number { + return Number(url.searchParams.get('page')); +} + +export function getLimit(url: URL, route: Page['route'], fallback: number): number { + return Number(url.searchParams.get('limit') ?? preferences.get(route).limit ?? fallback); +} + +export function getView(url: URL, route: Page['route'], fallback: 'table' | 'grid'): string { + return url.searchParams.get('view') ?? preferences.get(route).view ?? fallback; +} + +export function getSearch(url: URL): string | undefined { + return url.searchParams.get('search') ?? undefined; +} + type TabElement = { href: string; title: string; hasChildren?: boolean }; export function isTabSelected( diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index 41bd711ed..8afec6a43 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -1,5 +1,5 @@ @@ -65,8 +65,8 @@
-

Total results: {logs.total}

- + +
{:else} diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts new file mode 100644 index 000000000..29982ab78 --- /dev/null +++ b/src/lib/stores/preferences.ts @@ -0,0 +1,68 @@ +import { browser } from '$app/environment'; +import { page } from '$app/stores'; +import type { Page } from '@sveltejs/kit'; +import { get, writable } from 'svelte/store'; +import { sdk } from './sdk'; + +type Preferences = { + limit?: number; + view?: 'table' | 'grid'; +}; +type PreferencesStore = { + [key: string]: { + [key: string]: Preferences; + }; +}; + +function createPreferences() { + const { subscribe, set, update } = writable({}); + if (browser) { + set(JSON.parse(globalThis.localStorage.getItem('preferences') ?? '{}')); + } + return { + subscribe, + get: (route: Page['route']): Preferences => { + let preferences: PreferencesStore; + subscribe((n) => (preferences = n))(); + + return ( + preferences[sdk.forProject.client.config.project]?.[route.id] ?? { + limit: null, + view: null + } + ); + }, + setLimit: (limit: Preferences['limit']) => + update((n) => { + const path = get(page).route.id; + const project = sdk.forProject.client.config.project; + if (!n[project]?.[path]) { + n[project] ??= {}; + n[project][path] ??= {}; + } + + n[project][path].limit = limit; + + return n; + }), + setView: (view: Preferences['view']) => + update((n) => { + const path = get(page).route.id; + const project = sdk.forProject.client.config.project; + if (!n[project]?.[path]) { + n[project] ??= {}; + n[project][path] ??= {}; + } + + n[project][path].view = view; + + return n; + }) + }; +} + +export const preferences = createPreferences(); + +if (browser) { + preferences.subscribe((n) => globalThis.localStorage.setItem('preferences', JSON.stringify(n))); +} diff --git a/src/routes/console/account/activity/+page.svelte b/src/routes/console/account/activity/+page.svelte index c4c7521f1..d3939555d 100644 --- a/src/routes/console/account/activity/+page.svelte +++ b/src/routes/console/account/activity/+page.svelte @@ -5,4 +5,4 @@ export let data: PageData; - + diff --git a/src/routes/console/account/activity/+page.ts b/src/routes/console/account/activity/+page.ts index 13a06a80b..8b6fb15c3 100644 --- a/src/routes/console/account/activity/+page.ts +++ b/src/routes/console/account/activity/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte index c01ac1e9f..99c580f9b 100644 --- a/src/routes/console/account/organizations/+page.svelte +++ b/src/routes/console/account/organizations/+page.svelte @@ -6,7 +6,8 @@ Pagination, AvatarGroup, CardContainer, - Heading + Heading, + Limit } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; @@ -66,7 +67,7 @@ {/if}
-

Total results: {data.organizations.total}

+
diff --git a/src/routes/console/account/organizations/+page.ts b/src/routes/console/account/organizations/+page.ts index 90de71ddd..d80bc5036 100644 --- a/src/routes/console/account/organizations/+page.ts +++ b/src/routes/console/account/organizations/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? CARD_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/console/organization-[organization]/+page.svelte index 2a0ee8fbf..888056de7 100644 --- a/src/routes/console/organization-[organization]/+page.svelte +++ b/src/routes/console/organization-[organization]/+page.svelte @@ -1,7 +1,7 @@ @@ -110,7 +111,7 @@
-

Total results: {data.users.total}

+
{:else if data.search} diff --git a/src/routes/console/project-[project]/auth/+page.ts b/src/routes/console/project-[project]/auth/+page.ts index 0fca0d67f..badf0ca4e 100644 --- a/src/routes/console/project-[project]/auth/+page.ts +++ b/src/routes/console/project-[project]/auth/+page.ts @@ -1,14 +1,14 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - const search = url.searchParams.get('search') ?? undefined; return { offset, diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/console/project-[project]/auth/teams/+page.svelte index 3b00a547b..bc0e643a3 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/+page.svelte @@ -10,7 +10,14 @@ TableCell } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; - import { Empty, EmptySearch, AvatarInitials, Pagination, SearchQuery } from '$lib/components'; + import { + Empty, + EmptySearch, + AvatarInitials, + Pagination, + SearchQuery, + Limit + } from '$lib/components'; import Create from '../createTeam.svelte'; import { goto } from '$app/navigation'; import { toLocaleDateTime } from '$lib/helpers/date'; @@ -62,7 +69,7 @@
-

Total results: {data.teams.total}

+
{:else if data.search} diff --git a/src/routes/console/project-[project]/auth/teams/+page.ts b/src/routes/console/project-[project]/auth/teams/+page.ts index 7b222a0cc..42b4f5c1c 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/+page.ts @@ -1,14 +1,14 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - const search = url.searchParams.get('search') ?? undefined; return { offset, diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte index 4870c8b9b..f805a79f0 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte @@ -5,4 +5,4 @@ export let data: PageData; - + diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts index 173bd4d99..ea9009d74 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts @@ -1,16 +1,17 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ params, url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { offset, + limit, logs: await sdk.forProject.teams.listLogs(params.team, [ Query.limit(limit), Query.offset(offset) diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte index 8fd62a499..f7518114c 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte @@ -1,6 +1,13 @@ - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts index b5c397870..3fb3a619d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ params, url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte index 4870c8b9b..f805a79f0 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte @@ -5,4 +5,4 @@ export let data: PageData; - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts index d24d5e5e9..d11900203 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ params, url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte index c576a7e65..e8f306a60 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte @@ -2,7 +2,7 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { showCreate } from '../store'; - import type { PageData } from './[[page]]/$types'; + import type { PageData } from './$types'; $: data = $page.data as PageData; $: project = $page.params.project; diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index a7f9f7a6f..1a26cb9ba 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -1,7 +1,15 @@