jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-04-25 05:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix History Panel when no entities are found (#13103)

Browse Source
This commit is contained in:
Zack Barett 2022-07-05 18:05:40 -05:00 committed by GitHub
parent 153ebb2a20
commit 2094ae534b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/panels/history/ha-panel-history.ts
View File

@ -314,11 +314,17 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
this._isLoading = true;
const entityIds = this._getEntityIds();
if (!entityIds.length) {
if (entityIds === undefined) {
this._stateHistory = undefined;
return;
}
if (entityIds.length === 0) {
this._isLoading = false;
this._stateHistory = [];
return;
}
const dateHistory = await fetchDateWS(
this.hass,
this._startDate,
@ -334,7 +340,7 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
this._isLoading = false;
}
private _getEntityIds(): string[] {
private _getEntityIds(): string[] | undefined {
if (
this._targetPickerValue === undefined ||
this._entities === undefined ||
@ -344,7 +350,7 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
this._areaIdToEntities === undefined ||
this._areaIdToDevices === undefined
) {
return [];
return undefined;
}
const entityIds = new Set<string>();
let {
@ -353,25 +359,23 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
entity_id: searchingEntityId,
} = this._targetPickerValue;
if (searchingAreaId !== undefined) {
if (searchingAreaId) {
searchingAreaId =
typeof searchingAreaId === "string"
? [searchingAreaId]
: searchingAreaId;
for (const singleSearchingAreaId of searchingAreaId) {
const foundEntities = this._areaIdToEntities[singleSearchingAreaId];
if (!foundEntities) {
continue;
}
for (const foundEntity of foundEntities) {
if (foundEntity.entity_category === null) {
entityIds.add(foundEntity.entity_id);
if (foundEntities?.length) {
for (const foundEntity of foundEntities) {
if (foundEntity.entity_category === null) {
entityIds.add(foundEntity.entity_id);
}
}
}
const foundDevices = this._areaIdToDevices[singleSearchingAreaId];
if (foundDevices !== undefined) {
if (foundDevices) {
for (const foundDevice of foundDevices) {
const foundDeviceEntities =
this._deviceIdToEntities[foundDevice.id];
@ -389,20 +393,18 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
}
}
if (searchingDeviceId !== undefined) {
if (searchingDeviceId) {
searchingDeviceId =
typeof searchingDeviceId === "string"
? [searchingDeviceId]
: searchingDeviceId;
for (const singleSearchingDeviceId of searchingDeviceId) {
const foundEntities = this._deviceIdToEntities[singleSearchingDeviceId];
if (!foundEntities) {
continue;
}
for (const foundEntity of foundEntities) {
if (foundEntity.entity_category === null) {
entityIds.add(foundEntity.entity_id);
if (foundEntities?.length) {
for (const foundEntity of foundEntities) {
if (foundEntity.entity_category === null) {
entityIds.add(foundEntity.entity_id);
}
}
}
}
@ -417,6 +419,7 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
entityIds.add(singleSearchingEntityId);
}
}
return [...entityIds];
}
@ -441,7 +444,7 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
const params: Record<string, string> = {};
if (this._targetPickerValue) {
params.entity_id = this._getEntityIds().join(",");
params.entity_id = this._getEntityIds()?.join(",") || "";
}
if (this._startDate) {