infra
/
etesync
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Event Edit: fix handling of recurring events with an until field. 

It was slightly the wrong type because of typings were wrong. We now explicitly
convert it.
master
Tom Hacohen 2020-01-14 22:42:38 +02:00
parent 7b22e0e76b
commit d268c0fab6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/EventEdit.tsx
View File

@ -107,7 +107,13 @@ class EventEdit extends React.PureComponent<PropsType> {
this.state.location = event.location ? event.location : '';
this.state.description = event.description ? event.description : '';
this.state.timezone = event.timezone;
this.state.rrule = this.props.item?.component.getFirstPropertyValue<ICAL.Recur>('rrule')?.toJSON();
const rruleProp = this.props.item?.component.getFirstPropertyValue<ICAL.Recur>('rrule');
if (rruleProp) {
this.state.rrule = rruleProp.toJSON();
if (rruleProp.until) {
this.state.rrule.until = rruleProp.until;
}
}
} else {
this.state.uid = uuid.v4();
}

4
src/types/ical.js.d.ts vendored
View File

@ -175,6 +175,8 @@ declare module 'ical.js' {
export class Recur {
constructor(data?: RecurData);
public toJSON(): RecurData;
public until: Time | null;
public toJSON(): Omit<RecurData, 'until'> & { until?: string };
}
}