Formatting and variable name consistency
This commit is contained in:
parent
6b8c57c4b8
commit
2eb4d6016a
2 changed files with 40 additions and 39 deletions
|
|
@ -124,7 +124,7 @@ describe("scheduling.vue", () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const { wrapper } = setupMocks();
|
const { wrapper } = setupMocks();
|
||||||
wrapper.vm.inShopProvidersAndTimeslots = [
|
wrapper.vm.inshopProvidersAndTimeSlots = [
|
||||||
{ provider: { providerNumber: "05018" }, timeSlots: { days: [] } },
|
{ provider: { providerNumber: "05018" }, timeSlots: { days: [] } },
|
||||||
{ provider: { providerNumber: "05019" }, timeSlots: { days: [] } },
|
{ provider: { providerNumber: "05019" }, timeSlots: { days: [] } },
|
||||||
];
|
];
|
||||||
|
|
@ -161,7 +161,7 @@ describe("scheduling.vue", () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const { wrapper } = setupMocks();
|
const { wrapper } = setupMocks();
|
||||||
wrapper.vm.inShopProvidersAndTimeslots = [
|
wrapper.vm.inshopProvidersAndTimeSlots = [
|
||||||
{ provider: { providerNumber: "05018" }, timeSlots: { days: [] } },
|
{ provider: { providerNumber: "05018" }, timeSlots: { days: [] } },
|
||||||
{ provider: { providerNumber: "05019" }, timeSlots: { days: [] } },
|
{ provider: { providerNumber: "05019" }, timeSlots: { days: [] } },
|
||||||
];
|
];
|
||||||
|
|
@ -169,12 +169,12 @@ describe("scheduling.vue", () => {
|
||||||
|
|
||||||
await wrapper.vm.handleRequestMoreDates();
|
await wrapper.vm.handleRequestMoreDates();
|
||||||
|
|
||||||
expect(wrapper.vm.inShopProvidersAndTimeslots[0].timeSlots.days).toHaveLength(1);
|
expect(wrapper.vm.inshopProvidersAndTimeSlots[0].timeSlots.days).toHaveLength(1);
|
||||||
expect(
|
expect(
|
||||||
wrapper.vm.inShopProvidersAndTimeslots[0].timeSlots.days[0].timeSlots[0].id
|
wrapper.vm.inshopProvidersAndTimeSlots[0].timeSlots.days[0].timeSlots[0].id
|
||||||
).toBe("slot-a");
|
).toBe("slot-a");
|
||||||
expect(
|
expect(
|
||||||
wrapper.vm.inShopProvidersAndTimeslots[1].timeSlots.days[0].timeSlots[0].id
|
wrapper.vm.inshopProvidersAndTimeSlots[1].timeSlots.days[0].timeSlots[0].id
|
||||||
).toBe("slot-b");
|
).toBe("slot-b");
|
||||||
wrapper.unmount();
|
wrapper.unmount();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
:isLoading="isLoadingDates"
|
:isLoading="isLoadingDates"
|
||||||
@zip-code-clicked="onMobileZipCodeClicked" />
|
@zip-code-clicked="onMobileZipCodeClicked" />
|
||||||
<inshopSchedulingCard
|
<inshopSchedulingCard
|
||||||
v-for="entry in inShopProvidersAndTimeslots"
|
v-for="entry in inshopProvidersAndTimeSlots"
|
||||||
v-show="showInshopSchedulingCards"
|
v-show="showInshopSchedulingCards"
|
||||||
:key="entry.provider.providerNumber"
|
:key="entry.provider.providerNumber"
|
||||||
class="mt-4"
|
class="mt-4"
|
||||||
|
|
@ -55,8 +55,7 @@
|
||||||
linkType="text"
|
linkType="text"
|
||||||
:text="viewMoreShopsText"
|
:text="viewMoreShopsText"
|
||||||
href="javascript:void(0)"
|
href="javascript:void(0)"
|
||||||
@click-event="onViewMoreShopsClick"
|
@click-event="onViewMoreShopsClick">
|
||||||
>
|
|
||||||
<template #after-text>
|
<template #after-text>
|
||||||
<span class="spacing-gap"></span>
|
<span class="spacing-gap"></span>
|
||||||
<img
|
<img
|
||||||
|
|
@ -229,7 +228,7 @@ export default {
|
||||||
next(async (vm) => {
|
next(async (vm) => {
|
||||||
vm.setCmsContent(resultMap.cmsContent);
|
vm.setCmsContent(resultMap.cmsContent);
|
||||||
vm.allShopProviders = allShopProviders;
|
vm.allShopProviders = allShopProviders;
|
||||||
vm.inShopProvidersAndTimeslots = providers.map((provider) => ({
|
vm.inshopProvidersAndTimeSlots = providers.map((provider) => ({
|
||||||
provider,
|
provider,
|
||||||
timeSlots: null,
|
timeSlots: null,
|
||||||
}));
|
}));
|
||||||
|
|
@ -270,7 +269,7 @@ export default {
|
||||||
];
|
];
|
||||||
const timeSlotsResultMap = await settleAllPromises(timeSlotsPromiseResultMap);
|
const timeSlotsResultMap = await settleAllPromises(timeSlotsPromiseResultMap);
|
||||||
assignInshopTimeSlotsFromV2Response(
|
assignInshopTimeSlotsFromV2Response(
|
||||||
vm.inShopProvidersAndTimeslots,
|
vm.inshopProvidersAndTimeSlots,
|
||||||
timeSlotsResultMap.inshopTimeSlots
|
timeSlotsResultMap.inshopTimeSlots
|
||||||
);
|
);
|
||||||
if (vm.mobileProviderAndTimeSlot) {
|
if (vm.mobileProviderAndTimeSlot) {
|
||||||
|
|
@ -327,7 +326,7 @@ export default {
|
||||||
},
|
},
|
||||||
availableDates() {
|
availableDates() {
|
||||||
if (!this.datesLoaded) return null;
|
if (!this.datesLoaded) return null;
|
||||||
const inshopDates = this.inShopProvidersAndTimeslots.flatMap(({ timeSlots }) =>
|
const inshopDates = this.inshopProvidersAndTimeSlots.flatMap(({ timeSlots }) =>
|
||||||
(timeSlots?.days ?? []).map((d) => d.date)
|
(timeSlots?.days ?? []).map((d) => d.date)
|
||||||
);
|
);
|
||||||
const mobileDates = (this.mobileProviderAndTimeSlot?.timeSlots?.days ?? []).map(
|
const mobileDates = (this.mobileProviderAndTimeSlot?.timeSlots?.days ?? []).map(
|
||||||
|
|
@ -337,7 +336,7 @@ export default {
|
||||||
},
|
},
|
||||||
hasMoreShopsAvailable() {
|
hasMoreShopsAvailable() {
|
||||||
const maxVisible = Math.min(MAX_INSHOP_PROVIDERS, this.allShopProviders.length);
|
const maxVisible = Math.min(MAX_INSHOP_PROVIDERS, this.allShopProviders.length);
|
||||||
return this.inShopProvidersAndTimeslots.length < maxVisible;
|
return this.inshopProvidersAndTimeSlots.length < maxVisible;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
|
@ -347,7 +346,7 @@ export default {
|
||||||
datesLoaded: false,
|
datesLoaded: false,
|
||||||
datePickerStartDate: toDateString(0),
|
datePickerStartDate: toDateString(0),
|
||||||
datePickerEndDate: toDateString(SCHEDULE_FETCH_DAYS - 1),
|
datePickerEndDate: toDateString(SCHEDULE_FETCH_DAYS - 1),
|
||||||
inShopProvidersAndTimeslots: [],
|
inshopProvidersAndTimeSlots: [],
|
||||||
allShopProviders: [],
|
allShopProviders: [],
|
||||||
mobileProviderAndTimeSlot: null,
|
mobileProviderAndTimeSlot: null,
|
||||||
mobilePremiumAppointmentFee: null,
|
mobilePremiumAppointmentFee: null,
|
||||||
|
|
@ -361,7 +360,7 @@ export default {
|
||||||
if (!this.selectedDate) {
|
if (!this.selectedDate) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
const providerEntry = this.inShopProvidersAndTimeslots.find(
|
const providerEntry = this.inshopProvidersAndTimeSlots.find(
|
||||||
({ provider }) => provider.providerNumber === providerNumber
|
({ provider }) => provider.providerNumber === providerNumber
|
||||||
);
|
);
|
||||||
const day = providerEntry?.timeSlots?.days?.find((d) => d.date === this.selectedDate);
|
const day = providerEntry?.timeSlots?.days?.find((d) => d.date === this.selectedDate);
|
||||||
|
|
@ -378,11 +377,11 @@ export default {
|
||||||
if (this.isLoadingDates || this.isLoadingMoreShops) return;
|
if (this.isLoadingDates || this.isLoadingMoreShops) return;
|
||||||
|
|
||||||
const maxVisible = Math.min(MAX_INSHOP_PROVIDERS, this.allShopProviders.length);
|
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;
|
if (remainingCapacity <= 0) return;
|
||||||
|
|
||||||
const displayedProviderNumbers = new Set(
|
const displayedProviderNumbers = new Set(
|
||||||
this.inShopProvidersAndTimeslots.map(({ provider }) => provider.providerNumber)
|
this.inshopProvidersAndTimeSlots.map(({ provider }) => provider.providerNumber)
|
||||||
);
|
);
|
||||||
const newProviders = this.allShopProviders
|
const newProviders = this.allShopProviders
|
||||||
.filter((provider) => !displayedProviderNumbers.has(provider.providerNumber))
|
.filter((provider) => !displayedProviderNumbers.has(provider.providerNumber))
|
||||||
|
|
@ -395,7 +394,7 @@ export default {
|
||||||
timeSlots: null,
|
timeSlots: null,
|
||||||
isLoadingTimeSlots: true,
|
isLoadingTimeSlots: true,
|
||||||
}));
|
}));
|
||||||
this.inShopProvidersAndTimeslots = [...this.inShopProvidersAndTimeslots, ...newEntries];
|
this.inshopProvidersAndTimeSlots = [...this.inshopProvidersAndTimeSlots, ...newEntries];
|
||||||
this.isLoadingMoreShops = true;
|
this.isLoadingMoreShops = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
@ -405,7 +404,9 @@ export default {
|
||||||
promise: fetchInshopTimeSlots({
|
promise: fetchInshopTimeSlots({
|
||||||
startDate: this.datePickerStartDate,
|
startDate: this.datePickerStartDate,
|
||||||
endDate: this.datePickerEndDate,
|
endDate: this.datePickerEndDate,
|
||||||
providerNumbers: newProviders.map((provider) => provider.providerNumber),
|
providerNumbers: newProviders.map(
|
||||||
|
(provider) => provider.providerNumber
|
||||||
|
),
|
||||||
pageNameToLog: this.pageName,
|
pageNameToLog: this.pageName,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
|
@ -454,7 +455,7 @@ export default {
|
||||||
|
|
||||||
const newStartDate = toDateString(1, this.datePickerEndDate);
|
const newStartDate = toDateString(1, this.datePickerEndDate);
|
||||||
const newEndDate = toDateString(SCHEDULE_FETCH_DAYS, this.datePickerEndDate);
|
const newEndDate = toDateString(SCHEDULE_FETCH_DAYS, this.datePickerEndDate);
|
||||||
const providerNumbers = this.inShopProvidersAndTimeslots.map(
|
const providerNumbers = this.inshopProvidersAndTimeSlots.map(
|
||||||
({ provider }) => provider.providerNumber
|
({ provider }) => provider.providerNumber
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -490,7 +491,7 @@ export default {
|
||||||
const resultMap = await settleAllPromises(promiseResultMap);
|
const resultMap = await settleAllPromises(promiseResultMap);
|
||||||
|
|
||||||
appendInshopTimeSlotsFromV2Response(
|
appendInshopTimeSlotsFromV2Response(
|
||||||
this.inShopProvidersAndTimeslots,
|
this.inshopProvidersAndTimeSlots,
|
||||||
resultMap.inshopTimeSlots
|
resultMap.inshopTimeSlots
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -567,6 +568,6 @@ h5 {
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.text-link) {
|
:deep(.text-link) {
|
||||||
font-weight:600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue