From 21e68b9cf146011032668c1b777befca0e613622 Mon Sep 17 00:00:00 2001
From: crazywoola <100913391+crazywoola@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:59:19 +0800
Subject: [PATCH] fix: nodeExtraData might be undefined (#21856)

---
 .../components/workflow/hooks/use-nodes-data.ts   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/web/app/components/workflow/hooks/use-nodes-data.ts b/web/app/components/workflow/hooks/use-nodes-data.ts
index aeb45ddb9..7df6b2ffd 100644
--- a/web/app/components/workflow/hooks/use-nodes-data.ts
+++ b/web/app/components/workflow/hooks/use-nodes-data.ts
@@ -34,15 +34,14 @@ export const useNodesExtraData = () => {
 export const useAvailableBlocks = (nodeType?: BlockEnum, isInIteration?: boolean, isInLoop?: boolean) => {
   const nodesExtraData = useNodesExtraData()
   const availablePrevBlocks = useMemo(() => {
-    if (!nodeType)
+    if (!nodeType || !nodesExtraData[nodeType])
       return []
     return nodesExtraData[nodeType].availablePrevNodes || []
   }, [nodeType, nodesExtraData])
 
   const availableNextBlocks = useMemo(() => {
-    if (!nodeType)
+    if (!nodeType || !nodesExtraData[nodeType])
       return []
-
     return nodesExtraData[nodeType].availableNextNodes || []
   }, [nodeType, nodesExtraData])
 
@@ -55,10 +54,7 @@ export const useAvailableBlocks = (nodeType?: BlockEnum, isInIteration?: boolean
         if (isInLoop && (nType === BlockEnum.Iteration || nType === BlockEnum.Loop || nType === BlockEnum.End))
           return false
 
-        if (!isInLoop && nType === BlockEnum.LoopEnd)
-          return false
-
-        return true
+        return !(!isInLoop && nType === BlockEnum.LoopEnd)
       }),
       availableNextBlocks: availableNextBlocks.filter((nType) => {
         if (isInIteration && (nType === BlockEnum.Iteration || nType === BlockEnum.Loop || nType === BlockEnum.End))
@@ -67,10 +63,7 @@ export const useAvailableBlocks = (nodeType?: BlockEnum, isInIteration?: boolean
         if (isInLoop && (nType === BlockEnum.Iteration || nType === BlockEnum.Loop || nType === BlockEnum.End))
           return false
 
-        if (!isInLoop && nType === BlockEnum.LoopEnd)
-          return false
-
-        return true
+        return !(!isInLoop && nType === BlockEnum.LoopEnd)
       }),
     }
   }, [isInIteration, availablePrevBlocks, availableNextBlocks, isInLoop])