Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions frontend/public/components/resource-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
ResourceListPage as ResourceListPageExt,
isResourceListPage,
} from '@console/dynamic-plugin-sdk/src/extensions/pages';
import { useNamespaceFromURL } from './useNamespaceFromURL';

// Parameters can be in pros.params (in URL) or in props.route (attribute of Route tag)
const allParams = (props) => Object.assign({}, _.get(props, 'params'), props);
Expand Down Expand Up @@ -72,7 +73,8 @@ const ResourceListPage_ = connectToPlural(

export const ResourceListPage = (props) => {
const params = useParams();
return <ResourceListPage_ {...props} params={params} />;
const ns = useNamespaceFromURL();
return <ResourceListPage_ {...props} params={{ ...params, ns }} />;
};

const ResourceDetailsPage_ = connectToPlural((props: ResourceDetailsPageProps) => {
Expand Down Expand Up @@ -125,7 +127,8 @@ const ResourceDetailsPage_ = connectToPlural((props: ResourceDetailsPageProps) =

export const ResourceDetailsPage = (props) => {
const params = useParams();
return <ResourceDetailsPage_ {...props} params={params} />;
const ns = useNamespaceFromURL();
return <ResourceDetailsPage_ {...props} params={{ ...params, ns }} />;
};

export type ResourceListPageProps = {
Expand Down
21 changes: 21 additions & 0 deletions frontend/public/components/useNamespaceFromURL.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { useParams } from 'react-router';
import { useActiveNamespace } from '@console/dynamic-plugin-sdk/src/lib-core';
import { ALL_NAMESPACES_KEY } from '@console/shared/src/constants';

/**
* Hook to get the namespace from URL params or active namespace selector.
*
* For routes with explicit namespace (/k8s/ns/:ns/:plural), returns the URL param.
* For routes without namespace (/k8s/all-namespaces/:plural), returns the active
* namespace from the selector, converting ALL_NAMESPACES_KEY to undefined.
*
* @returns The namespace string or undefined for all-namespaces view
*/
export const useNamespaceFromURL = (): string | undefined => {
const params = useParams<{ ns?: string }>();
const [activeNamespace] = useActiveNamespace();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this hook redundant? I thought that the namespace context was driven by the URL, which means params.ns will always equal activeNamespace if there is an ns param in the url.


// Use namespace from URL params if available, otherwise use active namespace
// Convert ALL_NAMESPACES_KEY to undefined for the all-namespaces routes
return params.ns || (activeNamespace === ALL_NAMESPACES_KEY ? undefined : activeNamespace);
};