IO-2971 Export Table Size limit to 10

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/accounting-payables-table/accounting-payables-table.component.jsx

@@ -9,7 +9,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
+import { exportPageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
@@ -175,7 +175,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top", pageSize: pageLimit }}
+        pagination={{ position: "top", pageSize: exportPageLimit }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -8,7 +8,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
+import { exportPageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
@@ -177,7 +177,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top", pageSize: pageLimit }}
+        pagination={{ position: "top", pageSize: exportPageLimit }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -1,18 +1,18 @@
 import { Button, Card, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { exportPageLimit } from "../../utils/config";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
-
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { DateFormatter } from "../../utils/DateFormatter";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import JobMarkSelectedExported from "../jobs-mark-selected-exported/jobs-mark-selected-exported";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
@@ -201,7 +201,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top" }}
+        pagination={{ position: "top", pageSize: exportPageLimit }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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>
   );

client/src/utils/config.js

@@ -1,3 +1,4 @@
 // Sometimes referred to as PageSize, this variable controls the amount of records
 // to show on one page during pagination.
 export const pageLimit = 50;
+export const exportPageLimit = 10;

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

@@ -29,20 +29,22 @@ if (process.env.NODE_ENV !== "development") {
   // Handling SIGINT (e.g., Ctrl+C)
   process.on("SIGINT", async () => {
     await tasksEmailQueueCleanup();
+    process.exit(0);
   });
   // Handling SIGTERM (e.g., sent by system shutdown)
   process.on("SIGTERM", async () => {
     await tasksEmailQueueCleanup();
+    process.exit(0);
   });
   // Handling uncaught exceptions
   process.on("uncaughtException", async (err) => {
     await tasksEmailQueueCleanup();
-    throw err;
+    process.exit(1);
   });
   // Handling unhandled promise rejections
   process.on("unhandledRejection", async (reason, promise) => {
     await tasksEmailQueueCleanup();
-    throw reason;
+    process.exit(1);
   });
 }
 

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 })