diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index b5048d0ef..e247f5450 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -10,9 +10,10 @@ 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 { pageLimit } from "../../utils/config";
+import useLocalStorage from "../../utils/useLocalStorage";
import StartChatButton from "../chat-open-button/chat-open-button.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import {pageLimit} from "../../utils/config";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop,
@@ -25,6 +26,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
const search = queryString.parse(useLocation().search);
const [openSearchResults, setOpenSearchResults] = useState([]);
const [searchLoading, setSearchLoading] = useState(false);
+ const [filter, setFilter] = useLocalStorage("filter_jobs_all", null);
const { page, sortcolumn, sortorder } = search;
const history = useHistory();
@@ -93,6 +95,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
render: (text, record) => {
return record.status || t("general.labels.na");
},
+ filteredValue: filter?.status || null,
filters: bodyshop.md_ro_statuses.statuses.map((s) => {
return { text: s, value: [s] };
}),
@@ -189,6 +192,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
} else {
delete search.statusFilters;
}
+ setFilter(filters);
history.push({ search: queryString.stringify(search) });
};
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index fb2e1daa6..7761c0ed9 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -1,8 +1,8 @@
import {
- SyncOutlined,
+ BranchesOutlined,
ExclamationCircleFilled,
PauseCircleOutlined,
- BranchesOutlined,
+ SyncOutlined,
} from "@ant-design/icons";
import { useQuery } from "@apollo/client";
import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -14,382 +14,389 @@ import { Link, useHistory, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+import { onlyUnique } from "../../utils/arrayHelper";
+import { alphaSort, statusSort } from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
import AlertComponent from "../alert/alert.component";
import ChatOpenButton from "../chat-open-button/chat-open-button.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
+ bodyshop: selectBodyshop,
});
export function JobsList({ bodyshop }) {
- const searchParams = queryString.parse(useLocation().search);
- const { selected } = searchParams;
- const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
- .filter((screen) => !!screen[1])
- .slice(-1)[0];
- const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
- variables: {
- statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
- },
- fetchPolicy: "network-only",
- nextFetchPolicy: "network-only",
- });
+ const searchParams = queryString.parse(useLocation().search);
+ const { selected } = searchParams;
+ const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+ .filter((screen) => !!screen[1])
+ .slice(-1)[0];
+ const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
+ variables: {
+ statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
+ },
+ fetchPolicy: "network-only",
+ nextFetchPolicy: "network-only",
+ });
- const [state, setState] = useState({
- sortedInfo: {},
- filteredInfo: { text: "" },
- });
+ const [state, setState] = useState({ sortedInfo: {} });
+ const [filter, setFilter] = useLocalStorage("filter_jobs_list", null);
- const { t } = useTranslation();
- const history = useHistory();
- const [searchText, setSearchText] = useState("");
+ const { t } = useTranslation();
+ const history = useHistory();
+ const [searchText, setSearchText] = useState("");
- if (error) return ;
+ if (error) return ;
- const jobs = data
- ? searchText === ""
- ? data.jobs
- : data.jobs.filter(
- (j) =>
- (j.ro_number || "")
- .toString()
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.ownr_co_nm || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.comments || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.ownr_fn || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.ownr_ln || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
- (j.plate_no || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.v_model_desc || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.est_ct_fn || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.est_ct_ln || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.v_make_desc || "")
- .toLowerCase()
- .includes(searchText.toLowerCase())
- )
- : [];
+ const jobs = data
+ ? searchText === ""
+ ? data.jobs
+ : data.jobs.filter(
+ (j) =>
+ (j.ro_number || "")
+ .toString()
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.ownr_co_nm || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.comments || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.ownr_fn || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.ownr_ln || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
+ (j.plate_no || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.v_model_desc || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.est_ct_fn || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.est_ct_ln || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.v_make_desc || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase())
+ )
+ : [];
- const handleTableChange = (pagination, filters, sorter) => {
- setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
- };
+ const handleTableChange = (pagination, filters, sorter) => {
+ setState({ ...state, sortedInfo: sorter });
+ setFilter(filters);
+ };
- const handleOnRowClick = (record) => {
- if (record) {
- if (record.id) {
- history.push({
- search: queryString.stringify({
- ...searchParams,
- selected: record.id,
- }),
- });
- }
- }
- };
+ const handleOnRowClick = (record) => {
+ if (record) {
+ if (record.id) {
+ history.push({
+ search: queryString.stringify({
+ ...searchParams,
+ selected: record.id,
+ }),
+ });
+ }
+ }
+ };
- const columns = [
- {
- title: t("jobs.fields.ro_number"),
- dataIndex: "ro_number",
- key: "ro_number",
- sorter: (a, b) =>
- parseInt((a.ro_number || "0").replace(/\D/g, "")) -
- parseInt((b.ro_number || "0").replace(/\D/g, "")),
- sortOrder:
- state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-
- render: (text, record) => (
- e.stopPropagation()}
- >
-
- {record.ro_number || t("general.labels.na")}
- {record.production_vars && record.production_vars.alert ? (
-
- ) : null}
- {record.suspended && (
-
- )}
- {record.iouparent && (
-
-
-
- )}
-
-
- ),
- },
- {
- title: t("jobs.fields.owner"),
- dataIndex: "owner",
- key: "owner",
- ellipsis: true,
-
- responsive: ["md"],
- sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
- sortOrder:
- state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
- render: (text, record) => {
- return record.ownerid ? (
- e.stopPropagation()}
- >
-
-
- ) : (
-
+ const columns = [
+ {
+ title: t("jobs.fields.ro_number"),
+ dataIndex: "ro_number",
+ key: "ro_number",
+ sorter: (a, b) =>
+ parseInt((a.ro_number || "0").replace(/\D/g, "")) -
+ parseInt((b.ro_number || "0").replace(/\D/g, "")),
+ sortOrder:
+ state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+ render: (text, record) => (
+ e.stopPropagation()}
+ >
+
+ {record.ro_number || t("general.labels.na")}
+ {record.production_vars && record.production_vars.alert ? (
+
+ ) : null}
+ {record.suspended && (
+
+ )}
+ {record.iouparent && (
+
+
+
+ )}
+
+
+ ),
+ },
+ {
+ title: t("jobs.fields.owner"),
+ dataIndex: "owner",
+ key: "owner",
+ ellipsis: true,
+ responsive: ["md"],
+ sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+ sortOrder:
+ state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+ render: (text, record) => {
+ return record.ownerid ? (
+ e.stopPropagation()}
+ >
+
+
+ ) : (
+
- );
+ );
+ },
+ },
+ {
+ title: t("jobs.fields.ownr_ph1"),
+ dataIndex: "ownr_ph1",
+ key: "ownr_ph1",
+ ellipsis: true,
+ responsive: ["md"],
+ render: (text, record) => (
+
+ ),
+ },
+ {
+ title: t("jobs.fields.ownr_ph2"),
+ dataIndex: "ownr_ph2",
+ key: "ownr_ph2",
+ ellipsis: true,
+ responsive: ["md"],
+ render: (text, record) => (
+
+ ),
+ },
+ {
+ title: t("jobs.fields.status"),
+ dataIndex: "status",
+ key: "status",
+ ellipsis: true,
+ sorter: (a, b) => alphaSort(a.status, b.status),
+ sortOrder:
+ state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+ filteredValue: filter?.status || null,
+ filters:
+ (jobs &&
+ jobs
+ .map((j) => j.status)
+ .filter(onlyUnique)
+ .map((s) => {
+ return {
+ text: s || "No Status*",
+ value: [s],
+ };
+ })
+ .sort((a, b) =>
+ statusSort(
+ a.text,
+ b.text,
+ bodyshop.md_ro_statuses.active_statuses
+ )
+ )) ||
+ [],
+ onFilter: (value, record) => value.includes(record.status),
+ },
+
+ {
+ title: t("jobs.fields.vehicle"),
+ dataIndex: "vehicle",
+ key: "vehicle",
+ ellipsis: true,
+ render: (text, record) => {
+ return record.vehicleid ? (
+ e.stopPropagation()}
+ >
+ {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+ record.v_model_desc || ""
+ }`}
+
+ ) : (
+ {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+ record.v_model_desc || ""
+ }`}
+ );
+ },
+ },
+ {
+ title: t("vehicles.fields.plate_no"),
+ dataIndex: "plate_no",
+ key: "plate_no",
+ ellipsis: true,
+
+ responsive: ["md"],
+ sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+ sortOrder:
+ state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.clm_no"),
+ dataIndex: "clm_no",
+ key: "clm_no",
+ ellipsis: true,
+ responsive: ["md"],
+ sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+ sortOrder:
+ state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+ render: (text, record) =>
+ `${record.clm_no || ""}${
+ record.po_number ? ` (PO: ${record.po_number})` : ""
+ }`,
+ },
+ {
+ title: t("jobs.fields.ins_co_nm"),
+ dataIndex: "ins_co_nm",
+ key: "ins_co_nm",
+ ellipsis: true,
+ filteredValue: filter?.ins_co_nm || null,
+ filters:
+ (jobs &&
+ jobs
+ .map((j) => j.ins_co_nm)
+ .filter(onlyUnique)
+ .map((s) => {
+ return {
+ text: s || "No Ins. Co.*",
+ value: [s],
+ };
+ })
+ .sort((a, b) => alphaSort(a.text, b.text))) ||
+ [],
+ onFilter: (value, record) => value.includes(record.ins_co_nm),
+ responsive: ["md"],
+ },
+ {
+ title: t("jobs.fields.clm_total"),
+ dataIndex: "clm_total",
+ key: "clm_total",
+ responsive: ["md"],
+ ellipsis: true,
+ sorter: (a, b) => a.clm_total - b.clm_total,
+ sortOrder:
+ state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+ render: (text, record) => (
+ {record.clm_total}
+ ),
+ },
+ {
+ title: t("jobs.labels.estimator"),
+ dataIndex: "jobs.labels.estimator",
+ key: "estimator",
+ ellipsis: true,
+ responsive: ["xl"],
+ filterSearch: true,
+ filteredValue: filter?.estimator || null,
+ filters:
+ (jobs &&
+ jobs
+ .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
+ .filter(onlyUnique)
+ .map((s) => {
+ return {
+ text: s || "No Estimator*",
+ value: [s],
+ };
+ })
+ .sort((a, b) => alphaSort(a.text, b.text))) ||
+ [],
+ onFilter: (value, record) =>
+ value.includes(
+ `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
+ ),
+ render: (text, record) =>
+ `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
+ },
+ {
+ title: t("jobs.fields.comment"),
+ dataIndex: "comment",
+ key: "comment",
+ ellipsis: true,
+ responsive: ["md"],
+ },
+ // {
+ // title: t("jobs.fields.owner_owing"),
+ // dataIndex: "owner_owing",
+ // key: "owner_owing",
+ // responsive: ["md"],
+ // render: (text, record) => (
+ // {record.owner_owing}
+ // ),
+ // },
+ ];
+
+ const scrollMapper = {
+ xs: true,
+ sm: true,
+ md: true,
+ lg: "100%",
+ xl: "100%",
+ xxl: "100%",
+ };
+
+ return (
+
+
+ {
+ setSearchText(e.target.value);
+ }}
+ value={searchText}
+ enterButton
+ />
+
+ }
+ >
+ {
+ handleOnRowClick(record);
+ },
+ selectedRowKeys: [selected],
+ type: "radio",
+ }}
+ onChange={handleTableChange}
+ onRow={(record, rowIndex) => {
+ return {
+ onClick: (event) => {
+ handleOnRowClick(record);
},
- },
- {
- title: t("jobs.fields.ownr_ph1"),
- dataIndex: "ownr_ph1",
- key: "ownr_ph1",
- ellipsis: true,
- responsive: ["md"],
- render: (text, record) => (
-
- ),
- },
- {
- title: t("jobs.fields.ownr_ph2"),
- dataIndex: "ownr_ph2",
- key: "ownr_ph2",
- ellipsis: true,
- responsive: ["md"],
- render: (text, record) => (
-
- ),
- },
-
- {
- title: t("jobs.fields.status"),
- dataIndex: "status",
- key: "status",
- ellipsis: true,
-
- sorter: (a, b) => alphaSort(a.status, b.status),
- sortOrder:
- state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
- filters:
- (jobs &&
- jobs
- .map((j) => j.status)
- .filter(onlyUnique)
- .map((s) => {
- return {
- text: s || "No Status*",
- value: [s],
- };
- })) ||
- [],
- onFilter: (value, record) => value.includes(record.status),
- },
-
- {
- title: t("jobs.fields.vehicle"),
- dataIndex: "vehicle",
- key: "vehicle",
- ellipsis: true,
- render: (text, record) => {
- return record.vehicleid ? (
- e.stopPropagation()}
- >
- {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
- record.v_model_desc || ""
- }`}
-
- ) : (
- {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
- record.v_model_desc || ""
- }`}
- );
- },
- },
- {
- title: t("vehicles.fields.plate_no"),
- dataIndex: "plate_no",
- key: "plate_no",
- ellipsis: true,
-
- responsive: ["md"],
- sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
- sortOrder:
- state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
- },
- {
- title: t("jobs.fields.clm_no"),
- dataIndex: "clm_no",
- key: "clm_no",
- ellipsis: true,
- responsive: ["md"],
- sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
- sortOrder:
- state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
- render: (text, record) =>
- `${record.clm_no || ""}${
- record.po_number ? ` (PO: ${record.po_number})` : ""
- }`,
- },
- {
- title: t("jobs.fields.ins_co_nm"),
- dataIndex: "ins_co_nm",
- key: "ins_co_nm",
- ellipsis: true,
- filters:
- (jobs &&
- jobs
- .map((j) => j.ins_co_nm)
- .filter(onlyUnique)
- .map((s) => {
- return {
- text: s,
- value: [s],
- };
- })) ||
- [],
- onFilter: (value, record) => value.includes(record.ins_co_nm),
- responsive: ["md"],
- },
- {
- title: t("jobs.fields.clm_total"),
- dataIndex: "clm_total",
- key: "clm_total",
- responsive: ["md"],
- ellipsis: true,
-
- sorter: (a, b) => a.clm_total - b.clm_total,
- sortOrder:
- state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
- render: (text, record) => (
- {record.clm_total}
- ),
- },
- {
- title: t("jobs.labels.estimator"),
- dataIndex: "jobs.labels.estimator",
- key: "jobs.labels.estimator",
- ellipsis: true,
- responsive: ["xl"],
- filterSearch: true,
- filters:
- (jobs &&
- jobs
- .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
- .filter(onlyUnique)
- .map((s) => {
- return {
- text: s || "N/A",
- value: [s],
- };
- })) ||
- [],
- onFilter: (value, record) =>
- value.includes(
- `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
- ),
- render: (text, record) =>
- `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
- },
- {
- title: t("jobs.fields.comment"),
- dataIndex: "comment",
- key: "comment",
- ellipsis: true,
- responsive: ["md"],
- },
- // {
- // title: t("jobs.fields.owner_owing"),
- // dataIndex: "owner_owing",
- // key: "owner_owing",
- // responsive: ["md"],
- // render: (text, record) => (
- // {record.owner_owing}
- // ),
- // },
- ];
-
- const scrollMapper = {
- xs: true,
- sm: true,
- md: true,
- lg: "100%",
- xl: "100%",
- xxl: "100%",
- };
-
- return (
-
-
- {
- setSearchText(e.target.value);
- }}
- value={searchText}
- enterButton
- />
-
- }
- >
- {
- handleOnRowClick(record);
- },
- selectedRowKeys: [selected],
- type: "radio",
- }}
- onChange={handleTableChange}
- onRow={(record, rowIndex) => {
- return {
- onClick: (event) => {
- handleOnRowClick(record);
- },
- };
- }}
- />
-
- );
+ };
+ }}
+ />
+
+ );
}
export default connect(mapStateToProps, null)(JobsList);
diff --git a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
index fee461df2..147f6ea23 100644
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -16,11 +16,12 @@ import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { onlyUnique } from "../../utils/arrayHelper";
-import { alphaSort } from "../../utils/sorters";
+import { pageLimit } from "../../utils/config";
+import { alphaSort, statusSort } from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
import AlertComponent from "../alert/alert.component";
import ChatOpenButton from "../chat-open-button/chat-open-button.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import {pageLimit} from "../../utils/config";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -53,10 +54,8 @@ export function JobsReadyList({ bodyshop }) {
nextFetchPolicy: "network-only",
});
- const [state, setState] = useState({
- sortedInfo: {},
- filteredInfo: { text: "" },
- });
+ const [state, setState] = useState({ sortedInfo: {} });
+ const [filter, setFilter] = useLocalStorage("filter_jobs_ready", null);
const { t } = useTranslation();
const history = useHistory();
@@ -105,7 +104,8 @@ export function JobsReadyList({ bodyshop }) {
: [];
const handleTableChange = (pagination, filters, sorter) => {
- setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+ setState({ ...state, sortedInfo: sorter });
+ setFilter(filters);
};
const handleOnRowClick = (record) => {
@@ -129,7 +129,6 @@ export function JobsReadyList({ bodyshop }) {
sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
sortOrder:
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-
render: (text, record) => (
alphaSort(a.ownr_ln, b.ownr_ln),
sortOrder:
@@ -197,16 +195,15 @@ export function JobsReadyList({ bodyshop }) {
),
},
-
{
title: t("jobs.fields.status"),
dataIndex: "status",
key: "status",
ellipsis: true,
-
sorter: (a, b) => alphaSort(a.status, b.status),
sortOrder:
state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+ filteredValue: filter?.status || null,
filters:
(jobs &&
jobs
@@ -217,11 +214,17 @@ export function JobsReadyList({ bodyshop }) {
text: s || "No Status*",
value: [s],
};
- })) ||
+ })
+ .sort((a, b) =>
+ statusSort(
+ a.text,
+ b.text,
+ bodyshop.md_ro_statuses.active_statuses
+ )
+ )) ||
[],
onFilter: (value, record) => value.includes(record.status),
},
-
{
title: t("jobs.fields.vehicle"),
dataIndex: "vehicle",
@@ -274,6 +277,7 @@ export function JobsReadyList({ bodyshop }) {
dataIndex: "ins_co_nm",
key: "ins_co_nm",
ellipsis: true,
+ filteredValue: filter?.ins_co_nm || null,
filters:
(jobs &&
jobs
@@ -281,10 +285,11 @@ export function JobsReadyList({ bodyshop }) {
.filter(onlyUnique)
.map((s) => {
return {
- text: s,
+ text: s || "No Ins Co.*",
value: [s],
};
- })) ||
+ })
+ .sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) => value.includes(record.ins_co_nm),
responsive: ["md"],
@@ -295,7 +300,6 @@ export function JobsReadyList({ bodyshop }) {
key: "clm_total",
responsive: ["md"],
ellipsis: true,
-
sorter: (a, b) => a.clm_total - b.clm_total,
sortOrder:
state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
@@ -306,9 +310,10 @@ export function JobsReadyList({ bodyshop }) {
{
title: t("jobs.labels.estimator"),
dataIndex: "jobs.labels.estimator",
- key: "jobs.labels.estimator",
+ key: "estimator",
ellipsis: true,
responsive: ["xl"],
+ filteredValue: filter?.estimator || null,
filterSearch: true,
filters:
(jobs &&
@@ -317,10 +322,11 @@ export function JobsReadyList({ bodyshop }) {
.filter(onlyUnique)
.map((s) => {
return {
- text: s || "N/A",
+ text: s || "No Estimator*",
value: [s],
};
- })) ||
+ })
+ .sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) =>
value.includes(