fix: Adjust namespace in columnlayout state after create (#3946)

* fix: adjust namespace in columnlayout state after create

* fix: correct resourceType usage

Author: chriskari

src/components/App/ExtensibilityRoutes.js

@@ -64,6 +64,7 @@ const ColumnWrapper = ({ resourceType, extension, urlPath }) => {
   } else {
     startColumnComponent = (
       <List
+        rawResourceType={extension?.general?.resource?.kind}
         layoutCloseCreateUrl={layoutCloseCreateUrl}
         enableColumnLayout={true}
       />

src/components/Extensibility/ExtensibilityList.js

@@ -32,6 +32,7 @@ import '../../web-components/eventListenerTracker';
 export const ExtensibilityListCore = ({
   resMetaData,
   filterFunction,
+  rawResourceType,
   ...props
 }) => {
   const { t, widgetT, exists } = useGetTranslation();
@@ -123,6 +124,7 @@ export const ExtensibilityListCore = ({
     <ResourcesList
       {...listProps}
       {...props}
+      rawResourceType={rawResourceType}
       displayLabelForLabels
       disableCreate={disableCreate}
       disableDelete={disableDelete}

src/resources/ResourceQuotas/ResourceQuotasList.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import ResourceQuotaCreate from './ResourceQuotaCreate';
 import { Button } from '@ui5/webcomponents-react';
 import { useNavigate } from 'react-router';
-import { useRecoilState } from 'recoil';
+import { useSetRecoilState } from 'recoil';
 import { columnLayoutState } from 'state/columnLayoutAtom';
 import { useUrl } from 'hooks/useUrl';
 import pluralize from 'pluralize';
@@ -13,7 +13,7 @@ import { EMPTY_TEXT_PLACEHOLDER } from 'shared/constants';
 export function ResourceQuotasList(props: any) {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const [, setLayoutColumn] = useRecoilState(columnLayoutState);
+  const setLayoutColumn = useSetRecoilState(columnLayoutState);
   const { namespaceUrl } = useUrl();
 
   const customColumns = [

src/resources/createResourceRoutes.js

@@ -101,6 +101,7 @@ const ColumnWrapper = ({ list, details, create, ...props }) => {
 
   const listComponent = React.cloneElement(list, {
     ...elementListProps,
+    rawResourceType: props.resourceType,
     layoutCloseCreateUrl,
     enableColumnLayout: elementListProps.resourceType !== 'Namespaces',
   });

src/shared/ResourceForm/useCreateResource.js

@@ -1,6 +1,6 @@
 import { useNotification } from 'shared/contexts/NotificationContext';
 import { useTranslation } from 'react-i18next';
-import { useRecoilState } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useUpdate } from 'shared/hooks/BackendAPI/useMutation';
 import { usePost } from 'shared/hooks/BackendAPI/usePost';
@@ -12,6 +12,7 @@ import { ForceUpdateModalContent } from './ForceUpdateModalContent';
 import { useUrl } from 'hooks/useUrl';
 import { usePrepareLayout } from 'shared/hooks/usePrepareLayout';
 import { columnLayoutState } from 'state/columnLayoutAtom';
+import { activeNamespaceIdState } from 'state/activeNamespaceIdAtom';
 import { extractApiGroupVersion } from 'resources/Roles/helpers';
 import { useNavigate } from 'react-router';
 import { useMemo } from 'react';
@@ -38,6 +39,7 @@ export function useCreateResource({
   const patchRequest = useUpdate();
   const { scopedUrl } = useUrl();
   const [layoutColumn, setLayoutColumn] = useRecoilState(columnLayoutState);
+  const activeNamespace = useRecoilValue(activeNamespaceIdState);
 
   const { nextQuery, nextLayout } = usePrepareLayout(layoutNumber);
 
@@ -86,7 +88,7 @@ export function useCreateResource({
                   resourceName: resource.metadata.name,
                   resourceType: resource.kind,
                   rawResourceTypeName: resource.kind,
-                  namespaceId: resource.metadata.namespace,
+                  namespaceId: resource.metadata.namespace ?? activeNamespace,
                   apiGroup: group,
                   apiVersion: version,
                 },
@@ -101,7 +103,7 @@ export function useCreateResource({
                   resourceName: resource.metadata.name,
                   resourceType: resource.kind,
                   rawResourceTypeName: resource.kind,
-                  namespaceId: resource.metadata.namespace,
+                  namespaceId: resource.metadata.namespace ?? activeNamespace,
                 },
               },
         );

src/shared/components/GenericList/GenericList.js

@@ -63,6 +63,7 @@ export const GenericList = ({
   customColumnLayout = null,
   enableColumnLayout,
   resourceType = '',
+  rawResourceType = '',
   customUrl,
   hasDetailsView,
   disableHiding = true,
@@ -374,7 +375,7 @@ export const GenericList = ({
                   selectedEntry?.metadata?.name ??
                   e.target.children[0].innerText,
                 resourceType: resourceType,
-                rawResourceTypeName: resourceType,
+                rawResourceTypeName: rawResourceType,
                 namespaceId: selectedEntry?.metadata?.namespace,
                 apiGroup: group,
                 apiVersion: version,

src/shared/components/ResourcesList/ResourcesList.js

@@ -53,6 +53,7 @@ ResourcesList.propTypes = {
   createActionLabel: PropTypes.string,
   resourceUrl: PropTypes.string.isRequired,
   resourceType: PropTypes.string.isRequired,
+  rawResourceType: PropTypes.string.isRequired,
   resourceTitle: PropTypes.string,
   namespace: PropTypes.string,
   hasDetailsView: PropTypes.bool,
@@ -191,6 +192,7 @@ function Resources(props) {
 export function ResourceListRenderer({
   resourceUrl,
   resourceType,
+  rawResourceType,
   resourceTitle,
   namespace,
   customColumns = [],
@@ -349,7 +351,7 @@ export function ResourceListRenderer({
             endColumn: null,
             showCreate: {
               resourceType: resourceType,
-              rawResourceTypeName: resourceType,
+              rawResourceTypeName: rawResourceType,
               namespaceId: namespace,
               resource: activeResource,
             },
@@ -362,6 +364,7 @@ export function ResourceListRenderer({
             endColumn: null,
             showCreate: {
               resourceType: resourceType,
+              rawResourceTypeName: rawResourceType,
               namespaceId: namespace,
               resource: activeResource,
             },
@@ -450,7 +453,7 @@ export function ResourceListRenderer({
             endColumn: null,
             showCreate: {
               resourceType: layoutState?.midColumn.resourceName,
-              rawResourceTypeName: layoutState?.midColumn.resourceName,
+              rawResourceTypeName: rawResourceType,
               namespaceId: namespace,
             },
             showEdit: null,
@@ -462,6 +465,7 @@ export function ResourceListRenderer({
             endColumn: null,
             showCreate: {
               resourceType: resourceType,
+              rawResourceTypeName: rawResourceType,
               namespaceId: namespace,
             },
             showEdit: null,
@@ -543,6 +547,7 @@ export function ResourceListRenderer({
             hasDetailsView={hasDetailsView}
             customUrl={customUrl}
             resourceType={resourceType}
+            rawResourceType={rawResourceType}
             customColumnLayout={customColumnLayout}
             columnLayout={columnLayout}
             enableColumnLayout={enableColumnLayout}

src/shared/hooks/usePrepareLayout.js

@@ -264,6 +264,7 @@ export function usePrepareLayoutColumns({
           : {
               resourceName,
               resourceType,
+              rawResourceTypeName,
               namespaceId: resourceNamespace,
               apiGroup,
               apiVersion,