- the great reformat

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

client/src/components/contracts-find-modal/contracts-find-modal.component.jsx

@@ -1,37 +1,37 @@
-import { Form, Input } from "antd";
+import {Form, Input} from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+    bodyshop: selectBodyshop,
 });
 
 export default connect(mapStateToProps, null)(PartsReceiveModalComponent);
 
-export function PartsReceiveModalComponent({ bodyshop, form }) {
-  const { t } = useTranslation();
+export function PartsReceiveModalComponent({bodyshop, form}) {
+    const {t} = useTranslation();
 
-  return (
-    <div>
-      <Form.Item name="plate" label={t("courtesycars.fields.plate")}>
-        <Input />
-      </Form.Item>
-      <Form.Item
-        name="time"
-        label={t("contracts.labels.time")}
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-          },
-        ]}
-      >
-        <FormDateTimePicker />
-      </Form.Item>
-    </div>
-  );
+    return (
+        <div>
+            <Form.Item name="plate" label={t("courtesycars.fields.plate")}>
+                <Input/>
+            </Form.Item>
+            <Form.Item
+                name="time"
+                label={t("contracts.labels.time")}
+                rules={[
+                    {
+                        required: true,
+                        //message: t("general.validation.required"),
+                    },
+                ]}
+            >
+                <FormDateTimePicker/>
+            </Form.Item>
+        </div>
+    );
 }

client/src/components/contracts-find-modal/contracts-find-modal.container.jsx

@@ -1,169 +1,169 @@
-import { useLazyQuery } from "@apollo/client";
-import { Button, Form, Modal, Table } from "antd";
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { FIND_CONTRACT } from "../../graphql/cccontracts.queries";
-import { toggleModalVisible } from "../../redux/modals/modals.actions";
-import { selectContractFinder } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
+import {useLazyQuery} from "@apollo/client";
+import {Button, Form, Modal, Table} from "antd";
+import React, {useEffect} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {Link} from "react-router-dom";
+import {createStructuredSelector} from "reselect";
+import {logImEXEvent} from "../../firebase/firebase.utils";
+import {FIND_CONTRACT} from "../../graphql/cccontracts.queries";
+import {toggleModalVisible} from "../../redux/modals/modals.actions";
+import {selectContractFinder} from "../../redux/modals/modals.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
+import {DateTimeFormatter} from "../../utils/DateFormatter";
 import ContractsFindModalComponent from "./contracts-find-modal.component";
 import AlertComponent from "../alert/alert.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  contractFinderModal: selectContractFinder,
