Merged in feature/IO-2514-Production-Board-Estimators (pull request #1135)

IO-2514 Only Unique items in Menu
This commit is contained in:
Allan Carr
2024-01-05 21:07:36 +00:00

View File

@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { TimeFormatter } from "../../utils/DateFormatter"; import { TimeFormatter } from "../../utils/DateFormatter";
import PhoneFormatter from "../../utils/PhoneFormatter"; import PhoneFormatter from "../../utils/PhoneFormatter";
import { onlyUnique } from "../../utils/arrayHelper";
import { alphaSort, dateSort, statusSort } from "../../utils/sorters"; import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
import JobAltTransportChange from "../job-at-change/job-at-change.component"; import JobAltTransportChange from "../job-at-change/job-at-change.component";
import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component"; import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
@@ -548,12 +549,17 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
sortOrder: sortOrder:
state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order, state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
filters: filters:
data?.map((s) => { (data &&
return { data
text: `${s.est_ct_fn || ""} ${s.est_ct_ln || ""}`.trim(), .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
value: [`${s.est_ct_fn || ""} ${s.est_ct_ln || ""}`.trim()], .filter(onlyUnique)
}; .map((s) => {
}) || [], return {
text: s || "N/A",
value: [s],
};
})) ||
[],
onFilter: (value, record) => onFilter: (value, record) =>
value.includes( value.includes(
`${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim() `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()