- Merge client update into test-beta

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx

@@ -1,105 +1,105 @@
-import { useLazyQuery } from "@apollo/client";
-import { Button, Input, Modal, Table } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { SEARCH_DMS_VEHICLES } from "../../graphql/dms.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useLazyQuery} from "@apollo/client";
+import {Button, Input, Modal, Table} from "antd";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {SEARCH_DMS_VEHICLES} from "../../graphql/dms.queries";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop,
+    //currentUser: selectCurrentUser
+    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+    //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkVehicles);
 
-export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
-  const [visible, setVisible] = useState(false);
-  const [selectedModel, setSelectedModel] = useState(null);
-  const { t } = useTranslation();
+export function DmsCdkVehicles({bodyshop, form, socket, job}) {
+    const [open, setOpen] = useState(false);
+    const [selectedModel, setSelectedModel] = useState(null);
+    const {t} = useTranslation();
 
-  const [callSearch, { loading, error, data }] =
-    useLazyQuery(SEARCH_DMS_VEHICLES);
-  const columns = [
-    {
-      title: t("vehicles.fields.v_make_desc"),
-      dataIndex: "make",
-      key: "make",
-    },
-    {
-      title: t("vehicles.fields.v_model_desc"),
-      dataIndex: "model",
-      key: "model",
-    },
-    {
-      title: t("jobs.fields.dms.dms_make"),
-      dataIndex: "makecode",
-      key: "makecode",
-    },
-    {
-      title: t("jobs.fields.dms.dms_model"),
-      dataIndex: "modelcode",
-      key: "modelcode",
-    },
-  ];
+    const [callSearch, {loading, error, data}] =
+        useLazyQuery(SEARCH_DMS_VEHICLES);
+    const columns = [
+        {
+            title: t("vehicles.fields.v_make_desc"),
+            dataIndex: "make",
+            key: "make",
+        },
+        {
+            title: t("vehicles.fields.v_model_desc"),
+            dataIndex: "model",
+            key: "model",
+        },
+        {
+            title: t("jobs.fields.dms.dms_make"),
+            dataIndex: "makecode",
+            key: "makecode",
+        },
+        {
+            title: t("jobs.fields.dms.dms_model"),
+            dataIndex: "modelcode",
+            key: "modelcode",
+        },
+    ];
 
-  return (
-    <>
-      <Modal
-        width={"90%"}
-        visible={visible}
-        onCancel={() => setVisible(false)}
-        onOk={() => {
-          form.setFieldsValue({
-            dms_make: selectedModel.makecode,
-            dms_model: selectedModel.modelcode,
-          });
-          setVisible(false);
-        }}
-      >
-        {error && <AlertComponent error={error.message} />}
-        <Table
-          title={() => (
-            <Input.Search
-              onSearch={(val) => callSearch({ variables: { search: val } })}
-              placeholder={t("general.labels.search")}
-            />
-          )}
-          columns={columns}
-          loading={loading}
-          rowKey="id"
-          dataSource={data ? data.search_dms_vehicles : []}
-          onRow={(record) => {
-            return {
-              onClick: () => setSelectedModel(record),
-            };
-          }}
-          rowSelection={{
-            onSelect: (record) => {
-              setSelectedModel(record);
-            },
+    return (
+        <>
+            <Modal
+                width={"90%"}
+                open={open}
+                onCancel={() => setOpen(false)}
+                onOk={() => {
+                    form.setFieldsValue({
+                        dms_make: selectedModel.makecode,
+                        dms_model: selectedModel.modelcode,
+                    });
+                    setOpen(false);
+                }}
+            >
+                {error && <AlertComponent error={error.message}/>}
+                <Table
+                    title={() => (
+                        <Input.Search
+                            onSearch={(val) => callSearch({variables: {search: val}})}
+                            placeholder={t("general.labels.search")}
+                        />
+                    )}
+                    columns={columns}
+                    loading={loading}
+                    rowKey="id"
+                    dataSource={data ? data.search_dms_vehicles : []}
+                    onRow={(record) => {
+                        return {
+                            onClick: () => setSelectedModel(record),
+                        };
+                    }}
+                    rowSelection={{
+                        onSelect: (record) => {
+                            setSelectedModel(record);
+                        },
 
-            type: "radio",
-            selectedRowKeys: [selectedModel && selectedModel.id],
-          }}
-        />
-      </Modal>
-      <Button
-        onClick={() => {
-          setVisible(true);
-          callSearch({
-            variables: {
-              search: job && job.v_model_desc && job.v_model_desc.substr(0, 3),
-            },
-          });
-        }}
-      >
-        {t("jobs.actions.dms.findmakemodelcode")}
-      </Button>
-    </>
-  );
+                        type: "radio",
+                        selectedRowKeys: [selectedModel && selectedModel.id],
+                    }}
+                />
+            </Modal>
+            <Button
+                onClick={() => {
+                    setOpen(true);
+                    callSearch({
+                        variables: {
+                            search: job && job.v_model_desc && job.v_model_desc.substr(0, 3),
+                        },
+                    });
+                }}
+            >
+                {t("jobs.actions.dms.findmakemodelcode")}
+            </Button>
+        </>
+    );
 }

client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx

@@ -1,40 +1,38 @@
-import { Button } from "antd";
+import {Button} from "antd";
 import axios from "axios";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop,
+    currentUser: selectCurrentUser,
+    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+    //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
 
-export function DmsCdkMakesRefetch({ currentUser, bodyshop, form, socket }) {
-  const [loading, setLoading] = useState(false);
-  const { t } = useTranslation();
+export function DmsCdkMakesRefetch({currentUser, bodyshop, form, socket}) {
+    const [loading, setLoading] = useState(false);
+    const {t} = useTranslation();
 
-  if (!currentUser.email.includes("@imex.")) return null;
+    if (!currentUser.email.includes("@imex.")) return null;
 
-  const handleRefetch = async () => {
-    setLoading(true);
-    await axios.post("/cdk/getvehicles", {
-      cdk_dealerid: bodyshop.cdk_dealerid,
-      bodyshopid: bodyshop.id,
-    });
+    const handleRefetch = async () => {
+        setLoading(true);
+        await axios.post("/cdk/getvehicles", {
+            cdk_dealerid: bodyshop.cdk_dealerid,
+            bodyshopid: bodyshop.id,
+        });
 
-    setLoading(false);
-  };
-  return (
-    <Button loading={loading} onClick={handleRefetch}>
-      {t("jobs.actions.dms.refetchmakesmodels")}
-    </Button>
-  );
+        setLoading(false);
+    };
+    return (
+        <Button loading={loading} onClick={handleRefetch}>
+            {t("jobs.actions.dms.refetchmakesmodels")}
+        </Button>
+    );
 }