From 03808f516ed27034250a33ad64bc1e0c34990a3b Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Fri, 26 Apr 2024 16:57:41 -0700
Subject: [PATCH 1/2] fix loading message in document picker bug

---
 .../Modals/MangeWorkspace/Documents/Directory/index.jsx     | 1 +
 .../Documents/UploadFile/FileUploadProgress/index.jsx       | 6 ++++++
 .../Modals/MangeWorkspace/Documents/UploadFile/index.jsx    | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Modals/MangeWorkspace/Documents/Directory/index.jsx b/frontend/src/components/Modals/MangeWorkspace/Documents/Directory/index.jsx
index 83544f72d8e..2a455b35711 100644
--- a/frontend/src/components/Modals/MangeWorkspace/Documents/Directory/index.jsx
+++ b/frontend/src/components/Modals/MangeWorkspace/Documents/Directory/index.jsx
@@ -306,6 +306,7 @@ function Directory({
           workspace={workspace}
           fetchKeys={fetchKeys}
           setLoading={setLoading}
+          setLoadingMessage={setLoadingMessage}
         />
       </div>
     </div>
diff --git a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/FileUploadProgress/index.jsx b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/FileUploadProgress/index.jsx
index c375aa2e363..e1f4651eb74 100644
--- a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/FileUploadProgress/index.jsx
+++ b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/FileUploadProgress/index.jsx
@@ -12,6 +12,8 @@ function FileUploadProgressComponent({
   reason = null,
   onUploadSuccess,
   onUploadError,
+  setLoading,
+  setLoadingMessage,
 }) {
   const [timerMs, setTimerMs] = useState(10);
   const [status, setStatus] = useState("pending");
@@ -19,6 +21,8 @@ function FileUploadProgressComponent({
 
   useEffect(() => {
     async function uploadFile() {
+      setLoading(true);
+      setLoadingMessage("Uploading file...");
       const start = Number(new Date());
       const formData = new FormData();
       formData.append("file", file, file.name);
@@ -34,6 +38,8 @@ function FileUploadProgressComponent({
         onUploadError(data.error);
         setError(data.error);
       } else {
+        setLoading(false);
+        setLoadingMessage("");
         setStatus("complete");
         clearInterval(timer);
         onUploadSuccess();
diff --git a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
index acf319d92f5..0f38159537c 100644
--- a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
+++ b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
@@ -7,7 +7,7 @@ import { v4 } from "uuid";
 import FileUploadProgress from "./FileUploadProgress";
 import Workspace from "../../../../../models/workspace";
 
-export default function UploadFile({ workspace, fetchKeys, setLoading }) {
+export default function UploadFile({ workspace, fetchKeys, setLoading, setLoadingMessage }) {
   const [ready, setReady] = useState(false);
   const [files, setFiles] = useState([]);
   const [fetchingUrl, setFetchingUrl] = useState(false);
@@ -15,6 +15,7 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) {
   const handleSendLink = async (e) => {
     e.preventDefault();
     setLoading(true);
+    setLoadingMessage("Scraping link...");
     setFetchingUrl(true);
     const formEl = e.target;
     const form = new FormData(formEl);
@@ -114,6 +115,8 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) {
                 reason={file?.reason}
                 onUploadSuccess={handleUploadSuccess}
                 onUploadError={handleUploadError}
+                setLoading={setLoading}
+                setLoadingMessage={setLoadingMessage}
               />
             ))}
           </div>

From 9eb923484e169c7100a26b57a55a2d29043ce068 Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Fri, 26 Apr 2024 17:07:47 -0700
Subject: [PATCH 2/2] linting

---
 .../Modals/MangeWorkspace/Documents/UploadFile/index.jsx   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
index 0f38159537c..e57997a830c 100644
--- a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
+++ b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
@@ -7,7 +7,12 @@ import { v4 } from "uuid";
 import FileUploadProgress from "./FileUploadProgress";
 import Workspace from "../../../../../models/workspace";
 
-export default function UploadFile({ workspace, fetchKeys, setLoading, setLoadingMessage }) {
+export default function UploadFile({
+  workspace,
+  fetchKeys,
+  setLoading,
+  setLoadingMessage,
+}) {
   const [ready, setReady] = useState(false);
   const [files, setFiles] = useState([]);
   const [fetchingUrl, setFetchingUrl] = useState(false);