Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix or-rule-viewer scheduler save event not propagating (#2548)

Koenf6644549650c
diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.ts
index 61c2836c9..043caf24b 100644
--- a/ui/component/or-rules/src/or-rule-viewer.ts
+++ b/ui/component/or-rules/src/or-rule-viewer.ts
@@ -305,7 +305,8 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {
if (this.ruleset) {
this.ruleset.meta ??= {};
this.ruleset.meta.validity = e?.detail.value;
- this.requestUpdate("ruleset");
+ this.modified = true;
+ this.requestUpdate();
}
}
diff --git a/ui/component/or-scheduler/src/index.ts b/ui/component/or-scheduler/src/index.ts
index 6732c26f8..793fbd484 100644
--- a/ui/component/or-scheduler/src/index.ts
+++ b/ui/component/or-scheduler/src/index.ts
@@ -216,8 +216,7 @@ export class OrScheduler extends translate(i18next)(LitElement) {
const schedule = this._scheduleWithOffset;
if (schedule?.start && schedule?.end) {
- const { start, end, recurrence } = schedule;
- this._eventType = recurrence ? EventTypes.recurrence : EventTypes.period;
+ const { start, end } = schedule;
this.isAllDay = this._calculateIsAllDay(start, end);
}
@@ -238,6 +237,13 @@ export class OrScheduler extends translate(i18next)(LitElement) {
} else if (this._eventType === EventTypes.default && this.defaultSchedule?.recurrence) {
this._rrule = RRule.fromString(this.defaultSchedule.recurrence);
}
+
+ const schedule = this._scheduleWithOffset;
+ if (schedule?.start && schedule?.end) {
+ this._eventType = schedule.recurrence ? EventTypes.recurrence : EventTypes.period;
+ } else {
+ this._eventType = EventTypes.default;
+ }
}
if (changedProps.has("_rrule") && this._rrule) {