Merged in feature/2021-08-13 (pull request #166)

Merge into CDK Branch

Approved-by: Patrick Fic

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

@@ -121,6 +121,7 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
             billId={record.id}
             disabled={transInProgress || !!record.exported}
             loadingCallback={setTransInProgress}
+            setSelectedBills={setSelectedBills}
           />
         </div>
       ),

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

@@ -120,6 +120,7 @@ export default function AccountingPayablesTableComponent({
           paymentId={record.id}
           disabled={transInProgress || !!record.exportedat}
           loadingCallback={setTransInProgress}
+          setSelectedPayments={setSelectedPayments}
         />
       ),
     },

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

@@ -125,6 +125,7 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
           <JobExportButton
             jobId={record.id}
             disabled={!!record.date_exported}
+            setSelectedJobs={setSelectedJobs}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
             <Button>{t("jobs.labels.viewallocations")}</Button>

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -90,13 +90,7 @@ export function JobsAvailableContainer({
 
     const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
 
-    if (
+    if (!(estData && estData.est_data)) {
-      !(
-  
-        estData &&
-        estData.est_data
-      )
-    ) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -115,10 +109,7 @@ export function JobsAvailableContainer({
     ).data;
 
     let existingVehicles;
-    if (
+    if (estData.est_data.vehicle && estData.est_data.vin) {
-      estData.est_data.vehicle &&
-      estData.est_data.vin
-    ) {
       //There's vehicle data, need to double check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
@@ -197,13 +188,7 @@ export function JobsAvailableContainer({
     setJobModalVisible(false);
     setInsertLoading(true);
     const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
-    if (
+    if (!(estData && estData.est_data)) {
-      !(
-        
-        estData &&
-        estData.est_data
-      )
-    ) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -215,7 +200,8 @@ export function JobsAvailableContainer({
 
       delete supp.owner;
       delete supp.vehicle;
-      if (importOptions.overrideHeaders) {
+      delete supp.ins_co_nm;
+      if (!importOptions.overrideHeaders) {
         HeaderFields.forEach((item) => delete supp[item]);
       }
 
@@ -396,7 +382,7 @@ export default connect(
 function replaceEmpty(someObj, replaceValue = null) {
   const replacer = (key, value) => (value === "" ? replaceValue : value);
   //^ because you seem to want to replace (strings) "null" or "undefined" too
-  console.log(someObj)
+  console.log(someObj);
   const temp = JSON.stringify(someObj, replacer);
   console.log(`temp`, temp);
   return JSON.parse(temp);

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

@@ -24,6 +24,7 @@ export function JobsCloseExportButton({
   currentUser,
   jobId,
   disabled,
+  setSelectedJobs,
 }) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -147,6 +148,11 @@ export function JobsCloseExportButton({
           }),
         });
       }
+      if (setSelectedJobs) {
+        setSelectedJobs((selectedJobs) => {
+          return selectedJobs.filter((i) => i.id !== jobId);
+        });
+      }
     }
 
     setLoading(false);

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

@@ -25,6 +25,7 @@ export function PayableExportButton({
   billId,
   disabled,
   loadingCallback,
+  setSelectedBills,
 }) {
   const { t } = useTranslation();
   const [updateBill] = useMutation(UPDATE_BILLS);
@@ -142,6 +143,11 @@ export function PayableExportButton({
           }),
         });
       }
+      if (setSelectedBills) {
+        setSelectedBills((selectedBills) => {
+          return selectedBills.filter((i) => i.id !== billId);
+        });
+      }
     }
 
     if (!!loadingCallback) loadingCallback(false);

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

@@ -24,6 +24,7 @@ export function PaymentExportButton({
   paymentId,
   disabled,
   loadingCallback,
+  setSelectedPayments,
 }) {
   const { t } = useTranslation();
   const [updatePayment] = useMutation(UPDATE_PAYMENTS);
@@ -141,6 +142,12 @@ export function PaymentExportButton({
           }),
         });
       }
+
+      if (setSelectedPayments) {
+        setSelectedPayments((selectedBills) => {
+          return selectedBills.filter((i) => i.id !== paymentId);
+        });
+      }
     }
 
     if (!!loadingCallback) loadingCallback(false);

client/src/redux/user/user.sagas.js

@@ -28,6 +28,7 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import * as Sentry from "@sentry/browser";
 
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -178,6 +179,11 @@ export function* signInSuccessSaga({ payload }) {
     ]);
     console.log("Setting $crisp segments", ["user"]);
     window.$crisp.push(["set", "session:segments", [["user"]]]);
+
+    Sentry.setUser({
+      email: payload.email,
+      username: payload.displayName || payload.email,
+    });
   } catch (error) {
     console.log("Error updating Crisp settings.", error);
   }