Reformat all project files to use the prettier config file.

client/src/components/inventory-list/inventory-list.component.jsx

@@ -1,224 +1,206 @@
-import {EditFilled, FileAddFilled, SyncOutlined} from "@ant-design/icons";
-import {Button, Card, Input, Space, Table, Typography} from "antd";
+import { EditFilled, FileAddFilled, SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
 import React from "react";
-import {useTranslation} from "react-i18next";
-import {connect} from "react-redux";
-import {Link, useLocation, useNavigate} from "react-router-dom";
-import {createStructuredSelector} from "reselect";
-import {setModalContext} from "../../redux/modals/modals.actions";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InventoryBillRo from "../inventory-bill-ro/inventory-bill-ro.component";
 import InventoryLineDelete from "../inventory-line-delete/inventory-line-delete.component";
-import {pageLimit} from "../../utils/config";
+import { pageLimit } from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
-    //currentUser: selectCurrentUser
-    bodyshop: selectBodyshop,
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-    setInventoryUpsertContext: (context) =>
-        dispatch(setModalContext({context: context, modal: "inventoryUpsert"})),
+  setInventoryUpsertContext: (context) => dispatch(setModalContext({ context: context, modal: "inventoryUpsert" }))
 });
 
-export function JobsList({bodyshop, refetch, loading, jobs, total, setInventoryUpsertContext,}) {
-    const search = queryString.parse(useLocation().search);
-    const {page, sortcolumn, sortorder} = search;
-    const history = useNavigate();
+export function JobsList({ bodyshop, refetch, loading, jobs, total, setInventoryUpsertContext }) {
+  const search = queryString.parse(useLocation().search);
+  const { page, sortcolumn, sortorder } = search;
+  const history = useNavigate();
 
-    const {t} = useTranslation();
-    const columns = [
-        {
-            title: t("billlines.fields.line_desc"),
-            dataIndex: "line_desc",
-            key: "line_desc",
+  const { t } = useTranslation();
+  const columns = [
+    {
+      title: t("billlines.fields.line_desc"),
+      dataIndex: "line_desc",
+      key: "line_desc",
 
-            sorter: true, //(a, b) => alphaSort(a.line_desc, b.line_desc),
-            sortOrder: sortcolumn === "line_desc" && sortorder,
-            render: (text, record) =>
-                record.billline?.bill?.job ? (
-                    <div>
-                        <div>{text}</div>
-                        <strong>{`(${record.billline?.bill?.job?.v_model_yr} ${record.billline?.bill?.job?.v_make_desc} ${record.billline?.bill?.job?.v_model_desc})`}</strong>
-                    </div>
-                ) : (
-                    text
-                ),
-        },
-        {
-            title: t("inventory.labels.frombillinvoicenumber"),
-            dataIndex: "vendorname",
-            key: "vendorname",
-            ellipsis: true,
-            //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: true, //(a, b) => alphaSort(a.line_desc, b.line_desc),
+      sortOrder: sortcolumn === "line_desc" && sortorder,
+      render: (text, record) =>
+        record.billline?.bill?.job ? (
+          <div>
+            <div>{text}</div>
+            <strong>{`(${record.billline?.bill?.job?.v_model_yr} ${record.billline?.bill?.job?.v_make_desc} ${record.billline?.bill?.job?.v_model_desc})`}</strong>
+          </div>
+        ) : (
+          text
+        )
+    },
+    {
+      title: t("inventory.labels.frombillinvoicenumber"),
+      dataIndex: "vendorname",
+      key: "vendorname",
+      ellipsis: true,
+      //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
 
-            //sortOrder: sortcolumn === "ownr_ln" && sortorder,
-            render: (text, record) =>
-                (
-                    (record.billline?.bill?.invoice_number || "") +
-                    " " +
-                    (record.manualinvoicenumber || "")
-                ).trim(),
-        },
-        {
-            title: t("inventory.labels.fromvendor"),
-            dataIndex: "vendorname",
-            key: "vendorname",
-            ellipsis: true,
-            //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      //sortOrder: sortcolumn === "ownr_ln" && sortorder,
+      render: (text, record) =>
+        ((record.billline?.bill?.invoice_number || "") + " " + (record.manualinvoicenumber || "")).trim()
+    },
+    {
+      title: t("inventory.labels.fromvendor"),
+      dataIndex: "vendorname",
+      key: "vendorname",
+      ellipsis: true,
+      //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
 
-            //sortOrder: sortcolumn === "ownr_ln" && sortorder,
-            render: (text, record) =>
-                (
-                    (record.billline?.bill?.vendor?.name || "") +
-                    " " +
-                    (record.manualvendor || "")
-                ).trim(),
-        },
-        {
-            title: t("billlines.fields.actual_price"),
-            dataIndex: "actual_price",
-            key: "actual_price",
+      //sortOrder: sortcolumn === "ownr_ln" && sortorder,
+      render: (text, record) => ((record.billline?.bill?.vendor?.name || "") + " " + (record.manualvendor || "")).trim()
+    },
+    {
+      title: t("billlines.fields.actual_price"),
+      dataIndex: "actual_price",
+      key: "actual_price",
 
-            render: (text, record) => (
-                <CurrencyFormatter>{record.actual_price}</CurrencyFormatter>
-            ),
-        },
-        {
-            title: t("billlines.fields.actual_cost"),
-            dataIndex: "actual_cost",
-            key: "actual_cost",
+      render: (text, record) => <CurrencyFormatter>{record.actual_price}</CurrencyFormatter>
+    },
+    {
+      title: t("billlines.fields.actual_cost"),
+      dataIndex: "actual_cost",
+      key: "actual_cost",
 
-            render: (text, record) => (
-                <CurrencyFormatter>{record.actual_cost}</CurrencyFormatter>
-            ),
-        },
-        {
-            title: t("inventory.fields.comment"),
-            dataIndex: "comment",
-            key: "comment",
-        },
-        {
-            title: t("inventory.labels.consumedbyjob"),
-            dataIndex: "consumedbyjob",
-            key: "consumedbyjob",
+      render: (text, record) => <CurrencyFormatter>{record.actual_cost}</CurrencyFormatter>
+    },
+    {
+      title: t("inventory.fields.comment"),
+      dataIndex: "comment",
+      key: "comment"
+    },
+    {
+      title: t("inventory.labels.consumedbyjob"),
+      dataIndex: "consumedbyjob",
+      key: "consumedbyjob",
 
-            ellipsis: true,
-            render: (text, record) =>
-                record.bill?.job?.ro_number ? (
-                    <Link to={`/manage/jobs/${record.bill?.job?.id}`}>
-                        {record.bill?.job?.ro_number}
-                    </Link>
-                ) : (
-                    <InventoryBillRo inventoryline={record}/>
-                ),
-        },
-        {
-            title: t("general.labels.actions"),
-            dataIndex: "actions",
-            key: "actions",
+      ellipsis: true,
+      render: (text, record) =>
+        record.bill?.job?.ro_number ? (
+          <Link to={`/manage/jobs/${record.bill?.job?.id}`}>{record.bill?.job?.ro_number}</Link>
+        ) : (
+          <InventoryBillRo inventoryline={record} />
+        )
+    },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
 
-            ellipsis: true,
-            render: (text, record) => (
-                <Space wrap>
-                    <Button
-                        onClick={() => {
-                            setInventoryUpsertContext({
-                                actions: {refetch: refetch},
-                                context: {
-                                    existingInventory: record,
-                                },
-                            });
-                        }}
-                    >
-                        <EditFilled/>
-                    </Button>
-                    <InventoryLineDelete inventoryline={record} refetch={refetch}/>
-                </Space>
-            ),
-        },
-    ];
+      ellipsis: true,
+      render: (text, record) => (
+        <Space wrap>
+          <Button
+            onClick={() => {
+              setInventoryUpsertContext({
+                actions: { refetch: refetch },
+                context: {
+                  existingInventory: record
+                }
+              });
+            }}
+          >
+            <EditFilled />
+          </Button>
+          <InventoryLineDelete inventoryline={record} refetch={refetch} />
+        </Space>
+      )
+    }
+  ];
 
-    const handleTableChange = (pagination, filters, sorter) => {
-        search.page = pagination.current;
-        search.sortcolumn = sorter.column && sorter.column.key;
-        search.sortorder = sorter.order;
-        history({search: queryString.stringify(search)});
-    };
+  const handleTableChange = (pagination, filters, sorter) => {
+    search.page = pagination.current;
+    search.sortcolumn = sorter.column && sorter.column.key;
+    search.sortorder = sorter.order;
+    history({ search: queryString.stringify(search) });
+  };
 
-    return (
-        <Card
-            extra={
-                <Space wrap>
-                    {search.search && (
-                        <>
-                            <Typography.Title level={4}>
-                                {t("general.labels.searchresults", {search: search.search})}
-                            </Typography.Title>
-                            <Button
-                                onClick={() => {
-                                    delete search.search;
-                                    history({search: queryString.stringify(search)});
-                                }}
-                            >
-                                {t("general.actions.clear")}
-                            </Button>
-                        </>
-                    )}
-                    <Button
-                        onClick={() => {
-                            setInventoryUpsertContext({
-                                actions: {refetch: refetch},
-                                context: {},
-                            });
-                        }}
-                    >
-                        <FileAddFilled/>
-                    </Button>
-                    <Button
-                        onClick={() => {
-                            if (search.showall) delete search.showall;
-                            else {
-                                search.showall = true;
-                            }
-                            history({search: queryString.stringify(search)});
-                        }}
-                    >
-                        {search.showall
-                            ? t("inventory.labels.showavailable")
-                            : t("inventory.labels.showall")}
-                    </Button>
-
-                    <Button onClick={() => refetch()}>
-                        <SyncOutlined/>
-                    </Button>
-                    <Input.Search
-                        placeholder={search.search || t("general.labels.search")}
-                        onSearch={(value) => {
-                            search.search = value;
-                            history({search: queryString.stringify(search)});
-                        }}
-                        enterButton
-                    />
-                </Space>
-            }
-        >
-            <Table
-                loading={loading}
-                pagination={{
-                    position: "top",
-                    pageSize: pageLimit,
-                    current: parseInt(page || 1),
-                    total: total,
+  return (
+    <Card
+      extra={
+        <Space wrap>
+          {search.search && (
+            <>
+              <Typography.Title level={4}>
+                {t("general.labels.searchresults", { search: search.search })}
+              </Typography.Title>
+              <Button
+                onClick={() => {
+                  delete search.search;
+                  history({ search: queryString.stringify(search) });
                 }}
-                columns={columns}
-                rowKey="id"
-                dataSource={jobs}
-                onChange={handleTableChange}
-            />
-        </Card>
-    );
+              >
+                {t("general.actions.clear")}
+              </Button>
+            </>
+          )}
+          <Button
+            onClick={() => {
+              setInventoryUpsertContext({
+                actions: { refetch: refetch },
+                context: {}
+              });
+            }}
+          >
+            <FileAddFilled />
+          </Button>
+          <Button
+            onClick={() => {
+              if (search.showall) delete search.showall;
+              else {
+                search.showall = true;
+              }
+              history({ search: queryString.stringify(search) });
+            }}
+          >
+            {search.showall ? t("inventory.labels.showavailable") : t("inventory.labels.showall")}
+          </Button>
+
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
+          <Input.Search
+            placeholder={search.search || t("general.labels.search")}
+            onSearch={(value) => {
+              search.search = value;
+              history({ search: queryString.stringify(search) });
+            }}
+            enterButton
+          />
+        </Space>
+      }
+    >
+      <Table
+        loading={loading}
+        pagination={{
+          position: "top",
+          pageSize: pageLimit,
+          current: parseInt(page || 1),
+          total: total
+        }}
+        columns={columns}
+        rowKey="id"
+        dataSource={jobs}
+        onChange={handleTableChange}
+      />
+    </Card>
+  );
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobsList);

client/src/components/inventory-list/inventory-list.container.jsx

@@ -1,62 +1,55 @@
-import {useQuery} from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import queryString from "query-string";
 import React from "react";
-import {connect} from "react-redux";
-import {useLocation} from "react-router-dom";
-import {createStructuredSelector} from "reselect";
-import {QUERY_INVENTORY_PAGINATED} from "../../graphql/inventory.queries";
-import {setBreadcrumbs, setSelectedHeader,} from "../../redux/application/application.actions";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { QUERY_INVENTORY_PAGINATED } from "../../graphql/inventory.queries";
+import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import AlertComponent from "../alert/alert.component";
 import InventoryListPaginated from "./inventory-list.component";
-import {pageLimit} from "../../utils/config";
+import { pageLimit } from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
-    //bodyshop: selectBodyshop,
+  //bodyshop: selectBodyshop,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
-    setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function InventoryList({setBreadcrumbs, setSelectedHeader}) {
-    const searchParams = queryString.parse(useLocation().search);
-    const {page, sortcolumn, sortorder, search, showall} = searchParams;
+export function InventoryList({ setBreadcrumbs, setSelectedHeader }) {
+  const searchParams = queryString.parse(useLocation().search);
+  const { page, sortcolumn, sortorder, search, showall } = searchParams;
 
-    const {loading, error, data, refetch} = useQuery(
-        QUERY_INVENTORY_PAGINATED,
+  const { loading, error, data, refetch } = useQuery(QUERY_INVENTORY_PAGINATED, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    variables: {
+      search: search || "",
+      offset: page ? (page - 1) * pageLimit : 0,
+      limit: pageLimit,
+      consumedIsNull: showall === "true" ? null : true,
+      order: [
         {
-            fetchPolicy: "network-only",
-            nextFetchPolicy: "network-only",
-            variables: {
-                search: search || "",
-                offset: page ? (page - 1) * pageLimit : 0,
-                limit: pageLimit,
-                consumedIsNull: showall === "true" ? null : true,
-                order: [
-                    {
-                        [sortcolumn || "created_at"]:
-                            sortorder && sortorder !== "false"
-                                ? sortorder === "descend"
-                                    ? "desc"
-                                    : "asc"
-                                : "desc",
-                    },
-                ],
-            },
+          [sortcolumn || "created_at"]:
+            sortorder && sortorder !== "false" ? (sortorder === "descend" ? "desc" : "asc") : "desc"
         }
-    );
+      ]
+    }
+  });
 
-    if (error) return <AlertComponent message={error.message} type="error"/>;
-    return (
-        <InventoryListPaginated
-            refetch={refetch}
-            loading={loading}
-            searchParams={searchParams}
-            total={data ? data.search_inventory_aggregate.aggregate.count : 0}
-            jobs={data ? data.search_inventory : []}
-        />
-    );
+  if (error) return <AlertComponent message={error.message} type="error" />;
+  return (
+    <InventoryListPaginated
+      refetch={refetch}
+      loading={loading}
+      searchParams={searchParams}
+      total={data ? data.search_inventory_aggregate.aggregate.count : 0}
+      jobs={data ? data.search_inventory : []}
+    />
+  );
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(InventoryList);