fix: migrating to React 18

newrelic · Jan 9, 2025 · b79fdfe · b79fdfe
1 parent 9985ccb
commit b79fdfe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/nerdlets/home/index.js b/nerdlets/home/index.js
@@ -75,7 +75,7 @@ const HomeNerdlet = () => {
     loading: flowsLoading,
     refetch: flowsRefetch,
   } = useFlowLoader({ accountId });
-  const { data: accounts = [] } = useAccountsQuery();
+  const { data: accounts = [], loading: isAcctsLoading } = useAccountsQuery();
   const transitionTimeoutId = useRef();
 
   useEffect(() => {
@@ -85,8 +85,8 @@ const HomeNerdlet = () => {
     };
   }, []);
 
-  useEffect(
-    () =>
+  useEffect(() => {
+    if (!isAcctsLoading) {
       setApp({
         account: {
           id: accountId,
@@ -96,9 +96,9 @@ const HomeNerdlet = () => {
         debugMode,
         maxEntitiesInStep: MAX_ENTITIES_IN_STEP,
         user,
-      }),
-    [accountId, accounts, user, debugMode]
-  );
+      });
+    }
+  }, [accountId, accounts, user, debugMode, isAcctsLoading]);
 
   useEffect(() => {
     let actionControlButtons;

diff --git a/src/components/flow/index.js b/src/components/flow/index.js
@@ -65,6 +65,7 @@ const Flow = forwardRef(
       label: 'Starting playback...',
     });
     const [isPreview, setIsPreview] = useState(false);
+    const [activateTransition, setActivateTransition] = useState(false);
     const {
       account: { id: accountId } = {},
       debugMode,
@@ -141,9 +142,16 @@ const Flow = forwardRef(
         component: FLOW_DISPATCH_COMPONENTS.FLOW,
         saveFlow,
       });
-      if (onTransition && prevNonEditMode) onTransition(prevNonEditMode);
+      setActivateTransition(true);
     };
 
+    useEffect(() => {
+      if (activateTransition) {
+        if (onTransition && prevNonEditMode) onTransition(prevNonEditMode);
+        setActivateTransition(false);
+      }
+    }, [activateTransition]);
+
     const discardFlowHandler = useCallback(() => {
       setIsPreview(false);
       if (onTransition) onTransition(prevNonEditMode);