Merge pull request #1143 from AOT-Technologies/feature/FWF-6254-task-assignment-issue

FWF-6254-task-listing-for-direct-assignees

Author: arun-s-aot

forms-flow-review/src/components/TaskFilterModal/TaskFilterModalBody.tsx

@@ -162,9 +162,15 @@ const TaskFilterModalBody = ({
 
   const getCriteria = () => {
     const criteria: FilterCriteria = {
-      includeAssignedTasks: true,
-      candidateGroupsExpression: "${currentUserGroups()}",
-      // If sorting is based on submission id or form name, that should be passed as process variable in sorting
+      orQueries: [
+        {
+          candidateGroupsExpression: "${currentUserGroups()}",
+          includeAssignedTasks: true,
+        },
+        {
+          assigneeExpression: "${currentUser()}",
+        },
+      ],
       sorting: sortValue === "applicationId" || sortValue === "formName" ?
         ([{
           sortBy: "processVariable", sortOrder: sortOrder,
@@ -173,8 +179,6 @@ const TaskFilterModalBody = ({
         [{ sortBy: sortValue, sortOrder: sortOrder }],
     };
 
-    
-
     if (selectedForm?.formId) {
       criteria.processVariables = [];
       criteria.processVariables.push({
@@ -185,20 +189,24 @@ const TaskFilterModalBody = ({
     }
 
     if (accessOption === SPECIFIC_ROLE) {
-   const trimmedAccessValue = trimFirstSlash(accessValue);
-   criteria.candidateGroup = addTenantPrefixIfNeeded(
-     trimmedAccessValue,
-     tenantKey,
-     MULTITENANCY_ENABLED
-   );
-  delete criteria.assignee;
-    } else if(accessOption === SPECIFIC_ASSIGNEE){
+      const trimmedAccessValue = trimFirstSlash(accessValue);
+      const candidateGroup = addTenantPrefixIfNeeded(
+        trimmedAccessValue,
+        tenantKey,
+        MULTITENANCY_ENABLED
+      );
+      criteria.orQueries = [
+        {
+          candidateGroup: candidateGroup,
+          includeAssignedTasks: true,
+        },
+        {
+          assigneeExpression: "${currentUser()}",
+        },
+      ];
+    } else if (accessOption === SPECIFIC_ASSIGNEE) {
+      delete criteria.orQueries;
       criteria.assignee = accessValue;
-      delete criteria.candidateGroup;
-    }
-    else{
-      delete criteria.assignee;
-      delete criteria.candidateGroup;
     }
 
     return criteria;

forms-flow-review/src/constants/allTasksPayload.ts

@@ -9,8 +9,15 @@ const useAllTasksPayload = () => {
   return {
     name: "All Tasks",
     criteria: {
-      includeAssignedTasks: true,
-      candidateGroupsExpression: "${currentUserGroups()}",
+      orQueries: [
+        {
+          candidateGroupsExpression: "${currentUserGroups()}",
+          includeAssignedTasks: true,
+        },
+        {
+          assigneeExpression: "${currentUser()}",
+        },
+      ],
       sorting: [
         {
           sortBy: "created",

forms-flow-review/src/helper/taskHelper.ts

@@ -82,10 +82,29 @@ export const createReqPayload = (
       };
 
   const date = buildDateRangePayload(dateRange);
+
+  const criteria = clonedFilter?.criteria || {};
+
+  // Transform old-format filters (without orQueries) to use orQueries
+  // so that tasks directly assigned to the user are also returned.
+  if (!criteria.orQueries && criteria.candidateGroupsExpression) {
+    criteria.orQueries = [
+      {
+        candidateGroupsExpression: criteria.candidateGroupsExpression,
+        includeAssignedTasks: true,
+      },
+      {
+        assigneeExpression: "${ currentUser() }",
+      },
+    ];
+    delete criteria.candidateGroupsExpression;
+    delete criteria.includeAssignedTasks;
+  }
+
   const updatedFilter = {
     ...clonedFilter,
     criteria: {
-      ...clonedFilter?.criteria,
+      ...criteria,
       ...(processVariables.processVariables?.length && processVariables),
       ...(assignee.assignee && assignee),
       ...date,

forms-flow-review/src/types/taskFilter.ts

@@ -4,12 +4,14 @@ export interface FilterCriteria {
     includeAssignedTasks?: boolean;
     candidateGroup?: string;
     assignee?: string; 
+    assigneeExpression?: string;
     processVariables?: Array<{ 
       name: string;
       operator: string;
       value: string;
     }>;
-    candidateGroupsExpression: string;
+    candidateGroupsExpression?: string;
+    orQueries?: Array<Record<string, any>>;
     sorting: Array<{
   }>;
     createdAfter?: string;