Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflict #49

Merged
merged 2 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Project/BasicSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Project/ProjectCardList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/Project/SuperCheckerTasks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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" &&
Expand Down
6 changes: 3 additions & 3 deletions src/components/Project/TaskTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -885,7 +885,7 @@ const TaskTable = (props) => {
console.log(rsp_data);
}
};

console.log(ProjectDetails,"lll");
return (
<div>
{((props.type === "annotation" &&
Expand All @@ -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" &&
Expand Down
3 changes: 1 addition & 2 deletions src/components/common/WorkspaceTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ const WorkspaceTable = (props) => {

useEffect(() => {
dispatch(fetchWorkspaceData(currentPageNumber));
// console.log("fired now")
}, [currentPageNumber,dispatch]);
}, [currentPageNumber]);

useEffect(() => {
dispatch(fetchWorkspaceData(currentPageNumber));
Expand Down
Loading