From 8eda75d624148a18054931c6d41e3bc3dd7aa3c2 Mon Sep 17 00:00:00 2001
From: Sean Hatfield <seanhatfield5@gmail.com>
Date: Fri, 26 Apr 2024 17:08:10 -0700
Subject: [PATCH] [FIX] Loading message in document picker bug (#1202)
* fix loading message in document picker bug
* linting
---------
Co-authored-by: timothycarambat <rambat1010@gmail.com>
---
.../MangeWorkspace/Documents/Directory/index.jsx | 1 +
.../Documents/UploadFile/FileUploadProgress/index.jsx | 6 ++++++
.../MangeWorkspace/Documents/UploadFile/index.jsx | 10 +++++++++-
3 files changed, 16 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 83544f72d..2a455b357 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 c375aa2e3..e1f4651eb 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 acf319d92..e57997a83 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 }) {
+export default function UploadFile({
+ workspace,
+ fetchKeys,
+ setLoading,
+ setLoadingMessage,
+}) {
const [ready, setReady] = useState(false);
const [files, setFiles] = useState([]);
const [fetchingUrl, setFetchingUrl] = useState(false);
@@ -15,6 +20,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 +120,8 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) {
reason={file?.reason}
onUploadSuccess={handleUploadSuccess}
onUploadError={handleUploadError}
+ setLoading={setLoading}
+ setLoadingMessage={setLoadingMessage}
/>
))}
</div>
--
GitLab