Skip to content
Snippets Groups Projects
Unverified Commit 8eda75d6 authored by Sean Hatfield's avatar Sean Hatfield Committed by GitHub
Browse files

[FIX] Loading message in document picker bug (#1202)


* fix loading message in document picker bug

* linting

---------

Co-authored-by: default avatartimothycarambat <rambat1010@gmail.com>
parent 1b35bcbe
No related branches found
No related tags found
No related merge requests found
...@@ -306,6 +306,7 @@ function Directory({ ...@@ -306,6 +306,7 @@ function Directory({
workspace={workspace} workspace={workspace}
fetchKeys={fetchKeys} fetchKeys={fetchKeys}
setLoading={setLoading} setLoading={setLoading}
setLoadingMessage={setLoadingMessage}
/> />
</div> </div>
</div> </div>
......
...@@ -12,6 +12,8 @@ function FileUploadProgressComponent({ ...@@ -12,6 +12,8 @@ function FileUploadProgressComponent({
reason = null, reason = null,
onUploadSuccess, onUploadSuccess,
onUploadError, onUploadError,
setLoading,
setLoadingMessage,
}) { }) {
const [timerMs, setTimerMs] = useState(10); const [timerMs, setTimerMs] = useState(10);
const [status, setStatus] = useState("pending"); const [status, setStatus] = useState("pending");
...@@ -19,6 +21,8 @@ function FileUploadProgressComponent({ ...@@ -19,6 +21,8 @@ function FileUploadProgressComponent({
useEffect(() => { useEffect(() => {
async function uploadFile() { async function uploadFile() {
setLoading(true);
setLoadingMessage("Uploading file...");
const start = Number(new Date()); const start = Number(new Date());
const formData = new FormData(); const formData = new FormData();
formData.append("file", file, file.name); formData.append("file", file, file.name);
...@@ -34,6 +38,8 @@ function FileUploadProgressComponent({ ...@@ -34,6 +38,8 @@ function FileUploadProgressComponent({
onUploadError(data.error); onUploadError(data.error);
setError(data.error); setError(data.error);
} else { } else {
setLoading(false);
setLoadingMessage("");
setStatus("complete"); setStatus("complete");
clearInterval(timer); clearInterval(timer);
onUploadSuccess(); onUploadSuccess();
......
...@@ -7,7 +7,12 @@ import { v4 } from "uuid"; ...@@ -7,7 +7,12 @@ import { v4 } from "uuid";
import FileUploadProgress from "./FileUploadProgress"; import FileUploadProgress from "./FileUploadProgress";
import Workspace from "../../../../../models/workspace"; 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 [ready, setReady] = useState(false);
const [files, setFiles] = useState([]); const [files, setFiles] = useState([]);
const [fetchingUrl, setFetchingUrl] = useState(false); const [fetchingUrl, setFetchingUrl] = useState(false);
...@@ -15,6 +20,7 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) { ...@@ -15,6 +20,7 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) {
const handleSendLink = async (e) => { const handleSendLink = async (e) => {
e.preventDefault(); e.preventDefault();
setLoading(true); setLoading(true);
setLoadingMessage("Scraping link...");
setFetchingUrl(true); setFetchingUrl(true);
const formEl = e.target; const formEl = e.target;
const form = new FormData(formEl); const form = new FormData(formEl);
...@@ -114,6 +120,8 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) { ...@@ -114,6 +120,8 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) {
reason={file?.reason} reason={file?.reason}
onUploadSuccess={handleUploadSuccess} onUploadSuccess={handleUploadSuccess}
onUploadError={handleUploadError} onUploadError={handleUploadError}
setLoading={setLoading}
setLoadingMessage={setLoadingMessage}
/> />
))} ))}
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment