Add Magic areas 2 #75
Conversation
adrienbrault
force-pushed
the
magic-areas-refactored
branch
from
de49339 to
7d203c5
Compare
|
@DigiLive I've updated the branch with your suggestions. I think the configuration format should be improved though |
Which format of which configuration do you suggest to what? Do you have a code example? |
| @@ -355,7 +356,15 @@ class Helper { | |||
|
|
|||
| // Get states whose entity-id starts with the given string. | |||
| const stateEntities = Object.values(this.#hassStates).filter( | |||
| state => state.entity_id.startsWith(`${domain}.`), | |||
| state => { | |||
| if (deviceClass | |||
There was a problem hiding this comment.
Can the return conditions rewritten to a ternary operator statement?
E.g.: return deviceClass && state.attributes.device_class === deviceClass ? state.entity_id.startsWith(`${domain}.`) : false;
| * | ||
| * @return {stateObject[]} Array of state entities. | ||
| */ | ||
| static getStateEntities(area, domain) { | ||
| static getStateEntities(area, domain, deviceClass = null) { |
There was a problem hiding this comment.
deviceClass = null or deviceClass = undefined?
| state => state.entity_id.startsWith(`${domain}.`), | ||
| state => { | ||
| if (deviceClass | ||
| && state.attributes.device_class !== deviceClass |
There was a problem hiding this comment.
Unresolved variable device_class.
It should be included in typedef stateObject in file src/typedefs.js
|
|
||
| if (!card.secondary) { | ||
| // Get or determine the relevant sensor entity IDs based on options or default behavior | ||
| const temperatureSensorId = this.options?.temperature || Helper.getStateEntities(this.entity, "sensor", "temperature")[0]?.entity_id; |
There was a problem hiding this comment.
The type of field options in AbstractClass should change to {abstractOptions & Object<string, any>} to allow unknown additional properties.
Applies to lines #L70, #L71, #L72, #L92, #L93, #L94.
|
|
||
| if (!card.secondary) { | ||
| // Get or determine the relevant sensor entity IDs based on options or default behavior | ||
| const temperatureSensorId = this.options?.temperature || Helper.getStateEntities(this.entity, "sensor", "temperature")[0]?.entity_id; |
There was a problem hiding this comment.
Argument type hassEntity | areaEntity is not assignable to parameter type areaEntity.
Maybe it's more proper to declare private field #entity in AreaCard as type areaEntity and assign in the value of parameter area in the constructor. And then use this.#entity in the function call of Helper.getStateEntities
Applies to lines #L70, #L71, #L72, #L92, #L93, #L94.
| * | ||
| * The result excludes hidden and disabled entities. | ||
| * | ||
| * @param {areaEntity} area Area entity. | ||
| * @param {string} domain Domain of the entity-id. | ||
| * @param {string|null} deviceClass Device class attribute of the state. |
There was a problem hiding this comment.
deviceClass should be [deviceClass] if it's an optional parameter.
|
Please remove |
|
Warning The |
Hey,
This PR contains #44 rebased, along with some refactoring based on @DigiLive's comment.
Here's what it looks like on my dashboard: