From ad9d6eb5f4c727db5f6f798c7b3a16e3016935f2 Mon Sep 17 00:00:00 2001
From: Yi Xiao <54782454+YIXIAO0@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:24:48 +0800
Subject: [PATCH 1/3] fix app detail panel merge issues (#13460)

---
 web/app/components/app-sidebar/basic.tsx    |  1 -
 web/app/components/app/overview/appCard.tsx | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/web/app/components/app-sidebar/basic.tsx b/web/app/components/app-sidebar/basic.tsx
index bbb2505856..6d56f6ad86 100644
--- a/web/app/components/app-sidebar/basic.tsx
+++ b/web/app/components/app-sidebar/basic.tsx
@@ -88,7 +88,6 @@ export default function AppBasic({ icon, icon_background, name, isExternal, type
             />
           }
         </div>
-        <div className={`text-xs font-normal text-text-tertiary group-hover:text-text-secondary break-all ${textStyle?.extra ?? ''}`}>{type}</div>
         <div className='text-text-tertiary system-2xs-medium-uppercase'>{isExternal ? t('dataset.externalTag') : ''}</div>
       </div>}
     </div>
diff --git a/web/app/components/app/overview/appCard.tsx b/web/app/components/app/overview/appCard.tsx
index 610044cc81..3d966f365b 100644
--- a/web/app/components/app/overview/appCard.tsx
+++ b/web/app/components/app/overview/appCard.tsx
@@ -1,6 +1,5 @@
 'use client'
 import React, { useMemo, useState } from 'react'
-
 import { usePathname, useRouter } from 'next/navigation'
 import { useTranslation } from 'react-i18next'
 import {
@@ -165,7 +164,7 @@ function AppCard({
             </div>
             <div className="w-full h-9 pl-2 p-1 bg-components-input-bg-normal rounded-lg items-center inline-flex gap-0.5">
               <div className="h-4 px-1 justify-start items-start gap-2 flex flex-1 min-w-0">
-                <div className="text-text-secondary text-xs font-medium text-ellipsis overflow-hidden whitespace-nowrap">
+                <div className="text-text-secondary system-xs-medium text-ellipsis overflow-hidden whitespace-nowrap">
                   {isApp ? appUrl : apiUrl}
                 </div>
               </div>
@@ -173,7 +172,7 @@ function AppCard({
                 content={isApp ? appUrl : apiUrl}
                 className={'!size-6'}
               />
-              {isApp && <ShareQRCode content={isApp ? appUrl : apiUrl} className='z-50 !size-6 hover:bg-state-base-hover rounded-md' selectorId={randomString(8)} />}
+              {isApp && <ShareQRCode content={isApp ? appUrl : apiUrl} />}
               {isApp && <Divider type="vertical" className="!h-3.5 shrink-0 !mx-0.5" />}
               {/* button copy link/ button regenerate */}
               {showConfirmDelete && (
@@ -194,7 +193,7 @@ function AppCard({
                   popupContent={t('appOverview.overview.appInfo.regenerate') || ''}
                 >
                   <div
-                    className="w-6 h-6 cursor-pointer hover:bg-state-base-hover rounded-md"
+                    className="w-6 h-6 cursor-pointer hover:bg-state-base-hover rounded-lg"
                     onClick={() => setShowConfirmDelete(true)}
                   >
                     <div
@@ -229,9 +228,9 @@ function AppCard({
                   }
                   popupClassName={disabled ? 'mt-[-8px]' : '!hidden'}
                 >
-                  <div className="flex items-center justify-center gap-[1px]">
+                  <div className={`flex items-center justify-center gap-[1px] ${runningStatus ? 'text-text-tertiary' : 'text-components-button-ghost-text-disabled'}`}>
                     <op.opIcon className="h-3.5 w-3.5" />
-                    <div className={`${runningStatus ? 'text-text-tertiary' : 'text-components-button-ghost-text-disabled'} system-xs-medium px-[3px]`}>{op.opName}</div>
+                    <div className={'system-xs-medium px-[3px]'}>{op.opName}</div>
                   </div>
                 </Tooltip>
               </Button>

From 8281c688ca81ce103dc0d63348f847a081cccbe1 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Mon, 10 Feb 2025 16:05:05 +0800
Subject: [PATCH 2/3] fix: iteration open parallel not show iteration detail
 (#13476)

---
 .../workflow/run/utils/format-log/iteration/index.ts        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/app/components/workflow/run/utils/format-log/iteration/index.ts b/web/app/components/workflow/run/utils/format-log/iteration/index.ts
index ca3dad7fb0..d51c2315e3 100644
--- a/web/app/components/workflow/run/utils/format-log/iteration/index.ts
+++ b/web/app/components/workflow/run/utils/format-log/iteration/index.ts
@@ -3,10 +3,10 @@ import type { NodeTracing } from '@/types/workflow'
 import formatParallelNode from '../parallel'
 function addChildrenToIterationNode(iterationNode: NodeTracing, childrenNodes: NodeTracing[]): NodeTracing {
   const details: NodeTracing[][] = []
-  childrenNodes.forEach((item) => {
+  childrenNodes.forEach((item, index) => {
     if (!item.execution_metadata) return
-    const { parallel_mode_run_id, iteration_index = 0 } = item.execution_metadata
-    const runIndex: number = (parallel_mode_run_id || iteration_index) as number
+    const { iteration_index = 0 } = item.execution_metadata
+    const runIndex: number = iteration_index || index
     if (!details[runIndex])
       details[runIndex] = []
 

From 50cfb7c9ec8360dadf2ad70ed2936f101fe82499 Mon Sep 17 00:00:00 2001
From: Yeuoly <45712896+Yeuoly@users.noreply.github.com>
Date: Mon, 10 Feb 2025 21:13:28 +0800
Subject: [PATCH 3/3] fix: allow variable message to be any (#13494)

---
 api/core/tools/entities/tool_entities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/core/tools/entities/tool_entities.py b/api/core/tools/entities/tool_entities.py
index 02f66c545d..b8eae600d1 100644
--- a/api/core/tools/entities/tool_entities.py
+++ b/api/core/tools/entities/tool_entities.py
@@ -125,7 +125,7 @@ class ToolInvokeMessage(BaseModel):
 
     class VariableMessage(BaseModel):
         variable_name: str = Field(..., description="The name of the variable")
-        variable_value: str = Field(..., description="The value of the variable")
+        variable_value: Any = Field(..., description="The value of the variable")
         stream: bool = Field(default=False, description="Whether the variable is streamed")
 
         @model_validator(mode="before")