Merge pull request #2506 from Safelite/feature/CASH-45

Feature/cash 45

src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js

@@ -15,7 +15,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(0);
+        expect(wrapper.vm.progress).toBe(0);
         wrapper.unmount();
     });
 });
@@ -33,7 +33,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(4);
+        expect(wrapper.vm.progress).toBe(4);
         wrapper.unmount();
     });
 });
@@ -51,7 +51,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(48);
+        expect(wrapper.vm.progress).toBe(48);
         wrapper.unmount();
     });
 });
@@ -69,7 +69,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(100);
+        expect(wrapper.vm.progress).toBe(100);
         wrapper.unmount();
     });
 });

src/fmg-components/funnel-header/progress-bar/progress-bar.vue

@@ -10,15 +10,10 @@ import { getProgressBarPercentage } from "@/constants/progress-bar-mapper";
 
 export default {
     name: "progressBar",
-    data() {
+    data() {},
-        return {
+    computed: {
-            progress: this.getProgress(),
+        progress() {
-        };
+            return getProgressBarPercentage(this.pageName);
-    },
-    methods: {
-        getProgress() {
-            var pageName = this.pageName;
-            return getProgressBarPercentage(pageName);
         },
     },
 };

src/router/methods/before-each.js

@@ -52,6 +52,12 @@ export async function beforeEach(to, from) {
             }
         }
 
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
@@ -61,12 +67,6 @@ export async function beforeEach(to, from) {
             debugLog(" funnel cookie after: ", getFunnelCookie());
         }
 
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
         // Update if logging is enabled.
         checkLogParam();