From d4a1d045f807165f18e4348b9c2b9aa93445b4cc Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Thu, 5 Jun 2025 16:36:41 +0800
Subject: [PATCH] fix: to new var format

---
 .../workflow/nodes/_base/components/variable/utils.ts      | 7 +++++--
 .../_base/components/variable/var-reference-picker.tsx     | 2 +-
 .../nodes/_base/components/variable/var-reference-vars.tsx | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/app/components/workflow/nodes/_base/components/variable/utils.ts b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
index d29459a161..1f6a9ea008 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
@@ -53,6 +53,8 @@ export const isConversationVar = (valueSelector: ValueSelector) => {
 }
 
 export const isRagVariableVar = (valueSelector: ValueSelector) => {
+  if(!valueSelector)
+    return false
   return valueSelector[0] === 'rag'
 }
 
@@ -498,7 +500,7 @@ const formatItem = (
     case 'rag': {
       res.vars = data.ragVariables.map((ragVar: RAGPipelineVariable) => {
         return {
-          variable: `rag.${ragVar.variable}`,
+          variable: `rag.shared.${ragVar.variable}`,
           type: inputVarTypeToVarType(ragVar.type as any),
           des: ragVar.label,
           isRagVariable: true,
@@ -636,10 +638,11 @@ export const toNodeOutputVars = (
     let ragVariablesInDataSource: RAGPipelineVariable[] = []
     if (node.data.type === BlockEnum.DataSource)
       ragVariablesInDataSource = ragVariables.filter(ragVariable => ragVariable.belong_to_node_id === node.id)
+    console.log(ragVariables, ragVariablesInDataSource, node.id)
     return {
       ...formatItem(node, isChatMode, filterVar, ragVariablesInDataSource.map(
         (ragVariable: RAGPipelineVariable) => ({
-          variable: ragVariable.variable,
+          variable: `rag.${node.id}.${ragVariable.variable}`,
           type: inputVarTypeToVarType(ragVariable.type as any),
           description: ragVariable.label,
           isRagVariable: true,
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
index 24de113e0d..f0b2b6c572 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
@@ -183,7 +183,7 @@ const VarReferencePicker: FC<Props> = ({
     }
   }, [value, hasValue, isConstant, isIterationVar, iterationNode, availableNodes, outputVarNodeId, startNode, isLoopVar, loopNode])
 
-  const isShowAPart = (value as ValueSelector).length > 2
+  const isShowAPart = (value as ValueSelector).length > 2 && !isRagVariableVar((value as ValueSelector))
 
   const varName = useMemo(() => {
     if (!hasValue)
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
index 1f72d57da7..ef202336ee 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
@@ -165,7 +165,7 @@ const Item: FC<ItemProps> = ({
               <div title={itemData.des} className='system-sm-medium ml-1 w-0 grow truncate text-text-secondary'>{itemData.variable.replace('conversation.', '')}</div>
             )}
             {isRagVariable && (
-              <div title={itemData.des} className='system-sm-medium ml-1 w-0 grow truncate text-text-secondary'>{itemData.variable.replace('rag.', '')}</div>
+              <div title={itemData.des} className='system-sm-medium ml-1 w-0 grow truncate text-text-secondary'>{itemData.variable.split('.').slice(-1)[0]}</div>
             )}
           </div>
           <div className='ml-1 shrink-0 text-xs font-normal capitalize text-text-tertiary'>{itemData.type}</div>