Merge pull request #858 from AI4Bharat/revert-857-minorchange001

Revert "changes for export filename"
AI4Bharat · Dec 19, 2024 · 2c500f5 · 2c500f5
2 parents 1d54efa + 832e054
commit 2c500f5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/src/containers/Organization/OrgLevelTaskList.jsx b/src/containers/Organization/OrgLevelTaskList.jsx
@@ -445,8 +445,8 @@ const OrgLevelTaskList = () => {
 
       if (res.ok) {
         const resp = await res.blob();
-        const filename = res.headers.get('content-type');
-        exportFile(resp, currentTaskDetails, transcript, "transcription", filename);
+
+        exportFile(resp, currentTaskDetails, transcript, "transcription");
       } else {
         const resp = await res.json();
 
@@ -486,8 +486,8 @@ const OrgLevelTaskList = () => {
 
       if (res.ok) {
         const resp = await res.blob();
-        const filename = res.headers.get('content-type');
-        exportFile(resp, currentTaskDetails, translate, "translation", filename);
+
+        exportFile(resp, currentTaskDetails, translate, "translation");
       } else {
         const resp = await res.json();
 

diff --git a/src/containers/Organization/Project/TaskList.jsx b/src/containers/Organization/Project/TaskList.jsx
@@ -534,8 +534,8 @@ const TaskList = () => {
 
       if (res.ok) {
         const resp = await res.blob();
-        const filename = res.headers.get('content-type');
-        exportFile(resp, currentTaskDetails, transcript, "transcription", filename);
+
+        exportFile(resp, currentTaskDetails, transcript, "transcription");
       } else {
         const resp = await res.json();
 
@@ -575,8 +575,8 @@ const TaskList = () => {
 
       if (res.ok) {
         const resp = await res.blob();
-        const filename = res.headers.get('content-type');
-        exportFile(resp, currentTaskDetails, translate, "translation", filename);
+
+        exportFile(resp, currentTaskDetails, translate, "translation");
       } else {
         const resp = await res.json();
 

diff --git a/src/containers/Organization/Video/VoiceOverRightPanel1.jsx b/src/containers/Organization/Video/VoiceOverRightPanel1.jsx
@@ -789,8 +789,8 @@ const VoiceOverRightPanel1 = ({ currentIndex, setCurrentIndex, showTimeline, seg
 
       if (res.ok) {
         const resp = await res.blob();
-        const filename = res.headers.get('content-type');
-        exportFile(resp, taskData, transcript, "transcription", filename);
+
+        exportFile(resp, taskData, transcript, "transcription");
       } else {
         const resp = await res.json();
 
@@ -828,8 +828,8 @@ const VoiceOverRightPanel1 = ({ currentIndex, setCurrentIndex, showTimeline, seg
 
       if (res.ok) {
         const resp = await res.blob();
-        const filename = res.headers.get('content-type');
-        exportFile(resp, taskData, translate, "translation", filename);
+
+        exportFile(resp, taskData, translate, "translation");
       } else {
         const resp = await res.json();
 

diff --git a/src/utils/subtitleUtils.js b/src/utils/subtitleUtils.js
@@ -704,7 +704,7 @@ export const exportVoiceover = (data, taskDetails, exportTypes) => {
   }
 };
 
-export const exportFile = (data, taskDetails, exportType, type, filename) => {
+export const exportFile = (data, taskDetails, exportType, type) => {
   const {
     video: videoId,
     src_language: sourceLanguage,
@@ -740,9 +740,7 @@ export const exportFile = (data, taskDetails, exportType, type, filename) => {
   let fileName = "";
   if (specialOrgIds.includes(userOrgId) && description.length) {
     fileName = `${description}.${format}`;
-  }else if(filename.length){
-    fileName = `${filename}.${format}`;
-  }else {
+  } else {
     fileName = `Chitralekha_Video${videoId}_${YYYYMMDD}_${HHMMSS}_${language}.${format}`;
   }