From ff0d87717036ad0cc08b63d43a4fcd90e0093272 Mon Sep 17 00:00:00 2001 From: DavidAtSafelite Date: Wed, 10 May 2023 08:52:10 -0400 Subject: [PATCH 1/6] Changes for SSR-442, Defect SSR-463 and a little bit of cleanup for SSR-290 --- src/layouts/entry-page/entry-page.vue | 7 +- src/layouts/vehicle-damage/vehicle-damage.vue | 5 +- src/layouts/vehicle-parts/vehicle-parts.vue | 4 +- src/layouts/welcome-page/welcome-page.vue | 94 ++++++++++--------- src/store/index.js | 78 +++++++++------ 5 files changed, 107 insertions(+), 81 deletions(-) diff --git a/src/layouts/entry-page/entry-page.vue b/src/layouts/entry-page/entry-page.vue index 8fa467d5..4f06bb03 100644 --- a/src/layouts/entry-page/entry-page.vue +++ b/src/layouts/entry-page/entry-page.vue @@ -147,6 +147,11 @@ this.mainStore.issConfig.disabledFields.policyNumber = true; break; + case "policyzipcode": + this.mainStore.order.policy.policyZipCode = value; + this.mainStore.issConfig.disabledFields.policyZipCode = true; + break; + case "lossdate": // NOTE: May need some date parsing logic in here depending on client. this.mainStore.order.policy.dateOfLoss = value; @@ -167,7 +172,7 @@ break; } } - }, + } }, computed:{ }, diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index f01ff4a4..5106203c 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -95,9 +95,12 @@ export default { name: "vehicle-damage", mixins: [BaseFormMixin], async beforeRouteEnter(to, from, next) { + + const store = useMainStore(); + // Call APIs const cmsContentPromise = fetchCmsContentForPage(to.query.issPage); - const damageOptionsPromise = useMainStore().getDamageOptions(useMainStore().order.vehicle.carId); + const damageOptionsPromise = store.getDamageOptions(store.order.vehicle.carId); // Settle promises and get results const promiseResultMap = [ diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 08caf800..83d4077f 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -108,7 +108,7 @@ data() { }, computed: { isForwardActionDisabled() { - return this.selectedGlassPartNumbers.length !== this.PartsFromApi.partsOrQuestions.length + return this.selectedGlassPartNumbers?.length !== this.PartsFromApi.partsOrQuestions?.length }, selectedGlassPartNumbers() { // Compile all selected parts from the page. @@ -124,7 +124,7 @@ computed: { const partsData = this.PartsFromApi; // Map API result data, to vehicle-parts data structure - const mappedData = partsData.partsOrQuestions.map((g) => { + const mappedData = partsData.partsOrQuestions?.map((g) => { return { glassName: g.glassName, glassLocation: g.glassLocation, diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index b70a24eb..b2e53f00 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -18,13 +18,15 @@ validationRules="policy-number-required" /> -
+
+ ref="policyZip" + validationRules="policy-zip-required|policy-zip-format" />
@@ -152,51 +154,49 @@ diff --git a/src/layouts/vehicle-selection/model-question/model-question.vue b/src/layouts/vehicle-selection/model-question/model-question.vue new file mode 100644 index 00000000..e1cb2a75 --- /dev/null +++ b/src/layouts/vehicle-selection/model-question/model-question.vue @@ -0,0 +1,77 @@ + + + diff --git a/src/layouts/vehicle-selection/style-question/style-question.vue b/src/layouts/vehicle-selection/style-question/style-question.vue new file mode 100644 index 00000000..b957d923 --- /dev/null +++ b/src/layouts/vehicle-selection/style-question/style-question.vue @@ -0,0 +1,76 @@ + + + diff --git a/src/layouts/vehicle-selection/vehicle-selection.vue b/src/layouts/vehicle-selection/vehicle-selection.vue new file mode 100644 index 00000000..cb53c2ea --- /dev/null +++ b/src/layouts/vehicle-selection/vehicle-selection.vue @@ -0,0 +1,183 @@ + + + diff --git a/src/layouts/vehicle-selection/year-question/year-question.vue b/src/layouts/vehicle-selection/year-question/year-question.vue new file mode 100644 index 00000000..97ba0090 --- /dev/null +++ b/src/layouts/vehicle-selection/year-question/year-question.vue @@ -0,0 +1,63 @@ + + + \ No newline at end of file diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index 9cbbdfbc..763994ac 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -29,6 +29,7 @@ export const issPageValues = { VEHICLE_PARTS: 'vehicle-parts', VEHICLE_STYLE: 'vehicle-style', VEHICLE_YEAR: 'vehicle-year', + VEHICLE_SELECTION: 'vehicle-selection', VIN_LOOKUP: 'vin-lookup', TPA_SUBMIT: 'tpa-submit', BAILOUT_PAGE: 'bailout-page', diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index e6c25ae6..d9df9162 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -4,6 +4,19 @@ import { navigationScenarios } from '@/router/router-constants/navigation-scenar // Get store from router/index.js instead of importing it here to get updated values const routingTable = function(store) { return [ + { + issPageValue: issPageValues.VEHICLE_SELECTION, + maps: [ + { + scenario: navigationScenarios.CLICKED_BACK, + destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS + }, + { + scenario: navigationScenarios.CLICKED_FORWARD, + destinationIssPageValue: issPageValues.VEHICLE_DAMAGE + } + ] + }, { issPageValue: issPageValues.VEHICLE_YEAR, maps: [ @@ -61,7 +74,7 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.VEHICLE_STYLE + destinationIssPageValue: issPageValues.VEHICLE_SELECTION }, { scenario: navigationScenarios.CLICKED_FORWARD_WITH_REPAIR, @@ -389,7 +402,7 @@ const routingTable = function(store) { }, { scenario: navigationScenarios.CLICKED_FORWARD_POLICY_UNVERIFIED, - destinationIssPageValue: issPageValues.VEHICLE_YEAR + destinationIssPageValue: issPageValues.VEHICLE_SELECTION }, { scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED, From ca2181c2da036a56eaacf45d13bc006c61c39056 Mon Sep 17 00:00:00 2001 From: Sneha Date: Wed, 10 May 2023 20:02:18 +0530 Subject: [PATCH 3/6] Update routing-table.js --- src/router/router-constants/routing-table.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index d9df9162..65dcf571 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -74,7 +74,7 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.VEHICLE_SELECTION + destinationIssPageValue: issPageValues.VEHICLE_STYLE }, { scenario: navigationScenarios.CLICKED_FORWARD_WITH_REPAIR, @@ -402,7 +402,7 @@ const routingTable = function(store) { }, { scenario: navigationScenarios.CLICKED_FORWARD_POLICY_UNVERIFIED, - destinationIssPageValue: issPageValues.VEHICLE_SELECTION + destinationIssPageValue: issPageValues.VEHICLE_YEAR }, { scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED, From 0e5f0504c6fe2becac06c047095d36d4c01e449e Mon Sep 17 00:00:00 2001 From: Kroell Date: Wed, 10 May 2023 10:53:19 -0400 Subject: [PATCH 4/6] fixes to spacing around header --- src/layouts/service-location/service-location.vue | 2 +- src/layouts/welcome-page/welcome-page.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index eac6e7ec..5b42579c 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -3,7 +3,7 @@
- +
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index b70a24eb..353d2e11 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -3,9 +3,9 @@
- +
-
+
Date: Wed, 10 May 2023 11:03:03 -0400 Subject: [PATCH 5/6] Nulls for the win! --- src/store/index.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 9fba1222..90b04423 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -699,10 +699,10 @@ export const useMainStore = defineStore({ this.order.damage.partQuestionAnswers = null; this.order.damage.moldingQuestionAnswers = null; this.order.damage.capabilityQuestionAnswers = null; - this.applicationUser.pageData[issPageValues.PART_QUESTIONS] = {}; - this.applicationUser.pageData[issPageValues.VEHICLE_PARTS] = {}; - this.applicationUser.pageData[issPageValues.MOLDING_QUESTIONS] = {}; - this.applicationUser.pageData[issPageValues.CAPABILITY_QUESTIONS] = {}; + this.applicationUser.pageData[issPageValues.PART_QUESTIONS] = null; + this.applicationUser.pageData[issPageValues.VEHICLE_PARTS] = null; + this.applicationUser.pageData[issPageValues.MOLDING_QUESTIONS] = null; + this.applicationUser.pageData[issPageValues.CAPABILITY_QUESTIONS] = null; }, resetSupportingItemsState() { @@ -734,8 +734,8 @@ export const useMainStore = defineStore({ this.resetPartsAndDependencies(); this.updateMoldingQuestionAnswers(null); this.updateCapabilityQuestionAnswers(null); - this.updatePageData({ page: issPageValues.MOLDING_QUESTIONS, data: {} }); - this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: {} }); + this.updatePageData({ page: issPageValues.MOLDING_QUESTIONS, data: null }); + this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: null }); } }, @@ -842,7 +842,7 @@ export const useMainStore = defineStore({ }, updatePageData(pageData) { - this.applicationUser.pageData[pageData.page] = (!!pageData.data) ? pageData.data : {}; + this.applicationUser.pageData[pageData.page] = pageData.data; }, updatePolicyData(welcomePageModel) { @@ -890,9 +890,9 @@ export const useMainStore = defineStore({ this.resetSupportingItemsState(); this.resetVapsState(); - this.updatePageData({ page: issPageValues.VEHICLE_PARTS, data: {} }); - this.updatePageData({ page: issPageValues.MOLDING_QUESTIONS, data: {} }); - this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: {} }); + this.updatePageData({ page: issPageValues.VEHICLE_PARTS, data: null }); + this.updatePageData({ page: issPageValues.MOLDING_QUESTIONS, data: null }); + this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: null }); } //Save new values @@ -918,7 +918,7 @@ export const useMainStore = defineStore({ // was updateGlassParts(null), added dependencies for SSR-290 this.resetPartsAndDependencies(); this.updateCapabilityQuestionAnswers(null); - this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: {} }); + this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: null }); } // Save new values From 311d19cb30a6401d30fbfbb8903bf6346c0e7fcb Mon Sep 17 00:00:00 2001 From: DavidAtSafelite Date: Wed, 10 May 2023 11:19:15 -0400 Subject: [PATCH 6/6] Removed unwanted comments --- src/store/index.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 90b04423..25463efb 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -671,7 +671,6 @@ export const useMainStore = defineStore({ this.order.vehicle.imageVifNumber = vehicle.imageVifNumber; this.order.vehicle.imageColor = vehicle.imageVifColor; - // added for SSR-290 this.resetSupportingItemsState(); this.resetVapsState(); }, @@ -757,7 +756,6 @@ export const useMainStore = defineStore({ if(this.order.vehicle.year !== year) { this.resetVehicleState(); - // was resetDamageState, added dependencies for SSR-290 this.resetDamageAndDependencies(); this.order.vehicle.year = year; @@ -770,7 +768,6 @@ export const useMainStore = defineStore({ const year = this.order.vehicle.year; this.resetVehicleState(); - // was resetDamageState, added dependencies for SSR-290 this.resetDamageAndDependencies(); this.order.vehicle.year = year; @@ -785,7 +782,6 @@ export const useMainStore = defineStore({ const make = this.order.vehicle.make; this.resetVehicleState(); - // was resetDamageState, added dependencies for SSR-290 this.resetDamageAndDependencies(); this.order.vehicle.year = year; @@ -803,7 +799,6 @@ export const useMainStore = defineStore({ const model = this.order.vehicle.model; this.resetVehicleState(); - // was resetDamageState, added dependencies for SSR-290 this.resetDamageAndDependencies(); this.order.vehicle.year = year; @@ -886,7 +881,6 @@ export const useMainStore = defineStore({ this.updateGlassParts(null); this.updateMoldingQuestionAnswers(null); this.updateCapabilityQuestionAnswers(null); - // Added for SSR-290 this.resetSupportingItemsState(); this.resetVapsState(); @@ -915,7 +909,6 @@ export const useMainStore = defineStore({ ); if (haveMoldingQuestionAnswersChanged) { - // was updateGlassParts(null), added dependencies for SSR-290 this.resetPartsAndDependencies(); this.updateCapabilityQuestionAnswers(null); this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: null }); @@ -941,7 +934,6 @@ export const useMainStore = defineStore({ ); if (haveCapabilityQuestionAnswersChanged) { - // was updateGlassPars(null), added dependencies for SSR-290 this.resetPartsAndDependencies(); }