Merge branch 'release/2021-09-03' into feature/cdk-cert

client/src/App/App.container.jsx

@@ -11,15 +11,15 @@ 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({
-  projectKey: "FPjeYIbwJyvhrVVTTLHo",
-  ingestPoint: "https://replay.bodyshop.app/ingest",
-  // ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development"
-  //   ? { __DISABLE_SECURE_MODE: true }
-  //   : {}),
+  projectKey: "trDmOZlEXUpjGsMtHroA",
+  ingestPoint: "https://replay.imex.online/ingest",
+  ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development"
+    ? { __DISABLE_SECURE_MODE: true }
+    : {}),
   // beaconSize: 10485760,
   onStart: ({ sessionID }) =>
     console.log(
@@ -27,7 +27,10 @@ export const tracker = new Tracker({
       sessionID
     ),
 });
-//tracker.use(trackerAssist({ confirmText: "Confimr hep" })); // 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,6 +53,20 @@ 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,
@@ -65,12 +79,12 @@ export function JobChecklistForm({
           ...(type === "intake" && {
             production_vars: {
               ...job.production_vars,
-              ...values.production_vars,
+
               note:
                 values.production_vars &&
                 values.production_vars.note &&
                 values.production_vars.note !== ""
-                  ? job.production_vars && values.production_vars.note
+                  ? values.production_vars && values.production_vars.note
                   : job.production_vars && job.production_vars.note,
             },
           }),

client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -1,12 +1,11 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Form, notification, Popover } from "antd";
+import { Button, Card, Form, InputNumber, notification, Popover } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 
 export default function ScoreboardAddButton({
   job,
@@ -73,7 +72,7 @@ export default function ScoreboardAddButton({
               },
             ]}
           >
-            <InputNumberCalculator precision={1} />
+            <InputNumber precision={1} />
           </Form.Item>
           <Form.Item
             label={t("scoreboard.fields.painthrs")}
@@ -85,7 +84,7 @@ export default function ScoreboardAddButton({
               },
             ]}
           >
-            <InputNumberCalculator precision={1} />
+            <InputNumber precision={1} />
           </Form.Item>
 
           <Button type="primary" htmlType="submit">

client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx

@@ -1,10 +1,9 @@
-import { Button, Card, Dropdown, Form, notification } from "antd";
-import React, { useState } from "react";
 import { useMutation } from "@apollo/client";
+import { Button, Card, Dropdown, Form, InputNumber, notification } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 
 export default function ScoreboardEntryEdit({ entry }) {
   const [visible, setVisible] = useState(false);
@@ -64,7 +63,7 @@ export default function ScoreboardEntryEdit({ entry }) {
             },
           ]}
         >
-          <InputNumberCalculator precision={1} />
+          <InputNumber precision={1} />
         </Form.Item>
         <Form.Item
           label={t("scoreboard.fields.painthrs")}
@@ -76,7 +75,7 @@ export default function ScoreboardEntryEdit({ entry }) {
             },
           ]}
         >
-          <InputNumberCalculator precision={1} />
+          <InputNumber precision={1} />
         </Form.Item>
 
         <Button type="primary" loading={loading} htmlType="submit">