IO-1914 Add manual inventory and edit.

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

@@ -1,4 +1,4 @@
-import { SyncOutlined } from "@ant-design/icons";
+import { EditFilled, SyncOutlined, FileAddFilled } from "@ant-design/icons";
 import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
 import React from "react";
@@ -6,18 +6,28 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } 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";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  setInventoryUpsertContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "inventoryUpsert" })),
 });
 
-export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
+export function JobsList({
+  bodyshop,
+  refetch,
+  loading,
+  jobs,
+  total,
+  setInventoryUpsertContext,
+}) {
   const search = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder } = search;
   const history = useHistory();
@@ -31,6 +41,15 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
       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"),
@@ -40,7 +59,12 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
 
       //sortOrder: sortcolumn === "ownr_ln" && sortorder,
-      render: (text, record) => record.billline?.bill?.invoice_number,
+      render: (text, record) =>
+        (
+          (record.billline?.bill?.invoice_number || "") +
+          " " +
+          (record.manualinvoicenumber || "")
+        ).trim(),
     },
     {
       title: t("inventory.labels.fromvendor"),
@@ -50,7 +74,12 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
 
       //sortOrder: sortcolumn === "ownr_ln" && sortorder,
-      render: (text, record) => record.billline?.bill?.vendor?.name,
+      render: (text, record) =>
+        (
+          (record.billline?.bill?.vendor?.name || "") +
+          " " +
+          (record.manualvendor || "")
+        ).trim(),
     },
     {
       title: t("billlines.fields.actual_price"),
@@ -70,6 +99,11 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         <CurrencyFormatter>{record.actual_cost}</CurrencyFormatter>
       ),
     },
+    {
+      title: t("inventory.fields.comment"),
+      dataIndex: "comment",
+      key: "comment",
+    },
     {
       title: t("inventory.labels.consumedbyjob"),
       dataIndex: "consumedbyjob",
@@ -85,6 +119,30 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
           <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>
+      ),
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
@@ -113,7 +171,16 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
               </Button>
             </>
           )}
-
+          <Button
+            onClick={() => {
+              setInventoryUpsertContext({
+                actions: { refetch: refetch },
+                context: {},
+              });
+            }}
+          >
+            <FileAddFilled />
+          </Button>
           <Button
             onClick={() => {
               if (search.showall) delete search.showall;

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

@@ -11,7 +11,6 @@ import {
 } from "../../redux/application/application.actions";
 import AlertComponent from "../alert/alert.component";
 import InventoryListPaginated from "./inventory-list.component";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   //bodyshop: selectBodyshop,
@@ -52,15 +51,13 @@ export function InventoryList({ setBreadcrumbs, setSelectedHeader }) {
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
-    <RbacWrapper action="jobs:list-all">
-      <InventoryListPaginated
-        refetch={refetch}
-        loading={loading}
-        searchParams={searchParams}
-        total={data ? data.search_inventory_aggregate.aggregate.count : 0}
-        jobs={data ? data.search_inventory : []}
-      />
-    </RbacWrapper>
+    <InventoryListPaginated
+      refetch={refetch}
+      loading={loading}
+      searchParams={searchParams}
+      total={data ? data.search_inventory_aggregate.aggregate.count : 0}
+      jobs={data ? data.search_inventory : []}
+    />
   );
 }