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

Refactoring to use options from backend

Browse source
This commit is contained in:
Matias Bordese 2022-11-24 17:49:15 -03:00
parent db41acceff
commit 6ef4073e03
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
grafana-plugin/src/containers/RotationForm/RotationForm.tsx
View file

@ -154,7 +154,10 @@ const RotationForm: FC<RotationFormProps> = observer((props) => {
rolling_users: userGroups,
interval: repeatEveryValue,
frequency: repeatEveryPeriod,
by_day: repeatEveryPeriod === 0 || repeatEveryPeriod === 1 ? getUTCByDay(selectedDays, shiftStart) : null,
by_day:
repeatEveryPeriod === 0 || repeatEveryPeriod === 1
? getUTCByDay(store.scheduleStore.byDayOptions, selectedDays, shiftStart)
: null,
priority_level: shiftId === 'new' ? layerPriority : shift?.priority_level,
}),
[

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

@ -5,6 +5,7 @@ import { getLayersFromStore, getOverridesFromStore, getShiftsFromStore } from 'm
import { Event, Layer } from 'models/schedule/schedule.types';
import { Timezone } from 'models/timezone/timezone.types';
import { RootStore } from 'state';
import { SelectOption } from 'state/types';
export const getStartOfWeek = (tz: Timezone) => {
return dayjs().tz(tz).utcOffset() === 0 ? dayjs().utc().startOf('isoWeek') : dayjs().tz(tz).startOf('isoWeek');
@ -18,14 +19,14 @@ export const getDateTime = (date: string) => {
return dayjs(date);
};
export const getUTCByDay = (by_day: string[], moment: dayjs.Dayjs) => {
let UTCDays = [];
// FIXME: do this in a proper way
let byDayOptions = ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU'];
export const getUTCByDay = (dayOptions: SelectOption[], by_day: string[], moment: dayjs.Dayjs) => {
if (by_day.length > 0 && moment.day() !== moment.utc().day()) {
// when converting to UTC, shift starts on a different day,
// so we need to update the by_day list
// depending on the UTC side, move one day before or after
let UTCDays = [];
let byDayOptions = [];
Object.entries(dayOptions).forEach(([, option]) => byDayOptions.push(option.value));
let offset = moment.utcOffset();
by_day.forEach((element) => {
let index = byDayOptions.indexOf(element);