IO-3582 Remove Unneeded Query - Data in billQuery

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/eula/eula.component.jsx

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

client/src/components/job-totals-table/job-totals.table.labor.component.jsx

@@ -144,11 +144,18 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mapa")}
                 {InstanceRenderManager({
                   imex:
-                    (job.materials?.mapa ?? job.materials?.MAPA)?.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", { amount: (job.materials.mapa ?? job.materials.MAPA).cal_maxdlr }),
+                    job.materials?.mapa &&
+                    job.materials.mapa.cal_maxdlr &&
+                    job.materials.mapa.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.mapa.cal_maxdlr
+                    }),
                   rome:
-                    job.materials?.MAPA?.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", { amount: job.materials.MAPA.cal_maxdlr })
+                    job.materials?.MAPA &&
+                    job.materials.MAPA.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.MAPA.cal_maxdlr
+                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>
@@ -183,11 +190,18 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mash")}
                 {InstanceRenderManager({
                   imex:
-                    (job.materials?.mash ?? job.materials?.MASH)?.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", { amount: (job.materials.mash ?? job.materials.MASH).cal_maxdlr }),
+                    job.materials?.mash &&
+                    job.materials.mash.cal_maxdlr &&
+                    job.materials.mash.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.mash.cal_maxdlr
+                    }),
                   rome:
-                    job.materials?.MASH?.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", { amount: job.materials.MASH.cal_maxdlr })
+                    job.materials?.MASH &&
+                    job.materials.MASH.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.MASH.cal_maxdlr
+                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>

client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx

@@ -1,17 +1,16 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useLazyQuery, useMutation } from "@apollo/client/react";
+import { useMutation } from "@apollo/client/react";
 import { Button, Drawer, Grid, Popconfirm, Space } from "antd";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 import queryString from "query-string";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
 import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
 import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -92,34 +91,14 @@ export function PartsOrderListTableDrawerComponent({
     sortedInfo: {}
   });
 
-  const [billData, setBillData] = useState(null);
   const search = queryString.parse(useLocation().search);
   const selectedpartsorder = search.partsorderid;
 
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
   const { refetch } = billsQuery;
-  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
   const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder);
 
-  useEffect(() => {
-    const fetchData = async () => {
-      if (selectedPartsOrderRecord?.returnfrombill) {
-        try {
-          const { data } = await billQuery({
-            variables: {
-              billid: selectedPartsOrderRecord.returnfrombill
-            }
-          });
-          setBillData(data);
-        } catch (error) {
-          console.error("Error fetching bill data:", error);
-        }
-      } else setBillData(null);
-    };
-    fetchData();
-  }, [selectedPartsOrderRecord, billQuery]);
-
   const recordActions = (record) => (
     <Space orientation="horizontal" wrap>
       <Button
@@ -363,9 +342,9 @@ export function PartsOrderListTableDrawerComponent({
       <div>
         <PageHeader
           title={
-            billData
-              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
-              : `${record.vendor.name} - ${record.order_number}`
+            selectedPartsOrderRecord.returnfrombill
+              ? `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number} - ${t("bills.labels.returnfrombill")}: ${selectedPartsOrderRecord.bill.invoice_number}`
+              : `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number}`
           }
           extra={recordActions(record)}
         />

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -70,6 +70,12 @@ export function PartsOrderListTableComponent({
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
+
+  const enrichedPartsOrders = parts_orders.map((order) => ({
+    ...order,
+    invoice_number: order.bill?.invoice_number
+  }));
+
   const { refetch } = billsQuery;
 
   const recordActions = (record, showView = false) => (
@@ -222,7 +228,12 @@ export function PartsOrderListTableComponent({
       dataIndex: "order_number",
       key: "order_number",
       sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
+      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order,
+      render: (text, record) => (
+        <span>
+          {record.order_number} {record.invoice_number && `(${record.invoice_number})`}
+        </span>
+      )
     },
     {
       title: t("parts_orders.fields.order_date"),
@@ -272,10 +283,10 @@ export function PartsOrderListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
-  const filteredPartsOrders = parts_orders
+  const filteredPartsOrders = enrichedPartsOrders
     ? searchText === ""
-      ? parts_orders
-      : parts_orders.filter(
+      ? enrichedPartsOrders
+      : enrichedPartsOrders.filter(
           (b) =>
             (b.order_number || "").toString().toLowerCase().includes(searchText.toLowerCase()) ||
             (b.vendor.name || "").toLowerCase().includes(searchText.toLowerCase())

client/src/graphql/bills.queries.js

@@ -91,6 +91,10 @@ export const QUERY_PARTS_BILLS_BY_JOBID = gql`
       order_number
       comments
       user_email
+      bill {
+        id
+        invoice_number
+      }
     }
     parts_dispatch(where: { jobid: { _eq: $jobid } }) {
       id

server/job/job-totals.js

@@ -315,12 +315,7 @@ function CalculateRatesTotals(ratesList) {
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
       //Extend for when there are hours and a price.
-      if (
-        item.lbr_op === "OP14" &&
-        item.act_price > 0 &&
-        (!item.part_type || item.mod_lb_hrs === 0) &&
-        !IsAdditionalCost(item)
-      ) {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
         //Scenario where SGI may pay out hours using a part price.
         if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
           ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
@@ -344,30 +339,38 @@ function CalculateRatesTotals(ratesList) {
   let subtotal = Dinero({ amount: 0 });
   let rates_subtotal = Dinero({ amount: 0 });
 
-  for (const [property, values] of Object.entries(ret)) {
+  for (const property in ret) {
     //Skip calculating mapa and mash if we got the amounts.
-    const shouldSkipCalculation = (property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine);
-
-    if (!shouldSkipCalculation) {
-      values.total ??= Dinero();
-
-      //Check if there is a max for this type and apply it.
-      const maxDollar =
-        ratesList.materials?.[property]?.cal_maxdlr || ratesList.materials?.[property.toUpperCase()]?.cal_maxdlr;
-      const threshold = maxDollar > 0 ? Dinero({ amount: Math.round(maxDollar * 100) }) : null;
+    if (!((property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine))) {
+      if (!ret[property].total) {
+        ret[property].total = Dinero();
+      }
+      let threshold;
+      //Check if there is a max for this type.
+      if (ratesList.materials && ratesList.materials[property]) {
+        //
+        if (ratesList.materials[property].cal_maxdlr && ratesList.materials[property].cal_maxdlr > 0) {
+          //It has an upper threshhold.
+          threshold = Dinero({
+            amount: Math.round(ratesList.materials[property].cal_maxdlr * 100)
+          });
+        }
+      }
 
       const total = Dinero({
-        amount: Math.round((values.rate || 0) * 100)
-      }).multiply(values.hours);
+        amount: Math.round((ret[property].rate || 0) * 100)
+      }).multiply(ret[property].hours);
 
-      values.total = values.total.add(threshold && total.greaterThanOrEqual(threshold) ? threshold : total);
+      if (threshold && total.greaterThanOrEqual(threshold)) {
+        ret[property].total = ret[property].total.add(threshold);
+      } else {
+        ret[property].total = ret[property].total.add(total);
+      }
     }
 
-    subtotal = subtotal.add(values.total);
+    subtotal = subtotal.add(ret[property].total);
 
-    if (property !== "mapa" && property !== "mash") {
-      rates_subtotal = rates_subtotal.add(values.total);
-    }
+    if (property !== "mapa" && property !== "mash") rates_subtotal = rates_subtotal.add(ret[property].total);
   }
 
   ret.subtotal = subtotal;