Skip to content

Commit 56ef210

Browse files
committed
Calendar: optimize event loading according date range - refs BT#22682
1 parent 6b53492 commit 56ef210

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

assets/vue/composables/calendar/calendarEvent.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,30 +114,17 @@ async function getCalendarEvents(startDate, endDate, commonParams) {
114114
"endDate[after]": startDate.toISOString(),
115115
})
116116

117-
const currentEventsPromise = requestCalendarEvents({
118-
...commonParams,
119-
"endDate[before]": endDate.toISOString(),
120-
"startDate[after]": startDate.toISOString(),
121-
})
122-
123117
const startingEventsPromise = requestCalendarEvents({
124118
...commonParams,
125119
"startDate[before]": endDate.toISOString(),
126120
"startDate[after]": startDate.toISOString(),
127121
})
128122

129-
const [endingEvents, currentEvents, startingEvents] = await Promise.all([
130-
endingEventsPromise,
131-
currentEventsPromise,
132-
startingEventsPromise,
133-
])
123+
const [endingEvents, startingEvents] = await Promise.all([endingEventsPromise, startingEventsPromise])
134124

135125
const uniqueEventsMap = new Map()
136126

137-
endingEvents
138-
.concat(currentEvents)
139-
.concat(startingEvents)
140-
.forEach((event) => uniqueEventsMap.set(event.id, event))
127+
endingEvents.concat(startingEvents).forEach((event) => uniqueEventsMap.set(event.id, event))
141128

142129
return Array.from(uniqueEventsMap.values())
143130
}

0 commit comments

Comments
 (0)