Fix: don't show deleted in progress item (#393)

Signed-off-by: Daishan Peng <[email protected]>
obot-platform · Oct 31, 2024 · af06aef · af06aef
1 parent e85650d
commit af06aef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 66 deletions.
diff --git a/ui/admin/app/components/knowledge/AgentKnowledgePanel.tsx b/ui/admin/app/components/knowledge/AgentKnowledgePanel.tsx
@@ -47,6 +47,7 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
                                     ...item,
                                 }) as KnowledgeFile
                         )
+                        .filter((item) => !item.deleted)
             ),
         {
             revalidateOnFocus: false,
@@ -84,10 +85,10 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
     );
 
     let notionSource = knowledgeSources.find((source) => source.notionConfig);
-    let onedriveSource = knowledgeSources.find(
+    const onedriveSource = knowledgeSources.find(
         (source) => source.onedriveConfig
     );
-    let websiteSource = knowledgeSources.find(
+    const websiteSource = knowledgeSources.find(
         (source) => source.websiteCrawlingConfig
     );
 
@@ -258,7 +259,7 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         } else {
             setBlockPollingNotionFiles(false);
         }
-    }, [notionFiles]);
+    }, [notionFiles, notionSource?.state]);
 
     useEffect(() => {
         if (
@@ -280,7 +281,7 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         } else {
             setBlockPollingOneDriveFiles(false);
         }
-    }, [onedriveFiles]);
+    }, [onedriveFiles, onedriveSource?.state]);
 
     useEffect(() => {
         if (
@@ -302,10 +303,9 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         } else {
             setBlockPollingWebsiteFiles(false);
         }
-    }, [websiteFiles]);
+    }, [websiteFiles, websiteSource?.state]);
 
     useEffect(() => {
-        notionSource = knowledgeSources.find((source) => source.notionConfig);
         if (
             !notionSource ||
             notionSource?.state === KnowledgeSourceStatus.Synced
@@ -316,9 +316,6 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
             setBlockPollingNotion(false);
         }
 
-        onedriveSource = knowledgeSources.find(
-            (source) => source.onedriveConfig
-        );
         if (
             !onedriveSource ||
             onedriveSource?.state === KnowledgeSourceStatus.Synced
@@ -329,9 +326,6 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
             setBlockPollingOneDrive(false);
         }
 
-        websiteSource = knowledgeSources.find(
-            (source) => source.websiteCrawlingConfig
-        );
         if (
             !websiteSource ||
             websiteSource?.state === KnowledgeSourceStatus.Synced
@@ -341,7 +335,15 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         } else {
             setBlockPollingWebsite(false);
         }
-    }, [getKnowledgeSources]);
+    }, [
+        getKnowledgeSources,
+        notionSource,
+        onedriveSource,
+        websiteSource,
+        getNotionFiles,
+        getOnedriveFiles,
+        getWebsiteFiles,
+    ]);
 
     return (
         <div className="flex flex-col gap-4 justify-center items-center">
@@ -456,7 +458,6 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
                 onOpenChange={setIsAddFileModalOpen}
                 startPolling={startPollingLocalFiles}
                 files={localFiles}
-                getLocalFiles={getLocalFiles}
             />
             <NotionModal
                 agentId={agentId}

diff --git a/ui/admin/app/components/knowledge/file/FileModal.tsx b/ui/admin/app/components/knowledge/file/FileModal.tsx
@@ -1,8 +1,7 @@
 import { UploadIcon } from "lucide-react";
 import { useCallback, useRef } from "react";
-import { SWRResponse } from "swr";
 
-import { KnowledgeFile, KnowledgeFileState } from "~/lib/model/knowledge";
+import { KnowledgeFile } from "~/lib/model/knowledge";
 import { KnowledgeService } from "~/lib/service/api/knowledgeService";
 import { cn } from "~/lib/utils";
 
@@ -30,7 +29,6 @@ import IngestionStatusComponent from "../IngestionStatus";
 
 interface FileModalProps {
     agentId: string;
-    getLocalFiles: SWRResponse<KnowledgeFile[], Error>;
     isOpen: boolean;
     onOpenChange: (open: boolean) => void;
     startPolling: () => void;
@@ -39,7 +37,6 @@ interface FileModalProps {
 
 function FileModal({
     agentId,
-    getLocalFiles,
     startPolling,
     files,
     isOpen,
@@ -51,51 +48,9 @@ function FileModal({
         async (_index: number, file: File) => {
             await new Promise((resolve) => setTimeout(resolve, 1000));
             await KnowledgeService.addKnowledgeFilesToAgent(agentId, file);
-
-            // once added, we can immediately mutate the cache value
-            // without revalidating.
-            // Revalidating here would cause knowledge to be refreshed
-            // for each file being uploaded, which is not desirable.
-            const newItem: KnowledgeFile = {
-                id: "",
-                fileName: file.name,
-                agentID: agentId,
-                // set ingestion status to starting to ensure polling is enabled
-                approved: true,
-                created: new Date().toISOString(),
-                state: KnowledgeFileState.PendingApproval,
-                knowledgeSetID: "",
-                knowledgeSourceID: "",
-                url: "",
-                updatedAt: "",
-                checksum: "",
-                lastRunID: "",
-                error: "",
-            };
-
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            getLocalFiles.mutate(
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (prev: any) => {
-                    const existingItemIndex = prev?.findIndex(
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        (item: any) => item.fileName === newItem.fileName
-                    );
-                    if (existingItemIndex !== -1 && prev) {
-                        const updatedPrev = [...prev];
-                        updatedPrev[existingItemIndex!] = newItem;
-                        return updatedPrev;
-                    } else {
-                        return [newItem, ...(prev || [])];
-                    }
-                },
-                {
-                    revalidate: false,
-                }
-            );
             startPolling();
         },
-        [agentId, getLocalFiles, startPolling]
+        [agentId, startPolling]
     );
 
     // use multi async to handle uploading multiple files at once
@@ -116,11 +71,7 @@ function FileModal({
             agentId,
             item.fileName
         );
-
-        // optomistic update without cache revalidation
-        getLocalFiles.mutate((prev: KnowledgeFile[] | undefined) =>
-            prev?.filter((prevItem) => prevItem.fileName !== item.fileName)
-        );
+        startPolling();
     });
 
     return (

diff --git a/ui/admin/app/lib/model/knowledge.ts b/ui/admin/app/lib/model/knowledge.ts
@@ -113,6 +113,7 @@ type FolderSet = {
 export type KnowledgeFile = {
     id: string;
     created: string;
+    deleted: string;
     fileName: string;
     state: KnowledgeFileState;
     agentID: string;