diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.tsx index fd547af8d094..2b300aaf463c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.tsx @@ -19,7 +19,7 @@ import { GRAYED_OUT_COLOR } from '../../../../constants/constants'; import { EventSubscriptionDiagnosticInfo } from '../../../../generated/events/api/eventSubscriptionDiagnosticInfo'; import { useFqn } from '../../../../hooks/useFqn'; import { getDiagnosticInfo } from '../../../../rest/observabilityAPI'; -import { getDiagnosticItems } from '../../../../utils/Alerts/AlertsUtil'; +import { getDiagnosticItems } from '../../../../utils/Alerts/AlertsUtilPure'; import { showErrorToast } from '../../../../utils/ToastUtils'; function AlertDiagnosticInfoTab() { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertRecentEventsTab/AlertRecentEventsTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertRecentEventsTab/AlertRecentEventsTab.tsx index 5525ba16a6db..957af7f831b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertRecentEventsTab/AlertRecentEventsTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertRecentEventsTab/AlertRecentEventsTab.tsx @@ -37,12 +37,14 @@ import { import { usePaging } from '../../../../hooks/paging/usePaging'; import { getAlertEventsFromId } from '../../../../rest/alertsAPI'; import { - getAlertEventsFilterLabels, getAlertRecentEventsFilterOptions, getAlertStatusIcon, +} from '../../../../utils/Alerts/AlertsUtil'; +import { + getAlertEventsFilterLabels, getChangeEventDataFromTypedEvent, getLabelsForEventDetails, -} from '../../../../utils/Alerts/AlertsUtil'; +} from '../../../../utils/Alerts/AlertsUtilPure'; import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils'; import { getEntityName } from '../../../../utils/EntityNameUtils'; import { Transi18next } from '../../../../utils/i18next/LocalUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.component.tsx index d9d872d4e963..4fe49d7c8e0b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.component.tsx @@ -26,10 +26,12 @@ import { Destination } from '../../../generated/events/eventSubscription'; import { testAlertDestination } from '../../../rest/alertsAPI'; import { getConnectionTimeoutField, - getFormattedDestinations, getReadTimeoutField, - listLengthValidator, } from '../../../utils/Alerts/AlertsUtil'; +import { + getFormattedDestinations, + listLengthValidator, +} from '../../../utils/Alerts/AlertsUtilPure'; import { showErrorToast } from '../../../utils/ToastUtils'; import './destination-form-item.less'; import { DestinationFormItemProps } from './DestinationFormItem.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.test.tsx index d335dab04371..d3a285311bb8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationFormItem.test.tsx @@ -39,19 +39,23 @@ jest.mock('../../../utils/Alerts/AlertsUtil', () => ({ getDestinationConfigField: jest .fn() .mockReturnValue(
), - getSubscriptionTypeOptions: jest.fn().mockReturnValue([]), - listLengthValidator: jest.fn().mockImplementation(() => Promise.resolve()), - getFilteredDestinationOptions: jest - .fn() - .mockImplementation((key) => DESTINATION_SOURCE_ITEMS[key]), getConnectionTimeoutField: jest .fn() .mockReturnValue(
), getReadTimeoutField: jest .fn() .mockReturnValue(
), +})); + +jest.mock('../../../utils/Alerts/AlertsUtilPure', () => ({ + listLengthValidator: jest.fn().mockImplementation(() => Promise.resolve()), getFormattedDestinations: (...args: unknown[]) => mockGetFormattedDestinations(...args), + getSubscriptionTypeOptions: jest.fn().mockReturnValue([]), + getFilteredDestinationOptions: jest + .fn() + .mockImplementation((key) => DESTINATION_SOURCE_ITEMS[key]), + normalizeDestinationConfig: jest.fn().mockImplementation((config) => config), })); jest.mock('../../../utils/ObservabilityUtils', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationSelectItem/DestinationSelectItem.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationSelectItem/DestinationSelectItem.tsx index 6d67c03300ba..78f6d6408ac2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationSelectItem/DestinationSelectItem.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/DestinationFormItem/DestinationSelectItem/DestinationSelectItem.tsx @@ -44,10 +44,12 @@ import { ModifiedDestination } from '../../../../pages/AddObservabilityPage/AddO import { getDestinationConfigField, getDestinationStatusAlertData, +} from '../../../../utils/Alerts/AlertsUtil'; +import { getFilteredDestinationOptions, getSubscriptionTypeOptions, normalizeDestinationConfig, -} from '../../../../utils/Alerts/AlertsUtil'; +} from '../../../../utils/Alerts/AlertsUtilPure'; import { Transi18next } from '../../../../utils/i18next/LocalUtil'; import { checkIfDestinationIsInternal } from '../../../../utils/ObservabilityUtils'; import { DestinationSelectItemProps } from './DestinationSelectItem.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/FQNListSelect/FQNListSelect.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/FQNListSelect/FQNListSelect.component.tsx index 8eae4d6e6a93..6ac86759d7d6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/FQNListSelect/FQNListSelect.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/FQNListSelect/FQNListSelect.component.tsx @@ -17,10 +17,9 @@ import type { CustomTagProps } from 'rc-select/lib/BaseSelect'; import React, { useEffect, useState } from 'react'; import { SearchIndex } from '../../../enums/search.enum'; import { searchQuery } from '../../../rest/searchAPI'; -import { getTermQuery } from '../../../utils/SearchUtils'; +import { getTermQuery } from '../../../utils/SearchPureUtils'; import { AsyncSelect } from '../../common/AsyncSelect/AsyncSelect'; import { AsyncSelectListProps } from '../../common/AsyncSelect/AsyncSelectList.interface'; - interface FQNListSelectProps extends SelectProps, Pick { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AuditLog/AuditLogFilters.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AuditLog/AuditLogFilters.component.tsx index 9cc14055c3c0..0a30e095d1c5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AuditLog/AuditLogFilters.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AuditLog/AuditLogFilters.component.tsx @@ -34,7 +34,7 @@ import { } from '../../utils/AuditLogUtils'; import { getEntityName } from '../../utils/EntityNameUtils'; import { translateWithNestedKeys } from '../../utils/i18next/LocalUtil'; -import { getTermQuery } from '../../utils/SearchUtils'; +import { getTermQuery } from '../../utils/SearchPureUtils'; import DatePickerMenu from '../common/DatePickerMenu/DatePickerMenu.component'; import SearchDropdown from '../SearchDropdown/SearchDropdown'; import { SearchDropdownOption } from '../SearchDropdown/SearchDropdown.interface'; @@ -42,7 +42,6 @@ import { AuditLogFiltersProps, FilterOption, } from './AuditLogFilters.interface'; - const ENTITY_TYPE_OPTIONS: FilterOption[] = [ // Data Assets { label: 'Table', value: 'table' }, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx index d515512d2b65..95fee887bb71 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx @@ -58,7 +58,7 @@ import { useFqn } from '../../../hooks/useFqn'; import { useLineageStore } from '../../../hooks/useLineageStore'; import { QueryFieldInterface } from '../../../pages/ExplorePage/ExplorePage.interface'; import { exportLineageByEntityCountAsync } from '../../../rest/lineageAPI'; -import { getQuickFilterQuery } from '../../../utils/ExploreUtils'; +import { getQuickFilterQuery } from '../../../utils/ExplorePureUtils'; import { getSearchNameEsQuery } from '../../../utils/Lineage/LineageUtils'; import { useRequiredParams } from '../../../utils/useRequiredParams'; import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx index e23887a6ba6f..5acd34eefceb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx @@ -33,8 +33,8 @@ import { SearchIndex } from '../../../enums/search.enum'; import useCustomLocation from '../../../hooks/useCustomLocation/useCustomLocation'; import { TabsInfoData } from '../../../pages/ExplorePage/ExplorePage.interface'; import { getAllCustomProperties } from '../../../rest/metadataTypeAPI'; +import { getEmptyJsonTree } from '../../../utils/AdvancedSearchPureUtils'; import { - getEmptyJsonTree, getTreeConfig, processEntityTypeFields, } from '../../../utils/AdvancedSearchUtils'; @@ -49,7 +49,6 @@ import { AdvanceSearchProviderProps, SearchOutputType, } from './AdvanceSearchProvider.interface'; - const AdvancedSearchContext = createContext( {} as AdvanceSearchContext ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CustomPropertiesSection/CustomPropertiesSection.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CustomPropertiesSection/CustomPropertiesSection.test.tsx index 7c17f9378223..0b9a04ed3dde 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CustomPropertiesSection/CustomPropertiesSection.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CustomPropertiesSection/CustomPropertiesSection.test.tsx @@ -75,7 +75,7 @@ jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolderNew', () => ({ })); // Mock utility functions -jest.mock('../../../../utils/EntityBreadcrumbUtils', () => ({ +jest.mock('../../../../utils/EntityLinkUtils', () => ({ getEntityLinkFromType: jest.fn().mockReturnValue('/test-entity-link'), })); jest.mock('../../../../utils/EntityNameUtils', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx index 5ede19cc319a..c619164edc99 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx @@ -16,7 +16,7 @@ import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { EntityType } from '../../../../enums/entity.enum'; import { DataProduct } from '../../../../generated/entity/domains/dataProduct'; -import { getSortedTagsWithHighlight } from '../../../../utils/EntitySummaryPanelUtils'; +import { getSortedTagsWithHighlight } from '../../../../utils/EntitySummaryPanelPureUtils'; import { DomainLabel } from '../../../common/DomainLabel/DomainLabel.component'; import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DomainSummary/DomainSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DomainSummary/DomainSummary.component.tsx index bdf06777fad4..405616170463 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DomainSummary/DomainSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DomainSummary/DomainSummary.component.tsx @@ -15,7 +15,7 @@ import { get } from 'lodash'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Domain } from '../../../../generated/entity/domains/domain'; -import { getSortedTagsWithHighlight } from '../../../../utils/EntitySummaryPanelUtils'; +import { getSortedTagsWithHighlight } from '../../../../utils/EntitySummaryPanelPureUtils'; import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx index f301bc9094ae..9f3f8a66e129 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx @@ -20,7 +20,6 @@ import AppBadge from '../../../../common/Badge/Badge.component'; import RichTextEditorPreviewerV1 from '../../../../common/RichTextEditor/RichTextEditorPreviewerV1'; import TagsViewer from '../../../../Tag/TagsViewer/TagsViewer'; import { SummaryListItemProps } from './SummaryListItems.interface'; - const { Text, Paragraph } = Typography; function SummaryListItem({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx index f1d0dcf6605b..5eaf3328050d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx @@ -16,7 +16,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { SearchIndex } from '../../../../enums/search.enum'; import { searchQuery } from '../../../../rest/searchAPI'; -import { getTermQuery } from '../../../../utils/SearchUtils'; +import { getTermQuery } from '../../../../utils/SearchPureUtils'; import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import TableDataCardV2 from '../../../common/TableDataCardV2/TableDataCardV2'; import { SourceType } from '../../../SearchedData/SearchedData.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx index 5fa1578bed91..6eeb2a75befb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx @@ -21,7 +21,7 @@ import { SearchIndex } from '../../enums/search.enum'; import useCustomLocation from '../../hooks/useCustomLocation/useCustomLocation'; import { useSearchStore } from '../../hooks/useSearchStore'; import { QueryFilterInterface } from '../../pages/ExplorePage/ExplorePage.interface'; -import { getOptionsFromAggregationBucket } from '../../utils/AdvancedSearchUtils'; +import { getOptionsFromAggregationBucket } from '../../utils/AdvancedSearchPureUtils'; import { getCombinedQueryFilterObject, getQuickFilterWithDeletedFlag, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreTree/ExploreTree.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreTree/ExploreTree.tsx index e02aff859702..26bb41f301ed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreTree/ExploreTree.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreTree/ExploreTree.tsx @@ -37,7 +37,7 @@ import { getSubLevelHierarchyKey, updateTreeData, updateTreeDataWithCounts, -} from '../../../utils/ExploreUtils'; +} from '../../../utils/ExplorePureUtils'; import { Transi18next } from '../../../utils/i18next/LocalUtil'; import searchClassBase from '../../../utils/SearchClassBase'; import serviceUtilClassBase from '../../../utils/ServiceUtilClassBase'; @@ -53,7 +53,6 @@ import { ExploreTreeProps, TreeNodeData, } from './ExploreTree.interface'; - const ExploreTreeTitle = ({ node }: { node: ExploreTreeNode }) => { const tooltipText = node.tooltip ?? node.title; 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 77ac6d0d3959..82b27f73c39c 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 @@ -58,7 +58,7 @@ import { getCombinedQueryFilterObject } from '../../utils/ExplorePage/ExplorePag import { getExploreQueryFilterMust, getSelectedValuesFromQuickFilter, -} from '../../utils/ExploreUtils'; +} from '../../utils/ExplorePureUtils'; import searchClassBase from '../../utils/SearchClassBase'; import withSuspenseFallback from '../AppRouter/withSuspenseFallback'; import FilterErrorPlaceHolder from '../common/ErrorWithPlaceholder/FilterErrorPlaceHolder'; @@ -76,7 +76,6 @@ import { ReactComponent as IconAscending } from './../../assets/svg/ic-ascending import { ReactComponent as IconDescending } from './../../assets/svg/ic-descending.svg'; import './exploreV1.less'; import { IndexNotFoundBanner } from './IndexNotFoundBanner'; - const EntitySummaryPanel = withSuspenseFallback( lazy( () => diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LineageTable/LineageTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/LineageTable/LineageTable.tsx index e21df7a03ed6..9a0dee32dc93 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LineageTable/LineageTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/LineageTable/LineageTable.tsx @@ -58,7 +58,7 @@ import { import { getEntityLinkFromType } from '../../utils/EntityLinkUtils'; import { getEntityName } from '../../utils/EntityNameUtils'; import { highlightSearchText } from '../../utils/EntitySearchUtils'; -import { getQuickFilterQuery } from '../../utils/ExploreUtils'; +import { getQuickFilterQuery } from '../../utils/ExplorePureUtils'; import Fqn from '../../utils/Fqn'; import { Transi18next } from '../../utils/i18next/LocalUtil'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx index 02fa55922154..03c866afde34 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx @@ -28,7 +28,7 @@ import { ThreadType } from '../../generated/api/feed/createThread'; import { Post, Thread } from '../../generated/entity/feed/thread'; import { useApplicationStore } from '../../hooks/useApplicationStore'; import { getFeedsWithFilter } from '../../rest/feedsAPI'; -import { getEntityFQN, getEntityType } from '../../utils/FeedUtils'; +import { getEntityFQN, getEntityType } from '../../utils/FeedUtilsPure'; import { getUserPath } from '../../utils/RouterUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import Loader from '../common/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx index d09e27ad72e9..dcd2619761da 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx @@ -28,7 +28,6 @@ import { ActivityFeedTabs } from '../ActivityFeed/ActivityFeedTab/ActivityFeedTa import ProfilePicture from '../common/ProfilePicture/ProfilePicture'; import { SourceType } from '../SearchedData/SearchedData.interface'; import { NotificationFeedProp } from './NotificationFeedCard.interface'; - const NotificationFeedCard: FC = ({ createdBy, entityFQN, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.test.tsx index fcc205a0a2a1..d39573febdfc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.test.tsx @@ -19,6 +19,10 @@ import NotificationFeedCard from './NotificationFeedCard.component'; jest.mock('../../utils/date-time/DateTimeUtils', () => ({ formatDateTime: jest.fn().mockImplementation((date) => date), getRelativeTime: jest.fn().mockImplementation((date) => date), + getEpochMillisForPastDays: jest.fn().mockImplementation((days) => days), + getStartOfDayInMillis: jest.fn().mockImplementation((val) => val), + getEndOfDayInMillis: jest.fn().mockImplementation((val) => val), + getCurrentMillis: jest.fn().mockReturnValue(0), })); const mockPrepareFeedLink = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx index 4be199eaecf1..80b5e184e848 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx @@ -40,10 +40,10 @@ import { import { useTranslation } from 'react-i18next'; import { ReactComponent as DropDown } from '../../assets/svg/drop-down.svg'; import { NULL_OPTION_KEY } from '../../constants/AdvancedSearch.constants'; +import { getSelectedOptionLabelString } from '../../utils/AdvancedSearchPureUtils'; import { generateSearchDropdownLabel, getSearchDropdownLabels, - getSelectedOptionLabelString, } from '../../utils/AdvancedSearchUtils'; import searchClassBase from '../../utils/SearchClassBase'; import Loader from '../common/Loader/Loader'; @@ -52,7 +52,6 @@ import { SearchDropdownOption, SearchDropdownProps, } from './SearchDropdown.interface'; - const SearchDropdown: FC = ({ dropdownClassName, isSuggestionsLoading, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx index 8c8e6b506568..db585bd41436 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx @@ -22,16 +22,15 @@ import { Effect, EventSubscription, } from '../../../../generated/events/eventSubscription'; +import { EDIT_LINK_PATH } from '../../../../utils/Alerts/AlertsUtil'; import { - EDIT_LINK_PATH, getDisplayNameForEntities, getFunctionDisplayName, -} from '../../../../utils/Alerts/AlertsUtil'; +} from '../../../../utils/Alerts/AlertsUtilPure'; import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; import PageHeader from '../../../PageHeader/PageHeader.component'; import { HeaderProps } from '../../../PageHeader/PageHeader.interface'; - interface AlertDetailsComponentProps { alerts: EventSubscription; onDelete: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx index 77c25a7a2dd5..5014e179afee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx @@ -23,6 +23,9 @@ import { AlertDetailsComponent } from './AlertDetails.component'; jest.mock('../../../../utils/Alerts/AlertsUtil', () => ({ EDIT_LINK_PATH: 'Edit Alert Link', +})); + +jest.mock('../../../../utils/Alerts/AlertsUtilPure', () => ({ getDisplayNameForEntities: jest.fn().mockImplementation((entity) => entity), getFunctionDisplayName: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx index 9a27bad35668..b7bac7f0cb8e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx @@ -20,7 +20,6 @@ import { ReactComponent as CopyLeft } from '../../../../../assets/svg/copy-left. import { useClipboard } from '../../../../../hooks/useClipBoard'; import { splitCSV } from '../../../../../utils/CSV/CSVPureUtils'; import './workflow-array-field-template.less'; - const WorkflowArrayFieldTemplate = (props: FieldProps) => { const { t } = useTranslation(); const isFilterPatternField = (id: string) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx index ea361ba56d19..08d42017c41b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx @@ -41,7 +41,7 @@ import { searchQuery } from '../../../../../../rest/searchAPI'; import { getEmptyJsonTree, getEmptyJsonTreeForQueryBuilder, -} from '../../../../../../utils/AdvancedSearchUtils'; +} from '../../../../../../utils/AdvancedSearchPureUtils'; import { elasticSearchFormat } from '../../../../../../utils/QueryBuilderElasticsearchFormatUtils'; import { addEntityTypeFilter, @@ -50,14 +50,13 @@ import { getJsonTreeFromQueryFilter, migrateJsonLogic, READONLY_SETTINGS, -} from '../../../../../../utils/QueryBuilderUtils'; +} from '../../../../../../utils/QueryBuilderPureUtils'; import { getExplorePath } from '../../../../../../utils/RouterUtils'; import searchClassBase from '../../../../../../utils/SearchClassBase'; import { withAdvanceSearch } from '../../../../../AppRouter/withAdvanceSearch'; import { useAdvanceSearch } from '../../../../../Explore/AdvanceSearchProvider/AdvanceSearchProvider.component'; import { SearchOutputType } from '../../../../../Explore/AdvanceSearchProvider/AdvanceSearchProvider.interface'; import './query-builder-widget.less'; - const QueryBuilderWidget: FC< WidgetProps & { fields?: Config['fields']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/SelectWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/SelectWidget.tsx index c3fb9a41e70b..2585cf8d23da 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/SelectWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/SelectWidget.tsx @@ -17,7 +17,6 @@ import { FC } from 'react'; import { filterSelectOptions } from '../../../../../utils/FilterQueryUtils'; import { getPopupContainer } from '../../../../../utils/formPureUtils'; import TreeSelectWidget from './TreeSelectWidget'; - const getDisplayLabel = ( label: string | number | boolean | null, shouldCapitalize: boolean diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.test.tsx index 5bad1faae7c2..9af0e8328b3f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.test.tsx @@ -23,7 +23,7 @@ import { EntityType } from '../../../enums/entity.enum'; import { searchQuery } from '../../../rest/searchAPI'; import { getTreeConfig } from '../../../utils/AdvancedSearchUtils'; import * as QueryBuilderElasticsearchFormatUtils from '../../../utils/QueryBuilderElasticsearchFormatUtils'; -import * as QueryBuilderUtils from '../../../utils/QueryBuilderUtils'; +import * as QueryBuilderUtils from '../../../utils/QueryBuilderPureUtils'; import searchClassBase from '../../../utils/SearchClassBase'; import { SearchOutputType } from '../../Explore/AdvanceSearchProvider/AdvanceSearchProvider.interface'; import QueryBuilderWidgetV1 from './QueryBuilderWidgetV1'; @@ -48,6 +48,7 @@ jest.mock('../../../utils/AdvancedSearchUtils', () => ({ })); jest.mock('../../../utils/QueryBuilderUtils'); +jest.mock('../../../utils/QueryBuilderPureUtils'); jest.mock('../../../utils/QueryBuilderElasticsearchFormatUtils'); jest.mock('../../../utils/RouterUtils', () => { return { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.tsx index 1a815694e641..a4d553e2ebf2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryBuilderWidgetV1/QueryBuilderWidgetV1.tsx @@ -50,22 +50,19 @@ import { EntityType } from '../../../enums/entity.enum'; import { SearchIndex } from '../../../enums/search.enum'; import { QueryFilterInterface } from '../../../pages/ExplorePage/ExplorePage.interface'; import { searchQuery } from '../../../rest/searchAPI'; -import { - getEmptyJsonTreeForQueryBuilder, - getTreeConfig, -} from '../../../utils/AdvancedSearchUtils'; +import { getEmptyJsonTreeForQueryBuilder } from '../../../utils/AdvancedSearchPureUtils'; +import { getTreeConfig } from '../../../utils/AdvancedSearchUtils'; import { elasticSearchFormat } from '../../../utils/QueryBuilderElasticsearchFormatUtils'; import { addEntityTypeFilter, getEntityTypeAggregationFilter, getJsonTreeFromQueryFilter, READONLY_SETTINGS, -} from '../../../utils/QueryBuilderUtils'; +} from '../../../utils/QueryBuilderPureUtils'; import { getExplorePath } from '../../../utils/RouterUtils'; import searchClassBase from '../../../utils/SearchClassBase'; import { SearchOutputType } from '../../Explore/AdvanceSearchProvider/AdvanceSearchProvider.interface'; import './query-builder-widget-v1.less'; - const QueryBuilderWidgetV1: FC<{ fields?: Config['fields']; onChange?: (value: string, tree?: JsonTree) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx index 8037dfc90f04..9565a33b0500 100644 --- a/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx @@ -134,7 +134,7 @@ import { import { getLoadingStatusValue } from '../../utils/EntityLineageUtils'; import { updateNodeType } from '../../utils/EntityPureUtils'; import { getEntityReferenceFromEntity } from '../../utils/EntityReferenceUtils'; -import { getQuickFilterQuery } from '../../utils/ExploreUtils'; +import { getQuickFilterQuery } from '../../utils/ExplorePureUtils'; import { addBaseNodeDepthToNodes } from '../../utils/Lineage/LineageUtils'; import tableClassBase from '../../utils/TableClassBase'; import { showErrorToast } from '../../utils/ToastUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx index 412232e88498..6a5ea640e377 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx @@ -41,11 +41,10 @@ import { useSearchStore } from '../../hooks/useSearchStore'; import { Aggregations, SearchResponse } from '../../interface/search.interface'; import { extractTermKeys, - fetchEntityData, findActiveSearchIndex, - generateTabItems, parseSearchParams, -} from '../../utils/ExploreUtils'; +} from '../../utils/ExplorePureUtils'; +import { fetchEntityData, generateTabItems } from '../../utils/ExploreUtils'; import { getExplorePath } from '../../utils/RouterUtils'; import searchClassBase from '../../utils/SearchClassBase'; import { useRequiredParams } from '../../utils/useRequiredParams'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.test.tsx index 82ff981b7094..258c07b8109d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.test.tsx @@ -37,11 +37,13 @@ import { getEmptyJsonTreeForQueryBuilder, getOptionsFromAggregationBucket, getSchemaFieldOptions, - getSearchDropdownLabels, getSearchLabel, getSelectedOptionLabelString, getServiceOptions, getTasksOptions, +} from './AdvancedSearchPureUtils'; +import { + getSearchDropdownLabels, processCustomPropertyField, processEntityTypeFields, } from './AdvancedSearchUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.tsx index b155e4e84a2c..990ed0e361fe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchUtils.tsx @@ -39,23 +39,6 @@ import { t } from './i18next/LocalUtil'; import jsonLogicSearchClassBase from './JSONLogicSearchClassBase'; import searchClassBase from './SearchClassBase'; -export { - formatQueryValueBasedOnType, - getAssetsPageQuickFilters, - getChartsOptions, - getColumnsOptions, - getCustomPropertyAdvanceSearchEnumOptions, - getDataModelOptions, - getEmptyJsonTree, - getEmptyJsonTreeForQueryBuilder, - getOptionsFromAggregationBucket, - getSchemaFieldOptions, - getSearchLabel, - getSelectedOptionLabelString, - getServiceOptions, - getTasksOptions, -} from './AdvancedSearchPureUtils'; - export const getDropDownItems = (index: string): ExploreQuickFilterField[] => { return searchClassBase.getDropDownItems(index); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx index edf6956ebd7b..5c02de98971c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx @@ -38,32 +38,34 @@ import { import { ModifiedDestination } from '../../pages/AddObservabilityPage/AddObservabilityPage.interface'; import { searchContracts } from '../../rest/contractAPI'; import { searchQuery } from '../../rest/searchAPI'; -import { getTermQuery } from '../SearchUtils'; +import { getTermQuery } from '../SearchPureUtils'; import { - getAlertActionTypeDisplayName, - getAlertEventsFilterLabels, getAlertExtraInfo, getAlertRecentEventsFilterOptions, getAlertsActionTypeIcon, getAlertStatusIcon, + getConnectionTimeoutField, + getDestinationConfigField, + getFieldByArgumentType, + getFqnSearchIndexes, + searchEntity, +} from './AlertsUtil'; +import { + getAlertActionTypeDisplayName, + getAlertEventsFilterLabels, getChangeEventDataFromTypedEvent, getConfigHeaderArrayFromObject, getConfigHeaderObjectFromArray, getConfigQueryParamsArrayFromObject, getConfigQueryParamsObjectFromArray, - getConnectionTimeoutField, - getDestinationConfigField, getDisplayNameForEntities, - getFieldByArgumentType, getFilteredDestinationOptions, getFormattedDestinations, - getFqnSearchIndexes, getFunctionDisplayName, getLabelsForEventDetails, listLengthValidator, normalizeDestinationConfig, - searchEntity, -} from './AlertsUtil'; +} from './AlertsUtilPure'; jest.mock('antd', () => ({ ...jest.requireActual('antd'), diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx index 8d3a8e490bd6..1ca8589af691 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx @@ -11,28 +11,6 @@ * limitations under the License. */ -export { - getAlertActionTypeDisplayName, - getAlertEventsFilterLabels, - getChangeEventDataFromTypedEvent, - getConfigHeaderArrayFromObject, - getConfigHeaderObjectFromArray, - getConfigQueryParamsArrayFromObject, - getConfigQueryParamsObjectFromArray, - getDiagnosticItems, - getDisplayNameForEntities, - getFilteredDestinationOptions, - getFormattedDestinations, - getFunctionDisplayName, - getLabelsForEventDetails, - getMessageFromArgumentName, - getRandomizedAlertName, - getSelectOptionsFromEnum, - getSubscriptionTypeOptions, - listLengthValidator, - normalizeDestinationConfig, -} from './AlertsUtilPure'; - import { CheckCircleOutlined, CloseOutlined, @@ -104,7 +82,7 @@ import { getEntityName, getEntityNameLabel } from '../EntityNameUtils'; import { t } from '../i18next/LocalUtil'; import { getConfigFieldFromDestinationType } from '../ObservabilityUtils'; import searchClassBase from '../SearchClassBase'; -import { getTermQuery } from '../SearchUtils'; +import { getTermQuery } from '../SearchPureUtils'; import { showErrorToast } from '../ToastUtils'; import './alerts-util.less'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.test.ts index 5b64aab9d3b8..88786db481a3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.test.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.test.ts @@ -22,7 +22,7 @@ import { getSelectedValuesFromQuickFilter, getSubLevelHierarchyKey, updateTreeData, -} from './ExploreUtils'; +} from './ExplorePureUtils'; describe('Explore Utils', () => { it('should return undefined if data is empty', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.tsx index b4a45d8e5073..acdb4af04ca3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ExploreUtils.tsx @@ -41,24 +41,6 @@ import { import { escapeESReservedCharacters } from './StringUtils'; import { showErrorToast } from './ToastUtils'; -export { - extractTermKeys, - findActiveSearchIndex, - getAggregations, - getExploreQueryFilterMust, - getParseValueFromLocation, - getQuickFilterObject, - getQuickFilterObjectForEntities, - getQuickFilterQuery, - getSelectedValuesFromQuickFilter, - getSubLevelHierarchyKey, - isElasticsearchError, - parseSearchParams, - updateCountsInTreeData, - updateTreeData, - updateTreeDataWithCounts, -} from './ExplorePureUtils'; - export const getAggregationOptions = async ( index: SearchIndex | SearchIndex[], key: string, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.test.ts index aa31004b8905..9835cabf7c23 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.test.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.test.ts @@ -23,8 +23,7 @@ import { getJsonTreeFromQueryFilter, jsonLogicToElasticsearch, resolveFieldType, -} from './QueryBuilderUtils'; - +} from './QueryBuilderPureUtils'; jest.mock('./StringUtils', () => ({ generateUUID: jest.fn(), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx index bdff5f444b40..c2b1bee191b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx @@ -15,30 +15,6 @@ import type { RenderSettings } from '@react-awesome-query-builder/antd'; import { Button } from 'antd'; import { t } from './i18next/LocalUtil'; -export { - addEntityTypeFilter, - buildExploreUrlParams, - elasticsearchToJsonLogic, - getCommonFieldProperties, - getEntityTypeAggregationFilter, - getEqualFieldProperties, - getFieldsByKeys, - getJsonTreeFromQueryFilter, - getJsonTreePropertyFromQueryFilter, - getOperator, - getSelectAnyInProperties, - getSelectEqualsNotEqualsProperties, - getSelectNotAnyInProperties, - jsonLogicToElasticsearch, - JSONLOGIC_FIELDS_TO_IGNORE_SPLIT, - JSONLOGIC_OPERATORS, - migrateJsonLogic, - READONLY_SETTINGS, - resolveFieldType, - type ElasticsearchQuery, - type JsonLogic, -} from './QueryBuilderPureUtils'; - export const renderQueryBuilderFilterButtons: RenderSettings['renderButton'] = ( props ) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.test.ts index 5236cc9e5523..2dc13bd55d1b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.test.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.test.ts @@ -14,11 +14,10 @@ import { EntityType } from '../enums/entity.enum'; import { SearchIndex } from '../enums/search.enum'; import { getEntityTypeFromSearchIndex, - getGroupLabel, getTermQuery, parseBucketsData, -} from './SearchUtils'; - +} from './SearchPureUtils'; +import { getGroupLabel } from './SearchUtils'; // Add type definition for ESQueryClause to fix type errors type ESQueryClause = { term?: Record; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx index 6df02d88e40c..5aac9916e676 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx @@ -42,12 +42,6 @@ import i18n from './i18next/LocalUtil'; import searchClassBase from './SearchClassBase'; import serviceUtilClassBase from './ServiceUtilClassBase'; -export { - getEntityTypeFromSearchIndex, - getTermQuery, - parseBucketsData, -} from './SearchPureUtils'; - export const getGroupLabel = (index: string) => { let label = ''; let GroupIcon;