Added support for stack, grid and glance cards (#247)

info.md

@@ -1,6 +1,10 @@
 {% if installed %}
 
 ### Features
+{% if version_installed.replace("v", "").replace(".","") | int < 10724 %}
+- Added `support for stack, grid and glance cards`
+{% endif %}
+
 {% if version_installed.replace("v", "").replace(".","") | int < 10723 %}
 - Fixed `actions no longer working`
 - Removed `entity alongside more-info tap_actions`

package.json

@@ -1,6 +1,6 @@
 {
  "name": "room-card",
- "version": "1.07.23",
+ "version": "1.07.24",
  "description": "Show entities in Home Assistant's Lovelace UI",
  "keywords": [
  "home-assistant",

src/types/room-card-types.ts

@@ -28,7 +28,7 @@ export interface EntityStyles {
  template?: string;
 }
 
-export interface RoomCardConfig extends LovelaceCardConfig { 
+export interface RoomCardConfig extends LovelaceCardConfig {
  info_entities?: RoomCardEntity[];
  entities?: RoomCardEntity[];
  entity?: string;
@@ -78,7 +78,7 @@ export interface RoomCardIconTemplate {
  styles?: string;
 }
 
-export interface HideIfConfig { 
+export interface HideIfConfig {
  conditions?: EntityCondition[];
 }
 
@@ -98,7 +98,7 @@ export interface FormattingOptions {
  currency?: string;
 }
 
-export interface RoomCardTemplateContainer { 
+export interface RoomCardTemplateContainer {
  name: string;
  template: RoomCardTemplateDefinition;
 }
@@ -110,18 +110,19 @@ export interface RoomCardTemplateDefinition {
 
 export interface RoomCardLovelaceCardConfig extends LovelaceCardConfig {
  hide_if?: HideIfConfig;
+ cards?: RoomCardLovelaceCardConfig[];
+ entities?: (string | { entity: string })[];
 }
 
 export interface RoomCardAttributeTemplate {
  template: string;
 }
 
-
 export interface ActionHandler extends HTMLElement {
  holdTime: number;
  bind(element: Element, options: ActionHandlerOptions): void;
 }
 
 export interface ActionHandlerElement extends HTMLElement {
  actionHandler?: boolean;
-}
+}

src/util.ts

@@ -18,12 +18,12 @@ export const getValue = (entity: RoomCardEntity) => {
  return entity.attribute ? entity.stateObj.attributes[entity.attribute] : entity.stateObj.state;
 }
 
-export const getEntityIds = (config: RoomCardConfig) : string[] => 
+export const getEntityIds = (config: RoomCardConfig): string[] =>
  [config.entity]
  .concat(config.entities?.map((entity) => getEntity(entity)))
  .concat(config.info_entities?.map((entity) => getEntity(entity)))
- .concat(config.rows?.flatMap(row => row.entities).map((entity) => getEntity(entity)))
- .concat(config.cards?.map((card) => getEntity(card.entity)))
+ .concat(config.rows?.flatMap((row) => row.entities).map((entity) => getEntity(entity)))
+ .concat(config.cards?.flatMap((card) => getCardEntities(card)))
  .concat(getConditionEntitiesFromConfig(config))
  .filter((entity) => entity);
 
@@ -54,6 +54,13 @@ export const getConditionEntitiesFromConfig = (config: RoomCardConfig) : string[
  return conditionWithEntities.filter(condition => condition.entity).map(condition => condition.entity);
 }
 
+export const getCardEntities = (card: RoomCardLovelaceCardConfig) : string[] => {
+ return [getEntity(card.entity)]
+ .concat(card.cards?.flatMap((card) => getCardEntities(card)))
+ .concat(card.entities?.flatMap((entity) => getEntity(entity as RoomCardEntity)))
+ .filter((entity) => entity);
+}
+
 export const hasConfigOrEntitiesChanged = (node: RoomCardConfig, changedProps: PropertyValues) => {
  if (changedProps.has('config')) {
  return true;

tests/util/getEntityIds.test.ts

@@ -136,6 +136,50 @@ describe('Testing util file function getEntityIds', () => {
  'sensor.entity', 'sensor.entity2'
  ]);
  }),
+ test('Passing stackable cards should return row entities', () => {
+ const config: RoomCardConfig = {
+ info_entities: undefined,
+ entities: undefined,
+ entity: undefined,
+ cards: [
+ {
+ type: 'grid',
+ cards: [
+ {
+ type: 'custom:room-card',
+ entity: 'sensor.entity1'
+ },
+ {
+ type: 'grid',
+ cards: [
+ {
+ type: 'custom:room-card',
+ entity: 'sensor.entity2'
+ }
+ ]
+ }
+ ]
+ },
+ {
+ type: 'glance',
+ entities: [
+ 'sensor.entity3',
+ {
+ entity: 'sensor.entity4'
+ }
+ ]
+ }
+ ],
+ entityIds: [],
+ type: ''
+ }; 
+ expect(getEntityIds(config)).toMatchObject([
+ 'sensor.entity1',
+ 'sensor.entity2',
+ 'sensor.entity3',
+ 'sensor.entity4'
+ ]);
+ }),
  test('Passing entities with icon conditions should return entities and icon condition entities', () => {
  const config: RoomCardConfig = {
  info_entities: [{