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

Updating from Reviews

Browse Source
This commit is contained in:
Zack Arnett 2018-10-17 11:49:34 -04:00
parent 76e67d27e7
commit 2fd459381d
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/panels/lovelace/cards/hui-entities-card.ts
View File

@ -46,34 +46,35 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
public getCardSize() { public getCardSize() {
// +1 for the header // +1 for the header
return 1 + (this.config ? this.config.entities.length : 0); if (!this.config) {
return 0;
}
return this.config.title ? 1 : 0 + this.config.entities.length;
} }
public setConfig(config: Config) { public setConfig(config: Config) {
this.config = { show_header_toggle: true, ...config };
const entities = processConfigEntities(config.entities); const entities = processConfigEntities(config.entities);
for (const entity of entities) { for (const entity of entities) {
if ( if (
entity.type === "call-service" && entity.type === "call-service" &&
!entity.service && (!entity.service ||
!entity.name && !entity.name ||
!entity.icon && !entity.icon ||
!entity.service_data && !entity.service_data ||
!entity.action_name !entity.action_name)
) { ) {
throw new Error("Missing required property when type is call-service"); throw new Error("Missing required property when type is call-service");
} else if ( } else if (
entity.type === "weblink" && entity.type === "weblink" &&
!entity.name && (!entity.name || !entity.icon || !entity.url)
!entity.icon &&
!entity.url
) { ) {
throw new Error("Missing required property when type is weblink"); throw new Error("Missing required property when type is weblink");
} }
} }
this.config = config;
this.configEntities = entities; this.configEntities = entities;
if (this.hass) { if (this.hass) {
this.requestUpdate(); this.requestUpdate();
} }
@ -84,15 +85,8 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
return html``; return html``;
} }
const { show_header_toggle, title } = this.config; const { show_header_toggle, title } = this.config;
const states = this.hass.states;
const entities = this.configEntities!.filter( const entities = this.configEntities!.map((conf) => conf.entity);
(conf) => conf.entity in states
);
const toggableEntities = entities
.filter((item) => typeof item === "string" || item.entity)
.map((item) => (typeof item === "string" ? item : item.entity));
return html` return html`
${this.renderStyle()} ${this.renderStyle()}
@ -104,12 +98,12 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
<div class='header'> <div class='header'>
${!title ? html`` : html`<div class="name">${title}</div>`} ${!title ? html`` : html`<div class="name">${title}</div>`}
${ ${
!show_header_toggle show_header_toggle === false
? html`` ? html``
: html` : html`
<hui-entities-toggle <hui-entities-toggle
.hass="${this.hass}" .hass="${this.hass}"
.entities="${toggableEntities}" .entities="${entities}"
> >
</hui-entities-toggle>` </hui-entities-toggle>`
} }
@ -117,7 +111,7 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
} }
<div id="states"> <div id="states">
${repeat<EntityConfig>( ${repeat<EntityConfig>(
entities, this.configEntities as EntityConfig[],
(entityConf) => entityConf.entity, (entityConf) => entityConf.entity,
(entityConf) => this.renderEntity(entityConf) (entityConf) => this.renderEntity(entityConf)
)} )}
@ -165,7 +159,10 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
const element = createRowElement(entityConf); const element = createRowElement(entityConf);
element.hass = this.hass; element.hass = this.hass;
element.entityConf = entityConf; element.entityConf = entityConf;
if (!DOMAINS_HIDE_MORE_INFO.includes(computeDomain(entityConf.entity))) { if (
!!entityConf.entity &&
DOMAINS_HIDE_MORE_INFO.includes(computeDomain(entityConf.entity))
) {
element.classList.add("state-card-dialog"); element.classList.add("state-card-dialog");
element.onclick = this.handleClick; element.onclick = this.handleClick;
} }