From 2664b54be0dd69aa0a0e5d203ec0be3539d80967 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Fri, 4 Aug 2023 22:06:40 +0100 Subject: [PATCH] working filtering --- .../collection-[collection]/+page.ts | 11 +- .../collection-[collection]/filters.svelte | 184 ++++++++++++++---- 2 files changed, 157 insertions(+), 38 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts index ef7a3de27..76e2ac85b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts @@ -11,6 +11,10 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); + const queries = url.searchParams.get('query'); + const parsedQueries = queries ? JSON.parse(queries) : []; + console.log(parsedQueries); + return { offset, limit, @@ -18,7 +22,12 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { documents: await sdk.forProject.databases.listDocuments( params.database, params.collection, - [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')] + [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc('$createdAt'), + ...parsedQueries + ] ) }; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/filters.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/filters.svelte index 7d12a333f..700c6c839 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/filters.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/filters.svelte @@ -1,15 +1,5 @@ - + + @@ -80,22 +157,42 @@ id="operator" options={operatorsForColumn} placeholder="Select operator" - bind:value={operator} /> + bind:value={operatorKey} /> - {#if column && operator} + {#if column && operatorKey}
- +
{/if} - {filters} +
- - + +
@@ -123,6 +220,19 @@ } } + .tags { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.5rem; + + margin-block-start: 1rem; + + :global(b) { + font-weight: bold; + } + } + hr { height: 1px; width: calc(100% + 2rem);