fix: fix refresh and create opening

Author: OliwiaGowor

src/shared/ResourceForm/useCreateResource.js

@@ -77,6 +77,7 @@ export function useCreateResource({
                 ...layoutColumn,
                 layout: nextLayout,
                 showCreate: null,
+                showEdit: null,
                 midColumn: {
                   resourceName: resource.metadata.name,
                   resourceType: resource.kind,
@@ -90,6 +91,7 @@ export function useCreateResource({
                 ...layoutColumn,
                 layout: nextLayout,
                 showCreate: null,
+                showEdit: null,
                 endColumn: {
                   resourceName: resource.metadata.name,
                   resourceType: resource.kind,

src/shared/components/DynamicPageComponent/DynamicPageComponent.js

@@ -372,9 +372,11 @@ export const DynamicPageComponent = ({
               setLayoutColumn({
                 ...layoutColumn,
                 showEdit: {
-                  ...(layoutColumn.endColumn ??
-                    layoutColumn.midColumn ??
-                    layoutColumn.startColumn),
+                  ...(layoutNumber === 'EndColumn'
+                    ? layoutColumn.endColumn
+                    : layoutNumber === 'MidColumn'
+                    ? layoutColumn.midColumn
+                    : layoutColumn.startColumn),
                   resource: null,
                 },
               });

src/shared/components/ResourcesList/ResourcesList.js

@@ -354,6 +354,7 @@ export function ResourceListRenderer({
               namespaceId: namespace,
               resource: activeResource,
             },
+            showEdit: null,
             layout: 'ThreeColumnsEndExpanded',
           }
         : {
@@ -365,6 +366,7 @@ export function ResourceListRenderer({
               namespaceId: namespace,
               resource: activeResource,
             },
+            showEdit: null,
             layout: 'TwoColumnsMidExpanded',
           },
     );
@@ -444,6 +446,7 @@ export function ResourceListRenderer({
               resourceType: layoutState?.midColumn.resourceName,
               namespaceId: namespace,
             },
+            showEdit: null,
             layout: 'ThreeColumnsEndExpanded',
           }
         : {
@@ -454,6 +457,7 @@ export function ResourceListRenderer({
               resourceType: resourceType,
               namespaceId: namespace,
             },
+            showEdit: null,
             layout: 'TwoColumnsMidExpanded',
           },
     );

src/shared/hooks/usePrepareLayout.js

@@ -4,7 +4,7 @@ import {
   useNavigationType,
   useSearchParams,
 } from 'react-router-dom';
-import { useSetRecoilState } from 'recoil';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { columnLayoutState } from 'state/columnLayoutAtom';
 import { isFormOpenState } from 'state/formOpenAtom';
 
@@ -92,6 +92,7 @@ export function usePrepareLayoutColumns({
 }) {
   const setLayoutColumn = useSetRecoilState(columnLayoutState);
   const setIsFormOpen = useSetRecoilState(isFormOpenState);
+  const isFormOpen = useRecoilValue(isFormOpenState);
   const [searchParams] = useSearchParams();
   const layout = searchParams.get('layout');
   const showCreate = searchParams.get('showCreate');
@@ -204,13 +205,17 @@ export function usePrepareLayoutColumns({
   useEffect(() => {
     if (navigationType === NavigationType.Pop) {
       setLayoutColumn(newLayoutState);
-      setIsFormOpen({ formOpen: !!newLayoutState.showCreate });
+      setIsFormOpen({
+        formOpen: !!newLayoutState.showCreate || !!newLayoutState.showEdit,
+      });
     }
   }, [newLayoutState, setLayoutColumn, setIsFormOpen, navigationType]);
 
   useEffect(() => {
     setLayoutColumn(newLayoutState);
-    setIsFormOpen({ formOpen: !!newLayoutState.showCreate });
+    setIsFormOpen({
+      formOpen: !!newLayoutState.showCreate || !!newLayoutState.showEdit,
+    });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 }