Skip to content

OCPBUGS-62713: Prevent application filter in Topology view from resetting to all applications unexpectedly #15812

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

Open
vikram-raj wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

OCPBUGS-62713: Prevent application filter in Topology view from resetting to all applications unexpectedly #15812

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion frontend/public/components/namespace-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import { useDispatch, useSelector } from 'react-redux';

import { NamespaceBarProps, useActivePerspective } from '@console/dynamic-plugin-sdk';
import { ALL_NAMESPACES_KEY } from '@console/dynamic-plugin-sdk/src/constants';
import { FLAGS, KEYBOARD_SHORTCUTS } from '@console/shared/src/constants/common';
import {
ALL_APPLICATIONS_KEY,
FLAGS,
KEYBOARD_SHORTCUTS,
} from '@console/shared/src/constants/common';
import { NamespaceDropdown } from '@console/shared/src/components/namespace/NamespaceDropdown';
import { useActiveNamespace } from '@console/shared/src/hooks/useActiveNamespace';
import { useFlag } from '@console/dynamic-plugin-sdk/src/utils/flags';
Expand All @@ -18,6 +22,7 @@ import { FirehoseResult } from './utils/types';
import { removeQueryArgument } from './utils/router';
import { useCreateNamespaceOrProjectModal } from '@console/shared/src/hooks/useCreateNamespaceOrProjectModal';
import type { RootState } from '../redux';
import { setActiveApplication } from '../actions/ui';

export type NamespaceBarDropdownsProps = {
children: React.ReactNode;
Expand Down Expand Up @@ -77,6 +82,7 @@ export const NamespaceBarDropdowns: React.FC<NamespaceBarDropdownsProps> = ({
onNamespaceChange?.(newNamespace);
setActiveNamespace(newNamespace);
removeQueryArgument('project-name');
activeNamespace !== newNamespace && dispatch(setActiveApplication(ALL_APPLICATIONS_KEY));
}}
onCreateNew={() => {
createNamespaceOrProjectModal({
Expand Down
4 changes: 1 addition & 3 deletions frontend/public/reducers/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ export default (state: UIState, action: UIAction): UIState => {
return state;
}

return state
.set('activeApplication', ALL_APPLICATIONS_KEY)
.set('activeNamespace', action.payload.namespace);
return state.set('activeNamespace', action.payload.namespace);

case ActionType.SetCurrentLocation: {
state = state.set('location', action.payload.location);
Expand Down