Merge branch 'feature/IO-3255-simplified-part-management' into feature/IO-2776-cdk-fortellis

# Conflicts:
#	client/package-lock.json
#	client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
#	client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
#	client/src/pages/dms/dms.container.jsx
#	package-lock.json
#	package.json

client/src/components/dms-customer-selector/dms-customer-selector.component.jsx

@@ -1,6 +1,6 @@
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Col, Table } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -12,7 +12,7 @@ import { alphaSort } from "../../utils/sorters";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);
@@ -152,19 +152,17 @@ export function DmsCustomerSelector({ bodyshop, jobid }) {
       title: t("jobs.fields.dms.name1"),
       dataIndex: ["name1", "fullName"],
       key: "name1",
-      sorter: (a, b) => alphaSort(a.name1 && a.name1.fullName, b.name1 && b.name1.fullName)
+      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName)
     },
 
     {
       title: t("jobs.fields.dms.address"),
       //dataIndex: ["name2", "fullName"],
       key: "address",
-      render: (record, value) =>
-        `${
-          record.address && record.address.addressLine && record.address.addressLine[0]
-        }, ${record.address && record.address.city} ${
-          record.address && record.address.stateOrProvince
-        } ${record.address && record.address.postalCode}`
+      render: (record) =>
+        `${record.address?.addressLine && record.address.addressLine[0]}, ${record.address?.city} ${
+          record.address?.stateOrProvince
+        } ${record.address?.postalCode}`
     }
   ];
 
@@ -184,7 +182,7 @@ export function DmsCustomerSelector({ bodyshop, jobid }) {
     {
       title: t("jobs.fields.dms.address"),
       key: "address",
-      render: (record, value) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
+      render: (record) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
     }
   ];
 
@@ -197,10 +195,7 @@ export function DmsCustomerSelector({ bodyshop, jobid }) {
             <Button onClick={onUseSelected} disabled={!selectedCustomer}>
               {t("jobs.actions.dms.useselected")}
             </Button>
-            <Button
-              onClick={onUseGeneric}
-              disabled={!(bodyshop.cdk_configuration && bodyshop.cdk_configuration.generic_customer_number)}
-            >
+            <Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
               {t("jobs.actions.dms.usegeneric")}
             </Button>
             <Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>