fix setting states (#2625)

* fix setting states * bump
kyma-project · Oct 24, 2023 · 77fff09 · 77fff09
1 parent 7a62107
commit 77fff09
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/resources/web/deployment.yaml b/resources/web/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: busola
-          image: europe-docker.pkg.dev/kyma-project/dev/busola-web:PR-2609
+          image: europe-docker.pkg.dev/kyma-project/dev/busola-web:PR-2625
           imagePullPolicy: Always
           resources:
             requests:

diff --git a/src/hooks/usePermittedUrl.ts b/src/hooks/usePermittedUrl.ts
@@ -6,6 +6,7 @@ import { useUrl } from 'hooks/useUrl';
 
 import { permittedUrlsState } from 'state/permittedUrlsAtom';
 import { K8sResource } from 'types';
+import { useEffect } from 'react';
 
 const DEFAULT_TIMEOUT = 3600;
 
@@ -60,19 +61,22 @@ export function usePermittedUrl(
     data: Array<K8sResource> | null;
   };
 
+  const permittedUrl = error ? (namespacedError ? null : namespacedUrl) : url;
+  useEffect(() => {
+    if (!loading || !resourceNamespace || !skip)
+      setPermittedUrls({
+        [url]: {
+          url: permittedUrl,
+          timestamp: new Date(),
+        },
+      });
+  }, [loading, skip, resourceNamespace, setPermittedUrls, url, permittedUrl]);
+
   if (loading) return null;
   if (resourceNamespace) return namespacedUrl;
   if (skip) {
     return permittedUrls?.[url].url;
   }
 
-  const permittedUrl = error ? (namespacedError ? null : namespacedUrl) : url;
-  setPermittedUrls({
-    [url]: {
-      url: permittedUrl,
-      timestamp: new Date(),
-    },
-  });
-
   return permittedUrl;
 }
diff --git a/src/shared/ResourceForm/components/ResourceForm.js b/src/shared/ResourceForm/components/ResourceForm.js
@@ -61,13 +61,15 @@ export function ResourceForm({
     };
   }
 
-  if (!resourceRef.current) {
-    resourceRef.current = JSON.stringify(resource);
-    handleSetResetFormFn(() => () => {
-      setResource(JSON.parse(resourceRef.current));
-      if (onReset) onReset();
-    });
-  }
+  useEffect(() => {
+    if (!resourceRef.current) {
+      resourceRef.current = JSON.stringify(resource);
+      handleSetResetFormFn(() => () => {
+        setResource(JSON.parse(resourceRef.current));
+        if (onReset) onReset();
+      });
+    }
+  }, [handleSetResetFormFn, onReset, resource, resourceRef, setResource]);
 
   const { t } = useTranslation();
   const createResource = useCreateResource({

diff --git a/src/shared/components/ModalWithForm/ModalWithForm.js b/src/shared/components/ModalWithForm/ModalWithForm.js
@@ -28,7 +28,7 @@ export const ModalWithForm = ({
 }) => {
   const { t } = useTranslation();
   const [isOpen, setOpen] = useState(alwaysOpen || false);
-  const [resetFormFn, setResetFormFn] = useState(() => {});
+  const [resetFormFn, setResetFormFn] = useState(() => () => {});
 
   const {
     isValid,