diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts index bf2f0eb6a9a..8d8cf212c44 100644 --- a/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts +++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts @@ -260,16 +260,7 @@ export const fillRule = async ( await dropdownInput.fill(searchData); if (aggregateRes) { - const res = await aggregateRes; - if (field.id === 'Column') { - // check if aggregateRes has queryParam called 'sourceField' - const urlParams = new URLSearchParams(res.request().url()); - const sourceField = urlParams.get('sourceFields'); - if (sourceField) { - // check value of sourceField - expect(sourceField).toBe('columns.name'); - } - } + await aggregateRes; } await page diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx index ad771eb5cd2..024c9d84816 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx @@ -34,7 +34,7 @@ import { SUPPORTED_EMPTY_FILTER_FIELDS, TAG_FQN_KEY, } from '../../constants/explore.constants'; -import { SORT_ORDER } from '../../enums/common.enum'; +import { SIZE, SORT_ORDER } from '../../enums/common.enum'; import { useApplicationStore } from '../../hooks/useApplicationStore'; import { getDropDownItems } from '../../utils/AdvancedSearchUtils'; import { Transi18next } from '../../utils/CommonUtils'; @@ -45,6 +45,7 @@ import { } from '../../utils/ExploreUtils'; import { getApplicationDetailsPath } from '../../utils/RouterUtils'; import searchClassBase from '../../utils/SearchClassBase'; +import FilterErrorPlaceHolder from '../common/ErrorWithPlaceholder/FilterErrorPlaceHolder'; import Loader from '../common/Loader/Loader'; import ResizableLeftPanels from '../common/ResizablePanels/ResizableLeftPanels'; import { @@ -56,6 +57,7 @@ import ExploreTree from '../Explore/ExploreTree/ExploreTree'; import SearchedData from '../SearchedData/SearchedData'; import { SearchedDataProps } from '../SearchedData/SearchedData.interface'; import './exploreV1.less'; + const IndexNotFoundBanner = () => { const { theme } = useApplicationStore(); const { t } = useTranslation(); @@ -206,6 +208,38 @@ const ExploreV1: React.FC = ({ }); }; + const exploreLeftPanel = useMemo(() => { + if (tabItems.length === 0) { + return ( + + ); + } + + if (searchQueryParam) { + return ( + { + if (info && info.key !== activeTabKey) { + onChangeSearchIndex(info.key as ExploreSearchIndex); + setShowSummaryPanel(false); + } + }} + /> + ); + } + + return ; + }, [searchQueryParam, tabItems]); + useEffect(() => { const escapeKeyHandler = (e: KeyboardEvent) => { if (e.key === 'Escape') { @@ -265,28 +299,7 @@ const ExploreV1: React.FC = ({ flex: 0.13, minWidth: 280, title: t('label.data-asset-plural'), - children: ( -
- {searchQueryParam ? ( - { - if (info && info.key !== activeTabKey) { - onChangeSearchIndex(info.key as ExploreSearchIndex); - setShowSummaryPanel(false); - } - }} - /> - ) : ( - - )} -
- ), + children:
{exploreLeftPanel}
, }} secondPanel={{ className: 'content-height-with-resizable-panel', diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts index 4917099b1d9..622d680a5c6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts @@ -745,7 +745,6 @@ class AdvancedSearchClassBase { asyncFetch: this.autocomplete({ searchIndex: entitySearchIndex, entityField: EntityFields.COLUMN, - isCaseInsensitive: true, }), useAsyncSearch: true, },