From 40d2a410d11322a911dd38757f3feb470f4df81d Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 29 Apr 2025 14:22:43 +0800 Subject: [PATCH] feat: var assigner var inspect change --- .../workflow/hooks/use-inspect-vars-crud.ts | 3 ++- .../workflow/nodes/variable-assigner/use-config.ts | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud.ts index 8826965036..2396b2b283 100644 --- a/web/app/components/workflow/hooks/use-inspect-vars-crud.ts +++ b/web/app/components/workflow/hooks/use-inspect-vars-crud.ts @@ -66,7 +66,7 @@ const useInspectVarsCrud = () => { } const deleteNodeInspectorVars = async (nodeId: string) => { - // console.log('delete node inspector vars', nodeId) + console.log('delete node inspector vars', nodeId) if (hasNodeInspectVars(nodeId)) await doDeleteNodeInspectorVars(nodeId) @@ -103,6 +103,7 @@ const useInspectVarsCrud = () => { }, [data, currNodeId, currEditVarId, getNodeInspectVars, editInspectVarValue]) const renameInspectVarName = async (nodeId: string, oldName: string, newName: string) => { + console.log('rename:', nodeId, oldName, newName) const varId = getVarId(nodeId, oldName) if (!varId) return diff --git a/web/app/components/workflow/nodes/variable-assigner/use-config.ts b/web/app/components/workflow/nodes/variable-assigner/use-config.ts index f5a7a092b3..baf99d63b4 100644 --- a/web/app/components/workflow/nodes/variable-assigner/use-config.ts +++ b/web/app/components/workflow/nodes/variable-assigner/use-config.ts @@ -12,8 +12,13 @@ import { useNodesReadOnly, useWorkflow, } from '@/app/components/workflow/hooks' +import useInspectVarsCrud from '../../hooks/use-inspect-vars-crud' const useConfig = (id: string, payload: VariableAssignerNodeType) => { + const { + deleteNodeInspectorVars, + renameInspectVarName, + } = useInspectVarsCrud() const { nodesReadOnly: readOnly } = useNodesReadOnly() const { handleOutVarRenameChange, isVarUsedInNodes, removeUsedVarInNodes } = useWorkflow() @@ -113,7 +118,8 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => { draft.advanced_settings.group_enabled = enabled }) setInputs(newInputs) - }, [handleOutVarRenameChange, id, inputs, isVarUsedInNodes, setInputs, showRemoveVarConfirm]) + deleteNodeInspectorVars(id) + }, [deleteNodeInspectorVars, handleOutVarRenameChange, id, inputs, isVarUsedInNodes, setInputs, showRemoveVarConfirm]) const handleAddGroup = useCallback(() => { let maxInGroupName = 1 @@ -134,7 +140,8 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => { }) }) setInputs(newInputs) - }, [inputs, setInputs]) + deleteNodeInspectorVars(id) + }, [deleteNodeInspectorVars, id, inputs, setInputs]) const handleVarGroupNameChange = useCallback((groupId: string) => { return (name: string) => { @@ -144,8 +151,9 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => { }) handleOutVarRenameChange(id, [id, inputs.advanced_settings.groups[index].group_name, 'output'], [id, name, 'output']) setInputs(newInputs) + renameInspectVarName(id, inputs.advanced_settings.groups[index].group_name, name) } - }, [handleOutVarRenameChange, id, inputs, setInputs]) + }, [handleOutVarRenameChange, id, inputs, renameInspectVarName, setInputs]) const onRemoveVarConfirm = useCallback(() => { removedVars.forEach((v) => {