From a724f356722ec6049be7017c0aa5e43ca43f8617 Mon Sep 17 00:00:00 2001
From: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com>
Date: Mon, 4 Aug 2025 20:20:43 +0800
Subject: [PATCH] fix: fetchAppWithTags may return empty when apps is over 100
 (#23350)

---
 api/fields/app_fields.py                      |  8 ++++---
 .../(appDetailLayout)/[appId]/layout-main.tsx | 14 ++----------
 web/service/apps.ts                           | 22 +++++--------------
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/api/fields/app_fields.py b/api/fields/app_fields.py
index b6d85e0e24..1a5fcabf97 100644
--- a/api/fields/app_fields.py
+++ b/api/fields/app_fields.py
@@ -59,6 +59,8 @@ model_config_fields = {
     "updated_at": TimestampField,
 }
 
+tag_fields = {"id": fields.String, "name": fields.String, "type": fields.String}
+
 app_detail_fields = {
     "id": fields.String,
     "name": fields.String,
@@ -77,6 +79,7 @@ app_detail_fields = {
     "updated_by": fields.String,
     "updated_at": TimestampField,
     "access_mode": fields.String,
+    "tags": fields.List(fields.Nested(tag_fields)),
 }
 
 prompt_config_fields = {
@@ -92,8 +95,6 @@ model_config_partial_fields = {
     "updated_at": TimestampField,
 }
 
-tag_fields = {"id": fields.String, "name": fields.String, "type": fields.String}
-
 app_partial_fields = {
     "id": fields.String,
     "name": fields.String,
@@ -185,7 +186,6 @@ app_detail_fields_with_site = {
     "enable_api": fields.Boolean,
     "model_config": fields.Nested(model_config_fields, attribute="app_model_config", allow_null=True),
     "workflow": fields.Nested(workflow_partial_fields, allow_null=True),
-    "site": fields.Nested(site_fields),
     "api_base_url": fields.String,
     "use_icon_as_answer_icon": fields.Boolean,
     "max_active_requests": fields.Integer,
@@ -195,6 +195,8 @@ app_detail_fields_with_site = {
     "updated_at": TimestampField,
     "deleted_tools": fields.List(fields.Nested(deleted_tool_fields)),
     "access_mode": fields.String,
+    "tags": fields.List(fields.Nested(tag_fields)),
+    "site": fields.Nested(site_fields),
 }
 
 
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
index 47d5be29dd..6d337e3c47 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
@@ -20,7 +20,7 @@ import cn from '@/utils/classnames'
 import { useStore } from '@/app/components/app/store'
 import AppSideBar from '@/app/components/app-sidebar'
 import type { NavIcon } from '@/app/components/app-sidebar/navLink'
-import { fetchAppDetail, fetchAppWithTags } from '@/service/apps'
+import { fetchAppDetailDirect } from '@/service/apps'
 import { useAppContext } from '@/context/app-context'
 import Loading from '@/app/components/base/loading'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
@@ -118,17 +118,7 @@ const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
   useEffect(() => {
     setAppDetail()
     setIsLoadingAppDetail(true)
-    fetchAppDetail({ url: '/apps', id: appId }).then(async (res) => {
-      if (!res.tags || res.tags.length === 0) {
-        try {
-          const appWithTags = await fetchAppWithTags(appId)
-          if (appWithTags?.tags)
-            res.tags = appWithTags.tags
-        }
- catch (error) {
-          // Fallback failed, continue with empty tags
-        }
-      }
+    fetchAppDetailDirect({ url: '/apps', id: appId }).then((res: App) => {
       setAppDetailRes(res)
     }).catch((e: any) => {
       if (e.status === 404)
diff --git a/web/service/apps.ts b/web/service/apps.ts
index 3fdcf44667..1d7b0bccdb 100644
--- a/web/service/apps.ts
+++ b/web/service/apps.ts
@@ -9,7 +9,12 @@ export const fetchAppList: Fetcher<AppListResponse, { url: string; params?: Reco
   return get<AppListResponse>(url, { params })
 }
 
-export const fetchAppDetail = ({ url, id }: { url: string; id: string }) => {
+export const fetchAppDetail: Fetcher<AppDetailResponse, { url: string; id: string }> = ({ url, id }) => {
+  return get<AppDetailResponse>(`${url}/${id}`)
+}
+
+// Direct API call function for non-SWR usage
+export const fetchAppDetailDirect = async ({ url, id }: { url: string; id: string }): Promise<AppDetailResponse> => {
   return get<AppDetailResponse>(`${url}/${id}`)
 }
 
@@ -60,21 +65,6 @@ export const deleteApp: Fetcher<CommonResponse, string> = (appID) => {
   return del<CommonResponse>(`apps/${appID}`)
 }
 
-export const fetchAppWithTags = async (appID: string) => {
-  try {
-    const appListResponse = await fetchAppList({
-      url: '/apps',
-      params: { page: 1, limit: 100 },
-    })
-    const appWithTags = appListResponse.data.find(app => app.id === appID)
-    return appWithTags || null
-  }
- catch (error) {
-    console.warn('Failed to fetch app with tags:', error)
-    return null
-  }
-}
-
 export const updateAppSiteStatus: Fetcher<AppDetailResponse, { url: string; body: Record<string, any> }> = ({ url, body }) => {
   return post<AppDetailResponse>(url, { body })
 }