IO-2988 Jobline Upsert Undefined handling

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

.dockerignore

@@ -7,7 +7,7 @@ _reference
 client
 redis/dockerdata
 hasura
-
+node_modules
 # Files to exclude
 .ebignore
 .editorconfig

Dockerfile

@@ -29,13 +29,13 @@ WORKDIR /app
 RUN git config --global --add safe.directory /app
 
 # Copy package.json and package-lock.json
-COPY package*.json ./
+COPY package.json ./
 
 # Install Nodemon
 RUN npm install -g nodemon
 
 # Install dependencies
-RUN npm ci
+RUN npm i --no-package-lock
 
 # Copy the rest of your application code
 COPY . .

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -1,5 +1,8 @@
 import { useMutation } from "@apollo/client";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { notification } from "antd";
+import Axios from "axios";
+import Dinero from "dinero.js";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,13 +10,10 @@ import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_JOB_LINE, UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CriticalPartsScan from "../../utils/criticalPartsScan";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
-import Axios from "axios";
-import Dinero from "dinero.js";
-import CriticalPartsScan from "../../utils/criticalPartsScan";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
@@ -82,13 +82,15 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
         variables: {
           lineId: jobLineEditModal.context.id,
           line: {
-            ...values,
-            prt_dsmk_m: Dinero({
-              amount: Math.round(values.act_price * 100)
+            ...UndefinedToNull({
+              ...values,
+              prt_dsmk_m: Dinero({
+                amount: Math.round(values.act_price * 100)
+              })
+                .percentage(Math.abs(values.prt_dsmk_p || 0))
+                .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+                .toFormat(0.0)
             })
-              .percentage(Math.abs(values.prt_dsmk_p || 0))
-              .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
-              .toFormat(0.0)
           }
         },
         refetchQueries: ["GET_LINE_TICKET_BY_PK"]

client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx

@@ -219,7 +219,7 @@ export function JobsExportAllButton({
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || jobIds?.length > 10}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

client/src/components/payable-export-all-button/payable-export-all-button.component.jsx

@@ -200,7 +200,7 @@ export function PayableExportAll({
     );
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || billids?.length > 10}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

client/src/components/payments-export-all-button/payments-export-all-button.component.jsx

@@ -180,7 +180,7 @@ export function PaymentsExportAllButton({
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || paymentIds?.length > 10}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

docker-compose.yml

@@ -14,7 +14,7 @@ services:
       context: ./redis
     container_name: redis-node-1
     hostname: redis-node-1
-    restart: always
+    restart: unless-stopped
     networks:
       - redis-cluster-net
     volumes:
@@ -32,7 +32,7 @@ services:
       context: ./redis
     container_name: redis-node-2
     hostname: redis-node-2
-    restart: always
+    restart: unless-stopped
     networks:
       - redis-cluster-net
     volumes:
@@ -50,7 +50,7 @@ services:
       context: ./redis
     container_name: redis-node-3
     hostname: redis-node-3
-    restart: always
+    restart: unless-stopped
     networks:
       - redis-cluster-net
     volumes:
@@ -70,7 +70,7 @@ services:
     hostname: localstack
     networks:
       - redis-cluster-net
-    restart: always
+    restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
@@ -152,7 +152,7 @@ services:
 #    image: redislabs/redisinsight:latest
 #    container_name: redis-insight
 #    hostname: redis-insight
-#    restart: always
+#    restart: unless-stopped
 #    ports:
 #      - "3334:5540"
 #    networks:

server/email/tasksEmails.js

@@ -25,26 +25,32 @@ const tasksEmailQueueCleanup = async () => {
   }
 };
 
-if (process.env.NODE_ENV !== "development") {
-  // Handling SIGINT (e.g., Ctrl+C)
-  process.on("SIGINT", async () => {
-    await tasksEmailQueueCleanup();
-  });
-  // Handling SIGTERM (e.g., sent by system shutdown)
-  process.on("SIGTERM", async () => {
-    await tasksEmailQueueCleanup();
-  });
-  // Handling uncaught exceptions
-  process.on("uncaughtException", async (err) => {
-    await tasksEmailQueueCleanup();
-    throw err;
-  });
-  // Handling unhandled promise rejections
-  process.on("unhandledRejection", async (reason, promise) => {
-    await tasksEmailQueueCleanup();
-    throw reason;
-  });
-}
+// if (process.env.NODE_ENV !== "development") {
+//   // Handling SIGINT (e.g., Ctrl+C)
+//   process.on("SIGINT", async () => {
+//     console.log("Handling SIGNIT For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(0);
+//   });
+//   // Handling SIGTERM (e.g., sent by system shutdown)
+//   process.on("SIGTERM", async () => {
+//     console.log("Handling SIGTERM For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(0);
+//   });
+//   // Handling uncaught exceptions
+//   process.on("uncaughtException", async (err) => {
+//     console.log("Handling uncaughtException For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(1);
+//   });
+//   // Handling unhandled promise rejections
+//   process.on("unhandledRejection", async (reason, promise) => {
+//     console.log("Handling unhandledRejection For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(1);
+//   });
+// }
 
 /**
  * Format the date for the email.

server/email/tasksEmailsQueue.js

@@ -13,7 +13,7 @@ const taskEmailQueue = () =>
       console.log("Processing reminds for taskIds: ", taskIds.join(", "));
 
       // Set the remind_at_sent to the current time.
-      const now = moment.utc().toISOString();
+      const now = moment().toISOString();
 
       client
         .request(UPDATE_TASKS_REMIND_AT_SENT, { taskIds, now })