From d3d880b2b3ac5fb6af41c5388c2c88bc9b477ba6 Mon Sep 17 00:00:00 2001
From: Frank <frank.rua@safelite.com>
Date: Mon, 29 Nov 2021 16:14:32 -0500
Subject: [PATCH] Added Promise.All

---
 .../{cms-adapter.js => cms-content-helper.js} |  3 +-
 src/layouts/vehicle-year/vehicle-year.vue     | 62 ++++++++++---------
 .../year-question/year-question.vue           |  3 -
 3 files changed, 35 insertions(+), 33 deletions(-)
 rename src/helpers/{cms-adapter.js => cms-content-helper.js} (94%)

diff --git a/src/helpers/cms-adapter.js b/src/helpers/cms-content-helper.js
similarity index 94%
rename from src/helpers/cms-adapter.js
rename to src/helpers/cms-content-helper.js
index 721569396..da9d3b29f 100644
--- a/src/helpers/cms-adapter.js
+++ b/src/helpers/cms-content-helper.js
@@ -2,7 +2,7 @@ import { storeActions } from "@/constants/store-actions.js";
 import { widgetNames } from "@/constants/widget-names.js";
 import store from "@/store";
 
-export function GetContentFromCms(fmgPage) {
+export function fetchCmsContentForPage(fmgPage) {
     return store.dispatch(storeActions.GET_PAGE_DATA, { pageName: fmgPage }).then((response) => {
 
         const pageDataFromCms = {
@@ -18,7 +18,6 @@ export function GetContentFromCms(fmgPage) {
                 }
 
                 pageDataFromCms[widget.Type] = [widget.Model];
-
             }
         });
 
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index dc610dac3..14d1e85cb 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,40 +1,46 @@
 <template>
-<div class="select-car">
+  <div class="select-car">
     <div class="select-car-form rounded text-center">
-        <pageHeader :text="pageHeaderWidgets.HeaderText" class="Header" />
-        <yearQuestion :questionText="radioQuestionWidgets.QuestionText" />
+      <pageHeader :text="pageHeaderWidgets.HeaderText" class="Header" />
+      <yearQuestion :questionText="radioQuestionWidgets.QuestionText" />
     </div>
-</div>
+  </div>
 </template>
 
 <script>
 import yearQuestion from "@/layouts/vehicle-year/year-question/year-question";
 import pageHeader from "@/ux-components/header/header";
-import {
-    GetContentFromCms
-} from "@/helpers/cms-adapter";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import store from "@/store";
+import { storeActions } from "@/constants/store-actions.js";
 
 export default {
-    name: "vehicle-year",
-    data() {
-        return {
-            pageHeaderWidgets: {},
-            radioQuestionWidgets: {},
-        };
-    },
-    computed: {},
-    beforeRouteEnter(to, from, next) {
-        GetContentFromCms(to.query.fmgPage).then((response) => {
-            console.log(response)
-            next(vm => {
-                vm.pageHeaderWidgets = response.PageHeaderWidget[0];
-                vm.radioQuestionWidgets = response.RadioQuestionWidget[0];
-            });
-        });
-    },
-    components: {
-        yearQuestion,
-        pageHeader,
-    },
+  name: "vehicle-year",
+  data() {
+    return {
+      pageHeaderWidgets: {},
+      radioQuestionWidgets: {},
+    };
+  },
+  computed: {},
+  beforeRouteEnter(to, from, next) {
+
+    Promise.allSettled([
+      fetchCmsContentForPage(to.query.fmgPage),
+      store.dispatch(storeActions.GET_VEHICLE_YEARS, {}),
+    ]).then(([contentPromise, getYearsPromise]) => {
+
+
+      // Call our next function to transition to the next page.
+      next((vm) => {
+        vm.pageHeaderWidgets = contentPromise.value.PageHeaderWidget[0];
+        vm.radioQuestionWidgets = contentPromise.value.RadioQuestionWidget[0];
+      });
+    });
+  },
+  components: {
+    yearQuestion,
+    pageHeader,
+  },
 };
 </script>
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 4aedb12df..5df3cffa8 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -16,9 +16,6 @@ export default {
         };
     },
     created() {
-        this.dispatchNonBlockingStoreAction(this.storeActions.GET_VEHICLE_YEARS, {}).then((response) => {
-            this.years = response.data;
-        });
     },
     components: {
         radioQuestion,