diff --git a/frontend/src/container/InfraMonitoringHosts/HostsListControls.tsx b/frontend/src/container/InfraMonitoringHosts/HostsListControls.tsx index ad07d1f2d75..5c7cad87ffe 100644 --- a/frontend/src/container/InfraMonitoringHosts/HostsListControls.tsx +++ b/frontend/src/container/InfraMonitoringHosts/HostsListControls.tsx @@ -1,18 +1,19 @@ import './InfraMonitoring.styles.scss'; +import { initialQueriesMap } from 'constants/queryBuilder'; import { K8sCategory } from 'container/InfraMonitoringK8s/constants'; import QueryBuilderSearch from 'container/QueryBuilder/filters/QueryBuilderSearch'; import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2'; -import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder'; import { useCallback, useMemo } from 'react'; import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData'; +import { DataSource } from 'types/common/queryBuilder'; function HostsListControls({ handleFiltersChange, }: { handleFiltersChange: (value: IBuilderQuery['filters']) => void; }): JSX.Element { - const { currentQuery } = useQueryBuilder(); + const currentQuery = initialQueriesMap[DataSource.METRICS]; const updatedCurrentQuery = useMemo( () => ({ ...currentQuery, diff --git a/frontend/src/container/InfraMonitoringK8s/K8sHeader.tsx b/frontend/src/container/InfraMonitoringK8s/K8sHeader.tsx index 84fd1e9964f..2f583a96519 100644 --- a/frontend/src/container/InfraMonitoringK8s/K8sHeader.tsx +++ b/frontend/src/container/InfraMonitoringK8s/K8sHeader.tsx @@ -2,13 +2,14 @@ import './InfraMonitoringK8s.styles.scss'; import { Button, Select } from 'antd'; +import { initialQueriesMap } from 'constants/queryBuilder'; import QueryBuilderSearch from 'container/QueryBuilder/filters/QueryBuilderSearch'; import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2'; -import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder'; import { Filter, SlidersHorizontal } from 'lucide-react'; import { useCallback, useMemo, useState } from 'react'; import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse'; import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData'; +import { DataSource } from 'types/common/queryBuilder'; import { K8sCategory } from './constants'; import K8sFiltersSidePanel from './K8sFiltersSidePanel/K8sFiltersSidePanel'; @@ -47,7 +48,7 @@ function K8sHeader({ }: K8sHeaderProps): JSX.Element { const [isFiltersSidePanelOpen, setIsFiltersSidePanelOpen] = useState(false); - const { currentQuery } = useQueryBuilder(); + const currentQuery = initialQueriesMap[DataSource.METRICS]; const updatedCurrentQuery = useMemo( () => ({ diff --git a/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts b/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts index 208e6f06655..4859bbce93d 100644 --- a/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts +++ b/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts @@ -243,13 +243,15 @@ export const useFetchKeysAndValues = ( fetchingSuggestionsStatus === 'success' && suggestionsData?.payload?.attributes ) { - setKeys(suggestionsData.payload.attributes); - setSourceKeys((prevState) => - uniqWith( - [...(suggestionsData.payload.attributes ?? []), ...prevState], - isEqual, - ), - ); + if (!isInfraMonitoring) { + setKeys(suggestionsData.payload.attributes); + setSourceKeys((prevState) => + uniqWith( + [...(suggestionsData.payload.attributes ?? []), ...prevState], + isEqual, + ), + ); + } } else { setKeys([]); } @@ -265,6 +267,7 @@ export const useFetchKeysAndValues = ( suggestionsData?.payload?.attributes, fetchingSuggestionsStatus, suggestionsData?.payload?.example_queries, + isInfraMonitoring, ]); return {