Added status filter to all jobs list IO-581

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -3,13 +3,25 @@ import { Button, Input, Table } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import { alphaSort } from "../../utils/sorters";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
+import _ from "lodash";
 
-export default function JobsList({ refetch, loading, jobs, total }) {
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
   const search = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder } = search;
   const history = useHistory();
@@ -36,9 +48,9 @@ export default function JobsList({ refetch, loading, jobs, total }) {
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      // sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       width: "25%",
-      sortOrder: sortcolumn === "owner" && sortorder,
+      // sortOrder: sortcolumn === "owner" && sortorder,
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
@@ -79,6 +91,10 @@ export default function JobsList({ refetch, loading, jobs, total }) {
       render: (text, record) => {
         return record.status || t("general.labels.na");
       },
+      filters: bodyshop.md_ro_statuses.statuses.map((s) => {
+        return { text: s, value: [s] };
+      }),
+      onFilter: (value, record) => value.includes(record.status),
     },
 
     {
@@ -162,9 +178,15 @@ export default function JobsList({ refetch, loading, jobs, total }) {
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
+    console.log("filters :>> ", filters);
     search.page = pagination.current;
     search.sortcolumn = sorter.columnKey;
     search.sortorder = sorter.order;
+    if (filters.status) {
+      search.statusFilters = JSON.stringify(_.flattenDeep(filters.status));
+    } else {
+      delete search.statusFilters;
+    }
     history.push({ search: queryString.stringify(search) });
   };
 
@@ -206,3 +228,4 @@ export default function JobsList({ refetch, loading, jobs, total }) {
     </div>
   );
 }
+export default connect(mapStateToProps, mapDispatchToProps)(JobsList);