Merged in release/2022-06-17 (pull request #519)

release/2022-06-17

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -15374,6 +15374,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>sizelimit</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -44929,6 +44950,27 @@
                                     <folder_node>
                                         <name>signinerror</name>
                                         <children>
+                                            <concept_node>
+                                                <name>auth/user-disabled</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>auth/user-not-found</name>
                                                 <definition_loaded>false</definition_loaded>

client/src/components/documents-upload/documents-upload.utility.js

@@ -54,7 +54,7 @@ export const uploadToCloudinary = async (
   //Set variables for getting the signed URL.
   let timestamp = Math.floor(Date.now() / 1000);
   let public_id = key;
-  let tags = `${bodyshop.textid},${
+  let tags = `${bodyshop.imexshopid},${
     tagsArray ? tagsArray.map((tag) => `${tag},`) : ""
   }`;
   //  let eager = process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS;

client/src/components/email-documents/email-documents.component.jsx

@@ -38,6 +38,12 @@ export function EmailDocumentsComponent({
     nextFetchPolicy: "network-only",
   });
 
+  console.log(
+    selectedMedia &&
+      selectedMedia
+        .filter((s) => s.isSelected)
+        .reduce((acc, val) => (acc = acc + val.size), 0)
+  );
   return (
     <div>
       {loading && <LoadingSpinner />}
@@ -45,6 +51,12 @@ export function EmailDocumentsComponent({
       {selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
         <div style={{ color: "red" }}>{t("messaging.labels.maxtenimages")}</div>
       ) : null}
+      {selectedMedia &&
+      selectedMedia
+        .filter((s) => s.isSelected)
+        .reduce((acc, val) => (acc = acc + val.size), 0) >= 9961472 ? (
+        <div style={{ color: "red" }}>{t("general.errors.sizelimit")}</div>
+      ) : null}
       {data && (
         <JobDocumentsGalleryExternal
           data={data ? data.documents : []}

client/src/components/email-overlay/email-overlay.component.jsx

@@ -180,6 +180,23 @@ export function EmailOverlayComponent({
               }
               return e && e.fileList;
             }}
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  const totalSize = value.reduce(
+                    (acc, val) => (acc = acc + val.size),
+                    0
+                  );
+
+                  const limit = 9961472;
+
+                  if (totalSize > limit) {
+                    return Promise.reject(t("general.errors.sizelimit"));
+                  }
+                  return Promise.resolve();
+                },
+              }),
+            ]}
           >
             <Upload.Dragger
               beforeUpload={Upload.LIST_IGNORE}

client/src/components/error-boundary/error-boundary.component.jsx

@@ -30,6 +30,7 @@ class ErrorBoundary extends React.Component {
 
   static getDerivedStateFromError(error) {
     console.log("ErrorBoundary -> getDerivedStateFromError -> error", error);
+
     return { hasErrored: true, error: error };
   }
 

client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx

@@ -25,6 +25,7 @@ function JobsDocumentGalleryExternal({
           id: value.id,
           type: value.type,
           tags: [{ value: value.type, title: value.type }],
+          size: value.size,
         });
       }
 

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -31,7 +31,7 @@ export default function OwnerFindModalContainer({
 
   useEffect(() => {
     if (modalProps.visible && owner) {
-      const s = OwnerNameDisplayFunction(owner);
+      const s = OwnerNameDisplayFunction(owner, true);
 
       setSearchText(s.trim());
       callSearchowners({ variables: { search: s.trim() } });

client/src/components/owner-name-display/owner-name-display.component.jsx

@@ -27,7 +27,7 @@ export function OwnerNameDisplay({ bodyshop, ownerObject }) {
   }`.trim();
 }
 
-export function OwnerNameDisplayFunction(ownerObject) {
+export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) {
   const emptyTest =
     ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm;
 
@@ -36,7 +36,7 @@ export function OwnerNameDisplayFunction(ownerObject) {
 
   const rdxStore = store.getState();
 
-  if (rdxStore.user.bodyshop.last_name_first)
+  if (rdxStore.user.bodyshop.last_name_first && !forceFirstLast)
     return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${
       ownerObject.ownr_co_nm || ""
     }`.trim();

client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx

@@ -146,7 +146,8 @@ const JobRelatedTicketsTable = ({
       title: t("employees.labels.name"),
       dataIndex: "empname",
       key: "empname",
-      sorter: (a, b) => alphaSort(a.empname, b.empname),
+      sorter: (a, b) =>
+        alphaSort(a.item.employee.last_name, b.item.employee.last_name),
       sortOrder:
         state.sortedInfo.columnKey === "empname" && state.sortedInfo.order,
       render: (text, record) =>
@@ -172,7 +173,9 @@ const JobRelatedTicketsTable = ({
       title: t("timetickets.fields.efficiency"),
       dataIndex: "total",
       key: "total",
-      sorter: (a, b) => a.total - b.total,
+      sorter: (a, b) =>
+        (a.actHrs === 0 || !a.actHrs ? 0 : (a.prodHrs / a.actHrs) * 100) -
+        (b.actHrs === 0 || !b.actHrs ? 0 : (b.prodHrs / b.actHrs) * 100),
       sortOrder:
         state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
       render: (text, record) =>

client/src/pages/manage/manage.page.component.jsx

@@ -24,6 +24,8 @@ import {
   selectBodyshop,
   selectInstanceConflict,
 } from "../../redux/user/user.selectors";
+import * as Sentry from "@sentry/react";
+
 import "./manage.page.styles.scss";
 
 const ManageRootPage = lazy(() =>
@@ -407,7 +409,10 @@ export function Manage({ match, conflict, bodyshop }) {
 
         <Content className="content-container">
           <PartnerPingComponent />
-          <ErrorBoundary>{PageContent}</ErrorBoundary>
+          <Sentry.ErrorBoundary fallback={<ErrorBoundary />} showDialog>
+            {PageContent}
+          </Sentry.ErrorBoundary>
+
           <BackTop />
           <Footer>
             <div

client/src/translations/en_us/common.json

@@ -961,7 +961,8 @@
 			},
 			"errors": {
 				"fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
-				"notfound": "No record was found."
+				"notfound": "No record was found.",
+				"sizelimit": "The selected items exceed the size limit."
 			},
 			"itemtypes": {
 				"contract": "CC Contract",
@@ -2668,6 +2669,7 @@
 		"users": {
 			"errors": {
 				"signinerror": {
+					"auth/user-disabled": "User account disabled. ",
 					"auth/user-not-found": "A user with this email does not exist.",
 					"auth/wrong-password": "The email and password combination you provided is incorrect."
 				}

client/src/translations/es/common.json

@@ -961,7 +961,8 @@
 			},
 			"errors": {
 				"fcm": "",
-				"notfound": ""
+				"notfound": "",
+				"sizelimit": ""
 			},
 			"itemtypes": {
 				"contract": "",
@@ -2668,6 +2669,7 @@
 		"users": {
 			"errors": {
 				"signinerror": {
+					"auth/user-disabled": "",
 					"auth/user-not-found": "",
 					"auth/wrong-password": ""
 				}

client/src/translations/fr/common.json

@@ -961,7 +961,8 @@
 			},
 			"errors": {
 				"fcm": "",
-				"notfound": ""
+				"notfound": "",
+				"sizelimit": ""
 			},
 			"itemtypes": {
 				"contract": "",
@@ -2668,6 +2669,7 @@
 		"users": {
 			"errors": {
 				"signinerror": {
+					"auth/user-disabled": "",
 					"auth/user-not-found": "",
 					"auth/wrong-password": ""
 				}

client/src/utils/RenderTemplate.js

@@ -103,7 +103,7 @@ export default async function RenderTemplate(
             }),
           },
         };
-        console.log("PDFREQ", pdfRequest);
+
         const pdfRender = await jsreport.renderAsync(pdfRequest);
         pdf = pdfRender.toDataURI();
       }

firebase/readme.md

@@ -1,3 +1,3 @@
 Must set the environment variables using:
 
-firebase functions:config:set auth.graphql_endpoint="https://bodyshop-dev-db.herokuapp.com/v1/graphql" auth.hasura_secret_admin_key="Dev-BodyShopApp!"
+firebase functions:config:set auth.graphql_endpoint="https://db.development.bodyshop.app/v1/graphql" auth.hasura_secret_admin_key="Dev-BodyShopApp!"

hasura/config.yaml

@@ -1,5 +1,5 @@
 version: 2
-endpoint: https://bodyshop-dev-db.herokuapp.com
+endpoint: https://db.development.bodyshop.app
 admin_secret: Dev-BodyShopApp!
 metadata_directory: metadata
 actions:

server.js

@@ -157,7 +157,21 @@ app.post(
   fb.unsubscribe
 );
 app.post("/adm/updateuser", fb.validateFirebaseIdToken, fb.updateUser);
+app.post("/adm/getuser", fb.validateFirebaseIdToken, fb.getUser);
 app.post("/adm/createuser", fb.validateFirebaseIdToken, fb.createUser);
+const adm = require("./server/admin/adminops");
+app.post(
+  "/adm/createassociation",
+  fb.validateFirebaseIdToken,
+  fb.validateAdmin,
+  adm.createAssociation
+);
+app.post(
+  "/adm/createshop",
+  fb.validateFirebaseIdToken,
+  fb.validateAdmin,
+  adm.createShop
+);
 
 //Stripe Processing
 var stripe = require("./server/stripe/payment");

server/admin/adminops.js

@@ -0,0 +1,68 @@
+const path = require("path");
+
+const _ = require("lodash");
+const logger = require("../utils/logger");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+
+const client = require("../graphql-client/graphql-client").client;
+
+exports.createAssociation = async (req, res) => {
+  logger.log("admin-create-association", "ADMIN", req.user.email, null, {
+    request: req.body,
+    ioadmin: true,
+  });
+  const { shopid, authlevel, useremail } = req.body;
+
+  const result = await client.request(
+    `mutation INSERT_ASSOCIATION($assoc: associations_insert_input!){
+  insert_associations_one(object:$assoc){
+    id
+    authlevel
+    useremail
+    active
+  }
+}`,
+    {
+      assoc: { shopid, authlevel, useremail, active: false },
+    }
+  );
+  res.json(result);
+};
+exports.createShop = async (req, res) => {
+  logger.log("admin-create-shop", "ADMIN", req.user.email, null, {
+    request: req.body,
+    ioadmin: true,
+  });
+  const { bodyshop, ronum } = req.body;
+
+  try {
+    const result = await client.request(
+      `mutation INSERT_BODYSHOPS($bs: bodyshops_insert_input!){
+  insert_bodyshops_one(object:$bs){
+    id
+   
+  }
+}`,
+      {
+        bs: {
+          ...bodyshop,
+          counters: {
+            data: [
+              { countertype: "ronum", count: ronum },
+              { countertype: "ihbnum", count: 1 },
+              { countertype: "paymentnum", count: 1 },
+            ],
+          },
+        },
+      }
+    );
+    res.json(result);
+  } catch (error) {
+    res.status(500).json(error);
+  }
+};

server/email/sendemail.js

@@ -10,7 +10,8 @@ let nodemailer = require("nodemailer");
 let aws = require("aws-sdk");
 const logger = require("../utils/logger");
 const ses = new aws.SES({
-  apiVersion: "2010-12-01",
+  apiVersion: "latest",
+
   region: "ca-central-1",
 });
 
@@ -43,6 +44,7 @@ exports.sendServerEmail = async function ({ subject, text }) {
   } catch (error) {
     console.log(error);
     logger.log("server-email-failure", "error", null, null, error);
+    res.status(500).json(error);
   }
 };
 exports.sendTaskEmail = async function ({ to, subject, text, attachments }) {
@@ -153,7 +155,7 @@ exports.sendEmail = async (req, res) => {
           error: err,
         });
 
-        res.json({ success: false, error: err });
+        res.status(500).json({ success: false, error: err });
       }
     }
   );

server/firebase/firebase-handler.js

@@ -1,13 +1,14 @@
 var admin = require("firebase-admin");
 const logger = require("../utils/logger");
 const path = require("path");
+const { auth } = require("firebase-admin");
 require("dotenv").config({
   path: path.resolve(
     process.cwd(),
     `.env.${process.env.NODE_ENV || "development"}`
   ),
 });
-
+const client = require("../graphql-client/graphql-client").client;
 var serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON);
 
 admin.initializeApp({
@@ -19,54 +20,61 @@ exports.admin = admin;
 
 const adminEmail = [
   "patrick@imex.dev",
-  "patrick@imex.text",
+  //"patrick@imex.test",
   "patrick@imex.prod",
   "patrick@imexsystems.ca",
   "patrick@thinkimex.com",
 ];
 
-exports.createUser = (req, res) => {
-  logger.log("admin-create-user", "WARN", req.user.email, null, {
+exports.createUser = async (req, res) => {
+  logger.log("admin-create-user", "ADMIN", req.user.email, null, {
     request: req.body,
+    ioadmin: true,
   });
-  if (!adminEmail.includes(req.user.email)) {
-    logger.log(
-      "admin-create-user-unauthorized",
-      "ERROR",
-      req.user.email,
-      null,
+
+  const { email, displayName, password, shopid, authlevel } = req.body;
+  try {
+    const userRecord = await admin
+      .auth()
+      .createUser({ email, displayName, password });
+
+    // See the UserRecord reference doc for the contents of userRecord.
+
+    const result = await client.request(
+      `
+        mutation INSERT_USER($user: users_insert_input!) {
+          insert_users_one(object: $user) {
+            email
+          }
+        }
+      `,
       {
-        request: req.body,
-        user: req.user,
+        user: {
+          email,
+          authid: userRecord.uid,
+          associations: {
+            data: [{ shopid, authlevel, active: true }],
+          },
+        },
       }
     );
-    res.sendStatus(404);
-  }
-  const { email, displayName, password } = req.body;
-  admin
-    .auth()
-    .createUser({ email, displayName, password })
-    .then((userRecord) => {
-      // See the UserRecord reference doc for the contents of userRecord.
 
-      logger.log("admin-update-user-success", "DEBUG", req.user.email, null, {
-        userRecord,
-      });
-      res.json(userRecord);
-    })
-    .catch((error) => {
-      logger.log("admin-update-user-error", "ERROR", req.user.email, null, {
-        error,
-      });
-      res.status(500).json(error);
+    res.json({ userRecord, result });
+  } catch (error) {
+    logger.log("admin-update-user-error", "ERROR", req.user.email, null, {
+      error,
     });
+    res.status(500).json(error);
+  }
 };
 
 exports.updateUser = (req, res) => {
-  logger.log("admin-update-user", "WARN", req.user.email, null, {
+  logger.log("admin-update-user", "ADMIN", req.user.email, null, {
     request: req.body,
+    ioadmin: true,
   });
-  if (!adminEmail.includes(req.user.email)) {
+
+  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
     logger.log(
       "admin-update-user-unauthorized",
       "ERROR",
@@ -78,6 +86,7 @@ exports.updateUser = (req, res) => {
       }
     );
     res.sendStatus(404);
+    return;
   }
 
   admin
@@ -98,8 +107,9 @@ exports.updateUser = (req, res) => {
     .then((userRecord) => {
       // See the UserRecord reference doc for the contents of userRecord.
 
-      logger.log("admin-update-user-success", "DEBUG", req.user.email, null, {
+      logger.log("admin-update-user-success", "ADMIN", req.user.email, null, {
         userRecord,
+        ioadmin: true,
       });
       res.json(userRecord);
     })
@@ -111,6 +121,41 @@ exports.updateUser = (req, res) => {
     });
 };
 
+exports.getUser = (req, res) => {
+  logger.log("admin-get-user", "ADMIN", req.user.email, null, {
+    request: req.body,
+    ioadmin: true,
+  });
+
+  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
+    logger.log(
+      "admin-update-user-unauthorized",
+      "ERROR",
+      req.user.email,
+      null,
+      {
+        request: req.body,
+        user: req.user,
+      }
+    );
+    res.sendStatus(404);
+    return;
+  }
+
+  admin
+    .auth()
+    .getUser(req.body.uid)
+    .then((userRecord) => {
+      res.json(userRecord);
+    })
+    .catch((error) => {
+      logger.log("admin-get-user-error", "ERROR", req.user.email, null, {
+        error,
+      });
+      res.status(500).json(error);
+    });
+};
+
 exports.sendNotification = async (req, res) => {
   setTimeout(() => {
     // Send a message to the device corresponding to the provided
@@ -221,3 +266,35 @@ exports.validateFirebaseIdToken = async (req, res, next) => {
     return;
   }
 };
+
+exports.validateAdmin = async (req, res, next) => {
+  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
+    logger.log("admin-validation-failed", "ERROR", req.user.email, null, {
+      request: req.body,
+      user: req.user,
+    });
+    res.sendStatus(404);
+    return;
+  } else {
+    next();
+    return;
+  }
+};
+
+//Admin claims code.
+// const uid = "JEqqYlsadwPEXIiyRBR55fflfko1";
+
+// admin
+//   .auth()
+//   .getUser(uid)
+//   .then((user) => {
+//     console.log(user);
+//     admin.auth().setCustomUserClaims(uid, {
+//       ioadmin: true,
+//       "https://hasura.io/jwt/claims": {
+//         "x-hasura-default-role": "admin",
+//         "x-hasura-allowed-roles": ["admin"],
+//         "x-hasura-user-id": uid,
+//       },
+//     });
+//   });

server/utils/logger.js

@@ -13,7 +13,7 @@ function log(message, type, user, record, object) {
       record,
       ...object,
     });
-  logger.log(message, {
+  logger.log(message, message, {
     type,
     env: process.env.NODE_ENV || "development",
     user,