Merge pull request #1227 from AletheiaFact/filter-tasks-by-cross-chec…

…king-and-reviews Implemented kanban filter to visualize assigned cross-checkings and assigned reviewers
AletheiaFact · Jun 8, 2024 · a205865 · a205865
2 parents 1e32cf2 + be531d7
commit a205865
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 21 deletions.
diff --git a/public/locales/en/kanban.json b/public/locales/en/kanban.json
@@ -1,5 +1,7 @@
 {
     "claimBy": "Claim by",
     "assignedTo": "Fact-checkers",
-    "myTasks": "My tasks only"
+    "myTasks": "My tasks only",
+    "myCrossChecks": "My cross-checks only",
+    "myReviews": "My reviews only"
 }
diff --git a/public/locales/pt/kanban.json b/public/locales/pt/kanban.json
@@ -1,5 +1,7 @@
 {
     "claimBy": "Afirmação de",
     "assignedTo": "Checadores",
-    "myTasks": "Apenas minhas tarefas"
+    "myTasks": "Apenas minhas tarefas",
+    "myCrossChecks": "Apenas meus cross-checkings",
+    "myReviews": "Minhas revisões"
 }
diff --git a/server/claim-review-task/claim-review-task.service.ts b/server/claim-review-task/claim-review-task.service.ts
@@ -73,12 +73,19 @@ export class ClaimReviewTaskService {
     _buildPipeline(value, filterUser, nameSpace) {
         const pipeline = [];
         const query = getQueryMatchForMachineValue(value);
+        const fieldMap = {
+            assigned: "machine.context.reviewData.usersId",
+            crossChecked: "machine.context.reviewData.crossCheckerId",
+            reviewed: "machine.context.reviewData.reviewerId",
+        };
 
-        if (filterUser === true) {
-            query["machine.context.reviewData.usersId"] = Types.ObjectId(
-                this.req.user._id
-            );
-        }
+        Object.keys(filterUser).forEach((key) => {
+            const value = filterUser[key];
+            if (value === true || value === "true") {
+                const queryPath = fieldMap[key];
+                query[queryPath] = Types.ObjectId(this.req.user._id);
+            }
+        });
 
         pipeline.push(
             { $match: query },
@@ -511,11 +518,19 @@ export class ClaimReviewTaskService {
 
     async countReviewTasksNotDeleted(query, filterUser, nameSpace) {
         try {
-            if (filterUser === true) {
-                query["machine.context.reviewData.usersId"] = Types.ObjectId(
-                    this.req.user._id
-                );
-            }
+            const fieldMap = {
+                assigned: "machine.context.reviewData.usersId",
+                crossChecked: "machine.context.reviewData.crossCheckerId",
+                reviewed: "machine.context.reviewData.reviewerId",
+            };
+
+            Object.keys(filterUser).forEach((key) => {
+                const value = filterUser[key];
+                if (value === true || value === "true") {
+                    const queryPath = fieldMap[key];
+                    query[queryPath] = Types.ObjectId(this.req.user._id);
+                }
+            });
 
             const pipeline = [
                 { $match: query },

diff --git a/server/claim-review-task/dto/get-tasks.dto.ts b/server/claim-review-task/dto/get-tasks.dto.ts
@@ -1,7 +1,7 @@
 import {
-    IsBoolean,
     IsInt,
     IsNumber,
+    IsObject,
     IsOptional,
     IsString,
     Min,
@@ -23,9 +23,13 @@ export class GetTasksDTO {
     @IsString()
     value: string;
 
-    @IsBoolean()
+    @IsObject()
     @IsOptional()
-    filterUser?: boolean;
+    filterUser?: {
+        assigned: boolean;
+        crossChecked: boolean;
+        reviewerd: boolean;
+    };
 
     @IsString()
     @IsOptional()

diff --git a/src/api/ClaimReviewTaskApi.ts b/src/api/ClaimReviewTaskApi.ts
@@ -13,7 +13,7 @@ const getClaimReviewTasks = (options) => {
         order: options.order || "asc",
         pageSize: options.pageSize ? options.pageSize : 5,
         value: options.value,
-        filterUser: options.filterUser ? true : null,
+        filterUser: options.filterUser,
         nameSpace: options.nameSpace ? options.nameSpace : NameSpaceEnum.Main,
     };
     return request

diff --git a/src/components/Kanban/KanbanCol.tsx b/src/components/Kanban/KanbanCol.tsx
@@ -19,7 +19,11 @@ const StyledColumn = styled.div`
 interface KanbanColProps {
     nameSpace: string;
     state: ReviewTaskStates;
-    filterUser: boolean;
+    filterUser: {
+        assigned: boolean;
+        crossChecked: boolean;
+        reviewed: boolean;
+    };
 }
 
 const KanbanCol = ({ nameSpace, state, filterUser }: KanbanColProps) => {

diff --git a/src/components/Kanban/KanbanView.tsx b/src/components/Kanban/KanbanView.tsx
@@ -21,7 +21,11 @@ const KanbanView = () => {
             state !== ReviewTaskStates.addCommentCrossChecking &&
             state !== ReviewTaskStates.rejected
     );
-    const [filterUser, setFilterUser] = useState(false);
+    const [filterUserTasks, setFilterUserTasks] = useState({
+        assigned: false,
+        crossChecked: false,
+        reviewed: false,
+    });
 
     return (
         <Row justify="center" style={{ padding: "3vh 0", height: "100%" }}>
@@ -36,12 +40,48 @@ const KanbanView = () => {
                 <FormControlLabel
                     control={
                         <Switch
-                            checked={filterUser}
-                            onChange={() => setFilterUser(!filterUser)}
+                            checked={filterUserTasks.assigned}
+                            onChange={() =>
+                                setFilterUserTasks((prev) => ({
+                                    reviewed: false,
+                                    crossChecked: false,
+                                    assigned: !prev.assigned,
+                                }))
+                            }
                         />
                     }
                     label={t("kanban:myTasks")}
                 />
+                <FormControlLabel
+                    control={
+                        <Switch
+                            checked={filterUserTasks.crossChecked}
+                            onChange={() =>
+                                setFilterUserTasks((prev) => ({
+                                    assigned: false,
+                                    reviewed: false,
+                                    crossChecked: !prev.crossChecked,
+                                }))
+                            }
+                        />
+                    }
+                    label={t("kanban:myCrossChecks")}
+                />
+                <FormControlLabel
+                    control={
+                        <Switch
+                            checked={filterUserTasks.reviewed}
+                            onChange={() =>
+                                setFilterUserTasks((prev) => ({
+                                    assigned: false,
+                                    crossChecked: false,
+                                    reviewed: !prev.reviewed,
+                                }))
+                            }
+                        />
+                    }
+                    label={t("kanban:myReviews")}
+                />
             </Col>
             <Col
                 span={23}
@@ -59,7 +99,7 @@ const KanbanView = () => {
                             key={state}
                             nameSpace={nameSpace}
                             state={ReviewTaskStates[state]}
-                            filterUser={filterUser}
+                            filterUser={filterUserTasks}
                         />
                     );
                 })}