Skip to content

Commit aea3421

Browse files
committed
Merge branch 'stop-events-from-jumping' of Arnei/opencast-admin-interface into main
Pull request #1103 Enforce event ordering
2 parents 6e281a6 + ede8b6e commit aea3421

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

src/slices/eventSlice.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,13 @@ export const fetchEvents = createAppAsyncThunk('events/fetchEvents', async (_, {
239239
const state = getState();
240240
let params: ReturnType<typeof getURLParams> & { getComments?: boolean } = getURLParams(state, "events");
241241

242+
// Add a secondary filter to enforce order of events
243+
// (Elasticsearch does not guarantee ordering)
244+
params = {
245+
...params,
246+
sort: params.sort ? params.sort + ",uid:asc" : "uid:asc"
247+
}
248+
242249
// Only if the notes column is enabled, fetch comment information for events
243250
if (state.table.columns.find(column => column.label === "EVENTS.EVENTS.TABLE.ADMINUI_NOTES" && !column.deactivated)) {
244251
params = {

0 commit comments

Comments
 (0)