From cc76a6c5edf82ea6c6b504d18744095eac92f313 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Tue, 27 Sep 2022 15:39:14 +0200
Subject: [PATCH] Add unique_id to entity registry (#13886)

---
 demo/src/ha-demo.ts                              | 2 ++
 gallery/src/pages/misc/integration-card.ts       | 1 +
 src/data/entity_registry.ts                      | 2 +-
 src/panels/config/entities/ha-config-entities.ts | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/demo/src/ha-demo.ts b/demo/src/ha-demo.ts
index b583245e5a..b80c4d71de 100644
--- a/demo/src/ha-demo.ts
+++ b/demo/src/ha-demo.ts
@@ -68,6 +68,7 @@ class HaDemo extends HomeAssistantAppEl {
         hidden_by: null,
         entity_category: null,
         has_entity_name: false,
+        unique_id: "co2_intensity",
       },
       {
         config_entry_id: "co2signal",
@@ -82,6 +83,7 @@ class HaDemo extends HomeAssistantAppEl {
         hidden_by: null,
         entity_category: null,
         has_entity_name: false,
+        unique_id: "grid_fossil_fuel_percentage",
       },
     ]);
 
diff --git a/gallery/src/pages/misc/integration-card.ts b/gallery/src/pages/misc/integration-card.ts
index 7d3fc2eda4..5b6b064803 100644
--- a/gallery/src/pages/misc/integration-card.ts
+++ b/gallery/src/pages/misc/integration-card.ts
@@ -196,6 +196,7 @@ const createEntityRegistryEntries = (
     icon: null,
     platform: "updater",
     has_entity_name: false,
+    unique_id: "updater",
   },
 ];
 
diff --git a/src/data/entity_registry.ts b/src/data/entity_registry.ts
index 78da19f6f2..075ce04b12 100644
--- a/src/data/entity_registry.ts
+++ b/src/data/entity_registry.ts
@@ -20,10 +20,10 @@ export interface EntityRegistryEntry {
   entity_category: "config" | "diagnostic" | null;
   has_entity_name: boolean;
   original_name?: string;
+  unique_id: string;
 }
 
 export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
-  unique_id: string;
   capabilities: Record<string, unknown>;
   original_icon?: string;
   device_class?: string;
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index ac02d2e048..8e3448994f 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -68,10 +68,12 @@ import type { HomeAssistant, Route } from "../../../types";
 import { configSections } from "../ha-panel-config";
 import "../integrations/ha-integration-overflow-menu";
 
-export interface StateEntity extends Omit<EntityRegistryEntry, "id"> {
+export interface StateEntity
+  extends Omit<EntityRegistryEntry, "id" | "unique_id"> {
   readonly?: boolean;
   selectable?: boolean;
   id?: string;
+  unique_id?: string;
 }
 
 export interface EntityRow extends StateEntity {