Merge branch 'feat/workflow' into deploy/dev

langgenius · Mar 21, 2024 · 0a6bbe8 · 0a6bbe8
2 parents 7a1bd83 + 096cc74
commit 0a6bbe8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/web/app/components/base/chat/chat/answer/index.tsx b/web/app/components/base/chat/chat/answer/index.tsx
@@ -90,7 +90,7 @@ const Answer: FC<AnswerProps> = ({
             }
             {
               workflowProcess && (
-                <WorkflowProcess data={workflowProcess} />
+                <WorkflowProcess data={workflowProcess} hideInfo />
               )
             }
             {

diff --git a/web/app/components/base/chat/chat/answer/workflow-process.tsx b/web/app/components/base/chat/chat/answer/workflow-process.tsx
@@ -16,11 +16,13 @@ type WorkflowProcessProps = {
   data: WorkflowProcess
   grayBg?: boolean
   expand?: boolean
+  hideInfo?: boolean
 }
 const WorkflowProcessItem = ({
   data,
   grayBg,
   expand = false,
+  hideInfo = false,
 }: WorkflowProcessProps) => {
   const { t } = useTranslation()
   const [collapse, setCollapse] = useState(!expand)
@@ -87,6 +89,7 @@ const WorkflowProcessItem = ({
                   <NodePanel
                     className='!p-0'
                     nodeInfo={node}
+                    hideInfo={hideInfo}
                   />
                 </div>
               ))

diff --git a/web/app/components/workflow/run/node.tsx b/web/app/components/workflow/run/node.tsx
@@ -14,9 +14,10 @@ import type { NodeTracing } from '@/types/workflow'
 type Props = {
   nodeInfo: NodeTracing
   className?: string
+  hideInfo?: boolean
 }
 
-const NodePanel: FC<Props> = ({ nodeInfo, className }) => {
+const NodePanel: FC<Props> = ({ nodeInfo, className, hideInfo = false }) => {
   const [collapseState, setCollapseState] = useState<boolean>(true)
   const { t } = useTranslation()
 
@@ -59,7 +60,7 @@ const NodePanel: FC<Props> = ({ nodeInfo, className }) => {
           />
           <BlockIcon className='shrink-0 mr-2' type={nodeInfo.node_type} />
           <div className='grow text-gray-700 text-[13px] leading-[16px] font-semibold truncate' title={nodeInfo.title}>{nodeInfo.title}</div>
-          {nodeInfo.status !== 'running' && (
+          {nodeInfo.status !== 'running' && !hideInfo && (
             <div className='shrink-0 text-gray-500 text-xs leading-[18px]'>{`${getTime(nodeInfo.elapsed_time || 0)} · ${getTokenCount(nodeInfo.execution_metadata?.total_tokens || 0)} tokens`}</div>
           )}
           {nodeInfo.status === 'succeeded' && (
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ const Answer: FC<AnswerProps> = ({ @@
                 }
                 {
                   workflowProcess && (
-                    <WorkflowProcess data={workflowProcess} />
+                    <WorkflowProcess data={workflowProcess} hideInfo />
                   )
                 }
                 {
@@ Expand Down @@