diff --git a/src/layouts/scheduling/scheduling.spec.js b/src/layouts/scheduling/scheduling.spec.js index c76a0985f..92c869898 100644 --- a/src/layouts/scheduling/scheduling.spec.js +++ b/src/layouts/scheduling/scheduling.spec.js @@ -124,7 +124,7 @@ describe("scheduling.vue", () => { }); const { wrapper } = setupMocks(); - wrapper.vm.inShopProvidersAndTimeslots = [ + wrapper.vm.inshopProvidersAndTimeSlots = [ { provider: { providerNumber: "05018" }, timeSlots: { days: [] } }, { provider: { providerNumber: "05019" }, timeSlots: { days: [] } }, ]; @@ -161,7 +161,7 @@ describe("scheduling.vue", () => { }); const { wrapper } = setupMocks(); - wrapper.vm.inShopProvidersAndTimeslots = [ + wrapper.vm.inshopProvidersAndTimeSlots = [ { provider: { providerNumber: "05018" }, timeSlots: { days: [] } }, { provider: { providerNumber: "05019" }, timeSlots: { days: [] } }, ]; @@ -169,12 +169,12 @@ describe("scheduling.vue", () => { await wrapper.vm.handleRequestMoreDates(); - expect(wrapper.vm.inShopProvidersAndTimeslots[0].timeSlots.days).toHaveLength(1); + expect(wrapper.vm.inshopProvidersAndTimeSlots[0].timeSlots.days).toHaveLength(1); expect( - wrapper.vm.inShopProvidersAndTimeslots[0].timeSlots.days[0].timeSlots[0].id + wrapper.vm.inshopProvidersAndTimeSlots[0].timeSlots.days[0].timeSlots[0].id ).toBe("slot-a"); expect( - wrapper.vm.inShopProvidersAndTimeslots[1].timeSlots.days[0].timeSlots[0].id + wrapper.vm.inshopProvidersAndTimeSlots[1].timeSlots.days[0].timeSlots[0].id ).toBe("slot-b"); wrapper.unmount(); }); diff --git a/src/layouts/scheduling/scheduling.vue b/src/layouts/scheduling/scheduling.vue index bb1193ecf..a4094f6d9 100644 --- a/src/layouts/scheduling/scheduling.vue +++ b/src/layouts/scheduling/scheduling.vue @@ -34,7 +34,7 @@ :isLoading="isLoadingDates" @zip-code-clicked="onMobileZipCodeClicked" /> -
- - - -
- +
+ + + +
+ { vm.setCmsContent(resultMap.cmsContent); vm.allShopProviders = allShopProviders; - vm.inShopProvidersAndTimeslots = providers.map((provider) => ({ + vm.inshopProvidersAndTimeSlots = providers.map((provider) => ({ provider, timeSlots: null, })); @@ -270,7 +269,7 @@ export default { ]; const timeSlotsResultMap = await settleAllPromises(timeSlotsPromiseResultMap); assignInshopTimeSlotsFromV2Response( - vm.inShopProvidersAndTimeslots, + vm.inshopProvidersAndTimeSlots, timeSlotsResultMap.inshopTimeSlots ); if (vm.mobileProviderAndTimeSlot) { @@ -327,7 +326,7 @@ export default { }, availableDates() { if (!this.datesLoaded) return null; - const inshopDates = this.inShopProvidersAndTimeslots.flatMap(({ timeSlots }) => + const inshopDates = this.inshopProvidersAndTimeSlots.flatMap(({ timeSlots }) => (timeSlots?.days ?? []).map((d) => d.date) ); const mobileDates = (this.mobileProviderAndTimeSlot?.timeSlots?.days ?? []).map( @@ -337,7 +336,7 @@ export default { }, hasMoreShopsAvailable() { const maxVisible = Math.min(MAX_INSHOP_PROVIDERS, this.allShopProviders.length); - return this.inShopProvidersAndTimeslots.length < maxVisible; + return this.inshopProvidersAndTimeSlots.length < maxVisible; }, }, data() { @@ -347,7 +346,7 @@ export default { datesLoaded: false, datePickerStartDate: toDateString(0), datePickerEndDate: toDateString(SCHEDULE_FETCH_DAYS - 1), - inShopProvidersAndTimeslots: [], + inshopProvidersAndTimeSlots: [], allShopProviders: [], mobileProviderAndTimeSlot: null, mobilePremiumAppointmentFee: null, @@ -361,7 +360,7 @@ export default { if (!this.selectedDate) { return []; } - const providerEntry = this.inShopProvidersAndTimeslots.find( + const providerEntry = this.inshopProvidersAndTimeSlots.find( ({ provider }) => provider.providerNumber === providerNumber ); const day = providerEntry?.timeSlots?.days?.find((d) => d.date === this.selectedDate); @@ -378,11 +377,11 @@ export default { if (this.isLoadingDates || this.isLoadingMoreShops) return; const maxVisible = Math.min(MAX_INSHOP_PROVIDERS, this.allShopProviders.length); - const remainingCapacity = maxVisible - this.inShopProvidersAndTimeslots.length; + const remainingCapacity = maxVisible - this.inshopProvidersAndTimeSlots.length; if (remainingCapacity <= 0) return; const displayedProviderNumbers = new Set( - this.inShopProvidersAndTimeslots.map(({ provider }) => provider.providerNumber) + this.inshopProvidersAndTimeSlots.map(({ provider }) => provider.providerNumber) ); const newProviders = this.allShopProviders .filter((provider) => !displayedProviderNumbers.has(provider.providerNumber)) @@ -395,7 +394,7 @@ export default { timeSlots: null, isLoadingTimeSlots: true, })); - this.inShopProvidersAndTimeslots = [...this.inShopProvidersAndTimeslots, ...newEntries]; + this.inshopProvidersAndTimeSlots = [...this.inshopProvidersAndTimeSlots, ...newEntries]; this.isLoadingMoreShops = true; try { @@ -405,7 +404,9 @@ export default { promise: fetchInshopTimeSlots({ startDate: this.datePickerStartDate, endDate: this.datePickerEndDate, - providerNumbers: newProviders.map((provider) => provider.providerNumber), + providerNumbers: newProviders.map( + (provider) => provider.providerNumber + ), pageNameToLog: this.pageName, }), }, @@ -454,7 +455,7 @@ export default { const newStartDate = toDateString(1, this.datePickerEndDate); const newEndDate = toDateString(SCHEDULE_FETCH_DAYS, this.datePickerEndDate); - const providerNumbers = this.inShopProvidersAndTimeslots.map( + const providerNumbers = this.inshopProvidersAndTimeSlots.map( ({ provider }) => provider.providerNumber ); @@ -490,7 +491,7 @@ export default { const resultMap = await settleAllPromises(promiseResultMap); appendInshopTimeSlotsFromV2Response( - this.inShopProvidersAndTimeslots, + this.inshopProvidersAndTimeSlots, resultMap.inshopTimeSlots ); @@ -567,6 +568,6 @@ h5 { } :deep(.text-link) { - font-weight:600; + font-weight: 600; }