Filter count (AOT-Technologies#1980)

* task attribute adjustments * task variables and attribute changes * fixed test cases * submissionId aligned in list view and card view * fixed filter dropdown count issue and priority issue --------- Co-authored-by: shuhaib-aot <[email protected]>
Bonymol-aot · Mar 28, 2024 · 5b58cab · 5b58cab
1 parent ed56525
commit 5b58cab
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 30 deletions.
diff --git a/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskListView.js b/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskListView.js
@@ -180,7 +180,7 @@ const ServiceTaskListView = React.memo((props) => {
                       ?.applicationId && (
                       <Col xs={2}>
                         <div className="col-12">
-                          <h6 className="fw-bold">{t("Submission ID")}</h6>
+                          <h6 className="fw-bold">{t("Submission Id")}</h6>
                           <h6>
                             {
                               task?._embedded?.variable?.filter(
@@ -222,9 +222,10 @@ const ServiceTaskListView = React.memo((props) => {
                             (variableItem) => variableItem.name === e.name
                           );
                           return (
-                            <Col xs={2} key={i}>
+                            <Col className= {`${i == adjustedValues.length - 1 ? 'd-flex' : ''}`} xs={2} key={i}>
+                              <div>
                               <div className="col-12 word-break">
-                                <h6 className="fw-bold">{data?.label}</h6>
+                                <h6 className="fw-bold">{data?.label}</h6> 
                               </div>
                               <div className="d-flex col-12">
                                 <h6>
@@ -233,6 +234,35 @@ const ServiceTaskListView = React.memo((props) => {
                                   </u>
                                 </h6>
                               </div>
+                              </div>
+
+                              {taskListAttributes?.length >= 1  
+                              && i == adjustedValues.length - 1 && 
+                               !vissibleAttributes?.taskVisibleAttributes?.priority &&
+                              (
+
+                     <div
+                       className="justify-content-center ms-4"
+                       onClick={(e) => {
+                         e.stopPropagation();
+                         handleToggleTaskVariable(task.id);
+                       }}
+                       title={t("Click for task variables")}
+                     >
+                       <i
+                         className="fa fa-angle-down"
+                         style={{
+                           transform: `${
+                             expandedTasks[task.id]
+                               ? "rotate(180deg)"
+                               : "rotate(0deg)"
+                           }`,
+                         }}
+                         aria-hidden="true"
+                       />
+                     </div>
+
+                 )}
                             </Col>
                           );
                         })
@@ -242,7 +272,8 @@ const ServiceTaskListView = React.memo((props) => {
 
 
                       {vissibleAttributes?.taskVisibleAttributes?.priority &&
-                        <Col xs={1}>
+                        <Col xs={2} className="d-flex">
+                          <div>
                           <div className="col-12">
                             <h6 className="fw-bold">{t("Priority")}</h6>
                           </div>
@@ -263,34 +294,37 @@ const ServiceTaskListView = React.memo((props) => {
                               </u>
                             </h6>
                           </div>
+                          </div>
+
+                          {taskListAttributes?.length >= 1  && (
+
+                     <div
+                       className="justify-content-center ms-4"
+                       onClick={(e) => {
+                         e.stopPropagation();
+                         handleToggleTaskVariable(task.id);
+                       }}
+                       title={t("Click for task variables")}
+                     >
+                       <i
+                         className="fa fa-angle-down"
+                         style={{
+                           transform: `${
+                             expandedTasks[task.id]
+                               ? "rotate(180deg)"
+                               : "rotate(0deg)"
+                           }`,
+                         }}
+                         aria-hidden="true"
+                       />
+                     </div>
+
+                 )}
                         </Col>
                       }
 
 
-                    {taskListAttributes?.length >= 1  && (
-                      <Col xs={1}>
-                        <div
-                          className="justify-content-center"
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            handleToggleTaskVariable(task.id);
-                          }}
-                          title={t("Click for task variables")}
-                        >
-                          <i
-                            className="fa fa-angle-down"
-                            style={{
-                              transform: `${
-                                expandedTasks[task.id]
-                                  ? "rotate(180deg)"
-                                  : "rotate(0deg)"
-                              }`,
-                            }}
-                            aria-hidden="true"
-                          />
-                        </div>
-                      </Col>
-                    )}
+
                   </Row>
                   {expandedTasks[task.id] &&
                     task?._embedded?.variable?.some(

diff --git a/forms-flow-web/src/containers/TaskHead.js b/forms-flow-web/src/containers/TaskHead.js
@@ -4,9 +4,10 @@ import { push } from "connected-react-router";
 import { NavDropdown } from "react-bootstrap";
 import ServiceFlowFilterListDropDown from "../components/ServiceFlow/filter/ServiceTaskFilterListDropDown";
  import {MULTITENANCY_ENABLED} from "../constants/constants";
-import {setSelectedTaskID, setViewType } from '../actions/bpmTaskActions';
+import {setBPMFilterLoader, setBPMFiltersAndCount, setSelectedTaskID, setViewType } from '../actions/bpmTaskActions';
 import CreateNewFilterDrawer from "../components/ServiceFlow/list/sort/CreateNewFilter";
 import { useTranslation } from "react-i18next"; 
+import { fetchBPMTaskCount } from "../apiManager/services/bpmTaskServices";
 function TaskHead() {
   const dispatch = useDispatch();
   const { t } = useTranslation();
@@ -19,14 +20,22 @@ function TaskHead() {
   const isFilterLoading = useSelector(
     (state) => state.bpmTasks.isFilterLoading
   );
-
+  const filterListItems = useSelector((state) => state.bpmTasks.filterList);
   const isTaskListLoading = useSelector(
     (state) => state.bpmTasks.isTaskListLoading
   );
 
     const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : "/";
 
   const goToTask = () => {
+      fetchBPMTaskCount(filterListItems)
+      .then((res) => {
+        dispatch(setBPMFiltersAndCount(res.data));
+      })
+      .catch((err) => console.error(err))
+      .finally(() => {
+        dispatch(setBPMFilterLoader(false));
+      });
     dispatch(push(`${baseUrl}task`));
   };