-
+
@@ -21,12 +34,27 @@
@@ -109,10 +137,22 @@ import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integratio
// DEFINE VALIDATION RULES
defineRule("zip-required", required(errorMessages.ZIP_REQUIRED));
-defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
-defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
+defineRule(
+ "email-address-required",
+ required(errorMessages.EMAIL_ADDRESS_REQUIRED)
+);
+defineRule(
+ "email-address-format",
+ regex(
+ /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/,
+ errorMessages.EMAIL_ADDRESS_FORMAT
+ )
+);
defineRule("vin-required", required(errorMessages.VIN_REQUIRED));
-defineRule("vin-format", regex(/^[A-HJ-NPR-Z0-9]{17}$/, errorMessages.VIN_FORMAT));
+defineRule(
+ "vin-format",
+ regex(/^[A-HJ-NPR-Z0-9]{17}$/, errorMessages.VIN_FORMAT)
+);
export default {
name: "vin-lookup",
@@ -120,7 +160,6 @@ export default {
// Call APIs
const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-
// Settle promises and get results
const promiseResultMap = [
{
@@ -211,12 +250,20 @@ export default {
getZipFromStore(){
return store.getters.vehicle.registration.zipCode
},
+ attachCustomEvents() {
+ this.prependActionToMethod(this, this.forwardButtonAction, () => {
+ this.pushEventToGA(
+ this.$route.query[this.queryStrings.FMG_PAGE],
+ this.GaActions.SUBMITTED,
+ this.GaLabels.VINLOOKUP,
+ true
+ );
+ });
+ },
backButtonAction() {
this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
},
async forwardButtonAction() {
- this.pushEventToGA(this.$route.query[this.queryStrings.FMG_PAGE], this.GaActions.SUBMITTED, this.GaLabels.VINLOOKUP , true);
-
const zipValidation = await this.validateZip(this.zip);
if (!zipValidation.data.isServiceable) {
this.customAlertData.zip = this.zip;
@@ -257,10 +304,9 @@ export default {
}
},
validateZip(zip) {
- return baseMixin.methods.dispatchStoreAction(
- storeActions.VALIDATE_ZIP,
- { zip }
- );
+ return baseMixin.methods.dispatchStoreAction(storeActions.VALIDATE_ZIP, {
+ zip,
+ });
},
lookupVehicle(vin) {
return baseMixin.methods.dispatchStoreAction(
@@ -282,7 +328,7 @@ export default {
store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, carInfo.imageUrl);
store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, carInfo.imageVifNumber);
store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, carInfo.imageVifNumber);
- store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP, this.zip);
+ store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP_CODE, this.zip);
store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.email);
},
},
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index c2c86c2dd..36ec73fe4 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -62,7 +62,7 @@ export default {
},
pushExperimentsToDataLayer(experiments) {
- experiments?.data?.forEach(exp => {
+ experiments?.forEach(exp => {
// Set Google Dimension Index based on experiment settings.
let googleDimensionIndex = 99;
@@ -72,16 +72,26 @@ export default {
}
// Create object with dimension index and value.
- const experimentWithDimension = {};
-
- Object.keys(exp).forEach(key => {
- experimentWithDimension[`${key}_${googleDimensionIndex}`] = exp[key];
- });
+ const experimentWithDimension = {
+ [`experimentId_${googleDimensionIndex}`]: exp.universeId,
+ [`variationId_${googleDimensionIndex}`]: exp.variationId,
+ [`experimentName_${googleDimensionIndex}`]: exp.universeName,
+ [`variationName_${googleDimensionIndex}`]: exp.variationName,
+ [`customDimension_${googleDimensionIndex}`]: `${exp.universeId}_${exp.variationId}_${exp.universeName}_${exp.variationName}`
+ };
// Push to the data layer with the Google Custom Dimension Index.
pushToDataLayerIfDefined(experimentWithDimension);
});
- }
+ },
+
+ prependActionToMethod(object, method, actionToPrepend) {
+ const baseMethod = object[method.name];
+ object[method.name] = function () {
+ actionToPrepend.apply(this, arguments);
+ return baseMethod.apply(object, arguments);
+ };
+ },
},
computed: {
analyticsPageEvents() {
@@ -96,7 +106,7 @@ export default {
GaLabels() {
return GaLabels;
}
- }
+ },
};
function pushToDataLayerIfDefined(data) {
diff --git a/src/mixins/analytics-mixin.spec.js b/src/mixins/analytics-mixin.spec.js
index b4ec2a5b5..1e29e35de 100644
--- a/src/mixins/analytics-mixin.spec.js
+++ b/src/mixins/analytics-mixin.spec.js
@@ -40,21 +40,27 @@ describe("analyticsMixin.js", () => {
// Arrange
window.dataLayer = [];
- const mockExperimentData = {
- data: [
+ const mockExperimentData =
+ [
{
settings: {},
variationName: 'test',
universeName: 'testUniverse'
}
]
- }
+
// Act
analyticsMixin.methods.pushExperimentsToDataLayer(mockExperimentData);
// Assert
- expect(window.dataLayer).toEqual([ { settings_99: {}, variationName_99: 'test', universeName_99: 'testUniverse' } ]);
+ expect(window.dataLayer).toEqual([{
+ experimentId_99: undefined,
+ variationId_99: undefined,
+ experimentName_99: 'testUniverse',
+ variationName_99: 'test',
+ customDimension_99: 'undefined_undefined_testUniverse_test'
+ }]);
});
@@ -62,22 +68,27 @@ describe("analyticsMixin.js", () => {
// Arrange
window.dataLayer = [];
- const mockExperimentData = {
- data: [
+ const mockExperimentData =
+ [
{
- settings: { "Google Custom Dimension Index": "5"},
+ settings: { "Google Custom Dimension Index": "5" },
variationName: 'test',
universeName: 'testUniverse'
}
]
- }
+
// Act
analyticsMixin.methods.pushExperimentsToDataLayer(mockExperimentData);
// Assert
- expect(window.dataLayer).toEqual([ { settings_5: {"Google Custom Dimension Index": "5"}, variationName_5: 'test', universeName_5: 'testUniverse' } ]);
+ expect(window.dataLayer).toEqual([{
+ experimentId_5: undefined,
+ variationId_5: undefined,
+ experimentName_5: 'testUniverse',
+ variationName_5: 'test',
+ customDimension_5: 'undefined_undefined_testUniverse_test'
+ }]);
});
-
});
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 9ffd28522..f11bd4228 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,8 +126,12 @@ const router = createRouter({
router.afterEach(async (to, from) => {
// Push page view to GA
analyticsMixin.methods.pushPageViewToGA(to.query[queryStrings.FMG_PAGE]);
- const assignedExperiments = await baseMixin.methods.dispatchStoreAction(storeActions.GET_EXPERIMENTS_BY_USER_FOR_GA, { userId: getDeviceIdValue() });
- analyticsMixin.methods.pushExperimentsToDataLayer(assignedExperiments);
+
+ baseMixin.methods.dispatchStoreAction(storeActions.GET_EXPERIMENTS_BY_USER, { userId: getDeviceIdValue() })
+ .then( (response) => {
+ analyticsMixin.methods.pushExperimentsToDataLayer(response.data);
+ });
+
});
router.navigate = (scenario, currentRoute, optionalQuery = {}, optionalParams = {}, optionalPageData = {}) => {
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 5380a3fa7..b3ce4d6d7 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -8,14 +8,14 @@ const navigationScenarios = {
CLICKED_FORWARD: "CLICKED_FORWARD",
CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
SELECTED_PARTS: "SELECTED_PARTS",
- SELECTED_DAMAGE_WITH_SINGLE_PART: "SELECTED_DAMAGE_WITH_SINGLE_PART",
- SELECTED_DAMAGE_WITH_MULTIPLE_PARTS: "SELECTED_DAMAGE_WITH_MULTIPLE_PARTS",
- SELECTED_DAMAGE_WITH_PART_QUESTIONS: "SELECTED_DAMAGE_WITH_PART_QUESTIONS",
CONTINUING_WITH_PARTS_QUESTION: "CONTINUING_WITH_PARTS_QUESTION",
CONTINUING_WITH_MULTIPLE_PARTS: "CONTINUING_WITH_MULTIPLE_PARTS",
CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
- TEMPORARY_TO_ADDRESS_LOOKUP: "TEMPORARY_TO_ADDRESS_LOOKUP",
+ CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
+ SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
+ SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
+ SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
};
export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 3290c43eb..2d27efcdf 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -59,23 +59,11 @@ const routingTable = [
},
{
scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
- destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
- },
- {
- scenario: navigationScenarios.SELECTED_DAMAGE_WITH_SINGLE_PART,
- destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
- },
- {
- scenario: navigationScenarios.SELECTED_DAMAGE_WITH_MULTIPLE_PARTS,
destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
},
{
- scenario: navigationScenarios.SELECTED_DAMAGE_WITH_PART_QUESTIONS,
- destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,//This might be temporary
- },
- {
- scenario: navigationScenarios.TEMPORARY_TO_ADDRESS_LOOKUP,
- destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP, //This will be temporary
+ scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+ destinationFmgPageValue: fmgPageValues.ESTIMATE,
},
],
},
@@ -172,6 +160,26 @@ const routingTable = [
},
],
},
+ {fmgPageValue: fmgPageValues.ESTIMATE,
+ maps: [
+ {
+ scenario: navigationScenarios.CLICKED_BACK,
+ destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+ },
+ {
+ scenario: navigationScenarios.SELECTED_MANUAL_VIN,
+ destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+ },
+ {
+ scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
+ destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
+ },
+ {
+ scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
+ destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+ },
+ ],
+ },
];
export { routingTable };
diff --git a/src/store/index.js b/src/store/index.js
index 66005abd5..591bb70c5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -31,7 +31,7 @@ const getDefaultState = () => {
},
},
serviceLocation: {
- zip: null,
+ zipCode: null,
},
customer: {
emailAddress: null,
@@ -144,8 +144,8 @@ export const mutations = {
updateRegistrationAddress(state, registrationAddress){
state.order.vehicle.registration.address = registrationAddress;
},
- updateServiceLocationZip(state, serviceLocationZip){
- state.order.serviceLocation.zip = serviceLocationZip;
+ updateServiceLocationZipCode(state, serviceLocationZipCode){
+ state.order.serviceLocation.zipCode = serviceLocationZipCode;
},
updateRegistrationCity(state, serviceCity){
state.order.serviceLocation.city = serviceCity;
@@ -459,10 +459,10 @@ export const actions = {
});
},
- getExperimentsByUserForGa(context, { userId }){
+ GetExperimentsByUser(context, { userId }){
return globalMethods.callHttpClient({
- method: endpoints.GetExperimentsByUserForGa.method,
- endpoint: `${endpoints.GetExperimentsByUserForGa.url}/${userId}`,
+ method: endpoints.GetExperimentsByUser.method,
+ endpoint: `${endpoints.GetExperimentsByUser.url}/${userId}`,
payload: {}
});
},