From 59b5b0f9dd9af48feb7be66a48accd9567754f8a Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 28 Feb 2022 18:47:38 +0100 Subject: [PATCH] name change + comment --- src/mixins/subscribe-mixin.ts | 9 +++++---- .../energy/hui-energy-carbon-consumed-gauge-card.ts | 2 +- .../cards/energy/hui-energy-devices-graph-card.ts | 2 +- .../cards/energy/hui-energy-distribution-card.ts | 2 +- .../lovelace/cards/energy/hui-energy-gas-graph-card.ts | 2 +- .../energy/hui-energy-grid-neutrality-gauge-card.ts | 2 +- .../cards/energy/hui-energy-solar-consumed-gauge-card.ts | 2 +- .../lovelace/cards/energy/hui-energy-solar-graph-card.ts | 2 +- .../cards/energy/hui-energy-sources-table-card.ts | 2 +- .../lovelace/cards/energy/hui-energy-usage-graph-card.ts | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/mixins/subscribe-mixin.ts b/src/mixins/subscribe-mixin.ts index 376bfba90a..66dbd99519 100644 --- a/src/mixins/subscribe-mixin.ts +++ b/src/mixins/subscribe-mixin.ts @@ -13,7 +13,8 @@ export const SubscribeMixin = >( class SubscribeClass extends superClass { @property({ attribute: false }) public hass?: HomeAssistant; - protected hassSubscribeNeedsProperties?: string[]; + // we wait with subscribing till these properties are set on the host element + protected hassSubscribeRequiredHostProps?: string[]; private __unsubs?: Array>; @@ -43,11 +44,11 @@ export const SubscribeMixin = >( this.__checkSubscribed(); return; } - if (!this.hassSubscribeNeedsProperties) { + if (!this.hassSubscribeRequiredHostProps) { return; } for (const key of changedProps.keys()) { - if (this.hassSubscribeNeedsProperties.includes(key as string)) { + if (this.hassSubscribeRequiredHostProps.includes(key as string)) { this.__checkSubscribed(); return; } @@ -65,7 +66,7 @@ export const SubscribeMixin = >( this.__unsubs !== undefined || !(this as unknown as Element).isConnected || this.hass === undefined || - this.hassSubscribeNeedsProperties?.some( + this.hassSubscribeRequiredHostProps?.some( (prop) => this[prop] === undefined ) ) { diff --git a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts index 783b41e653..ea2c81d949 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts @@ -32,7 +32,7 @@ class HuiEnergyCarbonGaugeCard @state() private _data?: EnergyData; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public getCardSize(): number { return 4; diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts index 9042143c22..f65454631b 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts @@ -49,7 +49,7 @@ export class HuiEnergyDevicesGraphCard @query("ha-chart-base") private _chart?: HaChartBase; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [ diff --git a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts index bcde14dfb0..c8b573c611 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts @@ -43,7 +43,7 @@ class HuiEnergyDistrubutionCard @state() private _data?: EnergyData; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public setConfig(config: EnergyDistributionCardConfig): void { this._config = config; diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts index 8cc8ef70f0..8953ebfd6d 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts @@ -62,7 +62,7 @@ export class HuiEnergyGasGraphCard @state() private _unit?: string; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [ diff --git a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts index d6389ebbe7..bdc0892a62 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts @@ -35,7 +35,7 @@ class HuiEnergyGridGaugeCard @state() private _data?: EnergyData; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [ diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts index 84a1a83b65..756e78410f 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts @@ -30,7 +30,7 @@ class HuiEnergySolarGaugeCard @state() private _data?: EnergyData; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [ diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts index 83468ecdf6..6e3abbe7d7 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts @@ -61,7 +61,7 @@ export class HuiEnergySolarGraphCard @state() private _end = endOfToday(); - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [ diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts index 974843ce4c..e3bce86105 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts @@ -45,7 +45,7 @@ export class HuiEnergySourcesTableCard @state() private _data?: EnergyData; - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [ diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts index 0c0bd48cd7..8bd48b0b2c 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts @@ -50,7 +50,7 @@ export class HuiEnergyUsageGraphCard @state() private _end = endOfToday(); - protected hassSubscribeNeedsProperties = ["_config"]; + protected hassSubscribeRequiredHostProps = ["_config"]; public hassSubscribe(): UnsubscribeFunc[] { return [