diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx index 7d7ec4afa79..79dadfbbc1e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx @@ -236,23 +236,50 @@ const Explore: React.FC = ({ setEntityDetails(source); }; + const handleAdvanceSearchFilter = (data: ExploreQuickFilterField[]) => { + const term = {} as Record; + + data.forEach((filter) => { + if (filter.key) { + term[filter.key] = filter.value; + } + }); + + onChangeAdvancedSearchQueryFilter( + isEmpty(term) + ? undefined + : { + query: { bool: { must: [{ term }] } }, + } + ); + }; + const handleAdvanceFieldClear = () => { setSelectedQuickFilters([]); }; const handleAdvanceFieldRemove = (value: string) => { - setSelectedQuickFilters((prev) => prev.filter((p) => p.key !== value)); + setSelectedQuickFilters((prev) => { + const data = prev.filter((p) => p.key !== value); + handleAdvanceSearchFilter(data); + + return data; + }); }; const handleAdvanceFieldValueSelect = (field: ExploreQuickFilterField) => { setSelectedQuickFilters((pre) => { - return pre.map((preField) => { + const data = pre.map((preField) => { if (preField.key === field.key) { return field; } else { return preField; } }); + + handleAdvanceSearchFilter(data); + + return data; }); }; @@ -279,23 +306,6 @@ const Explore: React.FC = ({ }; }, []); - useEffect(() => { - const term = {} as Record; - selectedQuickFilters.map((filter) => { - if (filter.key) { - term[filter.key] = filter.value; - } - }); - - onChangeAdvancedSearchQueryFilter( - isEmpty(term) - ? undefined - : { - query: { bool: { must: [{ term }] } }, - } - ); - }, [selectedQuickFilters]); - return ( { pathname: `/explore/${tabsInfo[nSearchIndex].path}/${searchQueryParam}`, search: Qs.stringify({ page: 1 }), }); + setAdvancedSearchQueryFilter(undefined); }; const handleQueryFilterChange: ExploreProps['onChangeAdvancedSearchJsonTree'] =