File upload status (v2 backport) (#4219)

resources/scripts/components/server/files/UploadButton.tsx

@@ -7,7 +7,6 @@ import styled from 'styled-components/macro';
 import { ModalMask } from '@/components/elements/Modal';
 import Fade from '@/components/elements/Fade';
 import useEventListener from '@/plugins/useEventListener';
-import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
 import useFlash from '@/plugins/useFlash';
 import useFileManagerSwr from '@/plugins/useFileManagerSwr';
 import { ServerContext } from '@/state/server';
@@ -19,18 +18,40 @@ const InnerContainer = styled.div`
     ${tw`bg-black w-full border-4 border-primary-500 border-dashed rounded p-10 mx-10`}
 `;
 
+function isFileOrDirectory(event: DragEvent): boolean {
+    if (!event.dataTransfer?.types) {
+        return false;
+    }
+
+    for (let i = 0; i < event.dataTransfer.types.length; i++) {
+        // Check if the item being dragged is not a file.
+        // On Firefox a file of type "application/x-moz-file" is also in the array.
+        if (event.dataTransfer.types[i] !== 'Files' && event.dataTransfer.types[i] !== 'application/x-moz-file') {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 export default ({ className }: WithClassname) => {
     const fileUploadInput = useRef<HTMLInputElement>(null);
-    const uuid = ServerContext.useStoreState((state) => state.server.data!.uuid);
+    const [timeouts, setTimeouts] = useState<NodeJS.Timeout[]>([]);
     const [visible, setVisible] = useState(false);
-    const [loading, setLoading] = useState(false);
     const { mutate } = useFileManagerSwr();
     const { clearFlashes, clearAndAddHttpError } = useFlash();
+
+    const uuid = ServerContext.useStoreState((state) => state.server.data!.uuid);
     const directory = ServerContext.useStoreState((state) => state.files.directory);
+    const appendFileUpload = ServerContext.useStoreActions((actions) => actions.files.appendFileUpload);
+    const removeFileUpload = ServerContext.useStoreActions((actions) => actions.files.removeFileUpload);
 
     useEventListener(
         'dragenter',
         (e) => {
+            if (!isFileOrDirectory(e)) {
+                return;
+            }
             e.stopPropagation();
             setVisible(true);
         },
@@ -40,6 +61,9 @@ export default ({ className }: WithClassname) => {
     useEventListener(
         'dragexit',
         (e) => {
+            if (!isFileOrDirectory(e)) {
+                return;
+            }
             e.stopPropagation();
             setVisible(false);
         },
@@ -57,27 +81,47 @@ export default ({ className }: WithClassname) => {
         };
     }, [visible]);
 
-    const onFileSubmission = (files: FileList) => {
-        const form = new FormData();
-        Array.from(files).forEach((file) => form.append('files', file));
+    useEffect(() => {
+        return () => timeouts.forEach(clearTimeout);
+    }, []);
 
-        setLoading(true);
+    const onFileSubmission = (files: FileList) => {
+        const formData: FormData[] = [];
+        Array.from(files).forEach((file) => {
+            const form = new FormData();
+            form.append('files', file);
+            formData.push(form);
+        });
         clearFlashes('files');
-        getFileUploadUrl(uuid)
-            .then((url) =>
-                axios.post(`${url}&directory=${directory}`, form, {
-                    headers: {
-                        'Content-Type': 'multipart/form-data',
-                    },
-                })
+        Promise.all(
+            Array.from(formData).map((f) =>
+                getFileUploadUrl(uuid).then((url) =>
+                    axios.post(`${url}&directory=${directory}`, f, {
+                        headers: { 'Content-Type': 'multipart/form-data' },
+                        onUploadProgress: (data: ProgressEvent) => {
+                            // @ts-expect-error this is valid
+                            const name = f.getAll('files')[0].name;
+
+                            appendFileUpload({
+                                name: name,
+                                loaded: data.loaded,
+                                total: data.total,
+                            });
+
+                            if (data.loaded === data.total) {
+                                const timeout = setTimeout(() => removeFileUpload(name), 2000);
+                                setTimeouts((t) => [...t, timeout]);
+                            }
+                        },
+                    })
+                )
             )
+        )
             .then(() => mutate())
             .catch((error) => {
                 console.error(error);
                 clearAndAddHttpError({ error, key: 'files' });
-            })
-            .then(() => setVisible(false))
-            .then(() => setLoading(false));
+            });
     };
 
     return (
@@ -97,14 +141,13 @@ export default ({ className }: WithClassname) => {
                             onFileSubmission(e.dataTransfer.files);
                         }}
                     >
-                        <div css={tw`w-full flex items-center justify-center`} style={{ pointerEvents: 'none' }}>
+                        <div css={tw`w-full flex items-center justify-center pointer-events-none`}>
                             <InnerContainer>
                                 <p css={tw`text-lg text-neutral-200 text-center`}>Drag and drop files to upload.</p>
                             </InnerContainer>
                         </div>
                     </ModalMask>
                 </Fade>
-                <SpinnerOverlay visible={loading} size={'large'} fixed />
             </Portal>
             <input
                 type={'file'}
@@ -119,12 +162,7 @@ export default ({ className }: WithClassname) => {
                     }
                 }}
             />
-            <Button
-                className={className}
-                onClick={() => {
-                    fileUploadInput.current ? fileUploadInput.current.click() : setVisible(true);
-                }}
-            >
+            <Button className={className} onClick={() => fileUploadInput.current && fileUploadInput.current.click()}>
                 Upload
             </Button>
         </>