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

Do not query energy prefs if it's not loaded (#9763)

Browse Source
This commit is contained in:
Paulus Schoutsen 2021-08-10 10:40:51 -07:00 committed by GitHub
parent 34f8e5e28d
commit 29d29a337f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/panels/lovelace/strategies/original-states-strategy.ts
View File

@ -1,8 +1,9 @@
import { STATE_NOT_RUNNING } from "home-assistant-js-websocket"; import { STATE_NOT_RUNNING } from "home-assistant-js-websocket";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import { subscribeOne } from "../../../common/util/subscribe-one"; import { subscribeOne } from "../../../common/util/subscribe-one";
import { subscribeAreaRegistry } from "../../../data/area_registry"; import { subscribeAreaRegistry } from "../../../data/area_registry";
import { subscribeDeviceRegistry } from "../../../data/device_registry"; import { subscribeDeviceRegistry } from "../../../data/device_registry";
import { getEnergyPreferences } from "../../../data/energy"; import { EnergyPreferences, getEnergyPreferences } from "../../../data/energy";
import { subscribeEntityRegistry } from "../../../data/entity_registry"; import { subscribeEntityRegistry } from "../../../data/entity_registry";
import { generateDefaultViewConfig } from "../common/generate-lovelace-config"; import { generateDefaultViewConfig } from "../common/generate-lovelace-config";
import { import {
@ -38,16 +39,22 @@ export class OriginalStatesStrategy {
subscribeEntityRegistry(hass.connection, () => undefined); subscribeEntityRegistry(hass.connection, () => undefined);
} }
const [areaEntries, deviceEntries, entityEntries, localize, energyPrefs] = let energyPromise: Promise<EnergyPreferences> | undefined;
if (isComponentLoaded(hass, "energy")) {
energyPromise = getEnergyPreferences(hass);
}
const [areaEntries, deviceEntries, entityEntries, localize] =
await Promise.all([ await Promise.all([
subscribeOne(hass.connection, subscribeAreaRegistry), subscribeOne(hass.connection, subscribeAreaRegistry),
subscribeOne(hass.connection, subscribeDeviceRegistry), subscribeOne(hass.connection, subscribeDeviceRegistry),
subscribeOne(hass.connection, subscribeEntityRegistry), subscribeOne(hass.connection, subscribeEntityRegistry),
hass.loadBackendTranslation("title"), hass.loadBackendTranslation("title"),
// It raises if not configured, just swallow that.
getEnergyPreferences(hass).catch(() => undefined),
]); ]);
const energyPrefs = energyPromise ? await energyPromise : undefined;
// User can override default view. If they didn't, we will add one // User can override default view. If they didn't, we will add one
// that contains all entities. // that contains all entities.
const view = generateDefaultViewConfig( const view = generateDefaultViewConfig(