From fd989bf7e47bc13367cc3caf0ee516d6a4507607 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 13 Oct 2023 11:29:18 -0700
Subject: [PATCH] Added support chat and sentry ignore messages.

---
 electron/changelog.json                   |  5 +++++
 electron/decoder/constants.js             |  2 +-
 electron/file-watcher/file-watcher-ipc.js |  2 +-
 electron/file-watcher/file-watcher.js     | 11 ++++++++---
 electron/main.js                          |  6 +++++-
 package.json                              |  2 +-
 public/index.html                         | 15 +++++++++++++--
 src/index.js                              |  5 +++++
 src/redux/user/user.sagas.js              | 18 ++++++++++++++++++
 9 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/electron/changelog.json b/electron/changelog.json
index cf99fc7..ee1ca42 100644
--- a/electron/changelog.json
+++ b/electron/changelog.json
@@ -128,5 +128,10 @@
     "title": "Release Notes for 1.1.5",
     "date": "08/23/2023",
     "notes": "Bug Fixes:\r\n- Performance improvements."
+  },
+  "1.1.6": {
+    "title": "Release Notes for 1.1.6",
+    "date": "10/13/2023",
+    "notes": "New Feature:\r\n- Added live support chat."
   }
 }
diff --git a/electron/decoder/constants.js b/electron/decoder/constants.js
index 38afe2a..f4dd377 100644
--- a/electron/decoder/constants.js
+++ b/electron/decoder/constants.js
@@ -37,7 +37,7 @@ function WhichRulesetToApply(close_date) {
     (r) =>
       DateMoment.isSameOrAfter(r.range[0]) && DateMoment.isBefore(r.range[1])
   );
-  console.log("Using ruleset:", newRuleSet);
+  //console.log("Using ruleset:", newRuleSet);
 
   return newRuleSet?.title;
 }
diff --git a/electron/file-watcher/file-watcher-ipc.js b/electron/file-watcher/file-watcher-ipc.js
index 378f58e..9e41396 100644
--- a/electron/file-watcher/file-watcher-ipc.js
+++ b/electron/file-watcher/file-watcher-ipc.js
@@ -63,7 +63,7 @@ ipcMain.on(
     );
 
     const newFilePaths = store.get("filePaths");
-    console.log("newFilePaths", newFilePaths);
+    //console.log("newFilePaths", newFilePaths);
 
     event.sender.send(
       ipcTypes.default.fileWatcher.toRenderer.filepathsList,
diff --git a/electron/file-watcher/file-watcher.js b/electron/file-watcher/file-watcher.js
index 2780299..4c8142c 100644
--- a/electron/file-watcher/file-watcher.js
+++ b/electron/file-watcher/file-watcher.js
@@ -70,8 +70,13 @@ async function StartWatcher() {
     .on("error", function (error) {
       log.error("Error in Watcher", error);
       const b = BrowserWindow.getFocusedWindow();
-      b.webContents.send(ipcTypes.default.fileWatcher.toRenderer.error, error);
-     // Nucleus.track("WATCHER_ERROR", error);
+      if (b) {
+        b.webContents.send(
+          ipcTypes.default.fileWatcher.toRenderer.error,
+          error
+        );
+      }
+      // Nucleus.track("WATCHER_ERROR", error);
     })
     .on("ready", onWatcherReady)
     .on("raw", function (event, path, details) {
@@ -111,6 +116,6 @@ exports.StopWatcher = StopWatcher;
 exports.watcher = watcher;
 
 async function HandleNewFile(path) {
-//  Nucleus.track("IMPORT_JOB_FROM_WATCHER");
+  //  Nucleus.track("IMPORT_JOB_FROM_WATCHER");
   await ImportJob(path);
 }
diff --git a/electron/main.js b/electron/main.js
index d978f64..4bd0671 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -16,7 +16,6 @@ const { autoUpdater } = require("electron-updater");
 const log = require("electron-log");
 const contextMenu = require("electron-context-menu");
 const Sentry = require("@sentry/electron");
-const { set } = require("lodash");
 
 //const Nucleus = require("nucleus-nodejs");
 require("./ipc-main-handler");
@@ -24,6 +23,11 @@ require("./analytics");
 
 Sentry.init({
   dsn: "https://9840e0f304124299e379d9347e12d2e6@o492140.ingest.sentry.io/4505728058523648",
+  ignoreErrors: [
+    "SimpleURLLoaderWrapper",
+    "Cannot read properties of null (reading 'webContents')",
+    "EBUSY: resource busy or locked",
+  ],
 });
 autoUpdater.autoDownload = true;
 
diff --git a/package.json b/package.json
index f55e28b..431eaa3 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "ImEX RPS",
   "author": "ImEX Systems Inc. <support@thinkimex.com>",
   "description": "ImEX RPS",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "main": "electron/main.js",
   "homepage": "./",
   "dependencies": {
diff --git a/public/index.html b/public/index.html
index e861641..4ade066 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,9 +3,20 @@
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-   <!--
+    <script type="text/javascript">
+      window.$crisp = [];
+      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+      (function () {
+        d = document;
+        s = d.createElement("script");
+        s.src = "https://client.crisp.chat/l.js";
+        s.async = 1;
+        d.getElementsByTagName("head")[0].appendChild(s);
+      })();
+    </script>
+    <!--
 <script data-jsd-embedded data-key="51adb36e-ee16-46b1-a4c6-4b6d5fcd8530" data-base-url="https://jsd-widget.atlassian.com" src="https://jsd-widget.atlassian.com/assets/embed.js"></script>
-   --> 
+   -->
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#002366" />
     <meta
diff --git a/src/index.js b/src/index.js
index 4a2bfee..61ae076 100644
--- a/src/index.js
+++ b/src/index.js
@@ -17,6 +17,11 @@ Sentry.init({
   tracesSampleRate: 1.0,
   // Set `tracePropagationTargets` to control for which URLs distributed tracing should be enabled
   tracePropagationTargets: ["localhost", "https://db.rps.imex.online"],
+  ignoreErrors: [
+    "SimpleURLLoaderWrapper",
+    "Cannot read properties of null (reading 'webContents')",
+    "EBUSY: resource busy or locked",
+  ],
 });
 //if (process.env.NODE_ENV === "production") LogRocket.init("imex/rps");
 const container = document.getElementById("root");
diff --git a/src/redux/user/user.sagas.js b/src/redux/user/user.sagas.js
index 763a548..24bf2fc 100644
--- a/src/redux/user/user.sagas.js
+++ b/src/redux/user/user.sagas.js
@@ -29,6 +29,7 @@ import {
   updateUserDetailsSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import * as Sentry from "@sentry/electron";
 
 const { ipcRenderer } = window;
 
@@ -153,6 +154,23 @@ export function* signInSuccessSaga({ payload }) {
     });
     yield put(checkForNotification());
     //Check for notifications, and continue to check.
+    window.$crisp.push([
+      "set",
+      "user:company",
+      [shop.data.bodyshops[0].shopname],
+    ]);
+    window.$crisp.push([
+      "set",
+      "user:nickname",
+      [payload.displayName || payload.email],
+    ]);
+
+    window.$crisp.push(["set", "session:segments", [["rps-user"]]]);
+
+    Sentry.setUser({
+      email: payload.email,
+      username: payload.displayName || payload.email,
+    });
   } else {
     console.log("No bodyshop has been associated.");
     yield put(setBodyshop(false));