IO-3607 Employee Drop Down Inactive filter

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

client/src/components/email-overlay/email-overlay.component.jsx

@@ -41,7 +41,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const emailsToMenu = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,
@@ -59,7 +59,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const menuCC = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,

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

@@ -1,16 +1,17 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useMutation } from "@apollo/client/react";
+import { useLazyQuery, 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 { useState } from "react";
+import { useEffect, 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";
@@ -91,14 +92,34 @@ 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
@@ -342,9 +363,9 @@ export function PartsOrderListTableDrawerComponent({
       <div>
         <PageHeader
           title={
-            selectedPartsOrderRecord.returnfrombill
-              ? `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number} - ${t("bills.labels.returnfrombill")}: ${selectedPartsOrderRecord.bill.invoice_number}`
-              : `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number}`
+            billData
+              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
+              : `${record.vendor.name} - ${record.order_number}`
           }
           extra={recordActions(record)}
         />

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

@@ -70,12 +70,6 @@ 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) => (
@@ -228,12 +222,7 @@ 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,
-      render: (text, record) => (
-        <span>
-          {record.order_number} {record.invoice_number && `(${record.invoice_number})`}
-        </span>
-      )
+      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
     },
     {
       title: t("parts_orders.fields.order_date"),
@@ -283,10 +272,10 @@ export function PartsOrderListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
-  const filteredPartsOrders = enrichedPartsOrders
+  const filteredPartsOrders = parts_orders
     ? searchText === ""
-      ? enrichedPartsOrders
-      : enrichedPartsOrders.filter(
+      ? parts_orders
+      : parts_orders.filter(
           (b) =>
             (b.order_number || "").toString().toLowerCase().includes(searchText.toLowerCase()) ||
             (b.vendor.name || "").toLowerCase().includes(searchText.toLowerCase())

client/src/graphql/bills.queries.js

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