fix: ts and default dataset (labring#329)

c121914yu · Sep 20, 2023 · 0d94db4 · 0d94db4
1 parent 177482b
commit 0d94db4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeKbSearch.tsx b/client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeKbSearch.tsx
@@ -21,16 +21,16 @@ const KBSelect = ({
   onChange: (e: SelectedKbType) => void;
 }) => {
   const theme = useTheme();
-  const { datasets, loadAllDatasets } = useDatasetStore();
+  const { allDatasets, loadAllDatasets } = useDatasetStore();
   const {
     isOpen: isOpenKbSelect,
     onOpen: onOpenKbSelect,
     onClose: onCloseKbSelect
   } = useDisclosure();
 
   const showKbList = useMemo(
-    () => datasets.filter((item) => activeKbs.find((kb) => kb.kbId === item._id)),
-    [datasets, activeKbs]
+    () => allDatasets.filter((item) => activeKbs.find((kb) => kb.kbId === item._id)),
+    [allDatasets, activeKbs]
   );
 
   useQuery(['loadAllDatasets'], loadAllDatasets);
@@ -57,9 +57,12 @@ const KBSelect = ({
           </Flex>
         ))}
       </Grid>
-      {isOpenKbSelect && (
-        <KBSelectModal activeKbs={activeKbs} onChange={onChange} onClose={onCloseKbSelect} />
-      )}
+      <KBSelectModal
+        isOpen={isOpenKbSelect}
+        activeKbs={activeKbs}
+        onChange={onChange}
+        onClose={onCloseKbSelect}
+      />
     </>
   );
 };

diff --git a/client/src/pages/app/detail/components/BasicEdit/index.tsx b/client/src/pages/app/detail/components/BasicEdit/index.tsx
@@ -564,15 +564,18 @@ const Settings = ({ appId }: { appId: string }) => {
           defaultData={getValues('chatModel')}
         />
       )}
-      <KBSelectModal
-        isOpen={isOpenKbSelect}
-        activeKbs={selectedKbList.map((item) => ({
-          kbId: item._id,
-          vectorModel: item.vectorModel
-        }))}
-        onClose={onCloseKbSelect}
-        onChange={replaceKbList}
-      />
+      {isOpenKbSelect && (
+        <KBSelectModal
+          isOpen={isOpenKbSelect}
+          activeKbs={selectedKbList.map((item) => ({
+            kbId: item._id,
+            vectorModel: item.vectorModel
+          }))}
+          onClose={onCloseKbSelect}
+          onChange={replaceKbList}
+        />
+      )}
+
       {isOpenKbParams && (
         <KbParamsModal
           searchEmptyText={getValues('kb.searchEmptyText')}