feat: allow user to chat while feed process is pending (#1120)

* feat: remove 'ux-upload' feature flag * feat: publish a message at the end of feed process * feat: hide feed card during feed process
QuivrHQ · Sep 7, 2023 · a14c033 · a14c033
1 parent 711eff0
commit a14c033
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 18 deletions.
diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/ActionsBar.tsx b/frontend/app/chat/[chatId]/components/ActionsBar/ActionsBar.tsx
@@ -29,6 +29,7 @@ export const ActionsBar = (): JSX.Element => {
           shouldDisplayUploadCard={shouldDisplayUploadCard}
           setShouldDisplayUploadCard={setShouldDisplayUploadCard}
           feedBrain={() => void feedBrain()}
+          hasContentToFeedBrain={contents.length > 0}
         />
       </div>
     </div>

diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/index.tsx b/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/index.tsx
@@ -1,5 +1,5 @@
+/* eslint-disable max-lines */
 "use client";
-import { useFeature } from "@growthbook/growthbook-react";
 import { useTranslation } from "react-i18next";
 import { MdAddCircle, MdSend } from "react-icons/md";
 
@@ -15,17 +15,18 @@ type ChatInputProps = {
   shouldDisplayUploadCard: boolean;
   feedBrain: () => void;
   setShouldDisplayUploadCard: (shouldDisplayUploadCard: boolean) => void;
+  hasContentToFeedBrain: boolean;
 };
 
 export const ChatInput = ({
   shouldDisplayUploadCard,
   feedBrain,
   setShouldDisplayUploadCard,
+  hasContentToFeedBrain,
 }: ChatInputProps): JSX.Element => {
   const { setMessage, submitQuestion, chatId, generatingAnswer, message } =
     useChatInput();
   const { t } = useTranslation(["chat"]);
-  const shouldDisplayUploadButton = useFeature("ux-upload").on;
   const { currentBrainId } = useBrainContext();
 
   return (
@@ -37,7 +38,7 @@ export const ChatInput = ({
       }}
       className="sticky flex items-star bottom-0 bg-white dark:bg-black w-full flex justify-center gap-2 z-20"
     >
-      {!shouldDisplayUploadCard && shouldDisplayUploadButton && (
+      {!shouldDisplayUploadCard && (
         <div className="flex items-start">
           <Button
             className="p-0"
@@ -67,9 +68,12 @@ export const ChatInput = ({
         {shouldDisplayUploadCard ? (
           <div className="flex items-center">
             <Button
-              disabled={currentBrainId === null}
+              disabled={currentBrainId === null || !hasContentToFeedBrain}
               variant="tertiary"
-              onClick={feedBrain}
+              onClick={() => {
+                setShouldDisplayUploadCard(false);
+                feedBrain();
+              }}
               type="button"
             >
               <MdSend className="text-3xl transform -rotate-90" />

diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/hooks/useKnowledgeUploader.ts b/frontend/app/chat/[chatId]/components/ActionsBar/hooks/useKnowledgeUploader.ts
@@ -48,7 +48,6 @@ export const useKnowledgeUploader = () => {
           variant: "danger",
           text: t("crawlFailed", {
             message: JSON.stringify(error),
-            ns: "upload",
           }),
         });
       }
@@ -80,7 +79,7 @@ export const useKnowledgeUploader = () => {
         } else {
           publish({
             variant: "danger",
-            text: t("error", { message: e, ns: "upload" }),
+            text: t("error", { message: e }),
           });
         }
       }
@@ -106,11 +105,22 @@ export const useKnowledgeUploader = () => {
       return;
     }
     try {
-      await Promise.all([
-        ...files.map((file) => uploadFileHandler(file, currentBrainId)),
-        ...urls.map((url) => crawlWebsiteHandler(url, currentBrainId)),
-      ]);
-    } catch (e: unknown) {
+      const uploadPromises = files.map((file) =>
+        uploadFileHandler(file, currentBrainId)
+      );
+      const crawlPromises = urls.map((url) =>
+        crawlWebsiteHandler(url, currentBrainId)
+      );
+
+      await Promise.all([...uploadPromises, ...crawlPromises]);
+
+      setContents([]);
+
+      publish({
+        variant: "success",
+        text: t("knowledgeUploaded"),
+      });
+    } catch (e) {
       publish({
         variant: "danger",
         text: JSON.stringify(e),

diff --git a/frontend/public/locales/en/upload.json b/frontend/public/locales/en/upload.json
@@ -15,5 +15,6 @@
     "ohNo": "Oh no!",
     "selectBrainFirst": "You need to select a brain first. 🧠💡🥲",
     "missingNecessaryRole": "You don't have the necessary role to upload content to the selected brain. 🧠💡🥲",
-    "invalidFileType": "Invalid file type"
+    "invalidFileType": "Invalid file type",
+    "knowledgeUploaded": "Knowledge uploaded"
 }
diff --git a/frontend/public/locales/es/upload.json b/frontend/public/locales/es/upload.json
@@ -15,5 +15,6 @@
     "success": "Archivo subido correctamente",
     "title": "Subir conocimiento",
     "webSite": "Ingrese la URL del sitio web",
-    "invalidFileType": "Tipo de archivo no permitido"
+    "invalidFileType": "Tipo de archivo no permitido",
+    "knowledgeUploaded": "Conocimiento subido"
 }
diff --git a/frontend/public/locales/fr/upload.json b/frontend/public/locales/fr/upload.json
@@ -15,5 +15,6 @@
     "ohNo": "Oh non !",
     "selectBrainFirst": "Vous devez d'abord sélectionner un cerveau. 🧠💡🥲",
     "missingNecessaryRole": "Vous n'avez pas le rôle nécessaire pour télécharger du contenu dans le cerveau sélectionné. 🧠💡🥲",
-    "invalidFileType": "Type de fichier invalide"
+    "invalidFileType": "Type de fichier invalide",
+    "knowledgeUploaded": "Connaissance téléchargée"
 }
diff --git a/frontend/public/locales/pt-br/upload.json b/frontend/public/locales/pt-br/upload.json
@@ -15,5 +15,6 @@
     "ohNo": "Oh, não!",
     "selectBrainFirst": "Você precisa selecionar um cérebro primeiro. 🧠💡🥲",
     "missingNecessaryRole": "Você não possui a função necessária para enviar conteúdo para o cérebro selecionado. 🧠💡🥲",
-    "invalidFileType": "Tipo de arquivo inválido"
+    "invalidFileType": "Tipo de arquivo inválido",
+    "knowledgeUploaded": "Conhecimento enviado"
 }
diff --git a/frontend/public/locales/ru/upload.json b/frontend/public/locales/ru/upload.json
@@ -15,5 +15,6 @@
     "ohNo": "О нет!",
     "selectBrainFirst": "Сначала вам нужно выбрать мозг. 🧠💡🥲",
     "missingNecessaryRole": "У вас нет необходимой роли для загрузки контента в выбранный мозг. 🧠💡🥲",
-    "invalidFileType": "Неверный тип файла"
+    "invalidFileType": "Неверный тип файла",
+    "knowledgeUploaded": "Знания загружены"
 }
diff --git a/frontend/public/locales/zh-cn/upload.json b/frontend/public/locales/zh-cn/upload.json
@@ -15,5 +15,6 @@
     "ohNo": "不好了!",
     "selectBrainFirst": "你需要先选择一个大脑。 🧠💡🥲",
     "missingNecessaryRole": "您没有所选大脑的上传权限。 🧠💡🥲",
-    "invalidFileType": "文件类型不受支持"
+    "invalidFileType": "文件类型不受支持",
+    "knowledgeUploaded": "知识已上传"
 }