fix: start node check (#5794)

* fix: start node check

* remove log

* fix: variables refresh

* fix: workflow start check

* fix: variables refresh

* perf: auto save

* perf: add log

packages/global/common/string/time.ts

@@ -100,7 +100,7 @@ export const getNextTimeByCronStringAndTimezone = ({
 
     return new Date(date);
   } catch (error) {
-    console.log('getNextTimeByCronStringAndTimezone error', error);
+    console.log(`getNextTimeByCronStringAndTimezone error: ${cronString}`, error);
     return new Date();
   }
 };

packages/global/core/workflow/runtime/type.d.ts

@@ -108,6 +108,7 @@ export type RuntimeNodeItemType = {
   flowNodeType: StoreNodeItemType['flowNodeType'];
   showStatus?: StoreNodeItemType['showStatus'];
   isEntry?: boolean;
+  isStart?: boolean;
   version?: string;
 
   inputs: FlowNodeInputItemType[];

packages/global/core/workflow/runtime/utils.ts

@@ -294,11 +294,11 @@ export const checkNodeRunStatus = ({
   runtimeEdges: RuntimeEdgeItemType[];
 }) => {
   const filterRuntimeEdges = filterWorkflowEdges(runtimeEdges);
-
   const isStartNode = (nodeType: string) => {
     const map: Record<any, boolean> = {
       [FlowNodeTypeEnum.workflowStart]: true,
-      [FlowNodeTypeEnum.pluginInput]: true
+      [FlowNodeTypeEnum.pluginInput]: true,
+      [FlowNodeTypeEnum.loopStart]: true
     };
     return !!map[nodeType];
   };
@@ -328,10 +328,12 @@ export const checkNodeRunStatus = ({
         // Start node
         const sourceNode = nodesMap.get(edge.source);
         if (!sourceNode) continue;
-        if (isStartNode(sourceNode.flowNodeType)) {
+
+        if (isStartNode(sourceNode.flowNodeType) || sourceNode.isStart) {
           commonEdges.push(sourceEdge);
           continue;
         }
+
         // Circle detected
         if (edge.source === targetNode.nodeId) {
           recursiveEdgeGroupsMap.set(edge.target, [
@@ -350,6 +352,7 @@ export const checkNodeRunStatus = ({
 
         // 查找目标节点的 source edges 并加入栈中
         const nextEdges = filterRuntimeEdges.filter((item) => item.target === edge.source);
+
         for (const nextEdge of nextEdges) {
           stack.push({
             edge: nextEdge,
@@ -364,7 +367,7 @@ export const checkNodeRunStatus = ({
 
   // Classify edges
   const { commonEdges, recursiveEdgeGroups } = splitNodeEdges(node);
-
+  console.log(JSON.stringify({ commonEdges, recursiveEdgeGroups }, null, 2));
   // Entry
   if (commonEdges.length === 0 && recursiveEdgeGroups.length === 0) {
     return 'run';

packages/service/core/workflow/dispatch/ai/agent/utils.ts

@@ -62,9 +62,12 @@ export const initToolNodes = (
   nodes.forEach((node) => {
     if (entryNodeIds.includes(node.nodeId)) {
       node.isEntry = true;
+      node.isStart = true;
       if (startParams) {
         node.inputs = updateToolInputValue({ params: startParams, inputs: node.inputs });
       }
+    } else {
+      node.isStart = false;
     }
   });
 };

projects/app/src/components/core/app/ScheduledTriggerConfig.tsx

@@ -8,7 +8,7 @@ import {
   Textarea,
   HStack
 } from '@chakra-ui/react';
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useTranslation } from 'next-i18next';
 import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
@@ -61,7 +61,6 @@ const ScheduledTriggerConfig = ({
     }
   }, []);
 
-  const Render = useMemo(() => {
   return (
     <>
       <Flex alignItems={'center'}>
@@ -147,19 +146,6 @@ const ScheduledTriggerConfig = ({
       </MyModal>
     </>
   );
-  }, [
-    defaultPrompt,
-    isOpen,
-    isOpenSchedule,
-    onClose,
-    onOpen,
-    onUpdate,
-    t,
-    timezone,
-    value?.cronString
-  ]);
-
-  return Render;
 };
 
 export default React.memo(ScheduledTriggerConfig);

projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeSystemConfig.tsx

-import React, { type Dispatch, useMemo } from 'react';
+import React, { type Dispatch, useCallback, useMemo } from 'react';
 import { type NodeProps, useViewport } from 'reactflow';
 import { Box } from '@chakra-ui/react';
 import { type FlowNodeItemType } from '@fastgpt/global/core/workflow/type/node.d';
@@ -18,12 +18,10 @@ import {
   type AppDetailType,
   type VariableItemType
 } from '@fastgpt/global/core/app/type';
-import { useMemoizedFn } from 'ahooks';
 import VariableEdit from '@/components/core/app/VariableEdit';
 import { AppContext } from '@/pageComponents/app/detail/context';
 import WelcomeTextConfig from '@/components/core/app/WelcomeTextConfig';
 import FileSelect from '@/components/core/app/FileSelect';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { userFilesInput } from '@fastgpt/global/core/workflow/template/system/workflowStart';
 import Container from '../components/Container';
 import AutoExecConfig from '@/components/core/app/AutoExecConfig';
@@ -44,7 +42,7 @@ const NodeUserGuide = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
       systemConfigNode: data,
       isPublicFetch: true
     });
-  }, [data, appDetail]);
+  }, [data, appDetail.chatConfig]);
 
   const componentsProps = useMemo(
     () => ({
@@ -54,7 +52,6 @@ const NodeUserGuide = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
     [chatConfig, setAppDetail]
   );
 
-  const Render = useMemo(() => {
   return (
     <>
       <NodeCard
@@ -96,9 +93,6 @@ const NodeUserGuide = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
       </NodeCard>
     </>
   );
-  }, [componentsProps, data, selected]);
-
-  return Render;
 };
 
 export default React.memo(NodeUserGuide);
@@ -124,7 +118,8 @@ function WelcomeText({ chatConfig: { welcomeText }, setAppDetail }: ComponentPro
 }
 
 function ChatStartVariable({ chatConfig: { variables = [] }, setAppDetail }: ComponentProps) {
-  const updateVariables = useMemoizedFn((value: VariableItemType[]) => {
+  const updateVariables = useCallback(
+    (value: VariableItemType[]) => {
       setAppDetail((state) => ({
         ...state,
         chatConfig: {
@@ -132,7 +127,9 @@ function ChatStartVariable({ chatConfig: { variables = [] }, setAppDetail }: Com
           variables: value
         }
       }));
-  });
+    },
+    [setAppDetail]
+  );
   const { zoom } = useViewport();
 
   return <VariableEdit variables={variables} onChange={(e) => updateVariables(e)} zoom={zoom} />;

projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeWorkflowStart.tsx

@@ -8,7 +8,6 @@ import IOTitle from '../components/IOTitle';
 import { useTranslation } from 'next-i18next';
 import { useContextSelector } from 'use-context-selector';
 import { WorkflowBufferDataContext } from '../../context/workflowInitContext';
-import { useCreation } from 'ahooks';
 import { type FlowNodeOutputItemType } from '@fastgpt/global/core/workflow/type/io';
 import { FlowNodeOutputTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
@@ -16,8 +15,7 @@ import { AppContext } from '@/pageComponents/app/detail/context';
 import { workflowSystemVariables } from '@/web/core/app/utils';
 import {
   formatEditorVariablePickerIcon,
-  getAppChatConfig,
-  getGuideModule
+  getAppChatConfig
 } from '@fastgpt/global/core/workflow/utils';
 import MyDivider from '@fastgpt/web/components/common/MyDivider';
 import { useMemoEnhance } from '@fastgpt/web/hooks/useMemoEnhance';
@@ -48,9 +46,9 @@ const NodeStart = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
         valueDesc: item.valueDesc
       };
     });
-  }, [systemConfigNode, appDetail.chatConfig, t]);
+  }, [appDetail.chatConfig, systemConfigNode, t]);
 
-  const systemVariables = useMemo(
+  const systemVariables = useMemoEnhance(
     () =>
       workflowSystemVariables.map((item) => ({
         id: item.key,

projects/app/src/pageComponents/app/detail/WorkflowComponents/context/workflowPersistenceContext.tsx

@@ -14,7 +14,7 @@ import React, {
   useState
 } from 'react';
 import { createContext, useContextSelector } from 'use-context-selector';
-import { useDebounceEffect } from 'ahooks';
+import { useDebounceEffect, useMemoizedFn, useUnmount } from 'ahooks';
 import { WorkflowBufferDataContext, WorkflowInitContext } from './workflowInitContext';
 import { compareSnapshot } from '@/web/core/workflow/utils';
 import { AppContext } from '@/pageComponents/app/detail/context';
@@ -105,13 +105,10 @@ export const WorkflowPersistenceProvider: React.FC<PropsWithChildren> = ({ child
   }, [appDetail.chatConfig, flowData2StoreData, isSaved, onSaveApp]);
 
   // 页面关闭前自动保存
-  useEffect(() => {
-    return () => {
-      if (isProduction) {
+  useUnmount(() => {
     autoSaveFn();
-      }
-    };
-  }, [autoSaveFn]);
+  });
+
   useBeforeunload({
     tip: t('common:core.tip.leave page'),
     callback: autoSaveFn

projects/app/src/pageComponents/dashboard/mcp/EditModal.tsx

@@ -188,12 +188,7 @@ const SelectAppModal = ({
                     onClick={handleItemClick}
                   >
                     <Flex alignItems={'center'} w={'1.25rem'} onClick={(e) => e.stopPropagation()}>
-                      {!isFolder && (
-                        <Checkbox
-                          isChecked={selected}
-                          onChange={handleItemClick}
-                        />
-                      )}
+                      {!isFolder && <Checkbox isChecked={selected} onChange={handleItemClick} />}
                     </Flex>
                     <Avatar src={item.avatar} w="1.5rem" borderRadius={'sm'} />
                     <Box>{item.name}</Box>