From 555536586397eee1369fc186cbdfb73df9e54a4a Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 25 Nov 2020 10:53:30 -0800 Subject: [PATCH] Added groups reference modal RPS-57 --- WIP Changelog.txt | 5 +- .../vehicle-group-alert.atom.jsx | 1 + .../job-group/job-group.molecule.jsx | 2 + .../jobs-group-modal.molecule.jsx | 175 ++++++++++++++++++ 4 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 src/components/molecules/jobs-group-modal/jobs-group-modal.molecule.jsx diff --git a/WIP Changelog.txt b/WIP Changelog.txt index 4628dcf..72936a0 100644 --- a/WIP Changelog.txt +++ b/WIP Changelog.txt @@ -1,2 +1,5 @@ +New Features: +- Added a reference guide for MPI Grouping Guidelines next to the Group Descriptor on the estimate screen. + Bug Fixes: -- \ No newline at end of file +- Added better error handling on reporting for jobs that did not have a group set. \ No newline at end of file diff --git a/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx b/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx index 7a16923..f2e2e53 100644 --- a/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx +++ b/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx @@ -14,6 +14,7 @@ const models = [ "journey", "nv200", "rav4", + "odyssey", ]; export default function VehicleGroupAlertAtom({ job, showGroup = false }) { diff --git a/src/components/molecules/job-group/job-group.molecule.jsx b/src/components/molecules/job-group/job-group.molecule.jsx index dcdecd8..ef5e368 100644 --- a/src/components/molecules/job-group/job-group.molecule.jsx +++ b/src/components/molecules/job-group/job-group.molecule.jsx @@ -8,6 +8,7 @@ import { UPDATE_JOB } from "../../../graphql/jobs.queries"; import ipcTypes from "../../../ipc.types"; import { selectBodyshop } from "../../../redux/user/user.selectors"; import { AlertFilled } from "@ant-design/icons"; +import JobsGroupModalMolecule from "../jobs-group-modal/jobs-group-modal.molecule"; const { ipcRenderer } = window; const mapStateToProps = createStructuredSelector({ @@ -60,6 +61,7 @@ export function JobGroupMolecule({ bodyshop, jobId, group, job }) { {loading && } + {!group && (
diff --git a/src/components/molecules/jobs-group-modal/jobs-group-modal.molecule.jsx b/src/components/molecules/jobs-group-modal/jobs-group-modal.molecule.jsx new file mode 100644 index 0000000..136a5b1 --- /dev/null +++ b/src/components/molecules/jobs-group-modal/jobs-group-modal.molecule.jsx @@ -0,0 +1,175 @@ +import { Modal, List, Card, Input } from "antd"; +import React, { useState } from "react"; +import { InfoCircleFilled } from "@ant-design/icons"; + +const data = [ + { + group: "Group 1", + makes: [ + "GEO", + "ALFA ROMEO", + "TESLA", + "PORSCHE", + "MERCEDES BENZ-Truck", + "LAND ROVER", + "MERCEDES BENZ-Van", + "LINCOLN-Truck", + "BUICK-Truck", + "AM GENERAL", + "VOLKSWAGEN-Truck", + "JAGUAR", + "SMART", + "HUMMER-Truck", + "MERCEDES BENZ", + "RAM-Van", + "GENESIS", + "AUDI BMW-Truck", + ], + }, + { + group: "Group 2", + makes: [ + "NISSAN-Van", + "VOLVO", + "MINI", + "LEXUS", + "LAND ROVER-Truck", + "SAAB", + "SUBARU", + "BMW", + ], + }, + { + group: "Group 3", + makes: [ + "MAZDA-Truck", + "SCION", + "NISSAN-Truck", + "DODGE-Van", + "INFINITI", + "JEEP-Truck", + "MONACO-Van", + "JEEP", + "LINCOLN", + "KIA", + "VOLKSWAGEN", + "FIAT", + "TOYOTA-Truck", + "HYUNDAI", + "MAZDA", + "SUBARU-Truck", + "HUMMER", + "EAGLE", + "FORD-Truck", + "ISUZU", + ], + }, + { + group: "Group 4", + makes: [ + "ACURA", + "HONDA", + "HONDA-Truck", + "FORD", + "DODGE-Truck", + "CADILLAC", + "TOYOTA", + "BUICK", + "CHEVROLET-Truck", + "PLYMOUTH", + "GMC-Truck", + "RAM", + "AUDI-Truck", + "MITSUBISHI", + "NISSAN", + ], + }, + { + group: "Group 5", + makes: [ + "PONTIAC-Truck", + "CHRYSLER-Truck", + "GMC", + "CHRYSLER", + "SUZUKI", + "DODGE", + "ELDORADO", + "CHEVROLET", + ], + }, + { + group: "Group 6", + makes: [ + "CHEVROLET-Van", + "PONTIAC", + "HYUNDAI-Truck", + "CHRYSLER-Van", + "GMC-Van", + "SUZUKI-Truck", + "CADILLAC-Truck", + "MERCURY", + "RAM-Truck", + "OLDSMOBILE", + "KIA-Truck", + "SATURN", + "MITSUBISHI-Truck", + ], + }, +]; + +export default function JobsGroupModalMolecule() { + const [visible, setVisible] = useState(false); + const [search, setSearch] = useState(""); + return ( +
+ setVisible(false)} + onOk={() => setVisible(false)} + width="90%" + title="MPI Group Guidelines" + > +
+ setSearch(e.target.value)} + style={{ marginBottom: ".5rem" }} + /> + ( + + +
    + {item.makes.map((make, idx) => ( +
  • + {make} +
  • + ))} +
+
+
+ )} + /> +
+ This grouping information is provided for reference only and is not + guaranteed to be correct. Please confirm with grouping guidelines + provided by MPI. +
+
+
+ setVisible(true)} /> +
+ ); +}