diff --git a/src/utils/utils/helpers.ts b/src/utils/utils/helpers.ts index d9a2939f..485b2ee1 100644 --- a/src/utils/utils/helpers.ts +++ b/src/utils/utils/helpers.ts @@ -1,6 +1,6 @@ import { animals, colors, uniqueNamesGenerator } from 'unique-names-generator'; -import { ALL_NAMESPACES_KEY, DEFAULT_NAMESPACE } from '@utils/constants'; +import { ALL_NAMESPACES, ALL_NAMESPACES_KEY, DEFAULT_NAMESPACE } from '@utils/constants'; export const networkConsole = console; @@ -14,6 +14,9 @@ export const generateName = (prefix: string): string => { })}`; }; +export const createNamespacePath = (namespace: string) => + namespace ? `ns/${namespace}` : ALL_NAMESPACES; + export const getValidNamespace = (activeNamespace: string) => activeNamespace === ALL_NAMESPACES_KEY ? DEFAULT_NAMESPACE : activeNamespace; diff --git a/src/views/networkpolicies/list/EnableMultiPage.tsx b/src/views/networkpolicies/list/EnableMultiPage.tsx index 2b299fa3..6d97cfcb 100644 --- a/src/views/networkpolicies/list/EnableMultiPage.tsx +++ b/src/views/networkpolicies/list/EnableMultiPage.tsx @@ -20,9 +20,9 @@ import { EmptyStateHeader, Tooltip, } from '@patternfly/react-core'; -import { ALL_NAMESPACES } from '@utils/constants'; import { useNetworkingTranslation } from '@utils/hooks/useNetworkingTranslation'; import { MultiNetworkPolicyModel } from '@utils/models'; +import { createNamespacePath } from '@utils/utils/helpers'; import { NetworkConfigModel } from '@views/nads/form/utils/constants'; import '@styles/list-management-group.scss'; @@ -64,7 +64,7 @@ const EnableMultiPage: FC = ({ namespace }) => { model: NetworkConfigModel, resource: networkClusterConfig, }); - navigate(`/k8s/${namespace || ALL_NAMESPACES}/${modelToRef(MultiNetworkPolicyModel)}`); + navigate(`/k8s/${createNamespacePath(namespace)}/${modelToRef(MultiNetworkPolicyModel)}`); } catch (apiError) { setError(apiError); }