From 729e2f52484ef388342783de90276cd8a74bcfa7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 11 Jul 2022 19:07:07 -0700
Subject: [PATCH] Use entity name in device info page (#13165)

* Use entity name in device info page

* Adjust to new format

* Use latest API

* Fix types

* Fix CI?

Co-authored-by: Zack <zackbarett@hey.com>
---
 demo/src/ha-demo.ts                           | 12 ++++----
 gallery/src/pages/misc/integration-card.ts    |  1 +
 src/data/entity_registry.ts                   |  3 +-
 .../device-detail/ha-device-entities-card.ts  | 30 ++++++++++++-------
 .../config/entities/ha-config-entities.ts     |  1 +
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/demo/src/ha-demo.ts b/demo/src/ha-demo.ts
index 91edb70aa5..625ddc6187 100644
--- a/demo/src/ha-demo.ts
+++ b/demo/src/ha-demo.ts
@@ -1,5 +1,4 @@
 // Compat needs to be first import
-import "../../src/resources/compatibility";
 import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 import { navigate } from "../../src/common/navigate";
 import {
@@ -7,9 +6,14 @@ import {
   provideHass,
 } from "../../src/fake_data/provide_hass";
 import { HomeAssistantAppEl } from "../../src/layouts/home-assistant";
+import "../../src/resources/compatibility";
 import { HomeAssistant } from "../../src/types";
 import { selectedDemoConfig } from "./configs/demo-configs";
 import { mockAuth } from "./stubs/auth";
+import { mockConfigEntries } from "./stubs/config_entries";
+import { mockEnergy } from "./stubs/energy";
+import { energyEntities } from "./stubs/entities";
+import { mockEntityRegistry } from "./stubs/entity_registry";
 import { mockEvents } from "./stubs/events";
 import { mockFrontend } from "./stubs/frontend";
 import { mockHistory } from "./stubs/history";
@@ -20,10 +24,6 @@ import { mockShoppingList } from "./stubs/shopping_list";
 import { mockSystemLog } from "./stubs/system_log";
 import { mockTemplate } from "./stubs/template";
 import { mockTranslations } from "./stubs/translations";
-import { mockEnergy } from "./stubs/energy";
-import { energyEntities } from "./stubs/entities";
-import { mockConfigEntries } from "./stubs/config_entries";
-import { mockEntityRegistry } from "./stubs/entity_registry";
 
 class HaDemo extends HomeAssistantAppEl {
   protected async _initializeHass() {
@@ -66,6 +66,7 @@ class HaDemo extends HomeAssistantAppEl {
         platform: "co2signal",
         hidden_by: null,
         entity_category: null,
+        has_entity_name: false,
       },
       {
         config_entry_id: "co2signal",
@@ -78,6 +79,7 @@ class HaDemo extends HomeAssistantAppEl {
         platform: "co2signal",
         hidden_by: null,
         entity_category: null,
+        has_entity_name: false,
       },
     ]);
 
diff --git a/gallery/src/pages/misc/integration-card.ts b/gallery/src/pages/misc/integration-card.ts
index aa26eb2c6b..cf12cefd35 100644
--- a/gallery/src/pages/misc/integration-card.ts
+++ b/gallery/src/pages/misc/integration-card.ts
@@ -194,6 +194,7 @@ const createEntityRegistryEntries = (
     name: null,
     icon: null,
     platform: "updater",
+    has_entity_name: false,
   },
 ];
 
diff --git a/src/data/entity_registry.ts b/src/data/entity_registry.ts
index 77d9d00d8e..00ff94b00d 100644
--- a/src/data/entity_registry.ts
+++ b/src/data/entity_registry.ts
@@ -16,12 +16,13 @@ export interface EntityRegistryEntry {
   disabled_by: string | null;
   hidden_by: string | null;
   entity_category: "config" | "diagnostic" | null;
+  has_entity_name: boolean;
+  original_name?: string;
 }
 
 export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
   unique_id: string;
   capabilities: Record<string, unknown>;
-  original_name?: string;
   original_icon?: string;
   device_class?: string;
   original_device_class?: string;
diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index ce1e310e54..e73d02c0c7 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -163,17 +163,27 @@ export class HaDeviceEntitiesCard extends LitElement {
     if (this.hass) {
       element.hass = this.hass;
       const stateObj = this.hass.states[entry.entity_id];
-      const name = stripPrefixFromEntityName(
-        computeStateName(stateObj),
-        this.deviceName.toLowerCase()
-      );
-      if (entry.hidden_by) {
-        config.name = `${
-          name || computeStateName(stateObj)
-        } (${this.hass.localize("ui.panel.config.devices.entities.hidden")})`;
-      } else if (name) {
-        config.name = name;
+
+      let name = entry.name
+        ? entry.name
+        : entry.has_entity_name
+        ? entry.original_name || this.deviceName
+        : stripPrefixFromEntityName(
+            computeStateName(stateObj),
+            this.deviceName.toLowerCase()
+          );
+
+      if (!name) {
+        name = computeStateName(stateObj);
       }
+
+      if (entry.hidden_by) {
+        name += ` (${this.hass.localize(
+          "ui.panel.config.devices.entities.hidden"
+        )})`;
+      }
+
+      config.name = name;
     }
     // @ts-ignore
     element.entry = entry;
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index 0a92026932..6d31575a33 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -736,6 +736,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
           readonly: true,
           selectable: false,
           entity_category: null,
+          has_entity_name: false,
         });
       }
       if (changed) {