From 7da11341cfbc1c6d9ca3df5d7c6defa465ac3e92 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Tue, 11 Feb 2025 16:58:37 +0100 Subject: [PATCH] ui: same filter keys for exclusion in sankey, fix meta cta --- .../components/FilterSeries/ExcludeFilters.tsx | 6 ++++++ .../shared/Filters/FilterModal/FilterModal.tsx | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/frontend/app/components/Dashboard/components/FilterSeries/ExcludeFilters.tsx b/frontend/app/components/Dashboard/components/FilterSeries/ExcludeFilters.tsx index 398403016..6ad96b5d4 100644 --- a/frontend/app/components/Dashboard/components/FilterSeries/ExcludeFilters.tsx +++ b/frontend/app/components/Dashboard/components/FilterSeries/ExcludeFilters.tsx @@ -36,6 +36,12 @@ function ExcludeFilters(props: Props) { onUpdateFilter(index, f)} onRemoveFilter={() => onRemoveFilter(index)} diff --git a/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx b/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx index a8d293498..915eb6f08 100644 --- a/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx +++ b/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx @@ -231,7 +231,14 @@ function FilterModal(props: Props) { allowedFilterKeys, mode ); - const hasNoMeta = !filterObj['Metadata']; + const showMetaCTA = !filterObj['Metadata'] + && (allowedFilterKeys?.length + ? allowedFilterKeys.includes(FilterKey.METADATA) : true) + && (excludeCategory?.length + ? !excludeCategory.includes(FilterCategory.METADATA) : true) + && (excludeFilterKeys?.length + ? !excludeFilterKeys.includes(FilterKey.METADATA) : true); + const { matchingCategories, matchingFilters } = getMatchingEntries( searchQuery, filterObj @@ -274,7 +281,7 @@ function FilterModal(props: Props) { {key} ))} - {hasNoMeta ? ( + {showMetaCTA ? (
setCategory('META_CTA')} @@ -324,7 +331,7 @@ function FilterModal(props: Props) {
)) : null} - {category === 'META_CTA' && hasNoMeta ? ( + {category === 'META_CTA' && showMetaCTA ? (