From 7310e25f4893c5b6e22901c5131b785497adbbce Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Mar 2025 13:07:03 +0100 Subject: [PATCH 1/2] fix: design review + backend changes --- package.json | 2 +- pnpm-lock.yaml | 10 +-- .../components/filters/appliedFilter.svelte | 41 ++++++++++ src/lib/components/filters/menu.svelte | 14 +++- src/lib/components/filters/setFilters.ts | 76 ++++++++++++++----- src/lib/components/filters/subMenu.svelte | 2 +- .../functions/function-[function]/+page.ts | 4 +- .../executions/execute-function/+page.ts | 4 +- .../(components)/connectRepoModal.svelte | 9 ++- .../domains/add-domain/+page.svelte | 26 ++++--- .../sites/site-[site]/logs/+page.svelte | 16 ++-- .../sites/site-[site]/logs/+page.ts | 19 ++--- .../sites/site-[site]/logs/store.ts | 1 + 13 files changed, 158 insertions(+), 66 deletions(-) create mode 100644 src/lib/components/filters/appliedFilter.svelte diff --git a/package.json b/package.json index d755d2991..a61fb6009 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c", + "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b4c09ba5", "@appwrite.io/pink-legacy": "^1.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c700db0b3..8a2e378c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c + specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d + version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -211,8 +211,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d': + resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d} version: 1.2.1 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b4c09ba5': @@ -4097,7 +4097,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b4c09ba5(svelte@4.2.19)': dependencies: diff --git a/src/lib/components/filters/appliedFilter.svelte b/src/lib/components/filters/appliedFilter.svelte new file mode 100644 index 000000000..86ae82694 --- /dev/null +++ b/src/lib/components/filters/appliedFilter.svelte @@ -0,0 +1,41 @@ + + +{#if $parsedTags?.length} + + {#each $parsedTags as tag} + + + { + queries.removeFilter(tag); + queries.apply(); + parsedTags.update((tags) => tags.filter((t) => t.tag !== tag.tag)); + }}> + {#key tag.tag} + {tag.tag} + {/key} + + + {tag?.value?.toString()} + + + {/each} + + +{/if} diff --git a/src/lib/components/filters/menu.svelte b/src/lib/components/filters/menu.svelte index 743ac1a20..b0dd7fcd5 100644 --- a/src/lib/components/filters/menu.svelte +++ b/src/lib/components/filters/menu.svelte @@ -1,6 +1,6 @@ - - - {#if data.logs.total} - - {/if} - + + + + {#if data.logs.total} + + {/if} + + + {#if data?.logs?.total} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.ts index cf4af57b5..ece296b39 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.ts @@ -11,7 +11,6 @@ export const load = async ({ params, depends, url, route, parent }) => { const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); const query = getQuery(url); - const search = getSearch(url); const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); @@ -20,18 +19,12 @@ export const load = async ({ params, depends, url, route, parent }) => { offset, limit, query, - search, site, - logs: await sdk.forProject.sites.listLogs( - params.site, - [ - // Query.search('requestPath', search), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search - ) + logs: await sdk.forProject.sites.listLogs(params.site, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ]) }; }; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts b/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts index 9ddb0c6f5..617963999 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts @@ -89,6 +89,7 @@ export const columns = writable([ label: 'more than 30 seconds' } ], + filter: false, hide: true }, { From dd7e776379b05eb70318145725c04921a924d1e8 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Mar 2025 13:17:32 +0100 Subject: [PATCH 2/2] chore: bump version --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index abcc45a11..61db816da 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d", + "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b", "@appwrite.io/pink-legacy": "^1.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 073687de0..dabf57c2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d + specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78 + version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78 '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -211,8 +211,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78': + resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78} version: 1.2.1 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b': @@ -4097,7 +4097,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@a840d9d': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b(svelte@4.2.19)': dependencies: