From 70563d2bcb807d7952c38fff15ff8dcbfb9d93ff Mon Sep 17 00:00:00 2001
From: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com>
Date: Wed, 19 Mar 2025 23:08:22 +0800
Subject: [PATCH] fix DatasetSelectModal.tsx (#4241)

---
 .../core/app/DatasetSelectModal.tsx           | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/projects/app/src/components/core/app/DatasetSelectModal.tsx b/projects/app/src/components/core/app/DatasetSelectModal.tsx
index 3d7a25a3b..4d06ac847 100644
--- a/projects/app/src/components/core/app/DatasetSelectModal.tsx
+++ b/projects/app/src/components/core/app/DatasetSelectModal.tsx
@@ -41,17 +41,28 @@ export const DatasetSelectModal = ({
   const { Loading } = useLoading();
 
   const filterDatasets = useMemo(() => {
-    const filtered = {
-      selected: datasets.filter((item) =>
-        selectedDatasets.find((dataset) => dataset.datasetId === item._id)
-      ),
+    const selectedInDatasets = datasets.filter((item) =>
+      selectedDatasets.some((dataset) => dataset.datasetId === item._id)
+    );
+
+    const selectedNotInDatasets = selectedDatasets
+      .filter((selected) => !datasets.some((dataset) => dataset._id === selected.datasetId))
+      .map((selected) => ({
+        _id: selected.datasetId,
+        avatar: selected.avatar,
+        name: selected.name,
+        vectorModel: selected.vectorModel
+      }));
+
+    return {
+      selected: [...selectedInDatasets, ...selectedNotInDatasets],
       unSelected: datasets.filter(
-        (item) => !selectedDatasets.find((dataset) => dataset.datasetId === item._id)
+        (item) => !selectedDatasets.some((dataset) => dataset.datasetId === item._id)
       )
     };
-    return filtered;
   }, [datasets, selectedDatasets]);
-  const activeVectorModel = defaultSelectedDatasets[0]?.vectorModel?.model;
+
+  const activeVectorModel = selectedDatasets[0]?.vectorModel?.model;
 
   return (
     <DatasetSelectContainer
@@ -200,13 +211,8 @@ export const DatasetSelectModal = ({
         <ModalFooter>
           <Button
             onClick={() => {
-              // filter out the dataset that is not in the kList
-              const filterDatasets = selectedDatasets.filter((dataset) => {
-                return datasets.find((item) => item._id === dataset.datasetId);
-              });
-
               onClose();
-              onChange(filterDatasets);
+              onChange(selectedDatasets);
             }}
           >
             {t('common:common.Done')}