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

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

Author: arun-s-aot

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

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

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

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

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

@@ -82,29 +82,10 @@ 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: {
-      ...criteria,
+      ...clonedFilter?.criteria,
       ...(processVariables.processVariables?.length && processVariables),
       ...(assignee.assignee && assignee),
       ...date,

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

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