v0.16.4

web/js-dynamic/dashboard.js

@@ -169,6 +169,12 @@ function planFlowTraceActual(rule, item, node) {
   return JSON.stringify(actual);
 }
 
+function planRuleEffectivelyEnabled(rule) {
+  if (!rule.enabled) return false;
+  // A stale pushed plan must never advertise a disabled/missing parent Flow.
+  return !rule.flow_id || (app.flows || []).some(flow => flow.id === rule.flow_id && flow.enabled && !flow.draft);
+}
+
 function planFlowTriggerTrace(rule, expanded = false) {
   const trace = Array.isArray(rule.last_trigger_trace) ? rule.last_trigger_trace : [];
   if (rule.trigger_kind !== 'flow' || !trace.length) return '';
@@ -195,7 +201,7 @@ function planReasonCard(plan) {
   }).join('');
 
   const recentRules = (plan.rules || [])
-    .filter(rule => rule.enabled && rule.last_fired_at)
+    .filter(rule => planRuleEffectivelyEnabled(rule) && rule.last_fired_at)
     .sort((a, b) => new Date(b.last_fired_at) - new Date(a.last_fired_at))
     .slice(0, 4)
     .map((rule, index) => {
@@ -284,7 +290,7 @@ function renderControlPlan() {
     return `<article class="panel plan-card plan-zone ${planZoneEffectiveEnabled(zone) ? '' : 'disabled'}"><div class="plan-card-head"><div><span class="eyebrow">${esc(scope)}</span><h3>${esc(zone.zone_name)}</h3></div><span class="badge ${zone.device_manual_override ? 'manual-override' : (planZoneEffectiveEnabled(zone) && zone.demand ? 'active' : '')}">${esc(planState)}</span></div><div class="plan-temp"><span>${fmtTemp(zone.current_temperature)}</span><b>→</b><strong>${esc(target)}<small>°C</small></strong></div><p>${esc(houseModeLabel(zone.mode || 'off'))} · ${esc(zonePresetLabel(zone.preset))}${zone.current_schedule_name ? ` · ${esc(zone.current_schedule_name)}` : ''}</p><ul class="plan-events">${events.map(planEventMarkup).join('')}</ul></article>`;
   }).join('');
 
-  const rules = (plan.rules || []).filter(rule => rule.enabled);
+  const rules = (plan.rules || []).filter(planRuleEffectivelyEnabled);
   const ruleCard = rules.length ? `<article class="panel plan-card plan-rules ${plan.emergency_stop_active ? 'disabled' : ''}"><div class="plan-card-head"><div><span class="eyebrow">${esc(tr('plan.rules'))}</span><h3>${esc(tr(plan.emergency_stop_active ? 'plan.ruleCountPaused' : 'plan.ruleCount', { count: rules.length }))}</h3></div></div><ul class="plan-events">${rules.slice(0, 3).map(rule => {
     const automation = (app.automations || []).find(item => item.id === rule.id);
     const flow = automation?.flow_id ? (app.flows || []).find(item => item.id === automation.flow_id) : null;
@@ -537,7 +543,7 @@ function renderSimulationPage() {
     { label: tr('simulation.houseMode'), value: houseModeLabel(plan.house_mode || 'off'), note: tr('simulation.strategy', { strategy: (plan.control_strategy || 'setpoint') === 'setpoint' ? tr('plan.strategySetpoint') : (plan.control_strategy || 'setpoint') }) },
     { label: tr('settings.nightMode'), value: nightOn ? tr('common.active') : (app.settings?.night_mode?.enabled ? tr('simulation.scheduled') : tr('common.disabled')), note: `${plan.night_mode_start || '22:00'} → ${plan.night_mode_end || '06:00'} · ${tr('simulation.fanMax')} ${fanLabel(plan.night_mode_max_fan_speed || 1)}` },
     { label: tr('simulation.outdoor'), value: plan.outdoor_temperature == null ? '—' : fmtTemp(plan.outdoor_temperature), note: tr('simulation.generatedAt', { time: dateTime(plan.generated_at) }) },
-    { label: tr('simulation.activeZones'), value: String(enabledZones.length), note: `${tr('simulation.requestingZones', { count: demandingZones.length })} · ${tr('simulation.rulesLabel')}: ${(plan.rules || []).filter(rule => rule.enabled && simulationRuleVisible(rule, zones)).length}` },
+    { label: tr('simulation.activeZones'), value: String(enabledZones.length), note: `${tr('simulation.requestingZones', { count: demandingZones.length })} · ${tr('simulation.rulesLabel')}: ${(plan.rules || []).filter(rule => planRuleEffectivelyEnabled(rule) && simulationRuleVisible(rule, zones)).length}` },
   ].map(card => `<article class="panel simulation-summary-card"><small>${esc(card.label)}</small><strong>${esc(card.value)}</strong><span>${esc(card.note)}</span></article>`).join('');
 
   const nodeW = 190, nodeH = 106, rowH = 190, topY = 155;
@@ -607,7 +613,7 @@ function renderSimulationPage() {
     return `<article class="simulation-timeline-item"><time>${esc(simulationTime(item.event.at))}</time><div><strong>${esc(item.scope)}</strong><p>${esc(item.event.label)}${esc(target)}${item.device ? ` · ${esc(item.device)}` : ''}</p></div></article>`;
   }).join('') : `<div class="empty">${esc(tr('plan.noEvents'))}</div>`;
 
-  const activeRules = (plan.rules || []).filter(rule => rule.enabled && simulationRuleVisible(rule, zones));
+  const activeRules = (plan.rules || []).filter(rule => planRuleEffectivelyEnabled(rule) && simulationRuleVisible(rule, zones));
   rulesHost.innerHTML = activeRules.length ? activeRules.map(rule => `<article class="simulation-rule-card"><div class="simulation-rule-head"><div><span class="eyebrow">${esc(tr('common.automation'))}</span><h3>${esc(rule.name)}</h3></div><span class="badge active">${esc(automationTriggerLabel(rule))}</span></div><p>${esc(tr('simulation.ruleOnDevice', { device: rule.action_device_name || tr('common.noDevice') }))}</p><div class="simulation-rule-action">${esc(simulationRuleAction(rule))}</div><div class="simulation-rule-meta"><small>${esc(tr('automations.last'))}: ${esc(dateTime(rule.last_fired_at))}</small><small>${esc(tr('simulation.nextReady'))}: ${esc(dateTime(rule.next_ready_at))}</small></div></article>`).join('') : `<div class="empty">${esc(tr('simulation.noRules'))}</div>`;
 }