admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-2264-schedule-filter (pull request #818)

Browse Source 
Brought in shop estimator & made list of estimators unique.
This commit is contained in:
Patrick Fic
2023-05-26 19:03:54 +00:00
parent 109c34bebd 9b96460e4f
commit 404efcaf05
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/components/schedule-calendar/schedule-calendar.component.jsx
View File

@@ -21,6 +21,7 @@ import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verif
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import _ from "lodash";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
}); });
@@ -44,16 +45,19 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
[] []
); );
const estimators = useMemo( const estimators = useMemo(() => {
() => return _.uniq([
data ...data
.filter((d) => d.__typename === "appointments") .filter((d) => d.__typename === "appointments")
.map((app) => .map((app) =>
`${app.job?.est_ct_fn || ""} ${app.job?.est_ct_ln || ""}`.trim() `${app.job?.est_ct_fn || ""} ${app.job?.est_ct_ln || ""}`.trim()
) )
.filter((e) => e.length > 0), .filter((e) => e.length > 0),
[data] ...bodyshop.md_estimators.map((e) =>
); `${e.est_ct_fn || ""} ${e.est_ct_ln || ""}`.trim()
),
]);
}, [data, bodyshop.md_estimators]);
const filteredData = useMemo(() => { const filteredData = useMemo(() => {
return data.filter((d) => { return data.filter((d) => {