Reintroduce floor context (#22192)

home-assistant · Oct 22, 2024 · 849cfed · 849cfed
1 parent 8932dfd
commit 849cfed
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 6 deletions.
diff --git a/gallery/src/pages/automation/describe-action.ts b/gallery/src/pages/automation/describe-action.ts
@@ -142,7 +142,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         <div class="action">
           <span>
             ${this._action
-              ? describeAction(this.hass, [], [], this._action)
+              ? describeAction(this.hass, [], [], {}, this._action)
               : "<invalid YAML>"}
           </span>
           <ha-yaml-editor
@@ -155,7 +155,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         ${ACTIONS.map(
           (conf) => html`
             <div class="action">
-              <span>${describeAction(this.hass, [], [], conf as any)}</span>
+              <span>${describeAction(this.hass, [], [], {}, conf as any)}</span>
               <pre>${dump(conf)}</pre>
             </div>
           `

diff --git a/src/components/trace/hat-trace-timeline.ts b/src/components/trace/hat-trace-timeline.ts
@@ -22,8 +22,13 @@ import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_tim
 import { relativeTime } from "../../common/datetime/relative_time";
 import { fireEvent } from "../../common/dom/fire_event";
 import { toggleAttribute } from "../../common/dom/toggle_attribute";
-import { fullEntitiesContext, labelsContext } from "../../data/context";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../data/context";
 import { EntityRegistryEntry } from "../../data/entity_registry";
+import { FloorRegistryEntry } from "../../data/floor_registry";
 import { LabelRegistryEntry } from "../../data/label_registry";
 import { LogbookEntry } from "../../data/logbook";
 import {
@@ -201,6 +206,7 @@ class ActionRenderer {
     private hass: HomeAssistant,
     private entityReg: EntityRegistryEntry[],
     private labelReg: LabelRegistryEntry[],
+    private floorReg: { [id: string]: FloorRegistryEntry },
     private entries: TemplateResult[],
     private trace: AutomationTraceExtended,
     private logbookRenderer: LogbookRenderer,
@@ -319,6 +325,7 @@ class ActionRenderer {
         this.hass,
         this.entityReg,
         this.labelReg,
+        this.floorReg,
         data,
         actionType
       ),
@@ -486,7 +493,13 @@ class ActionRenderer {
 
     const name =
       repeatConfig.alias ||
-      describeAction(this.hass, this.entityReg, this.labelReg, repeatConfig);
+      describeAction(
+        this.hass,
+        this.entityReg,
+        this.labelReg,
+        this.floorReg,
+        repeatConfig
+      );
 
     this._renderEntry(repeatPath, name, undefined, disabled);
 
@@ -584,6 +597,7 @@ class ActionRenderer {
           this.hass,
           this.entityReg,
           this.labelReg,
+          this.floorReg,
           sequenceConfig,
           "sequence"
         ),
@@ -680,6 +694,10 @@ export class HaAutomationTracer extends LitElement {
   @consume({ context: labelsContext, subscribe: true })
   _labelReg!: LabelRegistryEntry[];
 
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: { [id: string]: FloorRegistryEntry };
+
   protected render() {
     if (!this.trace) {
       return nothing;
@@ -697,6 +715,7 @@ export class HaAutomationTracer extends LitElement {
       this.hass,
       this._entityReg,
       this._labelReg,
+      this._floorReg,
       entries,
       this.trace,
       logbookRenderer,

diff --git a/src/data/context.ts b/src/data/context.ts
@@ -27,4 +27,6 @@ export const panelsContext = createContext<HomeAssistant["panels"]>("panels");
 export const fullEntitiesContext =
   createContext<EntityRegistryEntry[]>("extendedEntities");
 
+export const floorsContext = createContext<HomeAssistant["floors"]>("floors");
+
 export const labelsContext = createContext<LabelRegistryEntry[]>("labels");
diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts
@@ -14,6 +14,7 @@ import {
   computeEntityRegistryName,
   entityRegistryById,
 } from "./entity_registry";
+import { FloorRegistryEntry } from "./floor_registry";
 import { domainToName } from "./integration";
 import { LabelRegistryEntry } from "./label_registry";
 import {
@@ -43,6 +44,7 @@ export const describeAction = <T extends ActionType>(
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
   labelRegistry: LabelRegistryEntry[],
+  floorRegistry: { [id: string]: FloorRegistryEntry },
   action: ActionTypes[T],
   actionType?: T,
   ignoreAlias = false
@@ -52,6 +54,7 @@ export const describeAction = <T extends ActionType>(
       hass,
       entityRegistry,
       labelRegistry,
+      floorRegistry,
       action,
       actionType,
       ignoreAlias
@@ -75,6 +78,7 @@ const tryDescribeAction = <T extends ActionType>(
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
   labelRegistry: LabelRegistryEntry[],
+  floorRegistry: { [id: string]: FloorRegistryEntry },
   action: ActionTypes[T],
   actionType?: T,
   ignoreAlias = false
@@ -164,7 +168,7 @@ const tryDescribeAction = <T extends ActionType>(
               );
             }
           } else if (key === "floor_id") {
-            const floor = hass.floors[targetThing] ?? undefined;
+            const floor = floorRegistry[targetThing] ?? undefined;
             if (floor?.name) {
               targets.push(floor.name);
             } else {

diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -43,8 +43,13 @@ import type { HaYamlEditor } from "../../../../components/ha-yaml-editor";
 import { ACTION_ICONS, YAML_ONLY_ACTION_TYPES } from "../../../../data/action";
 import { AutomationClipboard } from "../../../../data/automation";
 import { validateConfig } from "../../../../data/config";
-import { fullEntitiesContext, labelsContext } from "../../../../data/context";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../../../data/context";
 import { EntityRegistryEntry } from "../../../../data/entity_registry";
+import { FloorRegistryEntry } from "../../../../data/floor_registry";
 import { LabelRegistryEntry } from "../../../../data/label_registry";
 import {
   Action,
@@ -154,6 +159,10 @@ export default class HaAutomationActionRow extends LitElement {
   @consume({ context: labelsContext, subscribe: true })
   _labelReg!: LabelRegistryEntry[];
 
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: { [id: string]: FloorRegistryEntry };
+
   @state() private _warnings?: string[];
 
   @state() private _uiModeAvailable = true;
@@ -222,6 +231,7 @@ export default class HaAutomationActionRow extends LitElement {
                 this.hass,
                 this._entityReg,
                 this._labelReg,
+                this._floorReg,
                 this.action
               )
             )}
@@ -593,6 +603,7 @@ export default class HaAutomationActionRow extends LitElement {
           this.hass,
           this._entityReg,
           this._labelReg,
+          this._floorReg,
           this.action,
           undefined,
           true

diff --git a/src/state/context-mixin.ts b/src/state/context-mixin.ts
@@ -5,6 +5,7 @@ import {
   connectionContext,
   devicesContext,
   entitiesContext,
+  floorsContext,
   localeContext,
   localizeContext,
   panelsContext,
@@ -87,6 +88,10 @@ export const contextMixin = <T extends Constructor<HassBaseEl>>(
         context: panelsContext,
         initialValue: this.hass ? this.hass.panels : this._pendingHass.panels,
       }),
+      floors: new ContextProvider(this, {
+        context: floorsContext,
+        initialValue: this.hass ? this.hass.floors : this._pendingHass.floors,
+      }),
     };
 
     protected hassConnected() {