@@ -534,14 +534,14 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
Cancel
- ${this._writeFeedback?a`
+ ${this._writeFeedback?o`
${this._writeFeedback} `:""}
- `}_renderChainHeadSection(e){return e.prog_type===je?this._renderEventTriggerChain(e):e.prog_type===Ue?this._renderTimedTriggerChain(e):e.prog_type===Ye?this._renderEveryTriggerChain(e):a`
+ `}_renderChainHeadSection(e){return e.prog_type===We?this._renderEventTriggerChain(e):e.prog_type===Ve?this._renderTimedTriggerChain(e):e.prog_type===qe?this._renderEveryTriggerChain(e):o`
Editing trigger type ${e.prog_type} (chain head) is not supported.
-
`}_renderTimedTriggerChain(e){return a`
+
AT (trigger)
@@ -562,45 +562,45 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
- ${de.map(t=>{let n=((e.days??0)&t.bit)!==0;return a`
+ ${de.map(t=>{let i=((e.days??0)&t.bit)!==0;return o`
this._patchChainHead({days:(e.days??0)^t.bit})}
>${t.label} `})}
- `}_renderEventTriggerChain(e){let t=(e.month??0)<<8|(e.day??0),n=T(t),r=o=>{let c=me(o);this._patchChainHead({month:c>>8&255,day:c&255})};return a`
+ `}_renderEventTriggerChain(e){let t=(e.month??0)<<8|(e.day??0),i=T(t),r=s=>{let c=me(s);this._patchChainHead({month:c>>8&255,day:c&255})};return o`
WHEN (trigger event)
Category
- {let c=o.target.value;if(c==="button"){let l=this._objects?.buttons?.[0]?.index??1;r({category:"button",button:l})}else if(c==="zone"){let l=this._objects?.zones?.[0]?.index??1;r({category:"zone",zone:l,zoneState:1})}else if(c==="unit"){let l=this._objects?.units?.[0]?.index??1;r({category:"unit",unit:l,unitOn:!0})}else c==="fixed"&&r({category:"fixed",fixedId:772})}}>
- Button press
- Zone state change
- Unit state change
- Fixed (phone / AC)
- ${n.category==="raw"?a`
+ {let c=s.target.value;if(c==="button"){let l=this._objects?.buttons?.[0]?.index??1;r({category:"button",button:l})}else if(c==="zone"){let l=this._objects?.zones?.[0]?.index??1;r({category:"zone",zone:l,zoneState:1})}else if(c==="unit"){let l=this._objects?.units?.[0]?.index??1;r({category:"unit",unit:l,unitOn:!0})}else c==="fixed"&&r({category:"fixed",fixedId:772})}}>
+ Button press
+ Zone state change
+ Unit state change
+ Fixed (phone / AC)
+ ${i.category==="raw"?o`
Raw 0x${t.toString(16).padStart(4,"0")} `:""}
- ${this._renderChainEventSubfields(n,r)}
+ ${this._renderChainEventSubfields(i,r)}
- `}_renderChainEventSubfields(e,t){if(e.category==="button"){let n=this._bucketWithPreserve(this._objects?.buttons??null,"button",e.button??0);return a`
+ `}_renderChainEventSubfields(e,t){if(e.category==="button"){let i=this._bucketWithPreserve(this._objects?.buttons??null,"button",e.button??0);return o`
Button
t({category:"button",button:parseInt(r.target.value,10)})}>
- ${n.map(r=>a`
+ ${i.map(r=>o`
#${r.index} ${r.name}
`)}
- `}if(e.category==="zone"){let n=this._bucketWithPreserve(this._objects?.zones??null,"zone",e.zone??0);return a`
+ `}if(e.category==="zone"){let i=this._bucketWithPreserve(this._objects?.zones??null,"zone",e.zone??0);return o`
Zone
t({...e,category:"zone",zone:parseInt(r.target.value,10),zoneState:e.zoneState??1})}>
- ${n.map(r=>a`
+ ${i.map(r=>o`
#${r.index} ${r.name}
@@ -616,11 +616,11 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
trouble
tamper
- `}if(e.category==="unit"){let n=this._bucketWithPreserve(this._objects?.units??null,"unit",e.unit??0);return a`
+ `}if(e.category==="unit"){let i=this._bucketWithPreserve(this._objects?.units??null,"unit",e.unit??0);return o`
Unit
t({...e,category:"unit",unit:parseInt(r.target.value,10),unitOn:e.unitOn??!0})}>
- ${n.map(r=>a`
+ ${i.map(r=>o`
#${r.index} ${r.name}
@@ -634,29 +634,29 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
ON
OFF
- `}return e.category==="fixed"?a`
+ `}return e.category==="fixed"?o`
Event
- t({category:"fixed",fixedId:parseInt(n.target.value,10)})}>
- ${Z.map(n=>a`
-
- ${n.label}
+ t({category:"fixed",fixedId:parseInt(i.target.value,10)})}>
+ ${Z.map(i=>o`
+
+ ${i.label}
`)}
- `:a`Unrecognised event ID. Pick a category to redefine.
`}_renderEveryTriggerChain(e){let t=((e.cond??0)&255)<<8|(e.cond2??0)>>8&255;return a`
+ `:o`Unrecognised event ID. Pick a category to redefine.
`}_renderEveryTriggerChain(e){let t=((e.cond??0)&255)<<8|(e.cond2??0)>>8&255;return o`
EVERY (interval, seconds)
Seconds between fires
- `}_renderChainConditionsSection(e){return a`
+ `}_renderChainConditionsSection(e){return o`
Conditions (${e.length})
@@ -667,36 +667,98 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
+ OR IF
- ${e.length===0?a`
+ ${e.length===0?o`
No conditions — chain fires unconditionally when triggered.
`:""}
- ${e.map((t,n)=>this._renderChainConditionRow(t,n))}
+ ${e.map((t,i)=>this._renderChainConditionRow(t,i))}
- `}_renderChainConditionRow(e,t){let n=e.prog_type===be;if(We(e))return a`
-
-
- ${n?"OR IF":"AND IF"} (structured comparison — read-only)
- this._removeChainCondition(t)}>×
-
-
- This condition uses a structured comparison (TEMP > N etc.).
- Editing structured-OP records is not yet supported; it's
- preserved on save.
-
-
${this._renderChainCondFamily(r,t)}
-
`}_renderChainCondFamily(e,t){let n=o=>{let c=this._objects?.zones?.[0]?.index??1,l=this._objects?.units?.[0]?.index??1,u=this._objects?.areas?.[0]?.index??1,p;switch(o){case"none":p={family:"none"};break;case"misc":p={family:"misc",misc:1};break;case"zone":p={family:"zone",index:c,active:!1};break;case"unit":p={family:"unit",index:l,active:!0};break;case"time":p={family:"time",index:1,active:!0};break;case"sec":p={family:"sec",index:u,mode:0};break}let d=ve(p);this._patchChainCondition(t,d)},r=o=>{this._patchChainCondition(t,ve(o))};return a`
+ `}_renderStructuredChainConditionRow(e,t,i){let r=Qe(e);return tt(r)?o`
+
+
+ ${this._renderStructuredAndForm(r,t)}
+
`:o`
+
+
+
+ Structured comparison with a shape the editor can't drive
+ yet (Arg2 references another object, Arg1 is an unsupported
+ type, or a CompConst value is present). Preserved on save.
+
+
+
+ Arg1 type
+ {let d=parseInt(l.target.value,10),p=(Ee[d]??[{value:0}])[0].value,u=xe(d),f=0;u==="zone"?f=this._objects?.zones?.[0]?.index??1:u==="unit"?f=this._objects?.units?.[0]?.index??1:u==="thermostat"?f=this._objects?.thermostats?.[0]?.index??1:u==="area"&&(f=this._objects?.areas?.[0]?.index??1),i({arg1Type:d,arg1Ix:f,arg1Field:p})}}>
+ ${$e.filter(l=>l.value!==0).map(l=>o`
+
+ ${l.label}
+ `)}
+
+
+
+ ${s?this._renderStructuredArg1Picker(e,s,i):""}
+
+ ${r.length>0?o`
+
+ Field
+ i({arg1Field:parseInt(l.target.value,10)})}>
+ ${r.map(l=>o`
+
+ ${l.label}
+ `)}
+
+ `:""}
+
+
+ Operator
+ i({op:parseInt(l.target.value,10)})}>
+ ${Xe.map(l=>o`
+
+ ${l.label}
+ `)}
+
+
+
+ ${c?o`
+
+ Compare against (constant)
+ `:""}
+
`}_renderStructuredArg1Picker(e,t,i){let r=this._bucketWithPreserve(this._pickBucket(t),t,e.arg1Ix),s=t[0].toUpperCase()+t.slice(1);return o`
+
+ ${s}
+ i({arg1Ix:parseInt(c.target.value,10)})}>
+ ${r.map(c=>o`
+
+ #${c.index} ${c.name}
+ `)}
+
+ `}_renderChainCondFamily(e,t){let i=s=>{let c=this._objects?.zones?.[0]?.index??1,l=this._objects?.units?.[0]?.index??1,d=this._objects?.areas?.[0]?.index??1,p;switch(s){case"none":p={family:"none"};break;case"misc":p={family:"misc",misc:1};break;case"zone":p={family:"zone",index:c,active:!1};break;case"unit":p={family:"unit",index:l,active:!0};break;case"time":p={family:"time",index:1,active:!0};break;case"sec":p={family:"sec",index:d,mode:0};break}let u=ve(p);this._patchChainCondition(t,u)},r=s=>{this._patchChainCondition(t,ve(s))};return o`
Family
- n(o.target.value)}>
+ i(s.target.value)}>
Zone state
Unit state
Area in security mode
@@ -705,11 +767,11 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
${this._renderChainCondSubfields(e,r)}
- `}_renderChainCondSubfields(e,t){if(e.family==="zone"){let n=this._bucketWithPreserve(this._objects?.zones??null,"zone",e.index??0);return a`
+ `}_renderChainCondSubfields(e,t){if(e.family==="zone"){let i=this._bucketWithPreserve(this._objects?.zones??null,"zone",e.index??0);return o`
Zone
t({...e,index:parseInt(r.target.value,10)})}>
- ${n.map(r=>a`
+ ${i.map(r=>o`
#${r.index} ${r.name}
`)}
@@ -721,11 +783,11 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
secure
not ready
- `}if(e.family==="unit"){let n=this._bucketWithPreserve(this._objects?.units??null,"unit",e.index??0);return a`
+ `}if(e.family==="unit"){let i=this._bucketWithPreserve(this._objects?.units??null,"unit",e.index??0);return o`
Unit
t({...e,index:parseInt(r.target.value,10)})}>
- ${n.map(r=>a`
+ ${i.map(r=>o`
#${r.index} ${r.name}
`)}
@@ -737,11 +799,11 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
ON
OFF
- `}if(e.family==="sec"){let n=this._bucketWithPreserve(this._objects?.areas??null,"area",e.index??0);return a`
+ `}if(e.family==="sec"){let i=this._bucketWithPreserve(this._objects?.areas??null,"area",e.index??0);return o`
Area
t({...e,index:parseInt(r.target.value,10)})}>
- ${n.map(r=>a`
+ ${i.map(r=>o`
#${r.index} ${r.name}
`)}
@@ -750,76 +812,76 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
Mode
t({...e,mode:parseInt(r.target.value,10)})}>
- ${ge.map(r=>a`
+ ${fe.map(r=>o`
${r.label}
`)}
- `}return e.family==="time"?a`
+ `}return e.family==="time"?o`
Time clock # (1..3)
Is
- t({...e,active:n.target.value==="1"})}>
+ t({...e,active:i.target.value==="1"})}>
enabled
disabled
- `:a`
+ `:o`
Condition
- t({family:"misc",misc:parseInt(n.target.value,10)})}>
- ${fe.map(n=>a`
-
- ${n.label}
+ t({family:"misc",misc:parseInt(i.target.value,10)})}>
+ ${ge.map(i=>o`
+
+ ${i.label}
`)}
- `}_renderChainActionsSection(e){return a`
+ `}_renderChainActionsSection(e){return o`
Actions (${e.length})
this._addChainAction()}>+ THEN
- ${e.map((t,n)=>this._renderChainActionRow(t,n,e.length))}
+ ${e.map((t,i)=>this._renderChainActionRow(t,i,e.length))}
- `}_renderChainActionRow(e,t,n){let r=H(e.cmd??0),o=r?.ref_kind?this._bucketWithPreserve(this._pickBucket(r.ref_kind),r.ref_kind,e.pr2??0):null,c=e.cmd===9;return a`
+ `}_renderChainActionRow(e,t,i){let r=N(e.cmd??0),s=r?.ref_kind?this._bucketWithPreserve(this._pickBucket(r.ref_kind),r.ref_kind,e.pr2??0):null,c=e.cmd===9;return o`
Command
- {let u=parseInt(l.target.value,10),p=H(u),d=e.pr2??0;if(p?.ref_kind&&this._objects){let b=this._pickBucket(p.ref_kind);b&&b.length>0&&!b.some(_=>_.index===d)&&(d=b[0].index)}else p?.ref_kind||(d=0);this._patchChainAction(t,{cmd:u,pr2:d})}}>
- ${G.map(l=>a`
+ {let d=parseInt(l.target.value,10),p=N(d),u=e.pr2??0;if(p?.ref_kind&&this._objects){let f=this._pickBucket(p.ref_kind);f&&f.length>0&&!f.some(_=>_.index===u)&&(u=f[0].index)}else p?.ref_kind||(u=0);this._patchChainAction(t,{cmd:d,pr2:u})}}>
+ ${G.map(l=>o`
${l.label}
`)}
- ${r?.ref_kind?a`
+ ${r?.ref_kind?o`
${r.ref_kind[0].toUpperCase()+r.ref_kind.slice(1)}
- {let u=parseInt(l.target.value,10);Number.isFinite(u)&&this._patchChainAction(t,{pr2:u})}}>
- ${(o??[]).map(l=>a`
+ {let d=parseInt(l.target.value,10);Number.isFinite(d)&&this._patchChainAction(t,{pr2:d})}}>
+ ${(s??[]).map(l=>o`
#${l.index} ${l.name}
`)}
`:""}
- ${c?a`
+ ${c?o`
Level (0..100)
`:""}
@@ -1188,7 +1250,30 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
border-color: var(--error-color, #db4437);
}
.structured-cond {
- background: rgba(255, 152, 0, 0.08); /* subtle warning tint */
+ background: rgba(255, 152, 0, 0.08); /* subtle structured tint */
+ }
+ .structured-row {
+ display: grid;
+ grid-template-columns: 1fr;
+ gap: 6px;
+ }
+ .structured-tag, .readonly-tag {
+ display: inline-block;
+ margin-left: 6px;
+ padding: 1px 6px;
+ font-size: 0.7rem;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+ border-radius: 3px;
+ }
+ .structured-tag {
+ background: rgba(255, 152, 0, 0.18);
+ color: #b35a00;
+ }
+ .readonly-tag {
+ background: var(--secondary-background-color, #eee);
+ color: var(--secondary-text-color, #888);
}
.chain-meta {
margin-top: 8px;
@@ -1198,7 +1283,7 @@ var Ze=Object.defineProperty;var Ke=Object.getOwnPropertyDescriptor;var m=(s,i,e
background: var(--secondary-background-color, #f5f5f5);
border-radius: 4px;
}
- `,m([N({attribute:!1})],h.prototype,"hass",2),m([N({attribute:!1})],h.prototype,"narrow",2),m([f()],h.prototype,"_entryId",2),m([f()],h.prototype,"_rows",2),m([f()],h.prototype,"_total",2),m([f()],h.prototype,"_filteredTotal",2),m([f()],h.prototype,"_loading",2),m([f()],h.prototype,"_error",2),m([f()],h.prototype,"_activeTriggerTypes",2),m([f()],h.prototype,"_referenceFilter",2),m([f()],h.prototype,"_searchTerm",2),m([f()],h.prototype,"_selectedSlot",2),m([f()],h.prototype,"_detail",2),m([f()],h.prototype,"_detailLoading",2),m([f()],h.prototype,"_fireFeedback",2),m([f()],h.prototype,"_writeFeedback",2),m([f()],h.prototype,"_cloneTargetSlot",2),m([f()],h.prototype,"_showCloneInput",2),m([f()],h.prototype,"_confirmingClear",2),m([f()],h.prototype,"_editingDraft",2),m([f()],h.prototype,"_objects",2),m([f()],h.prototype,"_chainDraft",2),h=m([Oe("omni-panel-programs")],h);export{h as OmniPanelPrograms};
+ `,m([H({attribute:!1})],h.prototype,"hass",2),m([H({attribute:!1})],h.prototype,"narrow",2),m([g()],h.prototype,"_entryId",2),m([g()],h.prototype,"_rows",2),m([g()],h.prototype,"_total",2),m([g()],h.prototype,"_filteredTotal",2),m([g()],h.prototype,"_loading",2),m([g()],h.prototype,"_error",2),m([g()],h.prototype,"_activeTriggerTypes",2),m([g()],h.prototype,"_referenceFilter",2),m([g()],h.prototype,"_searchTerm",2),m([g()],h.prototype,"_selectedSlot",2),m([g()],h.prototype,"_detail",2),m([g()],h.prototype,"_detailLoading",2),m([g()],h.prototype,"_fireFeedback",2),m([g()],h.prototype,"_writeFeedback",2),m([g()],h.prototype,"_cloneTargetSlot",2),m([g()],h.prototype,"_showCloneInput",2),m([g()],h.prototype,"_confirmingClear",2),m([g()],h.prototype,"_editingDraft",2),m([g()],h.prototype,"_objects",2),m([g()],h.prototype,"_chainDraft",2),h=m([je("omni-panel-programs")],h);export{h as OmniPanelPrograms};
/*! Bundled license information:
@lit/reactive-element/css-tag.js:
diff --git a/dev/artifacts/screenshots/2026-05-16/12-structured-and.png b/dev/artifacts/screenshots/2026-05-16/12-structured-and.png
new file mode 100644
index 0000000..d67014e
Binary files /dev/null and b/dev/artifacts/screenshots/2026-05-16/12-structured-and.png differ