FWF-4820: [BugFix] Reviewer journey latest

forms-flow-review/src/components/AttributeFilterModal/AttributeFIlterModalBody.tsx

@@ -238,6 +238,11 @@ const createFilterShareOption = (labelKey, value) => ({
       return {
         name: filterName,
         criteria,
+        id: attributeFilter?.id,
+        created: attributeFilter?.created,
+        modified: attributeFilter?.modified,
+        createdBy:attributeFilter?.createdBy,
+        modifiedBy:attributeFilter?.modifiedBy,
         parentFilterId: selectedFilter.id,
         roles,
         users,

forms-flow-review/src/components/AttributeFilterModal/AttributeFilterModal.tsx

@@ -57,7 +57,10 @@ export const AttributeFilterModal = ({ show, onClose, toggleModal }) => {
       attributeFilterToEdit?.id
     );
     setUpdateSuccess(onClose, 2);
+    const filterList = attributeFilterList.filter((item) => item.id !== response.data.id);
     dispatch(setSelectedBpmAttributeFilter(response.data));
+    const newAttributeFilterList = [response.data, ...filterList];
+    dispatch(setAttributeFilterList(newAttributeFilterList));
     dispatch(fetchServiceTaskList(response.data, null, 1, limit));
   };
 

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

@@ -212,7 +212,7 @@ const SaveFilterTab = ({
       return null; 
     }
 
-    if (createFilters && selectedFilter.name !== "All Tasks") {
+    if (createFilters && (selectedFilter.name === "All Tasks" && !filterToEdit)) {
       return (
         <div className="pt-4">
           <CustomButton

forms-flow-review/src/components/TaskList/AttributeFilterDropdown.tsx

@@ -61,9 +61,11 @@ const AttributeFilterDropdown = () => {
       (item) => item.name !== "formId"
     );
     // we need to patch the current criteria with process variables from attribute filter
-    if (processVariables && processVariables.length > 0) {
-      currentCriteria.processVariables?.push(...processVariables);    
-  }
+   if (processVariables && processVariables.length > 0) {
+    currentCriteria.processVariables = currentCriteria.processVariables || [];
+    currentCriteria.processVariables.push(...processVariables);
+}
+
     // changing  assignee if assignee changed in attirbuite filter
     currentCriteria.assignee =  attributeFilter?.criteria.assignee;
     const data = { ...selectedFilter, criteria: currentCriteria };
@@ -91,16 +93,11 @@ const AttributeFilterDropdown = () => {
             }),
           }))
         : [];
-    const noAttributeFilter = {
-      content: <em>{t("No attribute filters found")}</em>,
-      onClick: () => {},
-      type: "none",
-      dataTestId: "no-attr-filters",
-      ariaLabel: t("No attribute filters available"),
-    };
+
 
     const clearAttributeFilter = {
-      content: <em>{t("All Fields")}</em>,
+      className:  !selectedAttributeFilter?.id ? "selected-filter-item" : "",   
+      content: <>{t("All Fields")}</>,
       onClick: () => changeAttributeFilterSelection(null),
       type: "none",
       dataTestId: "no-attr-filters",
@@ -144,7 +141,7 @@ const AttributeFilterDropdown = () => {
         reorderOption,
       ];
     } else {
-      options = [noAttributeFilter, customAttribute];
+      options = [clearAttributeFilter, customAttribute];
     }
 
     return options;
@@ -171,7 +168,7 @@ const AttributeFilterDropdown = () => {
         dropdownType="DROPDOWN_WITH_EXTRA_ACTION"
         dropdownItems={filterDropdownAttributeItems()}
         extraActionIcon={<PencilIcon color="white" />}
-        extraActionOnClick={handleEditAttrFilter}
+        extraActionOnClick={!selectedAttributeFilter ? handleToggleAttrFilterModal : handleEditAttrFilter}
         dataTestId="attribute-filter-dropdown"
         ariaLabel={t("Select attribute filter")}
         extraActionAriaLabel={t("Edit attribute filters")}

forms-flow-review/src/components/TaskList/TaskList.tsx

@@ -206,8 +206,8 @@ const TaskList = () => {
         dispatch(setDateRangeFilter({ startDate: null, endDate: null }));
         dispatch(fetchAttributeFilterList(currentFilter.id));
         dispatch(setBPMTaskListActivePage(1));
-        dispatch(setTaskListLimit(15));
-        dispatch(fetchServiceTaskList(currentFilter, null, 1, 15));
+        dispatch(setTaskListLimit(25));
+        dispatch(fetchServiceTaskList(currentFilter, null, 1, 25));
       });
     }
   }, [defaultFilterId]);

forms-flow-review/src/components/TaskList/TasklistTable.tsx

@@ -39,24 +39,32 @@ interface Task {
   assignee?: string;
   _embedded?: {
     variable?: Array<{ name: string; value: any }>;
+    candidateGroups?: Array<{ groupId: string }>;
   };
 }
 
 const getCellValue = (column: Column, task: Task) => {
   const { sortKey } = column;
   const { name: taskName, created, _embedded } = task ?? {};
   const variables = _embedded?.variable ?? [];
+  const candidateGroups = _embedded?.candidateGroups ?? [];
+
   if (column.sortKey === "applicationId") {
     return variables.find((v) => v.name === "applicationId")?.value ?? "-";
   }
 
+
+
   switch (sortKey) {
     case "name":
       return taskName ?? "-";
     case "created":
       return created ? HelperServices.getLocaldate(created) : "N/A";
     case "assignee":
       return <TaskAssigneeManager task={task} />;
+     case "roles": {
+    return candidateGroups.length > 0 ? candidateGroups[0]?.groupId ?? "-" : "-";
+  }
     default:
       return variables.find((v) => v.name === sortKey)?.value ?? "-";
   }

forms-flow-theme/scss/_table.scss

@@ -353,7 +353,7 @@ $white-color: var(--ff-white);
         background-color: var(--ff-body-bg);
         z-index: 2;
         border-left: 1px solid var(--ff-gray-medium-dark);
-        text-align: center;
+        text-align: left;
         vertical-align: middle; 
         .empty-table-message{
           border-left: none !important;