From a638f63cddb63abaef02f98b9b13a865129e73f6 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Thu, 28 Apr 2022 18:39:11 -0400 Subject: [PATCH] Rename consts --- .../button-question/button-question.vue | 2 +- src/constants/analytics-events.js | 22 -------------- src/constants/analytics.js | 29 +++++++++++++++++++ src/global-methods.js | 22 +++++++------- src/layouts/vehicle-damage/vehicle-damage.vue | 2 +- src/mixins/analytics-mixin.js | 21 +++++++------- 6 files changed, 54 insertions(+), 44 deletions(-) delete mode 100644 src/constants/analytics-events.js create mode 100644 src/constants/analytics.js diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index cae4744e9..7fba59c51 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -135,7 +135,7 @@ export default { }, handleCheckedChanged(val) { - this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.analyticsActions.CLICKED, val.value, true); + this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, val.value, true); if(this.isMultiSelect && this.selectedValues) { // Add or remove item to array of data to emit diff --git a/src/constants/analytics-events.js b/src/constants/analytics-events.js deleted file mode 100644 index c1b1e5594..000000000 --- a/src/constants/analytics-events.js +++ /dev/null @@ -1,22 +0,0 @@ -const analyticsPageEvents = { - ENTRY: "ENTRY", - EVENT: "EVENT" -}; - -const analyticsCategories = { - API_RESPONSE: 'Api_Response', - EVOX: 'Evox' -}; - -const analyticsActions = { - RESULT: 'Result', - CLICKED: 'Clicked', - VIF: 'vif' -}; - -const analyticsLabels = { - SUCCESS: 'Success', - ERROR: 'Error' -}; - -export { analyticsPageEvents, analyticsCategories, analyticsActions, analyticsLabels}; diff --git a/src/constants/analytics.js b/src/constants/analytics.js new file mode 100644 index 000000000..297adf3db --- /dev/null +++ b/src/constants/analytics.js @@ -0,0 +1,29 @@ +const analyticsPageEvents = { + ENTRY: "ENTRY", + EVENT: "EVENT" +}; + +// GA Constants +const GaEvents = { + GENERIC_EVENT: 'ga_Event', + PAGE_VIEW_EVENT : 'logPageview' +}; + +const GaCategories = { + API_RESPONSE: 'Api_Response', + EVOX: 'Evox' +}; + +const GaActions = { + RESULT: 'Result', + CLICKED: 'Clicked', + VIF: 'vif' +}; + +const GaLabels = { + SUCCESS: 'Success', + ERROR: 'Error' +}; + + +export { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents}; diff --git a/src/global-methods.js b/src/global-methods.js index 2cc50c6dc..bd95c18ae 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -1,6 +1,6 @@ import axios from "axios"; import { applicationConfig } from "@/constants/application-config.js"; -import { analyticsCategories, analyticsActions,analyticsLabels} from "@/constants/analytics-events"; +import { GaCategories, GaActions, GaLabels } from "@/constants/analytics"; import analyticsMixIn from "@/mixins/analytics-mixin.js"; import httpStatusCodes from "http-status-codes"; @@ -22,23 +22,25 @@ export default { (response) => { if (response.status == httpStatusCodes.OK) { if (response.data == undefined) { - analyticsMixIn.methods.pushEventToGA(analyticsCategories.API_RESPONSE, analyticsActions.RESULT, - `${analyticsLabels.ERROR}_${endpoint}`, true); - return reject(response); + analyticsMixIn.methods.pushEventToGA(GaCategories.API_RESPONSE, GaActions.RESULT, + `${GaLabels.ERROR}_${endpoint}`, true); + + reject(response); } else { - analyticsMixIn.methods.pushEventToGA(analyticsCategories.API_RESPONSE, analyticsActions.RESULT, - `${analyticsLabels.SUCCESS}_${endpoint}`, true); - return resolve(response); + analyticsMixIn.methods.pushEventToGA(GaCategories.API_RESPONSE, GaActions.RESULT, + `${GaLabels.SUCCESS}_${endpoint}`, true); + + resolve(response); } } }, (error) => { console.error(error); - analyticsMixIn.methods.pushEventToGA(analyticsCategories.API_RESPONSE, analyticsActions.RESULT, - `${analyticsLabels.ERROR}_${endpoint}`, true); - + analyticsMixIn.methods.pushEventToGA(GaCategories.API_RESPONSE, GaActions.RESULT, + `${GaLabels.ERROR}_${endpoint}`, true); + return reject(error.response); } ); diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 53417bcae..0db5c8b24 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -143,7 +143,7 @@ export default { }, mounted(){ if(this.$store.getters.vehicle.imageVifNumber){ - this.pushEventToGA(this.analyticsCategories.EVOX, `${this.analyticsActions.VIF}_${this.$store.getters.vehicle.imageVifNumber}`, + this.pushEventToGA(this.GaCategories.EVOX, `${this.GaActions.VIF}_${this.$store.getters.vehicle.imageVifNumber}`, this.$store.getters.vehicle.carId, true); } }, diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js index e18c167f4..db9baf64b 100644 --- a/src/mixins/analytics-mixin.js +++ b/src/mixins/analytics-mixin.js @@ -1,8 +1,8 @@ import { storeActions } from "@/constants/store-actions"; import { getDeviceIdValue, getSessionIdValue, getSessionKeyValue } from "@/helpers/heritage-integration/cookie-helper"; import { queryStrings } from "@/constants/query-strings"; -import { analyticsPageEvents, analyticsCategories, analyticsActions, analyticsLabels } from "@/constants/analytics-events"; import { experimentSettings } from "@/constants/experiments"; +import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents } from "@/constants/analytics"; import baseMixin from "@/mixins/base-mixin"; @@ -33,7 +33,7 @@ export default { pushEventToGA(category, action, label, pushToLogApp = false) { const eventToBePushed = { - 'event': 'ga_event', + 'event': GaEvents.GENERIC_EVENT, 'category': category, 'action': action, 'label': label, @@ -46,18 +46,19 @@ export default { if (pushToLogApp) { this.logEvent(currentPageName, undefined, category, action, label, undefined); } + }, pushPageViewToGA() { const pageViewEvent = { - 'event': 'logPageview', + 'event': GaEvents.PAGE_VIEW_EVENT, 'pagePath': `/fmg/?${queryStrings.FMG_PAGE}=${currentPageName}`, 'pageTitle': currentPageName }; pushToDataLayerIfDefined(pageViewEvent); - this.logEvent(currentPageName, analyticsPageEvents.ENTRY); + //this.logEvent(currentPageName, analyticsPageEvents.ENTRY); }, pushExperimentsToDataLayer(experiments){ @@ -86,14 +87,14 @@ export default { analyticsPageEvents() { return analyticsPageEvents; }, - analyticsCategories() { - return analyticsCategories; + GaCategories() { + return GaCategories; }, - analyticsActions() { - return analyticsActions; + GaActions() { + return GaActions; }, - analyticsLabels() { - return analyticsLabels; + GaLabels() { + return GaLabels; } } };