Merge branch 'test' into feature/cdk-cert

client/src/App/App.container.jsx

@@ -11,7 +11,7 @@ import App from "./App";
 import trackerGraphQL from "@openreplay/tracker-graphql";
 //import trackerRedux from "@openreplay/tracker-redux";
 import Tracker from "@openreplay/tracker";
-import trackerAssist from "@openreplay/tracker-assist";
+//import trackerAssist from "@openreplay/tracker-assist";
 moment.locale("en-US");
 
 export const tracker = new Tracker({
@@ -21,16 +21,12 @@ export const tracker = new Tracker({
     ? { __DISABLE_SECURE_MODE: true }
     : {}),
   // beaconSize: 10485760,
-  onStart: ({ sessionID }) =>
-    console.log(
-      "******** OpenReplay tracker started with session: ",
-      sessionID
-    ),
+  onStart: ({ sessionID }) => console.log("ORS SESSION ", sessionID),
 });
 
-tracker.use(
-  trackerAssist({ confirmText: "Technical support is about to assist you." })
-); // check the list of available options below
+// tracker.use(
+//   trackerAssist({ confirmText: "Technical support is about to assist you." })
+// ); // check the list of available options below
 export const recordGraphQL = tracker.use(trackerGraphQL());
 tracker.start();
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -53,20 +53,6 @@ export function JobChecklistForm({
     setLoading(true);
     logImEXEvent("job_complete_intake");
 
-    console.log({
-      values,
-      job,
-      production_vars: {
-        ...job.production_vars,
-
-        note:
-          values.production_vars &&
-          values.production_vars.note &&
-          values.production_vars.note !== ""
-            ? job.production_vars && values.production_vars.note
-            : job.production_vars && job.production_vars.note,
-      },
-    });
     const result = await intakeJob({
       variables: {
         jobId: jobId,
@@ -78,14 +64,16 @@ export function JobChecklistForm({
           ...(type === "intake" && { actual_in: new Date() }),
           ...(type === "intake" && {
             production_vars: {
-              ...job.production_vars,
+              ...(job ? job.production_vars : {}),
 
               note:
                 values.production_vars &&
                 values.production_vars.note &&
                 values.production_vars.note !== ""
-                  ? values.production_vars && values.production_vars.note
-                  : job.production_vars && job.production_vars.note,
+                  ? values &&
+                    values.production_vars &&
+                    values.production_vars.note
+                  : job && job.production_vars && job.production_vars.note,
             },
           }),
           ...(type === "intake" && {