IO-3286 Additional Product Fruit IDs

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

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -337,7 +337,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail })
       <Col {...colSpan}>
         <Card
           style={{ height: "100%" }}
-          title=<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>
+          title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>}
           id={"job-employee-assignments"}
         >
           <div>

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -3,7 +3,7 @@ import { Button, Card, Input, Space, Table, Typography } from "antd";
 import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -20,7 +20,7 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -203,6 +203,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
   return (
     <Card
+      id="all-jobs-list"
+      title={t("titles.bc.jobs-all")}
       extra={
         <Space wrap>
           {search.search && (
@@ -256,6 +258,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         rowKey="id"
         dataSource={search?.search ? openSearchResults : jobs}
         onChange={handleTableChange}
+        id="all-jobs-list-table"
       />
     </Card>
   );

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

@@ -2,7 +2,7 @@ import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOut
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -22,7 +22,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
 
 export function JobsList({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
@@ -342,13 +342,14 @@ export function JobsList({ bodyshop }) {
           type: "radio"
         }}
         onChange={handleTableChange}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               handleOnRowClick(record);
             }
           };
         }}
+        id="active-jobs-list-table"
       />
     </Card>
   );

client/src/contexts/SocketIO/socketProvider.jsx

@@ -16,7 +16,7 @@ import {
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { INITIAL_NOTIFICATIONS, SocketContext } from "./useSocket.js";
+import { SocketContext, INITIAL_NOTIFICATIONS } from "./useSocket.js";
 
 /**
  * Socket Provider - Scenario Notifications / Web Socket related items
@@ -157,10 +157,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         auth: { token, bodyshopId: bodyshop.id },
         reconnectionAttempts: Infinity,
         reconnectionDelay: 2000,
-        reconnectionDelayMax: 60000,
-        randomizationFactor: 0.5,
-        transports: ["websocket", "polling"], // Add this to prefer WebSocket with polling fallback
-        rememberUpgrade: true
+        reconnectionDelayMax: 10000
       });
 
       socketRef.current = socketInstance;

server/job/job-costing.js

@@ -19,7 +19,7 @@ async function JobCosting(req, res) {
   const client = req.userGraphQLClient;
 
   //Uncomment for further testing
-  logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
+  // logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
 
   try {
     const resp = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_JOB_COSTING_DETAILS, {
@@ -47,9 +47,9 @@ async function JobCostingMulti(req, res) {
   const client = req.userGraphQLClient;
 
   //Uncomment for further testing
-  logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, {
-    jobids
-  });
+  // logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, {
+  //   jobids
+  // });
 
   try {
     const resp = await client
@@ -589,7 +589,7 @@ function GenerateCostingData(job) {
           amount: Math.round((job.storage_payable || 0) * 100)
         });
   }
-
+  
   //Is it a DMS Setup?
   const selectedDmsAllocationConfig =
     (job.bodyshop.md_responsibility_centers.dms_defaults &&

server/job/job-lifecycle.js

@@ -8,7 +8,6 @@ const getLifecycleStatusColor = require("../utils/getLifecycleStatusColor");
 const jobLifecycle = async (req, res) => {
   // Grab the jobids and statuses from the request body
   const { jobids, statuses } = req.body;
-  const { logger } = req;
 
   if (!jobids) {
     return res.status(400).json({
@@ -17,118 +16,102 @@ const jobLifecycle = async (req, res) => {
   }
 
   const jobIDs = _.isArray(jobids) ? jobids : [jobids];
+  const client = req.userGraphQLClient;
+  const resp = await client.request(queries.QUERY_TRANSITIONS_BY_JOBID, { jobids: jobIDs });
 
-  logger.log("job-lifecycle-start", "DEBUG", req?.user?.email, null, {
-    jobids: jobIDs
-  });
-
-  try {
-    const client = req.userGraphQLClient;
-    const resp = await client.request(queries.QUERY_TRANSITIONS_BY_JOBID, { jobids: jobIDs });
-
-    const transitions = resp.transitions;
-
-    if (!transitions) {
-      return res.status(200).json({
-        jobIDs,
-        transitions: []
-      });
-    }
-
-    const transitionsByJobId = _.groupBy(resp.transitions, "jobid");
-
-    const groupedTransitions = {};
-    const allDurations = [];
-
-    for (let jobId in transitionsByJobId) {
-      let lifecycle = transitionsByJobId[jobId].map((transition) => {
-        transition.start_readable = transition.start ? moment(transition.start).fromNow() : "N/A";
-        transition.end_readable = transition.end ? moment(transition.end).fromNow() : "N/A";
-
-        if (transition.duration) {
-          transition.duration_seconds = Math.round(transition.duration / 1000);
-          transition.duration_minutes = Math.round(transition.duration_seconds / 60);
-          let duration = moment.duration(transition.duration);
-          transition.duration_readable = durationToHumanReadable(duration);
-        } else {
-          transition.duration_seconds = 0;
-          transition.duration_minutes = 0;
-          transition.duration_readable = "N/A";
-        }
-        return transition;
-      });
-
-      const durations = calculateStatusDuration(lifecycle, statuses);
-
-      groupedTransitions[jobId] = {
-        lifecycle,
-        durations
-      };
-
-      if (durations?.summations) {
-        allDurations.push(durations.summations);
-      }
-    }
-
-    const finalSummations = [];
-    const flatGroupedAllDurations = _.groupBy(allDurations.flat(), "status");
-
-    const finalStatusCounts = Object.keys(flatGroupedAllDurations).reduce((acc, status) => {
-      acc[status] = flatGroupedAllDurations[status].length;
-      return acc;
-    }, {});
-    // Calculate total value of all statuses
-    const finalTotal = Object.values(flatGroupedAllDurations).reduce((total, statusArr) => {
-      return total + statusArr.reduce((acc, curr) => acc + curr.value, 0);
-    }, 0);
-
-    Object.keys(flatGroupedAllDurations).forEach((status) => {
-      const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
-      const humanReadable = durationToHumanReadable(moment.duration(value));
-      const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
-      const color = getLifecycleStatusColor(status);
-      const roundedPercentage = `${Math.round(percentage)}%`;
-      const averageValue = _.size(jobIDs) > 0 ? value / jobIDs.length : 0;
-      const averageHumanReadable = durationToHumanReadable(moment.duration(averageValue));
-      finalSummations.push({
-        status,
-        value,
-        humanReadable,
-        percentage,
-        color,
-        roundedPercentage,
-        averageValue,
-        averageHumanReadable
-      });
-    });
+  const transitions = resp.transitions;
 
+  if (!transitions) {
     return res.status(200).json({
       jobIDs,
-      transition: groupedTransitions,
-      durations: {
-        jobs: jobIDs.length,
-        summations: finalSummations,
-        totalStatuses: finalSummations.length,
-        total: finalTotal,
-        statusCounts: finalStatusCounts,
-        humanReadable: durationToHumanReadable(moment.duration(finalTotal)),
-        averageValue: _.size(jobIDs) > 0 ? finalTotal / jobIDs.length : 0,
-        averageHumanReadable:
-          _.size(jobIDs) > 0
-            ? durationToHumanReadable(moment.duration(finalTotal / jobIDs.length))
-            : durationToHumanReadable(moment.duration(0))
-      }
-    });
-  } catch (error) {
-    logger.log("job-lifecycle-error", "ERROR", req?.user?.email, null, {
-      jobids: jobIDs,
-      statuses: statuses ? JSON.stringify(statuses) : "N/A",
-      error: error.message
-    });
-    return res.status(500).json({
-      error: "Internal server error"
+      transitions: []
     });
   }
+
+  const transitionsByJobId = _.groupBy(resp.transitions, "jobid");
+
+  const groupedTransitions = {};
+  const allDurations = [];
+
+  for (let jobId in transitionsByJobId) {
+    let lifecycle = transitionsByJobId[jobId].map((transition) => {
+      transition.start_readable = transition.start ? moment(transition.start).fromNow() : "N/A";
+      transition.end_readable = transition.end ? moment(transition.end).fromNow() : "N/A";
+
+      if (transition.duration) {
+        transition.duration_seconds = Math.round(transition.duration / 1000);
+        transition.duration_minutes = Math.round(transition.duration_seconds / 60);
+        let duration = moment.duration(transition.duration);
+        transition.duration_readable = durationToHumanReadable(duration);
+      } else {
+        transition.duration_seconds = 0;
+        transition.duration_minutes = 0;
+        transition.duration_readable = "N/A";
+      }
+      return transition;
+    });
+
+    const durations = calculateStatusDuration(lifecycle, statuses);
+
+    groupedTransitions[jobId] = {
+      lifecycle,
+      durations
+    };
+
+    if (durations?.summations) {
+      allDurations.push(durations.summations);
+    }
+  }
+
+  const finalSummations = [];
+  const flatGroupedAllDurations = _.groupBy(allDurations.flat(), "status");
+
+  const finalStatusCounts = Object.keys(flatGroupedAllDurations).reduce((acc, status) => {
+    acc[status] = flatGroupedAllDurations[status].length;
+    return acc;
+  }, {});
+  // Calculate total value of all statuses
+  const finalTotal = Object.values(flatGroupedAllDurations).reduce((total, statusArr) => {
+    return total + statusArr.reduce((acc, curr) => acc + curr.value, 0);
+  }, 0);
+
+  Object.keys(flatGroupedAllDurations).forEach((status) => {
+    const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
+    const humanReadable = durationToHumanReadable(moment.duration(value));
+    const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
+    const color = getLifecycleStatusColor(status);
+    const roundedPercentage = `${Math.round(percentage)}%`;
+    const averageValue = _.size(jobIDs) > 0 ? value / jobIDs.length : 0;
+    const averageHumanReadable = durationToHumanReadable(moment.duration(averageValue));
+    finalSummations.push({
+      status,
+      value,
+      humanReadable,
+      percentage,
+      color,
+      roundedPercentage,
+      averageValue,
+      averageHumanReadable
+    });
+  });
+
+  return res.status(200).json({
+    jobIDs,
+    transition: groupedTransitions,
+    durations: {
+      jobs: jobIDs.length,
+      summations: finalSummations,
+      totalStatuses: finalSummations.length,
+      total: finalTotal,
+      statusCounts: finalStatusCounts,
+      humanReadable: durationToHumanReadable(moment.duration(finalTotal)),
+      averageValue: _.size(jobIDs) > 0 ? finalTotal / jobIDs.length : 0,
+      averageHumanReadable:
+        _.size(jobIDs) > 0
+          ? durationToHumanReadable(moment.duration(finalTotal / jobIDs.length))
+          : durationToHumanReadable(moment.duration(0))
+    }
+  });
 };
 
 module.exports = jobLifecycle;