+    bodyshop: selectBodyshop,
+    contractFinderModal: selectContractFinder,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("contractFinder")),
+    toggleModalVisible: () => dispatch(toggleModalVisible("contractFinder")),
 });
 
 export function ContractsFindModalContainer({
-  contractFinderModal,
-  toggleModalVisible,
+                                                contractFinderModal,
+                                                toggleModalVisible,
 
-  bodyshop,
-}) {
-  const { t } = useTranslation();
+                                                bodyshop,
+                                            }) {
+    const {t} = useTranslation();
 
-  const { open } = contractFinderModal;
+    const {open} = contractFinderModal;
 
-  const [form] = Form.useForm();
+    const [form] = Form.useForm();
 
-  //  const [updateJobLines] = useMutation(UPDATE_JOB_LINE);
-  const [callSearch, { loading, error, data }] = useLazyQuery(FIND_CONTRACT);
-  const handleFinish = async (values) => {
-    logImEXEvent("contract_finder_search");
+    //  const [updateJobLines] = useMutation(UPDATE_JOB_LINE);
+    const [callSearch, {loading, error, data}] = useLazyQuery(FIND_CONTRACT);
+    const handleFinish = async (values) => {
+        logImEXEvent("contract_finder_search");
 
-    //Execute contract find
+        //Execute contract find
 
-    callSearch({
-      variables: {
-        plate:
-          (values.plate && values.plate !== "" && values.plate) || undefined,
-        time: values.time,
-      },
-    });
-  };
-
-  useEffect(() => {
-    if (open) {
-      form.resetFields();
-    }
-  }, [open, form]);
-
-  return (
-    <Modal
-      open={open}
-      width="70%"
-      title={t("contracts.labels.findermodal")}
-      onCancel={() => toggleModalVisible()}
-      onOk={() => toggleModalVisible()}
-      destroyOnClose
-      forceRender
-    >
-      <Form
-        form={form}
-        layout="vertical"
-        autoComplete="no"
-        onFinish={handleFinish}
-      >
-        <ContractsFindModalComponent form={form} />
-        <Button onClick={() => form.submit()} type="primary" loading={loading}>
-          {t("general.labels.search")}
-        </Button>
-        {error && (
-          <AlertComponent type="error" message={JSON.stringify(error)} />
-        )}
-        <Table
-          loading={loading}
-          columns={[
-            {
-              title: t("contracts.fields.agreementnumber"),
-              dataIndex: "agreementnumber",
-              key: "agreementnumber",
-
-              render: (text, record) => (
-                <Link to={`/manage/courtesycars/contracts/${record.id}`}>
-                  {record.agreementnumber || ""}
-                </Link>
-              ),
+        callSearch({
+            variables: {
+                plate:
+                    (values.plate && values.plate !== "" && values.plate) || undefined,
+                time: values.time,
             },
-            {
-              title: t("jobs.fields.ro_number"),
-              dataIndex: "job.ro_number",
-              key: "job.ro_number",
-              render: (text, record) => (
-                <Link to={`/manage/jobs/${record.job.id}`}>
-                  {record.job.ro_number || ""}
-                </Link>
-              ),
-            },
-            {
-              title: t("contracts.fields.driver"),
-              dataIndex: "driver_ln",
-              key: "driver_ln",
-              render: (text, record) =>
-                `${record.driver_fn || ""} ${record.driver_ln || ""}`,
-            },
-            {
-              title: t("contracts.labels.vehicle"),
-              dataIndex: "vehicle",
-              key: "vehicle",
-              render: (text, record) => (
-                <Link to={`/manage/courtesycars/${record.courtesycar.id}`}>{`${
-                  record.courtesycar.year
-                } ${record.courtesycar.make} ${record.courtesycar.model} ${
-                  record.courtesycar.plate
-                    ? `(${record.courtesycar.plate})`
-                    : ""
-                }`}</Link>
-              ),
-            },
-            {
-              title: t("contracts.fields.status"),
-              dataIndex: "status",
-              render: (text, record) => t(record.status),
-            },
-            {
-              title: t("contracts.fields.start"),
-              dataIndex: "start",
-              key: "start",
-              render: (text, record) => (
-                <DateTimeFormatter>{record.start}</DateTimeFormatter>
-              ),
-            },
-            {
-              title: t("contracts.fields.scheduledreturn"),
-              dataIndex: "scheduledreturn",
-              key: "scheduledreturn",
-              render: (text, record) => (
-                <DateTimeFormatter>{record.scheduledreturn}</DateTimeFormatter>
-              ),
-            },
-            {
-              title: t("contracts.fields.actualreturn"),
-              dataIndex: "actualreturn",
-              key: "actualreturn",
-              render: (text, record) => (
-                <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
-              ),
-            },
-          ]}
-          rowKey="id"
-          dataSource={data && data.cccontracts}
-        />
-      </Form>
-    </Modal>
-  );
+        });
+    };
+
+    useEffect(() => {
+        if (open) {
+            form.resetFields();
+        }
+    }, [open, form]);
+
+    return (
+        <Modal
+            open={open}
+            width="70%"
+            title={t("contracts.labels.findermodal")}
+            onCancel={() => toggleModalVisible()}
+            onOk={() => toggleModalVisible()}
+            destroyOnClose
+            forceRender
+        >
+            <Form
+                form={form}
+                layout="vertical"
+                autoComplete="no"
+                onFinish={handleFinish}
+            >
+                <ContractsFindModalComponent form={form}/>
+                <Button onClick={() => form.submit()} type="primary" loading={loading}>
+                    {t("general.labels.search")}
+                </Button>
+                {error && (
+                    <AlertComponent type="error" message={JSON.stringify(error)}/>
+                )}
+                <Table
+                    loading={loading}
+                    columns={[
+                        {
+                            title: t("contracts.fields.agreementnumber"),
+                            dataIndex: "agreementnumber",
+                            key: "agreementnumber",
+
+                            render: (text, record) => (
+                                <Link to={`/manage/courtesycars/contracts/${record.id}`}>
+                                    {record.agreementnumber || ""}
+                                </Link>
+                            ),
+                        },
+                        {
+                            title: t("jobs.fields.ro_number"),
+                            dataIndex: "job.ro_number",
+                            key: "job.ro_number",
+                            render: (text, record) => (
+                                <Link to={`/manage/jobs/${record.job.id}`}>
+                                    {record.job.ro_number || ""}
+                                </Link>
+                            ),
+                        },
+                        {
+                            title: t("contracts.fields.driver"),
+                            dataIndex: "driver_ln",
+                            key: "driver_ln",
+                            render: (text, record) =>
+                                `${record.driver_fn || ""} ${record.driver_ln || ""}`,
+                        },
+                        {
+                            title: t("contracts.labels.vehicle"),
+                            dataIndex: "vehicle",
+                            key: "vehicle",
+                            render: (text, record) => (
+                                <Link to={`/manage/courtesycars/${record.courtesycar.id}`}>{`${
+                                    record.courtesycar.year
+                                } ${record.courtesycar.make} ${record.courtesycar.model} ${
+                                    record.courtesycar.plate
+                                        ? `(${record.courtesycar.plate})`
+                                        : ""
+                                }`}</Link>
+                            ),
+                        },
+                        {
+                            title: t("contracts.fields.status"),
+                            dataIndex: "status",
+                            render: (text, record) => t(record.status),
+                        },
+                        {
+                            title: t("contracts.fields.start"),
+                            dataIndex: "start",
+                            key: "start",
+                            render: (text, record) => (
+                                <DateTimeFormatter>{record.start}</DateTimeFormatter>
+                            ),
+                        },
+                        {
+                            title: t("contracts.fields.scheduledreturn"),
+                            dataIndex: "scheduledreturn",
+                            key: "scheduledreturn",
+                            render: (text, record) => (
+                                <DateTimeFormatter>{record.scheduledreturn}</DateTimeFormatter>
+                            ),
+                        },
+                        {
+                            title: t("contracts.fields.actualreturn"),
+                            dataIndex: "actualreturn",
+                            key: "actualreturn",
+                            render: (text, record) => (
+                                <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
+                            ),
+                        },
+                    ]}
+                    rowKey="id"
+                    dataSource={data && data.cccontracts}
+                />
+            </Form>
+        </Modal>
+    );
 }
 
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+    mapStateToProps,
+    mapDispatchToProps
 )(ContractsFindModalContainer);