From 2a7525883699fa9d47196effde2743e2a80b2572 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Wed, 20 Mar 2024 13:55:26 +0800
Subject: [PATCH] feat: not show var

---
 .../components/base/prompt-editor/index.tsx   |  1 +
 .../prompt-editor/plugins/variable-picker.tsx | 43 +++++++++++--------
 .../variable/var-reference-picker.tsx         |  1 -
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/web/app/components/base/prompt-editor/index.tsx b/web/app/components/base/prompt-editor/index.tsx
index a2d64be3fe..64df9b22b5 100644
--- a/web/app/components/base/prompt-editor/index.tsx
+++ b/web/app/components/base/prompt-editor/index.tsx
@@ -180,6 +180,7 @@ const PromptEditor: FC<PromptEditorProps> = ({
           items={variableBlock.variables}
           externalTools={variableBlock.externalTools}
           onAddExternalTool={variableBlock.onAddExternalTool}
+          outToolDisabled={outToolDisabled}
         />
         {
           contextBlock.show && (
diff --git a/web/app/components/base/prompt-editor/plugins/variable-picker.tsx b/web/app/components/base/prompt-editor/plugins/variable-picker.tsx
index 1a532c5c37..9d418dc229 100644
--- a/web/app/components/base/prompt-editor/plugins/variable-picker.tsx
+++ b/web/app/components/base/prompt-editor/plugins/variable-picker.tsx
@@ -115,11 +115,13 @@ type VariablePickerProps = {
   items?: Option[]
   externalTools?: ExternalToolOption[]
   onAddExternalTool?: () => void
+  outToolDisabled?: boolean
 }
 const VariablePicker: FC<VariablePickerProps> = ({
   items = [],
   externalTools = [],
   onAddExternalTool,
+  outToolDisabled,
 }) => {
   const { t } = useTranslation()
   const { eventEmitter } = useEventEmitterContextContext()
@@ -215,7 +217,9 @@ const VariablePicker: FC<VariablePickerProps> = ({
     [editor],
   )
 
-  const mergedOptions = [...options, ...toolOptions, newOption, newToolOption]
+  const mergedOptions = [...options, ...toolOptions, newOption]
+  if (!outToolDisabled)
+    mergedOptions.push(newToolOption)
 
   return (
     <LexicalTypeaheadMenuPlugin
@@ -298,26 +302,29 @@ const VariablePicker: FC<VariablePickerProps> = ({
                   {newOption.icon}
                   <div className='text-[13px] text-gray-900'>{newOption.title}</div>
                 </div>
-                <div
-                  className={`
+                {!outToolDisabled && (
+                  <div
+                    className={`
                     flex items-center px-3 h-6 rounded-md hover:bg-primary-50 cursor-pointer
                     ${selectedIndex === options.length + toolOptions.length + 1 && 'bg-primary-50'}
                   `}
-                  ref={newToolOption.setRefElement}
-                  tabIndex={-1}
-                  onClick={() => {
-                    setHighlightedIndex(options.length + toolOptions.length + 1)
-                    selectOptionAndCleanUp(newToolOption)
-                  }}
-                  onMouseEnter={() => {
-                    setHighlightedIndex(options.length + toolOptions.length + 1)
-                  }}
-                  key={newToolOption.key}
-                >
-                  {newToolOption.icon}
-                  <div className='grow text-[13px] text-gray-900'>{newToolOption.title}</div>
-                  {newToolOption.extraElement}
-                </div>
+                    ref={newToolOption.setRefElement}
+                    tabIndex={-1}
+                    onClick={() => {
+                      setHighlightedIndex(options.length + toolOptions.length + 1)
+                      selectOptionAndCleanUp(newToolOption)
+                    }}
+                    onMouseEnter={() => {
+                      setHighlightedIndex(options.length + toolOptions.length + 1)
+                    }}
+                    key={newToolOption.key}
+                  >
+                    {newToolOption.icon}
+                    <div className='grow text-[13px] text-gray-900'>{newToolOption.title}</div>
+                    {newToolOption.extraElement}
+                  </div>
+                )}
+
               </div>
             </div>,
             anchorElementRef.current,
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 6e8edcb385..aecc4fd5ef 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
@@ -161,7 +161,6 @@ const VarReferencePicker: FC<Props> = ({
         })
       }
     })
-    console.log(newValue)
     onChange(newValue, varKindType)
     setOpen(false)
   }, [onChange, varKindType])