Merge pull request #1017 from AI4Bharat/revert-1016-clearChildren

Revert "changed audio urls for ANTE type"
AI4Bharat · May 2, 2024 · 41c41d7 · 41c41d7
2 parents 37765f8 + 8e9c88d
commit 41c41d7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 112 deletions.
diff --git a/src/ui/pages/container/CL-Transcription/AllAudioTranscriptionLandingPage.jsx b/src/ui/pages/container/CL-Transcription/AllAudioTranscriptionLandingPage.jsx
@@ -84,7 +84,6 @@ const AllAudioTranscriptionLandingPage = () => {
   const [advancedWaveformSettings, setAdvancedWaveformSettings] = useState(false);
   const [assignedUsers, setAssignedUsers] = useState(null);
   const [waveSurfer, setWaveSurfer] = useState(true);
-  const [audioURL, setAudioURL] = useState("");
 
   const handleCollapseClick = () => {
     !showNotes && setShowStdTranscript(false);
@@ -119,27 +118,6 @@ const AllAudioTranscriptionLandingPage = () => {
       }else{
         setWaveSurfer(true);
       }
-      const fetchAudioData = await fetch(String(resp?.data?.audio_url).replace("https://asr-transcription.objectstore.e2enetworks.net/", `https://${configs.BASE_URL_AUTO}/task/get_audio_file/?audio_url=`), {
-        method: "GET",
-        headers: ProjectObj.getHeaders().headers
-      })
-      if (!fetchAudioData.ok){
-        setAudioURL(resp?.data?.audio_url)
-      }else{
-        try {
-          var base64data = await fetchAudioData.json();
-          var binaryData = atob(base64data);
-          var buffer = new ArrayBuffer(binaryData.length);
-          var view = new Uint8Array(buffer);
-          for (var i = 0; i < binaryData.length; i++) {
-              view[i] = binaryData.charCodeAt(i);
-          }
-          var blob = new Blob([view], { type: 'audio/mpeg' });
-          setAudioURL(URL.createObjectURL(blob));
-        } catch {
-          setAudioURL(resp?.data?.audio_url)
-        }
-      }
     }
     setLoading(false);
   };
@@ -494,14 +472,11 @@ const AllAudioTranscriptionLandingPage = () => {
                 </Tooltip>
               </Grid>
             </Grid>
-            {audioURL &&
             <AudioPanel
               setCurrentTime={setCurrentTime}
               setPlaying={setPlaying}
               taskData={taskData}
-              audioUrl={audioURL}
             />
-            } 
             <Grid container spacing={1} sx={{ pt: 1, pl: 2, pr : 3}} justifyContent="flex-end">
              <Stack spacing={2} direction="row" sx={{ mb: 1 }} alignItems="center" justifyContent="flex-end" width="fit-content">
                 <Typography fontSize={14} fontWeight={"medium"} color="#555">
@@ -729,7 +704,7 @@ const AllAudioTranscriptionLandingPage = () => {
         position="fixed"
         bottom={1}
       >
-        {audioURL && (waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing} taskID={taskData?.id} waveformSettings={waveformSettings} />)}
+        {waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing} taskID={taskData?.id} waveformSettings={waveformSettings} />}
       </Grid>
     </>
   );

