IO-1927 Export Button as Primary

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

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

@@ -173,7 +173,7 @@ export function JobsCloseExportButton({
           }
         });
 
-        if (!!!jobUpdateResponse.errors) {
+        if (!jobUpdateResponse.errors) {
           notification.open({
             type: "success",
             key: "jobsuccessexport",
@@ -222,7 +222,7 @@ export function JobsCloseExportButton({
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled} type="primary">
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -10,8 +10,8 @@ import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOBS } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
@@ -165,7 +165,7 @@ export function JobsExportAllButton({
               }
             });
 
-            if (!!!jobUpdateResponse.errors) {
+            if (!jobUpdateResponse.errors) {
               notification.open({
                 type: "success",
                 key: "jobsuccessexport",
@@ -213,13 +213,13 @@ export function JobsExportAllButton({
       })
     );
 
-    if (!!completedCallback) completedCallback([]);
-    if (!!loadingCallback) loadingCallback(false);
+    if (completedCallback) completedCallback([]);
+    if (loadingCallback) loadingCallback(false);
     setLoading(false);
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled || jobIds?.length > 10}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || jobIds?.length > 10} type="primary">
       {t("jobs.actions.exportselected")}
     </Button>
   );

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

@@ -48,7 +48,7 @@ export function PayableExportAll({
     let PartnerResponse;
 
     setLoading(true);
-    if (!!loadingCallback) loadingCallback(true);
+    if (loadingCallback) loadingCallback(true);
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/payables`, {
         bills: billids,
@@ -85,7 +85,7 @@ export function PayableExportAll({
         notification["error"]({
           message: t("bills.errors.exporting-partner")
         });
-        if (!!loadingCallback) loadingCallback(false);
+        if (loadingCallback) loadingCallback(false);
         setLoading(false);
         return;
       }
@@ -152,7 +152,7 @@ export function PayableExportAll({
                   }
                 }
               });
-              if (!!!billUpdateResponse.errors) {
+              if (!billUpdateResponse.errors) {
                 notification.open({
                   type: "success",
                   key: "billsuccessexport",
@@ -187,8 +187,8 @@ export function PayableExportAll({
     });
 
     await Promise.all(proms);
-    if (!!completedCallback) completedCallback([]);
-    if (!!loadingCallback) loadingCallback(false);
+    if (completedCallback) completedCallback([]);
+    if (loadingCallback) loadingCallback(false);
     setLoading(false);
   };
 
@@ -200,7 +200,7 @@ export function PayableExportAll({
     );
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled || billids?.length > 10}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || billids?.length > 10} type="primary">
       {t("jobs.actions.exportselected")}
     </Button>
   );

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

@@ -46,7 +46,7 @@ export function PayableExportButton({
     logImEXEvent("accounting_export_payable");
 
     setLoading(true);
-    if (!!loadingCallback) loadingCallback(true);
+    if (loadingCallback) loadingCallback(true);
 
     //Check if it's a QBO Setup.
     let PartnerResponse;
@@ -88,7 +88,7 @@ export function PayableExportButton({
         notification["error"]({
           message: t("bills.errors.exporting-partner")
         });
-        if (!!loadingCallback) loadingCallback(false);
+        if (loadingCallback) loadingCallback(false);
         setLoading(false);
         return;
       }
@@ -149,7 +149,7 @@ export function PayableExportButton({
             }
           }
         });
-        if (!!!billUpdateResponse.errors) {
+        if (!billUpdateResponse.errors) {
           notification.open({
             type: "success",
             key: "billsuccessexport",
@@ -186,7 +186,7 @@ export function PayableExportButton({
       }
     }
 
-    if (!!loadingCallback) loadingCallback(false);
+    if (loadingCallback) loadingCallback(false);
     setLoading(false);
   };
 
@@ -198,7 +198,7 @@ export function PayableExportButton({
     );
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled} type="primary">
       {t("jobs.actions.export")}
     </Button>
   );

client/src/components/payment-export-button/payment-export-button.component.jsx

@@ -55,7 +55,7 @@ export function PaymentExportButton({
     } else {
       //Default is QBD
 
-      if (!!loadingCallback) loadingCallback(true);
+      if (loadingCallback) loadingCallback(true);
 
       let QbXmlResponse;
       try {
@@ -88,7 +88,7 @@ export function PaymentExportButton({
         notification["error"]({
           message: t("payments.errors.exporting-partner")
         });
-        if (!!loadingCallback) loadingCallback(false);
+        if (loadingCallback) loadingCallback(false);
         setLoading(false);
         return;
       }
@@ -148,7 +148,7 @@ export function PaymentExportButton({
             }
           }
         });
-        if (!!!paymentUpdateResponse.errors) {
+        if (!paymentUpdateResponse.errors) {
           notification.open({
             type: "success",
             key: "paymentsuccessexport",
@@ -184,12 +184,12 @@ export function PaymentExportButton({
         )
       ]);
     }
-    if (!!loadingCallback) loadingCallback(false);
+    if (loadingCallback) loadingCallback(false);
     setLoading(false);
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled} type="primary">
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -44,7 +44,7 @@ export function PaymentsExportAllButton({
 
   const handleQbxml = async () => {
     setLoading(true);
-    if (!!loadingCallback) loadingCallback(true);
+    if (loadingCallback) loadingCallback(true);
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/payments`, {
@@ -76,7 +76,7 @@ export function PaymentsExportAllButton({
         notification["error"]({
           message: t("payments.errors.exporting-partner")
         });
-        if (!!loadingCallback) loadingCallback(false);
+        if (loadingCallback) loadingCallback(false);
         setLoading(false);
         return;
       }
@@ -140,7 +140,7 @@ export function PaymentsExportAllButton({
                   }
                 }
               });
-              if (!!!paymentUpdateResponse.errors) {
+              if (!paymentUpdateResponse.errors) {
                 notification.open({
                   type: "success",
                   key: "paymentsuccessexport",
@@ -174,13 +174,13 @@ export function PaymentsExportAllButton({
       );
     });
     await Promise.all(proms);
-    if (!!completedCallback) completedCallback([]);
-    if (!!loadingCallback) loadingCallback(false);
+    if (completedCallback) completedCallback([]);
+    if (loadingCallback) loadingCallback(false);
     setLoading(false);
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled || paymentIds?.length > 10}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || paymentIds?.length > 10} type="primary">
       {t("jobs.actions.exportselected")}
     </Button>
   );

server.js

@@ -329,8 +329,7 @@ const main = async () => {
 main().catch((error) => {
   logger.log(`Main-API-Error: Something was not caught in the application.`, "error", "api", null, {
     error: error.message,
-    errorjson: JSON.stringify(error),
-    stack: error.stack
+    errorjson: JSON.stringify(error)
   });
   // Note: If we want the app to crash on all uncaught async operations, we would
   // need to put a `process.exit(1);` here

server/data/data.js

@@ -3,4 +3,3 @@ exports.autohouse = require("./autohouse").default;
 exports.chatter = require("./chatter").default;
 exports.claimscorp = require("./claimscorp").default;
 exports.kaizen = require("./kaizen").default;
-exports.usageReport = require("./usageReport").default;

server/data/usageReport.js

@@ -1,90 +0,0 @@
-const path = require("path");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-const client = require("../graphql-client/graphql-client").client;
-const emailer = require("../email/sendemail");
-const moment = require("moment-timezone");
-const converter = require("json-2-csv");
-const logger = require("../utils/logger");
-const queries = require("../graphql-client/queries");
-const InstanceMgr = require("../utils/instanceMgr").default;
-
-exports.default = async (req, res) => {
-  try {
-    logger.log("usage-report-email-start", "debug", req?.user?.email, null, {});
-
-    if (InstanceMgr({ rome: false, imex: true })) {
-      //Disable for ImEX at the moment.
-      res.sendStatus(403);
-      logger.log("usage-report-email-forbidden", "warn", req?.user?.email, null, {});
-      return;
-    }
-
-    if (process.env.NODE_ENV !== "production") {
-      res.sendStatus(403);
-      return;
-    }
-    // Validate using autohouse token header.
-    if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
-      res.sendStatus(401);
-      logger.log("usage-report-email-forbidden", "warn", req?.user?.email, null, {});
-      return;
-    }
-
-    //Query the usage data.
-    const queryResults = await client.request(queries.STATUS_UPDATE, {
-      today: moment().startOf("day").subtract(7, "days"),
-      period: moment().subtract(90, "days").startOf("day")
-    });
-
-    //Massage the data.
-    const shopList = queryResults.bodyshops.map((shop) => ({
-      "Shop Name": shop.shopname,
-      "Days Since Creation": moment().diff(moment(shop.created_at), "days"),
-      "Jobs Created": shop.jobs_created.aggregate.count,
-      "Jobs Updated": shop.jobs_updated.aggregate.count,
-      "Owners Created": shop.owners_created.aggregate.count,
-      "Owners Updated": shop.owners_updated.aggregate.count,
-      "Vehicles Created": shop.vehicles_created.aggregate.count,
-      "Vehicles Updated": shop.vehicles_updated.aggregate.count,
-      "Tasks Created": shop.tasks_created.aggregate.count,
-      "Tasks Updated": shop.tasks_updated.aggregate.count
-    }));
-
-    const csv = converter.json2csv(shopList, { emptyFieldValue: "" });
-    emailer
-      .sendTaskEmail({
-        to: ["patrick.fic@convenient-brands.com", "bradley.rhoades@convenient-brands.com"],
-        subject: `RO Usage Report - ${moment().format("MM/DD/YYYY")}`,
-        text: `
-Usage Report for ${moment().format("MM/DD/YYYY")} for Rome Online Customers. 
-        
-Notes:
-  - Days Since Creation: The number of days since the shop was created. Only shops created in the last 90 days are included.
-  - Updated values should be higher than created values.
-  - Counts are inclusive of the last 7 days of data.
-        `,
-        attachments: [{ filename: `RO Usage Report ${moment().format("MM/DD/YYYY")}.csv`, content: csv }]
-      })
-      .then(() => {
-        logger.log("usage-report-email-success", "debug", req?.user?.email, null, {
-          csv
-        });
-      })
-      .catch((error) => {
-        logger.log("usage-report-email-send-error", "ERROR", req?.user?.email, null, {
-          error: error.message,
-          stack: error.stack
-        });
-      });
-    res.sendStatus(200);
-    return;
-  } catch (error) {
-    logger.log("usage-report-email-error", "ERROR", req?.user?.email, null, {
-      error: error.message,
-      stack: error.stack
-    });
-    res.status(500).json({ error: error.message, stack: error.stack });
-  }
-};

server/graphql-client/queries.js

@@ -2617,76 +2617,3 @@ exports.CREATE_CONVERSATION = `mutation CREATE_CONVERSATION($conversation: [conv
   }
 }
 `;
-
-
-exports.STATUS_UPDATE = `query STATUS_UPDATE($period: timestamptz!, $today: timestamptz!) {
-  bodyshops(where: { created_at: { _gte: $period } }) {
-    shopname
-    id
-    created_at
-    jobs_created: jobs_aggregate(where: { created_at: { _gte: $today } }) {
-      aggregate {
-        count
-      }
-    }
-    jobs_updated: jobs_aggregate(where: { updated_at: { _gte: $today } }) {
-      aggregate {
-        count
-      }
-    }
-
-    owners_created: owners_aggregate(where: { created_at: { _gte: $today } }) {
-      aggregate {
-        count
-      }
-    }
-    owners_updated: owners_aggregate(where: { updated_at: { _gte: $today } }) {
-      aggregate {
-        count
-      }
-    }
-
-    vehicles_created: vehicles_aggregate(
-      where: { created_at: { _gte: $today } }
-    ) {
-      aggregate {
-        count
-      }
-    }
-    vehicles_updated: vehicles_aggregate(
-      where: { updated_at: { _gte: $today } }
-    ) {
-      aggregate {
-        count
-      }
-    }
-
-    tasks_created: tasks_aggregate(where: { created_at: { _gte: $today } }) {
-      aggregate {
-        count
-      }
-    }
-    tasks_updated: tasks_aggregate(where: { updated_at: { _gte: $today } }) {
-      aggregate {
-        count
-      }
-    }
-    jobs {
-      parts_orders_created: parts_orders_aggregate(
-        where: { created_at: { _gte: $today } }
-      ) {
-        aggregate {
-          count
-        }
-      }
-      parts_orders_updated: parts_orders_aggregate(
-        where: { updated_at: { _gte: $today } }
-      ) {
-        aggregate {
-          count
-        }
-      }
-    }
-  }
-}
-`

server/routes/dataRoutes.js

@@ -1,11 +1,10 @@
 const express = require("express");
 const router = express.Router();
-const { autohouse, claimscorp, chatter, kaizen, usageReport } = require("../data/data");
+const { autohouse, claimscorp, chatter, kaizen } = require("../data/data");
 
 router.post("/ah", autohouse);
 router.post("/cc", claimscorp);
 router.post("/chatter", chatter);
 router.post("/kaizen", kaizen);
-router.post("/usagereport", usageReport);
 
 module.exports = router;

server/tasks/tasks.js

@@ -41,7 +41,7 @@ exports.taskHandler = async (req, res) => {
 
     return res.status(200).send(csv);
   } catch (error) {
-    res.status(500).json({ error: error.message, stack: error.stack });
+    res.status(500).json({ error: error.message, stack: error.stackTrace });
   }
 };