Merge pull request #909 from AI4Bharat/master

Update develop to master
AI4Bharat · Feb 8, 2024 · b41159c · b41159c
2 parents 001a752 + f86dff0
commit b41159c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 20 deletions.
diff --git a/src/redux/actions/api/ProjectDetails/DownloadCSVProject.js b/src/redux/actions/api/ProjectDetails/DownloadCSVProject.js
@@ -4,11 +4,11 @@
  import constants from "../../../constants";
 
  export default class DownloadProjectCsvAPI extends API {
-    constructor(projectId,taskStatus, downloadMetadataToggle=false,timeout = 2000) {
+    constructor(projectId,taskStatus,timeout = 2000) {
       super("POST", timeout, false);
       this.projectBody={}//object with key-value pair
       this.type = constants.DOWNLOAD_PROJECT_CSV;
-      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getProjects}${projectId}/download/?export_type=CSV&task_status=${taskStatus}&include_input_data_metadata_json=${downloadMetadataToggle}`;
+      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getProjects}${projectId}/download/?export_type=CSV&task_status=${taskStatus}`;
     }
 
     processResponse(res) {

diff --git a/src/redux/actions/api/ProjectDetails/DownloadJSONProject.js b/src/redux/actions/api/ProjectDetails/DownloadJSONProject.js
@@ -4,11 +4,11 @@
  import constants from "../../../constants";
 
  export default class DownloadProjectJSONAPI extends API {
-    constructor(projectId, taskStatus ,downloadMetadataToggle=false, timeout = 2000) {
+    constructor(projectId, taskStatus , timeout = 2000) {
       super("POST", timeout, false);
       this.projectBody={}//object with key-value pair
       this.type = constants.DOWNLOAD_PROJECT_JSON;
-      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getProjects}${projectId}/download/?export_type=JSON&task_status=${taskStatus}&include_input_data_metadata_json=${downloadMetadataToggle}`;
+      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getProjects}${projectId}/download/?export_type=JSON&task_status=${taskStatus}`;
     }
 
     processResponse(res) {

diff --git a/src/redux/actions/api/ProjectDetails/DownloadTSVProject.js b/src/redux/actions/api/ProjectDetails/DownloadTSVProject.js
@@ -4,11 +4,11 @@
  import constants from "../../../constants";
 
  export default class DownloadProjectTsvAPI extends API {
-    constructor(projectId,taskStatus,downloadMetadataToggle=false, timeout = 2000) {
+    constructor(projectId,taskStatus, timeout = 2000) {
       super("POST", timeout, false);
      this.type = constants.DOWNLOAD_PROJECT_TSV;
      this.projectBody={}//object with key-value pair
-      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getProjects}${projectId}/download/?export_type=TSV&task_status=${taskStatus}&include_input_data_metadata_json=${downloadMetadataToggle}`;
+      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getProjects}${projectId}/download/?export_type=TSV&task_status=${taskStatus}`;
     }
 
     processResponse(res) {

diff --git a/src/ui/pages/component/Tabs/AdvancedOperation.jsx b/src/ui/pages/component/Tabs/AdvancedOperation.jsx
@@ -699,7 +699,7 @@ const AdvancedOperation = (props) => {
           sx={{ mt: 1 }}
         >
           {/* <div className={classes.divider} ></div> */}
-          <Grid item xs={12} sm={12} md={12} lg={12} xl={12}>
+          {/* <Grid item xs={12} sm={12} md={12} lg={12} xl={12}>
             <FormControlLabel
               control={<Switch color="primary" />}
               label="Download Metadata"
@@ -709,7 +709,7 @@ const AdvancedOperation = (props) => {
               disabled ={userRole.WorkspaceManager === loggedInUserData?.role?true:false}
 
             />
-          </Grid>
+          </Grid> */}
         </Grid>
 
         <Dialog

diff --git a/src/ui/pages/component/common/Header.jsx b/src/ui/pages/component/common/Header.jsx
@@ -446,17 +446,6 @@ console.log(unseenNotifications,'uuu');
               Projects
             </NavLink>
           </Typography>
-          <Typography variant="body1">
-            <NavLink
-              to="/datasets"
-              className={({ isActive }) =>
-                isActive ? classes.highlightedMenu : classes.headerMenu
-              }
-              activeClassName={classes.highlightedMenu}
-            >
-              Datasets
-            </NavLink>
-          </Typography>
           <Typography variant="body1">
             <NavLink
               to="/analytics"

diff --git a/src/ui/pages/container/CL-Transcription/AudioPanel.jsx b/src/ui/pages/container/CL-Transcription/AudioPanel.jsx
@@ -51,11 +51,20 @@ const AudioPanel = memo( ({
   //   }, [$video]);
 
 //console.log(TaskDetails?.data?.audio_url,"TaskDetailsTaskDetailsTaskDetails")
+
+  useEffect(() => {
+    const audio = document.getElementById('audio-panel');
+    audio.oncontextmenu = function (e) {
+      e.preventDefault();
+    };
+  }, [])
+
   return (
     <Grid style={{ padding: "0px 20px 0px 20px" }}>
 
       {/* <div className={classes.videoPlayerParent} style={{ display: "flex" }}> */}
         <audio
+          id ="audio-panel"
           controls
           controlsList="nodownload"
           src={TaskDetails?.data?.audio_url}

diff --git a/src/utils/TabsSuggestionData/TabsSuggestionData.js b/src/utils/TabsSuggestionData/TabsSuggestionData.js