diff --git a/src/ui/pages/container/CL-Transcription/AudioPanel.jsx b/src/ui/pages/container/CL-Transcription/AudioPanel.jsx
@@ -15,8 +15,7 @@ import APITransport from "../../../../redux/actions/apitransport/apitransport";
 const AudioPanel = memo( ({
   setCurrentTime,
   setPlaying,
-  taskData,
-  audioUrl
+  taskData
 }) => {
   const classes = AudioTranscriptionLandingStyle();
   const dispatch = useDispatch();
@@ -68,7 +67,7 @@ const AudioPanel = memo( ({
           id ="audio-panel"
           controls
           controlsList="nodownload"
-          src={audioUrl}
+          src={TaskDetails?.data?.audio_url}
           preload="metadata"
           type="audio"
           // style={{

diff --git a/src/ui/pages/container/CL-Transcription/AudioTranscriptionLandingPage.jsx b/src/ui/pages/container/CL-Transcription/AudioTranscriptionLandingPage.jsx
@@ -112,7 +112,6 @@ const AudioTranscriptionLandingPage = () => {
   const [autoSave, setAutoSave] = useState(true);
   const [waveSurfer, setWaveSurfer] = useState(true);
   const [autoSaveTrigger, setAutoSaveTrigger] = useState(false);
-  const [audioURL, setAudioURL] = useState("");
 
   // useEffect(() => {
   //   let intervalId;
@@ -294,27 +293,6 @@ const AudioTranscriptionLandingPage = () => {
       }else{
         setWaveSurfer(true);
       }
-      const fetchAudioData = await fetch(String(resp?.data?.audio_url).replace("https://asr-transcription.objectstore.e2enetworks.net/", `https://${configs.BASE_URL_AUTO}/task/get_audio_file/?audio_url=`), {
-        method: "GET",
-        headers: ProjectObj.getHeaders().headers
-      })
-      if (!fetchAudioData.ok){
-        setAudioURL(resp?.data?.audio_url)
-      }else{
-        try {
-          var base64data = await fetchAudioData.json();
-          var binaryData = atob(base64data);
-          var buffer = new ArrayBuffer(binaryData.length);
-          var view = new Uint8Array(buffer);
-          for (var i = 0; i < binaryData.length; i++) {
-              view[i] = binaryData.charCodeAt(i);
-          }
-          var blob = new Blob([view], { type: 'audio/mpeg' });
-          setAudioURL(URL.createObjectURL(blob));
-        } catch {
-          setAudioURL(resp?.data?.audio_url)
-        }
-      }
     }
     setLoading(false);
   };
@@ -949,16 +927,14 @@ useEffect(() => {
               filterMessage={filterMessage}
               taskData={taskData}
             />
-            {audioURL && 
             <AudioPanel
               setCurrentTime={setCurrentTime}
               setPlaying={setPlaying}
               handleAnnotationClick={handleAnnotationClick}
               onNextAnnotation={onNextAnnotation}
               AnnotationsTaskDetails={AnnotationsTaskDetails}
               taskData={taskData}
-              audioUrl={audioURL}
-            />}
+            />
             <Grid container spacing={1} sx={{ pt: 1, pl: 2, pr : 3}} justifyContent="flex-end">
              <Stack spacing={2} direction="row" sx={{ mb: 1 }} alignItems="center" justifyContent="flex-end" width="fit-content">
                 <Typography fontSize={14} fontWeight={"medium"} color="#555">
@@ -1234,7 +1210,7 @@ useEffect(() => {
         bottom={1}
       // style={fullscreen ? { visibility: "hidden" } : {}}
       >
-        {audioURL && (waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing} taskID={taskData?.id} waveformSettings={waveformSettings}/>)} 
+        {waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing} taskID={taskData?.id} waveformSettings={waveformSettings}/>} 
       </Grid>
     </>
   );

diff --git a/src/ui/pages/container/CL-Transcription/ReviewAudioTranscriptionLandingPage.jsx b/src/ui/pages/container/CL-Transcription/ReviewAudioTranscriptionLandingPage.jsx
@@ -49,7 +49,6 @@ import ArrowRightIcon from "@mui/icons-material/ArrowRight";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import getTaskAssignedUsers from '../../../../utils/getTaskAssignedUsers';
 import LightTooltip from "../../component/common/Tooltip"
-import configs from '../../../../config/config';
 
 const ReviewAudioTranscriptionLandingPage = () => {
   const classes = AudioTranscriptionLandingStyle();
@@ -117,7 +116,6 @@ const ReviewAudioTranscriptionLandingPage = () => {
   const [autoSave, setAutoSave] = useState(true);
   const [waveSurfer, setWaveSurfer] = useState(true);
   const [autoSaveTrigger, setAutoSaveTrigger] = useState(false);
-  const [audioURL, setAudioURL] = useState("");
 
   // useEffect(() => {
   //   let intervalId;
@@ -310,29 +308,7 @@ const ReviewAudioTranscriptionLandingPage = () => {
       setWaveSurfer(false);
     }else{
       setWaveSurfer(true);
-    }
-      const fetchAudioData = await fetch(String(resp?.data?.audio_url).replace("https://asr-transcription.objectstore.e2enetworks.net/", `https://${configs.BASE_URL_AUTO}/task/get_audio_file/?audio_url=`), {
-        method: "GET",
-        headers: ProjectObj.getHeaders().headers
-      })
-      if (!fetchAudioData.ok){
-        setAudioURL(resp?.data?.audio_url)
-      }else{
-        try {
-          var base64data = await fetchAudioData.json();
-          var binaryData = atob(base64data);
-          var buffer = new ArrayBuffer(binaryData.length);
-          var view = new Uint8Array(buffer);
-          for (var i = 0; i < binaryData.length; i++) {
-              view[i] = binaryData.charCodeAt(i);
-          }
-          var blob = new Blob([view], { type: 'audio/mpeg' });
-          setAudioURL(URL.createObjectURL(blob));
-        } catch {
-          setAudioURL(resp?.data?.audio_url)
-        }
-      }
-    }
+    }}
     setLoading(false);
   };
 
@@ -1149,16 +1125,13 @@ useEffect(() => {
               disableButton={disableButton}
               anchorEl={anchorEl} setAnchorEl={setAnchorEl}
             />
-            {audioURL && 
             <AudioPanel
               setCurrentTime={setCurrentTime}
               setPlaying={setPlaying}
               onNextAnnotation={onNextAnnotation}
               AnnotationsTaskDetails={AnnotationsTaskDetails}
               taskData={taskDetailList}
-              audioUrl={audioURL}
             />
-            }
             <Grid container spacing={1} sx={{ pt: 1, pl: 2, pr : 3}} justifyContent="flex-end">
              <Stack spacing={2} direction="row" sx={{ mb: 1 }} alignItems="center" justifyContent="flex-end" width="fit-content">
                 <Typography fontSize={14} fontWeight={"medium"} color="#555">
@@ -1459,7 +1432,7 @@ useEffect(() => {
         bottom={1}
       // style={fullscreen ? { visibility: "hidden" } : {}}
       >
-        {audioURL && (waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing}  taskID={taskDetailList} waveformSettings={waveformSettings}/>)}
+        {waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing}  taskID={taskDetailList} waveformSettings={waveformSettings}/>}
       </Grid>
     </>
   );

diff --git a/src/ui/pages/container/CL-Transcription/SuperCheckerAudioTranscriptionLandingPage.jsx b/src/ui/pages/container/CL-Transcription/SuperCheckerAudioTranscriptionLandingPage.jsx
@@ -114,7 +114,6 @@ const SuperCheckerAudioTranscriptionLandingPage = () => {
   const [autoSave, setAutoSave] = useState(true);
   const [waveSurfer, setWaveSurfer] = useState(false);
   const [autoSaveTrigger, setAutoSaveTrigger] = useState(false);
-  const [audioURL, setAudioURL] = useState("");
 
   // useEffect(() => {
   //   let intervalId;
@@ -230,29 +229,7 @@ const SuperCheckerAudioTranscriptionLandingPage = () => {
         setWaveSurfer(false);
       }else{
         setWaveSurfer(true);
-      }
-      const fetchAudioData = await fetch(String(resp?.data?.audio_url).replace("https://asr-transcription.objectstore.e2enetworks.net/", `https://${configs.BASE_URL_AUTO}/task/get_audio_file/?audio_url=`), {
-        method: "GET",
-        headers: ProjectObj.getHeaders().headers
-      })
-      if (!fetchAudioData.ok){
-        setAudioURL(resp?.data?.audio_url)
-      }else{
-        try {
-          var base64data = await fetchAudioData.json();
-          var binaryData = atob(base64data);
-          var buffer = new ArrayBuffer(binaryData.length);
-          var view = new Uint8Array(buffer);
-          for (var i = 0; i < binaryData.length; i++) {
-              view[i] = binaryData.charCodeAt(i);
-          }
-          var blob = new Blob([view], { type: 'audio/mpeg' });
-          setAudioURL(URL.createObjectURL(blob));
-        } catch {
-          setAudioURL(resp?.data?.audio_url)
-        }
-      }
-    }
+      }}
     setLoading(false);
   };
 
@@ -993,17 +970,14 @@ useEffect(() => {
               anchorEl={anchorEl}
               setAnchorEl={setAnchorEl}
             />
-            {audioURL &&
             <AudioPanel
               setCurrentTime={setCurrentTime}
               setPlaying={setPlaying}
               // handleAnnotationClick={handleAnnotationClick}
               onNextAnnotation={onNextAnnotation}
               AnnotationsTaskDetails={AnnotationsTaskDetails}
               taskData={taskDetailList}
-              audioUrl={audioURL}
             />
-            }
             <Grid container spacing={1} sx={{ pt: 1, pl: 2, pr : 3}} justifyContent="flex-end">
              <Stack spacing={2} direction="row" sx={{ mb: 1 }} alignItems="center" justifyContent="flex-end" width="fit-content">
                 <Typography fontSize={14} fontWeight={"medium"} color="#555">
@@ -1275,7 +1249,7 @@ useEffect(() => {
         bottom={1}
         // style={fullscreen ? { visibility: "hidden" } : {}}
       >
-        {audioURL && (waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing} taskID={taskDetailList} waveformSettings={waveformSettings} />)}
+        {waveSurfer ? <Timeline2 key={taskDetails?.data?.audio_url} details={taskDetails} waveformSettings={waveSurferWaveformSettings}/> : <Timeline currentTime={currentTime} playing={playing} taskID={taskDetailList} waveformSettings={waveformSettings} />}
       </Grid>
     </>
   );

diff --git a/src/ui/pages/container/CL-Transcription/wavesurfer.jsx b/src/ui/pages/container/CL-Transcription/wavesurfer.jsx
@@ -84,6 +84,7 @@ const Timeline2 = ({ key, details, waveformSettings }) => {
         barRadius: waveformSettings.barRadius,
         barHeight: waveformSettings.barHeight,
         mediaControls: true,
+        url: details?.data?.audio_url,
         hideScrollbar: true,
         autoCenter: true,
         autoScroll: true,
@@ -114,6 +115,7 @@ const Timeline2 = ({ key, details, waveformSettings }) => {
       miniMap.current = WaveSurfer.create({
         container: document.querySelector('#minimap'),
         height: '20',
+        url: details?.data?.audio_url,
         hideScrollbar: true,
         mediaControls: true,
         media: document.querySelector('audio'),
@@ -138,6 +140,7 @@ const Timeline2 = ({ key, details, waveformSettings }) => {
         barRadius: waveformSettings.barRadius,
         barHeight: waveformSettings.barHeight,
         mediaControls: true,
+        url: details?.data?.audio_url,
         hideScrollbar: true,
         autoCenter: true,
         autoScroll: true,
@@ -187,6 +190,7 @@ const Timeline2 = ({ key, details, waveformSettings }) => {
       miniMap.current = WaveSurfer.create({
         container: document.querySelector('#minimap'),
         height: '20',
+        url: details?.data?.audio_url,
         mediaControls: true,
         media: document.querySelector('audio'),
         hideScrollbar: true,