CSR-762 Fix merge conflicts

src/common-components/base-input-button/base-input-button.vue

@@ -72,23 +72,16 @@ export default {
         };
     },
     mounted() {
-        console.log("mounted: ", {
-            isChecked: this.isChecked
-        })
         if (this.isChecked) {
-            // if (this.shouldPushClickEventToGAOnMount) {
-            //     this.handleEventAction(this.eventTypes.MOUNT)
-            // } else {
+            if (this.shouldPushClickEventToGAOnMount) {
+                this.handleEventAction(this.eventTypes.MOUNT)
+            } else {
                 this.handleChange(this.modelValue);
-            // }
+            }
         }
     },
     methods: {
         handleEventAction(eventType, e) {
-            console.log("handleEventAction: ", {
-                eventType,
-                value: this.value,
-            });
             if (this.isMultiSelect) {
                 switch (eventType) {
                     case this.eventTypes.ENTER:

src/constants/store-actions.js

@@ -18,7 +18,6 @@ const storeActions = {
   LOOKUP_VEHICLE_BY_VIN: "lookupVehicleByVin",
   LOOKUP_VIN_BY_PLATE: "lookupVinByPlate",
   LOOKUP_VIN_BY_ADDRESS: "lookupVinByAddress",
-
   GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
   GET_PARTS: "getParts",
   GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions",

src/constants/store-mutations.js

@@ -68,4 +68,4 @@ const storeMutations = {
   UPDATE_TRIGGERED_SITE_ENTRY: "updateTriggeredSiteEntry",
 };
 
-export { storeMutations };
+export { storeMutations };

src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue

@@ -200,16 +200,10 @@ export default {
         // Loads the preselected values from the store.
         LoadPreselectedValues() {
             this.$nextTick(() => {
-                console.log("LoadPreselectedValues: ", {
-                    modelValue: this.modelValue,
-                    alreadyPopulatedPartsData: this.alreadyPopulatedPartsData,
-                    selectedPartNumber: this.selectedPartNumber
-                })
                 if (this.modelValue !== undefined) {
                     // Populate button-question model-value if parts data already exists in VueX
                     this.shouldPushClickEventToGAOnMount = false;
                     this.selectedTint = this.alreadyPopulatedPartsData.filter(part => part.partNumber === this.selectedPartNumber)[0]?.color;
-                    console.log({color: this.selectedTint})
                 }
             });
         },

src/mixins/analytics-mixin.js

@@ -57,8 +57,6 @@ export default {
         'path': `/fmg/?${queryStrings.FMG_PAGE}=${currentPageName}`
       }
 
-      console.log("PUSHING: ", labelToLog)
-
       pushToDataLayerIfDefined(eventToBePushed);
 
       if (pushToLogApp) {

src/ux-components/list-button-horizontal/list-button-horizontal.spec.js

@@ -186,7 +186,6 @@ describe("list-button-horizontal.vue", () => {
 });
 
 function setupMocks({ mockData }) {
-  console.log(mockData);
   const wrapper = mount(listButtonHorizontal, {
     ...mockData,
     propsData: {

src/ux-components/list-button/list-button.spec.js

@@ -252,7 +252,6 @@ describe("list-button.vue", () => {
 });
 
 function setupMocks({ mockData }) {
-  console.log(mockData);
   const wrapper = mount(listButton, {
     ...mockData,
     mixins: [inputButtonWrapperMixin],