From ca218e9d40e87b65f3fdf7f7b15f8417a397fa4b Mon Sep 17 00:00:00 2001
From: Jeremy Zimmerman <Jeremy.Zimmerman@safelite.com>
Date: Thu, 3 Nov 2022 15:05:11 -0400
Subject: [PATCH] Updates

---
 src/mixins/analytics-mixin.js | 17 ++++++++---------
 src/store/index.js            | 23 +++++------------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index fa013c52..6be54fa5 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -16,15 +16,13 @@ import {
     ValueToLogTypes,
 } from "@/constants/analytics";
 import { cookieNames } from "@/constants/cookie-names";
-//import { useMainStore } from "@/store";
+import { useMainStore } from "@/store";
 
 import baseMixin from "@/mixins/base-mixin";
-//import { mapStores } from "pinia";
+import { mapStores } from "pinia";
 
 export default {
-
-    methods: {
-   
+    methods: {                
         logPageView(pageEvent) {            
             const currentPageName = getPageNameByQueryString();
             var payload = {
@@ -35,7 +33,7 @@ export default {
                 action: "",
                 event: pageEvent,
                 shouldUseSessionId: false,
-                experimentsForUser: [], //useMainStore.applicationUser.experiments,
+                experimentsForUser: useMainStore().applicationUser.experiments,
             };
 
             baseMixin.methods.dispatchStoreAction(storeActions.LOG_PAGE_VIEW, payload, false);
@@ -54,7 +52,7 @@ export default {
                 label: label,
                 value: value,
                 shouldUseSessionId: false,
-                experimentsForUser: [], //useMainStore.applicationUser.experiments,
+                experimentsForUser: useMainStore().applicationUser.experiments,
             };
 
             baseMixin.methods.dispatchStoreAction(storeActions.LOG_CUSTOM_EVENT, payload, false);
@@ -94,7 +92,7 @@ export default {
         },
 
         pushExperimentsToDataLayer() {
-            const experiments =  []; //useMainStore.applicationUser.experiments;
+            const experiments =  useMainStore().applicationUser.experiments;
             experiments?.forEach((exp) => {
                 // Set Google Dimension Index based on experiment settings.
                 let googleDimensionIndex = 99;
@@ -173,7 +171,8 @@ export default {
         },
     },
     computed: {
-        //...mapStores(useMainStore),
+        ...mapStores(useMainStore),
+
         analyticsPageEvents() {
             return analyticsPageEvents;
         },
diff --git a/src/store/index.js b/src/store/index.js
index 057e845d..d5ea0e55 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -243,7 +243,7 @@ export const useMainStore = defineStore({
             },
         });
       },
-      logPageView({ userId, sessionKey, pageName, sessionId, action })
+      logPageView({ userId, sessionKey, pageName, sessionId, action, event, shouldUseSessionId, experimentsForUser })
       {
           var payload = {
               userId: userId,
@@ -263,21 +263,8 @@ export const useMainStore = defineStore({
               logApiCall: false,
           });
       },
-      logCustomEvent(
-          context,
-          {
-              userId,
-              sessionKey,
-              pageName,
-              sessionId,
-              category,
-              action,
-              label,
-              value,
-              shouldUseSessionId,
-              experimentsForUser,
-          }
-      ) {
+      logCustomEvent({ userId, sessionKey, pageName, sessionId, category, action, label, value, shouldUseSessionId, experimentsForUser})
+      {
           var payload = {
               userId: userId,
               sessionKey: sessionKey,
@@ -299,7 +286,7 @@ export const useMainStore = defineStore({
               logApiCall: false,
           });
       },
-      initializeSession(context, { userId, sessionId, userAgent, referrer }) {
+      initializeSession({ userId, sessionId, userAgent, referrer }) {
           var payload = {
               applicationName: applicationConfig.APPLICATION_NAME,
               userId: userId,
@@ -319,7 +306,7 @@ export const useMainStore = defineStore({
           });
       },
 
-      updateLastPageVisited(state, lastPageVisited) {
+      updateLastPageVisited(lastPageVisited) {
         this.applicationUser.lastPageVisited = lastPageVisited;
       },