From 099ddbbce99b9915e0f78b0e6d0a6f946bcaa055 Mon Sep 17 00:00:00 2001 From: Sachin Chaurasiya Date: Mon, 17 Jan 2022 12:46:06 +0530 Subject: [PATCH] Fix: Fixed #2102 #2103 (#2243) --- .../src/components/common/facetfilter/FacetFilter.tsx | 11 ++++------- .../src/main/resources/ui/src/pages/tags/index.tsx | 4 +++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx index 7dc277b6885..1b717c026a5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx @@ -45,8 +45,9 @@ const FacetFilter: FunctionComponent = ({ ) ); }; - const getSeparator = (length: number, index: number, flag: boolean) => { - return length !== 1 && index < length - 1 && flag ? ( + + const getSeparator = (length: number, index: number) => { + return length !== 1 && index < length - 1 ? (
) : null; }; @@ -187,11 +188,7 @@ const FacetFilter: FunctionComponent = ({
{getFilterItems(aggregation)}
- {getSeparator( - aggregations.length, - index, - aggregations[index + 1]?.buckets?.length > 0 - )} + {getSeparator(aggregations.length, index)} ) : null} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx index 134bb28529a..3e821edd88c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx @@ -269,7 +269,9 @@ const TagsPage = () => {

{getCountBadge( - category.children?.length || 0, + currentCategory?.name === category.name + ? currentCategory.children?.length + : category.children?.length || 0, 'tw-self-center', currentCategory?.name === category.name )}