From 465941466872f2fa0b010bd47e57e6038d61f3fa Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 6 May 2025 17:51:25 +0200 Subject: [PATCH] fix: quickfilter --- .../components/filters/customFilters.svelte | 4 +- .../components/filters/filtersModal.svelte | 24 ++- .../components/filters/quickFilters.svelte | 149 +++++++----------- .../filters/quickfiltersSubMenu.svelte | 5 +- src/lib/components/filters/setFilters.ts | 33 ++-- .../layout/responsiveContainerHeader.svelte | 12 +- .../function-[function]/+page.svelte | 33 ++-- .../executions/+page.svelte | 50 +++--- .../site-[site]/deployments/+page.svelte | 53 ------- .../sites/site-[site]/logs/+page.svelte | 12 +- 10 files changed, 140 insertions(+), 235 deletions(-) diff --git a/src/lib/components/filters/customFilters.svelte b/src/lib/components/filters/customFilters.svelte index 09ff475fb..8fd765f27 100644 --- a/src/lib/components/filters/customFilters.svelte +++ b/src/lib/components/filters/customFilters.svelte @@ -12,7 +12,9 @@ { show = true; - }}>Custom filters + }}> + Custom filters + {#if show} diff --git a/src/lib/components/filters/filtersModal.svelte b/src/lib/components/filters/filtersModal.svelte index aebb86f76..a192a60ea 100644 --- a/src/lib/components/filters/filtersModal.svelte +++ b/src/lib/components/filters/filtersModal.svelte @@ -11,11 +11,19 @@ } from '$lib/elements/forms'; import type { Writable } from 'svelte/store'; import Modal from '../modal.svelte'; - import { addFilter, generateTag, operators, queries, type TagValue } from './store'; + import { + addFilter, + generateTag, + operators, + queries, + ValidOperators, + type TagValue + } from './store'; import type { Column } from '$lib/helpers/types'; import { TagList } from '.'; import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { addFilterAndApply } from './quickFilters'; export let show = false; export let columns: Writable; @@ -35,9 +43,17 @@ function apply() { localQueries.forEach((query) => { - addFilter($columns, query.id, query.operator, query.value, query.arrayValues); + addFilterAndApply( + query.id, + $columns.find((c) => c.id === query.id).title, + query.operator as ValidOperators, + query.value, + query.arrayValues, + $columns, + analyticsSource + ); }); - queries.apply(); + localTags = []; localQueries = []; trackEvent(Submit.FilterApply, { @@ -48,7 +64,7 @@ } function addCondition() { - const newTag = generateTag(selectedColumn, operatorKey, value, arrayValues); + const newTag = generateTag(selectedColumn, operatorKey, value || arrayValues); if (localTags.some((t) => t.tag === newTag.tag && t.value === newTag.value)) { return; } else { diff --git a/src/lib/components/filters/quickFilters.svelte b/src/lib/components/filters/quickFilters.svelte index 143fe5c73..c00316154 100644 --- a/src/lib/components/filters/quickFilters.svelte +++ b/src/lib/components/filters/quickFilters.svelte @@ -1,107 +1,70 @@ -{#if $isSmallViewport} - {#if $parsedTags?.length} - - {:else} - - {/if} -{:else} - - {#if $parsedTags?.length} - - {:else} - - {/if} - - {#each filterCols as filter (filter.title + filter.id)} - {#if filter.options} - { - addFilterAndApply( - filter.id, - filter.title, - filter.operator, - e.detail.value, - filter?.array - ? (filter.options - .filter((opt) => opt.checked) - .map((opt) => opt.value) ?? []) - : [], - $columns, - analyticsSource - ); - }} - on:clear={() => { - addFilterAndApply( - filter.id, - filter.title, - filter.operator, - null, - [], - $columns, - analyticsSource - ); - }} /> - {/if} - {/each} - + + + + {#each filterCols.filter((f) => f?.options) as filter (filter.title + filter.id)} + {#if filter.options} + { + addFilterAndApply( + filter.id, + filter.title, + filter.operator, + e.detail.value, + filter?.array + ? (filter.options + .filter((opt) => opt.checked) + .map((opt) => opt.value) ?? []) + : [], + $columns, + analyticsSource + ); + }} + on:clear={() => { + addFilterAndApply( + filter.id, + filter.title, + filter.operator, + null, + [], + $columns, + analyticsSource + ); + }} /> + {/if} + {/each} + - - - - -{/if} - -{#if $isSmallViewport && openBottomSheet} - -{/if} + + + + diff --git a/src/lib/components/filters/quickfiltersSubMenu.svelte b/src/lib/components/filters/quickfiltersSubMenu.svelte index b49bef07e..ee8fe67f4 100644 --- a/src/lib/components/filters/quickfiltersSubMenu.svelte +++ b/src/lib/components/filters/quickfiltersSubMenu.svelte @@ -35,8 +35,9 @@
- {filter.title} + + {filter.title} +
diff --git a/src/lib/components/filters/setFilters.ts b/src/lib/components/filters/setFilters.ts index 7c8d858d2..c59a2408c 100644 --- a/src/lib/components/filters/setFilters.ts +++ b/src/lib/components/filters/setFilters.ts @@ -9,17 +9,18 @@ export function setFilters(localTags: TagValue[], filterCols: FilterData[], $col if (!localTags?.length) { filterCols.forEach((filter) => { resetOptions(filter); - cleanOldTags(filter.title); + cleanOldTags(filter?.title); }); } else { filterCols.forEach((filter) => { - if (filter.id.toLowerCase().includes('duration')) { + const id = filter?.id?.toLowerCase(); + if (id?.includes('duration')) { setTimeFilter(filter, $columns); - } else if (filter.id.toLocaleLowerCase().includes('size')) { + } else if (id?.includes('size')) { setSizeFilter(filter, $columns); - } else if (filter.id.toLocaleLowerCase().includes('statuscode')) { + } else if (id?.includes('statuscode')) { setStatusCodeFilter(filter, $columns); - } else if (filter.id === '$createdAt' || filter.id === '$updatedAt') { + } else if (id === '$createdat' || id === '$updatedat') { setDateFilter(filter, $columns); } else { setFilterData(filter); @@ -40,7 +41,7 @@ export function setFilterData(filter: FilterData) { option.checked = values.includes(option.value); }); } - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: tagData.tag.replace(',', ' or '), value: tagData.value @@ -52,7 +53,7 @@ export function setFilterData(filter: FilterData) { }); } else { resetOptions(filter); - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -76,7 +77,7 @@ export function setTimeFilter(filter: FilterData, columns: Column[]) { value: timeTag.value }; - cleanOldTags(filter.title); + cleanOldTags(filter?.title); parsedTags.update((tags) => { tags.push(newTag); @@ -84,7 +85,7 @@ export function setTimeFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -102,7 +103,7 @@ export function setSizeFilter(filter: FilterData, columns: Column[]) { return prev; }); if (sizeRange) { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: `**${filter.title}** is **${sizeRange.label}**`, @@ -114,7 +115,7 @@ export function setSizeFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -127,7 +128,7 @@ export function setStatusCodeFilter(filter: FilterData, columns: Column[]) { const codeRange = ranges.find((c) => c?.value && c.value === statusCodeTag.value); if (codeRange) { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: `**${filter.title}** is **${codeRange.label}**`, value: statusCodeTag.value @@ -139,7 +140,7 @@ export function setStatusCodeFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -158,7 +159,7 @@ export function setDateFilter(filter: FilterData, columns: Column[]) { return prev; }); if (dateRange) { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: `**${filter.title}** is **${dateRange.label}**`, value: dateTag.value @@ -169,11 +170,12 @@ export function setDateFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } function cleanOldTags(title: string) { + if (!title) return; parsedTags.update((tags) => { tags = tags.filter((tag) => !tag.tag.includes(`**${title}**`)); return tags; @@ -181,6 +183,7 @@ function cleanOldTags(title: string) { } export function resetOptions(filter: FilterData) { + if (!filter?.options) return; filter.options.forEach((option) => { option.checked = false; }); diff --git a/src/lib/layout/responsiveContainerHeader.svelte b/src/lib/layout/responsiveContainerHeader.svelte index 9c996df9e..247564f86 100644 --- a/src/lib/layout/responsiveContainerHeader.svelte +++ b/src/lib/layout/responsiveContainerHeader.svelte @@ -46,9 +46,7 @@ let showFilters = $state(false); let filterCols = $derived( - $columns - .map((col) => (col.filter !== false ? buildFilterCol(col) : null)) - .filter((f) => f?.options) + $columns.map((col) => (col.filter !== false ? buildFilterCol(col) : null)).filter(Boolean) ); afterNavigate((p) => { @@ -109,14 +107,16 @@ {/if} {#if hasFilters && $columns?.length} - + {/if} {#if hasDisplaySettings} {/if} - {@render children()} + {#if children} + {@render children()} + {/if} {/if} @@ -138,7 +138,7 @@ bind:openBottomSheet={showFilters} {columns} {analyticsSource} - bind:filterCols /> + filterCols={filterCols.filter((f) => f?.options)} /> {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte index ff3336871..6daaf1cc5 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte @@ -4,7 +4,7 @@ import { PaginationWithLimit, ViewSelector, EmptyFilter } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { columns, deploymentList, func } from './store'; - import { Container } from '$lib/layout'; + import { Container, ResponsiveContainerHeader } from '$lib/layout'; import type { Models } from '@appwrite.io/console'; import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system'; import { readOnly } from '$lib/stores/billing'; @@ -168,25 +168,18 @@ {/if} - - - - - - - {#if data.deploymentList.total} - - {/if} - - - - - - - + + + + + {#if data.deploymentList.total} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte index 3111f513c..84f962e42 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte @@ -1,19 +1,17 @@ - - - - - - {#if data?.executions?.total} - - {/if} - -
- -
- - Execution cannot be created because there is no active deployment. - -
-
-
- -
+ + +
+ +
+ + Execution cannot be created because there is no active deployment. + +
+
{#if data?.executions?.total}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte index 45f5d39eb..5d979e189 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte @@ -75,7 +75,6 @@ - - {#if data.deploymentList.total}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte index 530530364..4cf56ad45 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte @@ -3,7 +3,7 @@ import { EmptyFilter, PaginationWithLimit, ViewSelector } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - import { Container } from '$lib/layout'; + import { Container, ResponsiveContainerHeader } from '$lib/layout'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import Table from './table.svelte'; @@ -26,16 +26,8 @@ - - - - {#if data.logs.total} - - {/if} - + - - {#if data?.logs?.total}