centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #648 from grafana/rares/fix-avatar

Browse source 
Rares/fix avatar
This commit is contained in:
Maxim Mordasov 2022-10-13 14:30:59 +01:00 • committed by GitHub
commit f044731e2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
grafana-plugin/src/pages/schedule/Schedule.helpers.ts
View file

@ -2,7 +2,7 @@ import dayjs from 'dayjs';
import { findColor } from 'containers/Rotations/Rotations.helpers';
import { getLayersFromStore, getOverridesFromStore, getShiftsFromStore } from 'models/schedule/schedule.helpers';
import { Event } from 'models/schedule/schedule.types';
import { Event, Layer } from 'models/schedule/schedule.types';
import { Timezone } from 'models/timezone/timezone.types';
import { RootStore } from 'state';
@ -18,7 +18,6 @@ export const getDateTime = (date: string) => {
return dayjs(date);
};
export const getColorSchemeMappingForUsers = (
store: RootStore,
scheduleId: string,
@ -26,15 +25,21 @@ export const getColorSchemeMappingForUsers = (
): { [userId: string]: Set<string> } => {
const usersColorSchemeHash: { [userId: string]: Set<string> } = {};
const shifts = getShiftsFromStore(store, scheduleId, startMoment);
const layers = getLayersFromStore(store, scheduleId, startMoment);
const finalScheduleShifts = getShiftsFromStore(store, scheduleId, startMoment);
const layers: Layer[] = getLayersFromStore(store, scheduleId, startMoment);
const overrides = getOverridesFromStore(store, scheduleId, startMoment);
if (!shifts?.length || !layers?.length) {
if (!finalScheduleShifts?.length || !layers?.length) {
return usersColorSchemeHash;
}
shifts.forEach(({ shiftId, events }) => populateUserHashSet(events, shiftId));
const rotationShifts = layers.reduce((prev, current) => {
prev.push(...current.shifts);
return prev;
}, []);
finalScheduleShifts.forEach(({ shiftId, events }) => populateUserHashSet(events, shiftId));
rotationShifts.forEach(({ shiftId, events }) => populateUserHashSet(events, shiftId));
return usersColorSchemeHash;
@ -49,4 +54,4 @@ export const getColorSchemeMappingForUsers = (
});
});
}
}
};