Merge pull request #49 from AI4Bharat/conflict

Conflict
AI4Bharat · Feb 5, 2024 · 200beee · 200beee
2 parents 8f98ee2 + 143d4f5
commit 200beee
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/src/components/Project/BasicSettings.jsx b/src/components/Project/BasicSettings.jsx
@@ -91,7 +91,7 @@ const BasicSettings = (props) => {
             tgt_language: targetLanguage,
             src_language: sourceLanguage,
             project_type: ProjectDetails.project_type,
-            project_mode: ProjectDetails.project_mode,
+            // project_mode: ProjectDetails.project_mode,
             users: ProjectDetails.users,
             annotation_reviewers: ProjectDetails.annotation_reviewers,
             max_pending_tasks_per_user: newDetails.max_pending_tasks_per_user,

diff --git a/src/components/Project/ProjectCardList.jsx b/src/components/Project/ProjectCardList.jsx
@@ -178,7 +178,7 @@ const ProjectCardList = (props) => {
             el.project_type,
             userRole ? userRole : el.project_stage,
             el.tgt_language == null ? "-" : el.tgt_language,
-            el.project_mode,
+            // el.project_mode,
             el.workspace_id,
             <Link to={`/projects/${el.id}`} style={{ textDecoration: "none" }} key={i}>
               <CustomButton

diff --git a/src/components/Project/SuperCheckerTasks.jsx b/src/components/Project/SuperCheckerTasks.jsx
@@ -567,7 +567,7 @@ if (typeof window !== 'undefined') {
         )
         ) 
         &&
-        (ProjectDetails.project_mode === "Annotation" ? (
+        (ProjectDetails.project_type === "InstructionDrivenChat" ? (
           ProjectDetails.is_published ? (
             <Grid container direction="row" spacing={2} sx={{ mb: 2 }}>
               {((props.type === "superChecker" &&

diff --git a/src/components/Project/TaskTable.jsx b/src/components/Project/TaskTable.jsx
@@ -436,7 +436,7 @@ const TaskTable = (props) => {
                 label={
                   <Typography sx={{ color: "#FFFFFF" }} variant="body2">
                     {(props.type === "annotation" && ProjectDetails?.annotators?.some((a) => a.id === userDetails?.id)) ?
-                      (ProjectDetails.project_mode === "Annotation"
+                      (ProjectDetails.project_type === "InstructionDrivenChat"
                         ? "Annotate"
                         : "Edit")
                       : "View"
@@ -885,7 +885,7 @@ const TaskTable = (props) => {
       console.log(rsp_data);
     }
   };
-
+  console.log(ProjectDetails,"lll");
   return (
     <div>
       {((props.type === "annotation" &&
@@ -896,7 +896,7 @@ const TaskTable = (props) => {
           ProjectDetails?.annotation_reviewers?.some(
             (reviewer) => reviewer.id === userDetails?.id
           ))) &&
-        (ProjectDetails.project_mode === "Annotation" ? (
+        (ProjectDetails.project_type === "InstructionDrivenChat" ? (
           ProjectDetails.is_published ? (
             <Grid container direction="row" spacing={2} sx={{ mb: 2 }}>
               {((props.type === "annotation" &&

diff --git a/src/components/common/WorkspaceTable.jsx b/src/components/common/WorkspaceTable.jsx
@@ -36,8 +36,7 @@ const WorkspaceTable = (props) => {
 
     useEffect(() => {
         dispatch(fetchWorkspaceData(currentPageNumber)); 
-        // console.log("fired now")
-    }, [currentPageNumber,dispatch]);
+    }, [currentPageNumber]);
 
     useEffect(() => {       
         dispatch(fetchWorkspaceData(currentPageNumber));