From 26e320b0df6c1ba57aa9e7366471ab03e32d8a51 Mon Sep 17 00:00:00 2001
From: Finley Ge <32237950+FinleyGe@users.noreply.github.com>
Date: Tue, 29 Apr 2025 11:12:49 +0800
Subject: [PATCH] fix: app/dataset list peredit bug (#4714)

---
 .../app/src/pageComponents/dashboard/apps/List.tsx  | 13 ++++++++-----
 .../app/src/pageComponents/dataset/list/List.tsx    | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/projects/app/src/pageComponents/dashboard/apps/List.tsx b/projects/app/src/pageComponents/dashboard/apps/List.tsx
index 347e201df..31dddc013 100644
--- a/projects/app/src/pageComponents/dashboard/apps/List.tsx
+++ b/projects/app/src/pageComponents/dashboard/apps/List.tsx
@@ -58,11 +58,14 @@ const ListItem = () => {
 
   const [editedApp, setEditedApp] = useState<EditResourceInfoFormType>();
   const [editHttpPlugin, setEditHttpPlugin] = useState<EditHttpPluginProps>();
-  const [editPerAppIndex, setEditPerAppIndex] = useState<number>();
+  const [editPerAppId, setEditPerAppId] = useState<string>();
 
   const editPerApp = useMemo(
-    () => (editPerAppIndex !== undefined ? myApps[editPerAppIndex] : undefined),
-    [editPerAppIndex, myApps]
+    () =>
+      editPerAppId !== undefined
+        ? myApps.find((item) => String(item._id) === String(editPerAppId))
+        : undefined,
+    [editPerAppId, myApps]
   );
 
   const parentApp = useMemo(() => myApps.find((item) => item._id === parentId), [parentId, myApps]);
@@ -340,7 +343,7 @@ const ListItem = () => {
                                               icon: 'key',
                                               type: 'grayBg' as MenuItemType,
                                               label: t('common:permission.Permission'),
-                                              onClick: () => setEditPerAppIndex(index)
+                                              onClick: () => setEditPerAppId(app._id)
                                             }
                                           ]
                                         : [])
@@ -452,7 +455,7 @@ const ListItem = () => {
               }),
             refreshDeps: [editPerApp.inheritPermission]
           }}
-          onClose={() => setEditPerAppIndex(undefined)}
+          onClose={() => setEditPerAppId(undefined)}
         />
       )}
       {!!editHttpPlugin && (
diff --git a/projects/app/src/pageComponents/dataset/list/List.tsx b/projects/app/src/pageComponents/dataset/list/List.tsx
index 68da817aa..2eee61acd 100644
--- a/projects/app/src/pageComponents/dataset/list/List.tsx
+++ b/projects/app/src/pageComponents/dataset/list/List.tsx
@@ -51,7 +51,7 @@ function List() {
     folderDetail,
     setSearchKey
   } = useContextSelector(DatasetsContext, (v) => v);
-  const [editPerDatasetIndex, setEditPerDatasetIndex] = useState<number>();
+  const [editPerDatasetId, setEditPerDatasetId] = useState<string>();
   const router = useRouter();
   const { parentId = null } = router.query as { parentId?: string | null };
   const parentDataset = useMemo(
@@ -82,8 +82,8 @@ function List() {
   });
 
   const editPerDataset = useMemo(
-    () => (editPerDatasetIndex !== undefined ? myDatasets[editPerDatasetIndex] : undefined),
-    [editPerDatasetIndex, myDatasets]
+    () => myDatasets.find((item) => String(item._id) === String(editPerDatasetId)),
+    [editPerDatasetId, myDatasets]
   );
 
   const { mutate: exportDataset } = useRequest({
@@ -346,7 +346,7 @@ function List() {
                                         {
                                           icon: 'key',
                                           label: t('common:permission.Permission'),
-                                          onClick: () => setEditPerDatasetIndex(index)
+                                          onClick: () => setEditPerDatasetId(dataset._id)
                                         }
                                       ]
                                     : [])
@@ -449,7 +449,7 @@ function List() {
               }),
             refreshDeps: [editPerDataset._id, editPerDataset.inheritPermission]
           }}
-          onClose={() => setEditPerDatasetIndex(undefined)}
+          onClose={() => setEditPerDatasetId(undefined)}
         />
       )}
       <ConfirmModal />