jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-23 09:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

unique-id -> id (#13552)

Browse Source
This commit is contained in:
Bram Kragten 2022-09-01 17:51:38 +02:00 committed by GitHub
parent 8fcd396445
commit 430e671901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/src/ha-demo.ts
View File

@ -61,7 +61,7 @@ class HaDemo extends HomeAssistantAppEl {
area_id: null, area_id: null,
disabled_by: null, disabled_by: null,
entity_id: "sensor.co2_intensity", entity_id: "sensor.co2_intensity",
unique_id: "sensor.co2_intensity", id: "sensor.co2_intensity",
name: null, name: null,
icon: null, icon: null,
platform: "co2signal", platform: "co2signal",
@ -75,7 +75,7 @@ class HaDemo extends HomeAssistantAppEl {
area_id: null, area_id: null,
disabled_by: null, disabled_by: null,
entity_id: "sensor.grid_fossil_fuel_percentage", entity_id: "sensor.grid_fossil_fuel_percentage",
unique_id: "sensor.co2_intensity", id: "sensor.co2_intensity",
name: null, name: null,
icon: null, icon: null,
platform: "co2signal", platform: "co2signal",

2
gallery/src/pages/misc/integration-card.ts
View File

@ -191,7 +191,7 @@ const createEntityRegistryEntries = (
hidden_by: null, hidden_by: null,
entity_category: null, entity_category: null,
entity_id: "binary_sensor.updater", entity_id: "binary_sensor.updater",
unique_id: "binary_sensor.updater", id: "binary_sensor.updater",
name: null, name: null,
icon: null, icon: null,
platform: "updater", platform: "updater",

7
src/data/entity_registry.ts
View File

@ -7,8 +7,8 @@ import { debounce } from "../common/util/debounce";
import { HomeAssistant } from "../types"; import { HomeAssistant } from "../types";
export interface EntityRegistryEntry { export interface EntityRegistryEntry {
id: string;
entity_id: string; entity_id: string;
unique_id: string;
name: string | null; name: string | null;
icon: string | null; icon: string | null;
platform: string; platform: string;
@ -23,6 +23,7 @@ export interface EntityRegistryEntry {
} }
export interface ExtEntityRegistryEntry extends EntityRegistryEntry { export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
unique_id: string;
capabilities: Record<string, unknown>; capabilities: Record<string, unknown>;
original_icon?: string; original_icon?: string;
device_class?: string; device_class?: string;
@ -162,11 +163,11 @@ export const sortEntityRegistryByName = (entries: EntityRegistryEntry[]) =>
caseInsensitiveStringCompare(entry1.name || "", entry2.name || "") caseInsensitiveStringCompare(entry1.name || "", entry2.name || "")
); );
export const entityRegistryByUniqueId = memoizeOne( export const entityRegistryById = memoizeOne(
(entries: HomeAssistant["entities"]) => { (entries: HomeAssistant["entities"]) => {
const entities: HomeAssistant["entities"] = {}; const entities: HomeAssistant["entities"] = {};
for (const entity of Object.values(entries)) { for (const entity of Object.values(entries)) {
entities[entity.unique_id] = entity; entities[entity.id] = entity;
} }
return entities; return entities;
} }

6
src/data/script_i18n.ts
View File

@ -10,7 +10,7 @@ import { localizeDeviceAutomationAction } from "./device_automation";
import { computeDeviceName } from "./device_registry"; import { computeDeviceName } from "./device_registry";
import { import {
computeEntityRegistryName, computeEntityRegistryName,
entityRegistryByUniqueId, entityRegistryById,
} from "./entity_registry"; } from "./entity_registry";
import { domainToName } from "./integration"; import { domainToName } from "./integration";
import { import {
@ -91,9 +91,7 @@ export const describeAction = <T extends ActionType>(
targets.push(targetThing); targets.push(targetThing);
} }
} else { } else {
const entityReg = entityRegistryByUniqueId(hass.entities)[ const entityReg = entityRegistryById(hass.entities)[targetThing];
targetThing
];
if (entityReg) { if (entityReg) {
targets.push( targets.push(
computeEntityRegistryName(hass, entityReg) || targetThing computeEntityRegistryName(hass, entityReg) || targetThing

4
src/panels/config/entities/ha-config-entities.ts
View File

@ -68,10 +68,10 @@ import type { HomeAssistant, Route } from "../../../types";
import { configSections } from "../ha-panel-config"; import { configSections } from "../ha-panel-config";
import "../integrations/ha-integration-overflow-menu"; import "../integrations/ha-integration-overflow-menu";
export interface StateEntity extends Omit<EntityRegistryEntry, "unique_id"> { export interface StateEntity extends Omit<EntityRegistryEntry, "id"> {
readonly?: boolean; readonly?: boolean;
selectable?: boolean; selectable?: boolean;
unique_id?: string; id?: string;
} }
export interface EntityRow extends StateEntity { export interface EntityRow extends StateEntity {