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

Fix History Graph Name not being friendly (#13179)

Browse Source
This commit is contained in:
Zack Barett 2022-07-13 04:48:52 -05:00 committed by GitHub
parent d23fca4dd1
commit 24e54554ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/data/history.ts
View File

@ -1,4 +1,4 @@
import { HassEntity } from "home-assistant-js-websocket"; import { HassEntities, HassEntity } from "home-assistant-js-websocket";
import { computeDomain } from "../common/entity/compute_domain"; import { computeDomain } from "../common/entity/compute_domain";
import { computeStateDisplayFromEntityAttributes } from "../common/entity/compute_state_display"; import { computeStateDisplayFromEntityAttributes } from "../common/entity/compute_state_display";
import { import {
@ -268,7 +268,8 @@ const processTimelineEntity = (
localize: LocalizeFunc, localize: LocalizeFunc,
language: FrontendLocaleData, language: FrontendLocaleData,
entityId: string, entityId: string,
states: EntityHistoryState[] states: EntityHistoryState[],
current_state: HassEntity | undefined
): TimelineEntity => { ): TimelineEntity => {
const data: TimelineState[] = []; const data: TimelineState[] = [];
const first: EntityHistoryState = states[0]; const first: EntityHistoryState = states[0];
@ -292,7 +293,10 @@ const processTimelineEntity = (
} }
return { return {
name: computeStateNameFromEntityAttributes(entityId, states[0].a), name: computeStateNameFromEntityAttributes(
entityId,
current_state?.attributes || first.a
),
entity_id: entityId, entity_id: entityId,
data, data,
}; };
@ -300,7 +304,8 @@ const processTimelineEntity = (
const processLineChartEntities = ( const processLineChartEntities = (
unit, unit,
entities: HistoryStates entities: HistoryStates,
hassEntities: HassEntities
): LineChartUnit => { ): LineChartUnit => {
const data: LineChartEntity[] = []; const data: LineChartEntity[] = [];
@ -349,9 +354,16 @@ const processLineChartEntities = (
processedStates.push(processedState); processedStates.push(processedState);
} }
const attributes =
entityId in hassEntities
? hassEntities[entityId].attributes
: "friendly_name" in first.a
? first.a
: undefined;
data.push({ data.push({
domain, domain,
name: computeStateNameFromEntityAttributes(entityId, first.a), name: computeStateNameFromEntityAttributes(entityId, attributes || {}),
entity_id: entityId, entity_id: entityId,
states: processedStates, states: processedStates,
}); });
@ -411,7 +423,13 @@ export const computeHistory = (
if (!unit) { if (!unit) {
timelineDevices.push( timelineDevices.push(
processTimelineEntity(localize, hass.locale, entityId, stateInfo) processTimelineEntity(
localize,
hass.locale,
entityId,
stateInfo,
currentState
)
); );
} else if (unit in lineChartDevices && entityId in lineChartDevices[unit]) { } else if (unit in lineChartDevices && entityId in lineChartDevices[unit]) {
lineChartDevices[unit][entityId].push(...stateInfo); lineChartDevices[unit][entityId].push(...stateInfo);
@ -424,7 +442,7 @@ export const computeHistory = (
}); });
const unitStates = Object.keys(lineChartDevices).map((unit) => const unitStates = Object.keys(lineChartDevices).map((unit) =>
processLineChartEntities(unit, lineChartDevices[unit]) processLineChartEntities(unit, lineChartDevices[unit], hass.states)
); );
return { line: unitStates, timeline: timelineDevices }; return { line: unitStates, timeline: timelineDevices };