IO-1491 Simplify production query to use ignore employee relationships and match locally.

2021-11-10 16:54:02 -08:00
parent 89af6d23e8
commit f6fe8be7c4
6 changed files with 52 additions and 65 deletions
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -82,7 +82,6 @@ function Header({
  setReportCenterContext,
  recentItems,
 }) {
-  console.log("🚀 ~ file: header.component.jsx ~ line 85 ~ bodyshop", bodyshop);
  const { t } = useTranslation();

  return (
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -10,7 +10,7 @@ import { useTranslation } from "react-i18next";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";

-export default function ProductionBoardCard(technician, card) {
+export default function ProductionBoardCard(technician, card, bodyshop) {
  const { t } = useTranslation();
  const menu = (
    <div>
@@ -19,6 +19,21 @@ export default function ProductionBoardCard(technician, card) {
      </Card>
    </div>
  );
+  let employee_body, employee_prep, employee_refinish, employee_csr;
+  if (card.employee_body) {
+    employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
+  }
+  if (card.employee_prep) {
+    employee_prep = bodyshop.employees.find((e) => e.id === card.employee_prep);
+  }
+  if (card.employee_refinish) {
+    employee_refinish = bodyshop.employees.find(
+      (e) => e.id === card.employee_refinish
+    );
+  }
+  if (card.employee_csr) {
+    employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
+  }

  return (
    <Dropdown overlay={menu} trigger={["contextMenu"]}>
@@ -53,23 +68,23 @@ export default function ProductionBoardCard(technician, card) {
              </div>
              <div className="mex-flex-row__margin">
                <div>{`B: ${
-                  card.employee_body_rel
-                    ? `${card.employee_body_rel.first_name} ${card.employee_body_rel.last_name}`
+                  employee_body
+                    ? `${employee_body.first_name} ${employee_body.last_name}`
                    : ""
                }`}</div>
                <div>{`P: ${
-                  card.employee_prep_rel
-                    ? `${card.employee_prep_rel.first_name} ${card.employee_prep_rel.last_name}`
+                  employee_prep
+                    ? `${employee_prep.first_name} ${employee_prep.last_name}`
                    : ""
                }`}</div>
                <div>{`R: ${
-                  card.employee_refinish_rel
-                    ? `${card.employee_refinish_rel.first_name} ${card.employee_refinish_rel.last_name}`
+                  employee_refinish
+                    ? `${employee_refinish.first_name} ${employee_refinish.last_name}`
                    : ""
                }`}</div>
                <div>{`CSR: ${
-                  card.employee_csr_rel
-                    ? `${card.employee_csr_rel.first_name} ${card.employee_csr_rel.last_name}`
+                  employee_csr
+                    ? `${employee_csr.first_name} ${employee_csr.last_name}`
                    : ""
                }`}</div>
              </div>
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -131,14 +131,14 @@ export function ProductionBoardKanbanComponent({
    }
  };
  const totalHrs = data
-  .reduce(
-    (acc, val) =>
-      acc +
-      (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
-      (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
-    0
-  )
-  .toFixed(1);
+    .reduce(
+      (acc, val) =>
+        acc +
+        (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
+        (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
  return (
    <div>
      <IndefiniteLoading loading={isMoving} />
@@ -167,7 +167,7 @@ export function ProductionBoardKanbanComponent({
      <Board
        children={boardLanes}
        disableCardDrag={isMoving}
-        renderCard={(card) => ProductionBoardCard(technician, card)}
+        renderCard={(card) => ProductionBoardCard(technician, card, bodyshop)}
        onCardDragEnd={handleDragEnd}
      />
    </div>
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -129,7 +129,7 @@ const r = ({ technician, state, activeStatuses }) => {
                : "",
          }}
        >
-          <ProductionListDate record={record} field="date_next_contact" time/>
+          <ProductionListDate record={record} field="date_next_contact" time />
        </span>
      ),
    },
@@ -356,7 +356,7 @@ const r = ({ technician, state, activeStatuses }) => {
      render: (text, record) => (
        <ProductionListEmployeeAssignment
          record={record}
-          type="employee_body_rel"
+          type="employee_body"
        />
      ),
    },
@@ -367,7 +367,7 @@ const r = ({ technician, state, activeStatuses }) => {
      render: (text, record) => (
        <ProductionListEmployeeAssignment
          record={record}
-          type="employee_prep_rel"
+          type="employee_prep"
        />
      ),
    },
@@ -376,10 +376,7 @@ const r = ({ technician, state, activeStatuses }) => {
      dataIndex: "employee_csr",
      key: "employee_csr",
      render: (text, record) => (
-        <ProductionListEmployeeAssignment
-          record={record}
-          type="employee_csr_rel"
-        />
+        <ProductionListEmployeeAssignment record={record} type="employee_csr" />
      ),
    },
    {
@@ -389,7 +386,7 @@ const r = ({ technician, state, activeStatuses }) => {
      render: (text, record) => (
        <ProductionListEmployeeAssignment
          record={record}
-          type="employee_refinish_rel"
+          type="employee_refinish"
        />
      ),
    },
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -49,7 +49,7 @@ export function ProductionListEmpAssignment({
    const result = await updateJob({
      variables: { jobId: record.id, job: { [empAssignment]: employeeid } },

-      awaitRefetchQueries: true,
+      //   awaitRefetchQueries: true,
    });

    insertAuditTrail({
@@ -145,13 +145,18 @@ export function ProductionListEmpAssignment({
    </Row>
  );

+  let theEmployee;
+
+  if (record[type])
+    theEmployee = bodyshop.employees.find((e) => e.id === record[type]);
+
  return (
    <Popover destroyTooltipOnHide content={popContent} visible={visibility}>
      <Spin spinning={loading}>
        {record[type] ? (
          <div>
-            <span>{`${record[type].first_name || ""} ${
-              record[type].last_name || ""
+            <span>{`${theEmployee.first_name || ""} ${
+              theEmployee.last_name || ""
            }`}</span>
            <DeleteFilled
              style={iconStyle}
@@ -174,13 +179,13 @@ export function ProductionListEmpAssignment({

 const determineFieldName = (operation) => {
  switch (operation) {
-    case "employee_body_rel":
+    case "employee_body":
      return "employee_body";
-    case "employee_prep_rel":
+    case "employee_prep":
      return "employee_prep";
-    case "employee_refinish_rel":
+    case "employee_refinish":
      return "employee_refinish";
-    case "employee_csr_rel":
+    case "employee_csr":
      return "employee_csr";
    default:
      return null;
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -125,7 +125,7 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
      scheduled_completion
      scheduled_delivery
      date_last_contacted
-      date_next_contact 
+      date_next_contact
      ins_co_nm
      clm_total
      ownr_ph1
@@ -135,39 +135,10 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
      production_vars
      kanbanparent
      alt_transport
-      joblines_status {
-        part_type
-        count
-        status
-      }
      employee_body
-      employee_body_rel {
-        id
-        first_name
-        last_name
-      }
      employee_refinish
-      employee_refinish_rel {
-        id
-        first_name
-        last_name
-      }
      employee_prep
-      employee_prep_rel {
-        id
-        first_name
-        last_name
-      }
-      employee_csr_rel {
-        id
-        first_name
-        last_name
-      }
-      partcount: joblines_aggregate(where: { removed: { _eq: false } }) {
-        nodes {
-          status
-        }
-      }
+      employee_csr
      labhrs: joblines_aggregate(
        where: {
          _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }]