Merge pull request #609 from AFP-Medialab/fix-606

Fixes #606
AFP-Medialab · Oct 1, 2024 · 28f716e · 28f716e
2 parents 47af761 + 2c9b741
commit 28f716e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/src/components/NavItems/tools/Deepfake/DeepfakeVideo.jsx b/src/components/NavItems/tools/Deepfake/DeepfakeVideo.jsx
@@ -46,8 +46,8 @@ const Deepfake = () => {
 
   const dispatch = useDispatch();
 
-  const submitUrl = () => {
-    UseGetDeepfake(
+  const submitUrl = async () => {
+    await UseGetDeepfake(
       keyword,
       input,
       true,
@@ -78,9 +78,9 @@ const Deepfake = () => {
       preprocessingError,
     );
   };
-  const handleSubmit = () => {
+  const handleSubmit = async () => {
     dispatch(resetDeepfake());
-    submitUrl();
+    await submitUrl();
   };
 
   const handleClose = () => {
@@ -139,6 +139,7 @@ const Deepfake = () => {
                     fileInputTypesAccepted={"video/*"}
                     handleCloseSelectedFile={handleClose}
                     preprocessLocalFile={preprocessVideo}
+                    isParentLoading={isLoading}
                   />
                 </form>
                 <Box m={2} />

diff --git a/src/components/NavItems/tools/Deepfake/Results/DeepfakeResultsVideo.jsx b/src/components/NavItems/tools/Deepfake/Results/DeepfakeResultsVideo.jsx
@@ -199,7 +199,7 @@ const DeepfakeResultsVideo = (props) => {
           alignItems="flex-start"
         >
           <Grid2 size={{ xs: 6 }} container direction="column" spacing={3}>
-            <Grid2 size={{ xs: 6 }} container direction="column">
+            <Grid2 width="100%" size={{ xs: 6 }} container direction="column">
               <video
                 width="100%"
                 height="auto"
@@ -219,7 +219,7 @@ const DeepfakeResultsVideo = (props) => {
               </video>
             </Grid2>
             {!!results.deepfake_video_report.results && (
-              <Grid2 size={{ xs: 6 }} container direction="column">
+              <Grid2 size={{ xs: 6 }} container width="100%" direction="column">
                 <Typography
                   variant="body1"
                   style={{

diff --git a/src/components/Shared/StringFileUploadField/index.jsx b/src/components/Shared/StringFileUploadField/index.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useRef } from "react";
 import Box from "@mui/material/Box";
 import { Button, ButtonGroup, Grid2, TextField } from "@mui/material";
 import FolderOpenIcon from "@mui/icons-material/FolderOpen";
@@ -41,16 +41,6 @@ const StringFileUploadField = ({
 }) => {
   const fileRef = useRef(null);
 
-  const [isLoading, setIsLoading] = useState(
-    isParentLoading !== undefined ? isParentLoading : false,
-  );
-
-  useEffect(() => {
-    if (isParentLoading !== undefined && isLoading !== isParentLoading) {
-      setIsLoading(isParentLoading);
-    }
-  }, [isParentLoading]);
-
   return (
     <Box>
       <Grid2 container direction="row" spacing={3} alignItems="center">
@@ -63,7 +53,7 @@ const StringFileUploadField = ({
             fullWidth
             value={urlInput}
             variant="outlined"
-            disabled={isLoading || fileInput instanceof Blob}
+            disabled={isParentLoading || fileInput instanceof Blob}
             onChange={(e) => setUrlInput(e.target.value)}
           />
         </Grid2>
@@ -74,19 +64,20 @@ const StringFileUploadField = ({
             color="primary"
             onClick={async (e) => {
               e.preventDefault();
-              setIsLoading(true);
               urlInput ? await handleSubmit(urlInput) : await handleSubmit(e);
-              setIsLoading(false);
             }}
-            loading={isLoading}
-            disabled={(urlInput === "" && !fileInput) || isLoading}
+            loading={isParentLoading}
+            disabled={(urlInput === "" && !fileInput) || isParentLoading}
           >
             {submitButtonKeyword}
           </LoadingButton>
         </Grid2>
       </Grid2>
       <Grid2 mt={2}>
-        <ButtonGroup variant="outlined" disabled={isLoading || urlInput !== ""}>
+        <ButtonGroup
+          variant="outlined"
+          disabled={isParentLoading || urlInput !== ""}
+        >
           <Button startIcon={<FolderOpenIcon />} sx={{ textTransform: "none" }}>
             <label htmlFor="file">
               {fileInput ? fileInput.name : localFileKeyword}