feat: Add query parameter for resource namespace on all namespaces (#3926)

* feat: add query param for resource namespace

* fix: minor fix of previous changes

Author: chriskari

src/resources/createResourceRoutes.js

@@ -63,8 +63,7 @@ const ColumnWrapper = ({ list, details, create, ...props }) => {
     rawResourceTypeName: props.resourceType,
   });
 
-  const defaultColumn =
-    resourceName && namespaceId !== '-all-' ? 'details' : 'list';
+  const defaultColumn = resourceName ? 'details' : 'list';
 
   const layoutCloseCreateUrl = resourceListUrl({
     kind: props.resourceType,

src/shared/components/GenericList/GenericList.js

@@ -381,7 +381,11 @@ export const GenericList = ({
       );
       const link = `${linkTo(selectedEntry)}${
         enableColumnLayout
-          ? `?layout=${columnLayout ?? 'TwoColumnsMidExpanded'}`
+          ? `?layout=${columnLayout ?? 'TwoColumnsMidExpanded'}${
+              namespace === '-all-' && selectedEntry?.metadata?.namespace
+                ? `&resourceNamespace=${selectedEntry?.metadata?.namespace}`
+                : ''
+            }`
           : ''
       }`;
       navigate(link);

src/shared/hooks/usePrepareLayout.js

@@ -100,10 +100,13 @@ export function usePrepareLayoutColumns({
   const showCreate = searchParams.get('showCreate');
   const showEdit = searchParams.get('showEdit');
   const editColumn = searchParams.get('editColumn');
+  const resourceNamespace =
+    namespaceId === '-all-'
+      ? searchParams.get('resourceNamespace')
+      : namespaceId;
   const navigationType = useNavigationType();
 
   const newLayoutState = useMemo(() => {
-    const isAllNamespaces = namespaceId === '-all-';
     if (isModule) {
       return {
         layout: layout || 'OneColumn',
@@ -139,7 +142,7 @@ export function usePrepareLayoutColumns({
       };
     }
 
-    if (!layout || layout === 'OneColumn' || isAllNamespaces) {
+    if (!layout || layout === 'OneColumn') {
       return {
         layout: 'OneColumn',
         startColumn: {
@@ -156,8 +159,8 @@ export function usePrepareLayoutColumns({
         showEdit: showEdit
           ? {
               resourceType,
+              namespaceId: resourceNamespace,
               rawResourceTypeName,
-              namespaceId,
               apiGroup,
               apiVersion,
               resourceName:
@@ -182,8 +185,8 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName,
               resourceType,
+              namespaceId: resourceNamespace,
               rawResourceTypeName,
-              namespaceId,
               apiGroup,
               apiVersion,
             }
@@ -192,8 +195,8 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName: crName,
               resourceType: resourceName,
+              namespaceId: resourceNamespace,
               rawResourceTypeName: resourceName ?? rawResourceTypeName,
-              namespaceId,
               apiGroup,
               apiVersion,
             }
@@ -210,8 +213,8 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName: crName,
               resourceType: resourceName,
+              namespaceId: resourceNamespace,
               rawResourceTypeName: resourceName ?? rawResourceTypeName,
-              namespaceId,
               apiGroup,
               apiVersion,
               resource,
@@ -234,8 +237,8 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName,
               resourceType,
+              namespaceId: resourceNamespace,
               rawResourceTypeName,
-              namespaceId,
               apiGroup,
               apiVersion,
             }
@@ -253,15 +256,15 @@ export function usePrepareLayoutColumns({
         ? editColumn === 'startColumn'
           ? {
               resourceType,
+              namespaceId: resourceNamespace,
               rawResourceTypeName,
-              namespaceId,
               apiGroup,
               apiVersion,
             }
           : {
               resourceName,
               resourceType,
-              namespaceId,
+              namespaceId: resourceNamespace,
               apiGroup,
               apiVersion,
               resource,
@@ -273,6 +276,7 @@ export function usePrepareLayoutColumns({
     showCreate,
     showEdit,
     editColumn,
+    resourceNamespace,
     resourceType,
     namespaceId,
     apiGroup,
@@ -300,9 +304,7 @@ export function usePrepareLayoutColumns({
   useEffect(() => {
     setLayoutColumn(newLayoutState);
     setIsFormOpen({
-      formOpen:
-        namespaceId !== '-all-' &&
-        (!!newLayoutState.showCreate || !!newLayoutState.showEdit),
+      formOpen: !!newLayoutState.showCreate || !!newLayoutState.showEdit,
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);