From 26c07aa8d62460eac37a07ec350794583707b68b Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Tue, 24 Oct 2023 16:15:31 -0400 Subject: [PATCH 1/5] Renamed CorrelationId to ReferralCorrelationId to match the service change. Added handling of rejected promise on policy lookup call. --- src/helpers/unit-test-helper.js | 4 ++-- src/layouts/welcome-page/welcome-page.vue | 3 ++- src/store/index.js | 4 ++-- src/store/store.spec.js | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js index 9ccfd29b..8d3c3a4f 100644 --- a/src/helpers/unit-test-helper.js +++ b/src/helpers/unit-test-helper.js @@ -152,7 +152,7 @@ export function getMountOptions(mockData) { export function getMockOrderInfo( mockReferralNumber, - mockCorrelationId, + mockReferralCorrelationId, mockReferralDate, accountNumber = "0", savedSessionId, @@ -160,7 +160,7 @@ export function getMockOrderInfo( ) { return { referralNumber: mockReferralNumber, - referralCorrelationId: mockCorrelationId, + referralReferralCorrelationId: mockReferralCorrelationId, referralDate: mockReferralDate, accountNumber: accountNumber, savedSessionId: savedSessionId, diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index 1f0ac16e..76b6bd28 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -312,7 +312,8 @@ export default { .then(() => {}, () => {}) .finally(async () => { if (this.isCoverageEnabled) { - await this.mainStore.getCoveragePolicyInfo(); + await this.mainStore.getCoveragePolicyInfo() + .then(() => {}, () => {}); } this.navigateForward(); }); diff --git a/src/store/index.js b/src/store/index.js index 60699f03..f3fb510a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -401,7 +401,7 @@ export const useMainStore = defineStore({ policyNumber: policy.policyNumber, dateOfLoss: policy.dateOfLoss, zipCode: policy.policyZipCode, - correlationId: order.referralCorrelationId + referralCorrelationId: order.referralCorrelationId } }).then((r) => { const responsePolicy = r?.data?.policies?.[0]; @@ -439,7 +439,7 @@ export const useMainStore = defineStore({ endpoint: endpoints.RegisterClaim.url, payload: { - correlationId: this.order.referralCorrelationId, + referralCorrelationId: this.order.referralCorrelationId, accountNumber: this.issConfig.parentAccountNumber?.toString() ?? '', insured: { firstName: this.order.customer.firstName, diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 3ffb3bcf..2e122e20 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -385,7 +385,7 @@ describe('Store', () => { data: { claimantId: null, claimNumber: getRandomString(9, 9), - correlationId: getRandomGuid(), + referralCorrelationId: getRandomGuid(), isSuccess: true, isError: false, successMessage: getRandomString(9, 9), @@ -412,7 +412,7 @@ describe('Store', () => { data: { claimantId: null, claimNumber: getRandomString(9, 9), - correlationId: getRandomGuid(), + referralCorrelationId: getRandomGuid(), isSuccess: true, isError: false, successMessage: getRandomString(9, 9), @@ -1379,12 +1379,12 @@ describe('Store', () => { const policyNumber = getRandomString(6, 6); const dateOfLoss = getRandomString(6, 6); const zipCode = getRandomString(6, 6); - const correlationId = getRandomString(6, 6); + const referralCorrelationId = getRandomString(6, 6); store.order.accountNumber = accountNumber; store.order.policy.policyNumber = policyNumber; store.order.policy.dateOfLoss = dateOfLoss; store.order.policy.policyZipCode = zipCode; - store.order.referralCorrelationId = correlationId; + store.order.referralCorrelationId = referralCorrelationId; globalMethods.callHttpClient = jest.fn().mockReturnValue(Promise.resolve({})); // Act @@ -1397,7 +1397,7 @@ describe('Store', () => { policyNumber, dateOfLoss, zipCode, - correlationId + referralCorrelationId }) })); }); From 57c20b53056b814a77d373f0341f3b4fd3277a60 Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Tue, 24 Oct 2023 16:22:41 -0400 Subject: [PATCH 2/5] Slight change to fix unit test. --- src/layouts/welcome-page/welcome-page.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index 76b6bd28..382664ef 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -312,8 +312,7 @@ export default { .then(() => {}, () => {}) .finally(async () => { if (this.isCoverageEnabled) { - await this.mainStore.getCoveragePolicyInfo() - .then(() => {}, () => {}); + await this.mainStore.getCoveragePolicyInfo()?.then(() => {}, () => {}); } this.navigateForward(); }); From 10f6a654f7ff71868029420aac1c51388edb785b Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Tue, 24 Oct 2023 16:28:02 -0400 Subject: [PATCH 3/5] Undo double rename on comment. --- src/helpers/unit-test-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js index 8d3c3a4f..ac3a2694 100644 --- a/src/helpers/unit-test-helper.js +++ b/src/helpers/unit-test-helper.js @@ -160,7 +160,7 @@ export function getMockOrderInfo( ) { return { referralNumber: mockReferralNumber, - referralReferralCorrelationId: mockReferralCorrelationId, + referralCorrelationId: mockReferralCorrelationId, referralDate: mockReferralDate, accountNumber: accountNumber, savedSessionId: savedSessionId, From b174574f4a4cbb99f22487c6f0a95c2a420a16d1 Mon Sep 17 00:00:00 2001 From: Bill Richardson Date: Tue, 24 Oct 2023 16:33:43 -0400 Subject: [PATCH 4/5] Availability indicator update Warning updates --- .../button-question/button-question.vue | 2 + .../shop-list-button/shop-list-button.vue | 53 +++++++++++++++---- .../shop-question/shop-question.vue | 4 +- src/mixins/input-button-wrapper-mixin.js | 1 + src/styles/ux-variables-svg-strings.scss | 2 + 5 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index f4a3597c..9c14649a 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -48,6 +48,7 @@ :isWide="isWide" :validationRules="validationRules" :textPosition="textPosition" + :additionalButtonData="additionalButtonData" :additionalButtonStyling="additionalButtonStyling" :lastValuePushedToGa="lastValuePushedToGa" :setLastValuePushedToGa="setLastValuePushedToGa" @@ -129,6 +130,7 @@ export default { suppressError: Boolean, useTextForValue: Boolean, valueToLogType: String, + additionalButtonData: Object, additionalButtonStyling: String, isSmallQuestionText: Boolean, isSmallQuestionLabelText: Boolean diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue index c34d67c9..49fd2e64 100644 --- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue +++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue @@ -20,6 +20,22 @@ :class="textPosition">{{ buttonLabelSubCopy }} +
+
+ {{ badgeText }} + +
import baseInputButton from '@/digital-components/base-input-button/base-input-button.vue'; import inputButtonWrapperMixin from '@/mixins/input-button-wrapper-mixin'; +import loader from '@/ux-components/loader/loader.vue'; export default { name: 'shop-list-button', components: { - baseInputButton + baseInputButton, + loader }, mixins: [inputButtonWrapperMixin], data() { @@ -53,32 +71,45 @@ export default { }; }, computed: { + displayAvailabilityIndicators() { + return true; + }, isLoaderDisplayed() { return this.availabilityRating == null; }, availabilityRatingClass() { - if (this.availabilityRating == null) { - return 'gray'; + if (this.availabilityRating != null) { + return this.availabilityRating === 'high' ? 'green' : 'orange'; } - return this.availabilityRating === 'high' ? 'green' : 'orange'; + return 'gray'; }, badgeText() { if (this.availabilityRating != null) { return this.availabilityRating === 'high' ? 'Appts available' : 'Appts low'; } - return ''; } }, - methods: { - displayLoader() { - this.isLoaderDisplayed = true; + beforeMount() { + if (this.displayAvailabilityIndicators) { + const { startDate } = this.additionalButtonData; + const { endDate } = this.additionalButtonData; + const { shopAppointmentType } = this.additionalButtonData; + + this.additionalButtonData + .availabilityRatingCallback(startDate, endDate, shopAppointmentType, this.value) + .then((data) => { + this.availabilityRating = data; + }); } - } + }, + methods: { } };