Skip to content

[release-4.21] OU-1368: reset queries when namespace changes in dev perspective #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 14, 2026
Merged

[release-4.21] OU-1368: reset queries when namespace changes in dev perspective #940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions web/src/components/MetricsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import {
} from '@patternfly/react-table';
import * as _ from 'lodash-es';
import type { FC, Ref } from 'react';
import { useMemo, useCallback, useEffect, useState } from 'react';
import { useMemo, useCallback, useEffect, useState, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';

Expand Down Expand Up @@ -1336,7 +1336,7 @@ const MetricsPage_: FC = () => {
const { t } = useTranslation(process.env.I18N_NAMESPACE);
const [units, setUnits] = useQueryParam(QueryParams.Units, StringParam);
const [customDataSourceName] = useQueryParam(QueryParams.Datasource, StringParam);
const { setNamespace } = useMonitoringNamespace();
const { namespace, setNamespace } = useMonitoringNamespace();
const { displayNamespaceSelector } = useMonitoring();

const dispatch = useDispatch();
Expand Down Expand Up @@ -1401,6 +1401,17 @@ const MetricsPage_: FC = () => {
});
}, [extensions, extensionsResolved, customDataSourceName, hasExtensions]);

const prevNamespace = useRef(namespace);
useEffect(() => {
// In the developer perspective (display namespace selector is false since all dev perspective
// pages add them automatically) then clear queries when the namespace changes
if (prevNamespace.current === namespace || displayNamespaceSelector) {
return;
}
prevNamespace.current = namespace;
dispatch(queryBrowserDeleteAllQueries());
}, [namespace, dispatch, setNamespace]);

if (customDataSourceName) {
if (!extensionsResolved || (!customDataSourceIsResolved && !customDatasourceError)) {
return (
Expand Down