From f35a2f2cdf705fa506f103b6849feb815a52712e Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 28 May 2025 15:29:42 -0400
Subject: [PATCH 1/2] CASH-609 - Add dataevents for Sierra/Salesforce chat

---
 .../salesforce-webchat/salesforce-webchat.vue |  5 +++
 .../sierra-webchat/sierra-webchat.spec.js     | 21 +++++++++--
 .../sierra-webchat/sierra-webchat.vue         |  3 ++
 src/mixins/analytics-mixin.js                 | 35 +++++++++++++------
 src/mixins/analytics-mixin.spec.js            | 14 ++++++--
 src/store/index.js                            |  2 +-
 src/store/store.spec.js                       |  1 +
 7 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 20ac8e44f..29c0906b9 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -9,9 +9,11 @@ import { initializeSalesforceWebchatForQa } from "./salesforce-helper-qa";
 import { initializeSalesforceWebchatForProd } from "./salesforce-helper-prod";
 import { applicationConfig } from "@/constants/application-config";
 import { webchatHelper } from "@/helpers/webchat-helper";
+import analyticsMixin from "@/mixins/analytics-mixin";
 
 export default {
     name: "salesforceWebchat",
+    mixins: [analyticsMixin],
     data() {
         return {
             isAgentAvailable: false,
@@ -94,6 +96,9 @@ export default {
             window.embedded_svc.settings.prechatBackgroundImgURL = require("@/assets/img/salesforce-webchat/safelite_logo_webchat.png");
             window.embedded_svc.settings.smallCompanyLogoImgURL = require("@/assets/img/salesforce-webchat/minimized_chat_bubble_webchat.png");
             window.embedded_svc.settings.displayHelpButton = false;
+            window.embedded_svc.addEventHandler("onChatEstablished", () => {
+                this.pushEventForChatsToGA("support_chat", "chat_opened", "Live Agent", true);
+            });
         },
         finishedLoadingCallback(data) {
             this.isAgentAvailable = data.isAgentAvailable;
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.spec.js b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
index 5734eaab8..e4d819ffb 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.spec.js
+++ b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
@@ -1,11 +1,28 @@
 import { shallowMount } from "@vue/test-utils";
-import SierraWebchat from "./sierra-webchat.vue";
+import sierraWebchat from "./sierra-webchat.vue";
+
+jest.mock("@/mixins/analytics-mixin");
+// Mock router for analytics-mixin
+jest.mock("@/router", () => ({
+    currentRoute: {
+        value: {
+            name: "mockedPageName",
+        },
+    },
+    default: {
+        currentRoute: {
+            value: {
+                name: "mockedPageName",
+            },
+        },
+    },
+}));
 
 describe("sierraWebchat.vue", () => {
     let wrapper;
 
     beforeEach(() => {
-        wrapper = shallowMount(SierraWebchat);
+        wrapper = shallowMount(sierraWebchat);
         // Mock global window properties
         window.sierraChat = { openChatModal: jest.fn(), closeChatModal: jest.fn() };
         window.sierra = undefined;
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index e12ab053e..2a114616a 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -3,8 +3,10 @@
 </template>
 
 <script>
+import analyticsMixin from "@/mixins/analytics-mixin";
 export default {
     name: "sierraWebchat",
+    mixins: [analyticsMixin],
     methods: {
         openSierraChatModal() {
             const sierra = window.sierraChat || window.sierra || window.SierraChat;
@@ -18,6 +20,7 @@ export default {
                 launchLink.click();
                 document.body.removeChild(launchLink);
             }
+            this.pushEventForChatsToGA("support_chat", "chat_opened", "Scarlett", true);
         },
         createSierraConfig() {
             return {
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 54e3876a0..072851964 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -30,6 +30,7 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { routeData } from "@/router/constants/routes";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { Variables } from "../constants/analytics";
+import router from "@/router";
 
 export default {
     methods: {
@@ -100,7 +101,14 @@ export default {
             );
         },
 
-        async pushEventToGA(category, action, label, pushToLogApp = false, valueToLogType = null) {
+        async pushEventToGA(
+            category,
+            action,
+            label,
+            pushToLogApp = false,
+            valueToLogType = null,
+            value = null
+        ) {
             const currentPageName = getPageNameByQueryString();
             const labelToLog = getValueToLog(label, valueToLogType);
 
@@ -109,8 +117,8 @@ export default {
                 category: category,
                 action: action,
                 label: labelToLog,
-                value: undefined,
-                path: `/fmg/?${queryStrings.FMG_PAGE}=${currentPageName}`,
+                value: value ?? undefined,
+                path: `/fmg/${currentPageName}`,
             };
 
             pushToDataLayerIfDefined(eventToBePushed);
@@ -120,6 +128,12 @@ export default {
             }
         },
 
+        async pushEventForChatsToGA(category, action, label, pushToLogApp = false) {
+            const currentPageName = getPageNameByQueryString();
+            const value = `2.0_${currentPageName}`;
+            await this.pushEventToGA(category, action, label, pushToLogApp, null, value);
+        },
+
         async pushVariableToDataLayer(data) {
             pushToDataLayerIfDefined(data);
         },
@@ -128,7 +142,7 @@ export default {
             const currentPageName = getPageNameByQueryString();
             const pageViewEvent = {
                 event: GaEvents.PAGE_VIEW_EVENT,
-                pagePath: `/fmg/?${queryStrings.FMG_PAGE}=${currentPageName}`,
+                pagePath: `/fmg/${currentPageName}`,
                 pageTitle: currentPageName,
             };
 
@@ -791,12 +805,13 @@ function pushToDataLayerIfDefined(data) {
 }
 
 function getPageNameByQueryString() {
-    const params = new URLSearchParams(location.search);
-
-    if (params.has(queryStrings.FMG_PAGE)) {
-        return params.get(queryStrings.FMG_PAGE);
-    } else {
-        return "";
+    if (
+        router &&
+        router.currentRoute &&
+        router.currentRoute.value &&
+        router.currentRoute.value.name
+    ) {
+        return router.currentRoute.value.name;
     }
 }
 
diff --git a/src/mixins/analytics-mixin.spec.js b/src/mixins/analytics-mixin.spec.js
index 711702c4a..9121140e0 100644
--- a/src/mixins/analytics-mixin.spec.js
+++ b/src/mixins/analytics-mixin.spec.js
@@ -151,7 +151,7 @@ describe("analyticsMixin.js", () => {
             action: "action",
             label: "label",
             value: undefined,
-            path: "/fmg/?fmgPage=",
+            path: "/fmg/mockedPageName",
         });
 
         // Act
@@ -172,7 +172,7 @@ describe("analyticsMixin.js", () => {
             action: "action",
             label: "33333",
             value: undefined,
-            path: "/fmg/?fmgPage=",
+            path: "/fmg/mockedPageName",
         });
 
         const mockData = {
@@ -211,7 +211,7 @@ describe("analyticsMixin.js", () => {
             action: "action",
             label: "111",
             value: undefined,
-            path: "/fmg/?fmgPage=",
+            path: "/fmg/mockedPageName",
         });
 
         const mockData = {
@@ -1048,3 +1048,11 @@ describe("analyticsMixin.js", () => {
         });
     });
 });
+
+jest.mock("@/router", () => ({
+    currentRoute: {
+        value: {
+            name: "mockedPageName",
+        },
+    },
+}));
diff --git a/src/store/index.js b/src/store/index.js
index 41d00d1fc..c3ad4996e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1499,7 +1499,7 @@ export const actions = {
             parentAccountNumber,
         }
     ) {
-        if (!pageName) {
+        if (!pageName || !category) {
             return;
         }
 
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index cfc442612..2119f1e8b 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -930,6 +930,7 @@ describe("Actions", () => {
             pageName: "pageName",
             sessionId: "sessionId",
             customEvent: customEvent,
+            category: "category",
             shouldUseSessionId: false,
         });
         expect(response).toEqual({});

From 19281c2e1052fcf82dd09df4f0723bee9b49c956 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 28 May 2025 15:45:00 -0400
Subject: [PATCH 2/2] CASH-609 - Renamed getPageNameByQueryString method to
 getPageNameFromRouter as we are not using query string anymore

---
 src/mixins/analytics-mixin.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 072851964..298a3af8f 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -35,11 +35,11 @@ import router from "@/router";
 export default {
     methods: {
         getPageName() {
-            return getPageNameByQueryString();
+            return getPageNameFromRouter();
         },
 
         async logPageView(pageEvent) {
-            const currentPageName = getPageNameByQueryString();
+            const currentPageName = getPageNameFromRouter();
             await this.validateSession();
 
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
@@ -72,7 +72,7 @@ export default {
         },
 
         async logCustomEvent(category, action, label, value) {
-            const currentPageName = getPageNameByQueryString();
+            const currentPageName = getPageNameFromRouter();
             await this.validateSession();
 
             const refSequenceNum =
@@ -109,7 +109,7 @@ export default {
             valueToLogType = null,
             value = null
         ) {
-            const currentPageName = getPageNameByQueryString();
+            const currentPageName = getPageNameFromRouter();
             const labelToLog = getValueToLog(label, valueToLogType);
 
             const eventToBePushed = {
@@ -129,7 +129,7 @@ export default {
         },
 
         async pushEventForChatsToGA(category, action, label, pushToLogApp = false) {
-            const currentPageName = getPageNameByQueryString();
+            const currentPageName = getPageNameFromRouter();
             const value = `2.0_${currentPageName}`;
             await this.pushEventToGA(category, action, label, pushToLogApp, null, value);
         },
@@ -139,7 +139,7 @@ export default {
         },
 
         async pushPageViewToGA() {
-            const currentPageName = getPageNameByQueryString();
+            const currentPageName = getPageNameFromRouter();
             const pageViewEvent = {
                 event: GaEvents.PAGE_VIEW_EVENT,
                 pagePath: `/fmg/${currentPageName}`,
@@ -804,7 +804,7 @@ function pushToDataLayerIfDefined(data) {
     }
 }
 
-function getPageNameByQueryString() {
+function getPageNameFromRouter() {
     if (
         router &&
         router.currentRoute &&