Merge branch 'develop2' into master

package.json

@@ -30,6 +30,7 @@
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.5",
     "react-joyride": "^2.5.3",
+    "react-json-tree": "^0.19.0",
     "react-material-ui-carousel": "^3.4.2",
     "react-mui-dropzone": "^4.0.7",
     "react-paginate": "^8.1.4",

src/common/Header.jsx

@@ -230,7 +230,8 @@ const Header = () => {
                     Tasks
                   </NavLink>
                 </Typography>
-                {userData?.role == "ADMIN" && <Typography variant="body1">
+                {(userData?.role === "ADMIN" || userData?.role==="ORG_OWNER") && (
+                  <Typography variant="body1">
                     <NavLink
                       to={`/admin`}
                       className={({ isActive }) =>
@@ -241,7 +242,8 @@ const Header = () => {
                     >
                       Admin
                     </NavLink>
-                  </Typography>}
+                  </Typography>
+                )}
                 </>
                 {/* <Typography variant="body1">
                   <NavLink

src/config/apiendpoint.js

@@ -23,7 +23,11 @@ const endpoints = {
 
   //Video
   video: "/video/",
+  getVideoTasks: '/video/list_tasks',
+  listVideosTasks:'/video/get_listings',
   transcript: "/transcript/",
+  GetAllTranscriptions:"/transcript/retrieve_all_transcriptions/",
+  GetAllTranslations:"/translation/retrieve_all_translations/",
   translation: "/translation/",
   voiceover: "/voiceover/",
   videoSubtitle: "/transcript/get_word_aligned_json/?video_id",
@@ -45,4 +49,4 @@ const endpoints = {
   glossary: "/glossary/",
 };
 
-export default endpoints;
+export default endpoints;

src/config/reportConfig.js

@@ -25,6 +25,7 @@ export const languagelevelStats = [
   { lable: "Transcript", value: "transcript_stats" },
   { lable: "Translation", value: "translation_stats" },
   { lable: "Voiceover", value: "voiceover_stats" },
+  { lable: "Translation Voiceover", value: "translation_voiceover_stats" },
 ];
 
 export const projectReportLevels = [

src/config/tableColumns.js

@@ -196,6 +196,15 @@ export const videoTaskListColumns = [
       },
     },
   },
+  {
+    name: "eta",
+    label: "ETA",
+    options: {
+      customBodyRender: (value) => {
+        return <Box>{moment(value).format("DD/MM/YYYY HH:mm:ss")}</Box>;
+      },
+    },
+  },
   {
     name: "status",
     label: "Status",
@@ -338,6 +347,20 @@ export const taskListColumns = [
       },
     },
   },
+  {
+    name: "eta",  
+    label: "ETA",  
+    options: {
+      customBodyRender: (value) => {
+        if (value) {
+          const formattedETA = new Date(value).toLocaleString();
+          return <Box>{formattedETA}</Box>;
+        }
+        return <Box>N/A</Box>;
+      },
+    },
+  },
+
   {
     name: "time_spent",
     label: "Time Spent",