Add multiple condition types

piitaya · Oct 24, 2023 · a49728b · a49728b
1 parent 8af8db4
commit a49728b
Show file tree

Hide file tree

Showing 12 changed files with 498 additions and 222 deletions.
diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
     "start": "rollup -c --watch --bundleConfigAsCjs",
     "build": "rollup -c --bundleConfigAsCjs",
     "format": "prettier --write .",
-    "start:hass": "docker run --rm -p8123:8123 -v ${PWD}/.hass_dev:/config homeassistant/home-assistant:beta",
-    "start:hass-cmd": "docker run --rm -p8123:8123 -v  %cd%/.hass_dev:/config homeassistant/home-assistant:beta"
+    "start:hass": "docker run --rm -p8123:8123 -v ${PWD}/.hass_dev:/config homeassistant/home-assistant:dev",
+    "start:hass-cmd": "docker run --rm -p8123:8123 -v  %cd%/.hass_dev:/config homeassistant/home-assistant:dev"
   },
   "author": "Paul Bottein",
   "repository": {

diff --git a/src/cards/chips-card/chips-card-chips-editor.ts b/src/cards/chips-card/chips-card-chips-editor.ts
@@ -241,31 +241,23 @@ export class ChipsCardEditorChips extends MushroomBaseElement {
 
     private _renderChipLabel(chipConf: LovelaceChipConfig): string {
         const customLocalize = setupCustomlocalize(this.hass);
-        let label = customLocalize(`editor.chip.chip-picker.types.${chipConf.type}`);
-        if (chipConf.type === "conditional" && chipConf.conditions.length > 0) {
-            const condition = chipConf.conditions[0];
-            const entity = this.getEntityName(condition.entity) ?? condition.entity;
-            label += ` - ${entity} ${
-                condition.state
-                    ? `= ${condition.state}`
-                    : condition.state_not
-                    ? `≠ ${condition.state_not}`
-                    : null
-            }`;
-        }
-        return label;
+        return customLocalize(`editor.chip.chip-picker.types.${chipConf.type}`);
     }
 
     private _renderChipSecondary(chipConf: LovelaceChipConfig): string | undefined {
         const customLocalize = setupCustomlocalize(this.hass);
         if ("entity" in chipConf && chipConf.entity) {
-            return `${this.getEntityName(chipConf.entity) ?? chipConf.entity}`;
+            return `${this.getEntityName(chipConf.entity) ?? chipConf.entity ?? ""}`;
         }
         if ("chip" in chipConf && chipConf.chip) {
             const label = customLocalize(`editor.chip.chip-picker.types.${chipConf.chip.type}`);
-            return `${this._renderChipSecondary(chipConf.chip)} (via ${label})`;
+            const chipSecondary = this._renderChipSecondary(chipConf.chip);
+            if (chipSecondary) {
+                return `${this._renderChipSecondary(chipConf.chip)} (via ${label})`;
+            }
+            return label;
         }
-        return undefined;
+        return "";
     }
 
     private getEntityName(entity_id: string): string | undefined {

diff --git a/src/cards/chips-card/chips-card-editor.ts b/src/cards/chips-card/chips-card-editor.ts
@@ -74,16 +74,10 @@ const weatherChipConfigStruct = object({
     show_conditions: optional(boolean()),
 });
 
-const conditionStruct = object({
-    entity: string(),
-    state: optional(string()),
-    state_not: optional(string()),
-});
-
 const conditionChipConfigStruct = object({
     type: literal("conditional"),
     chip: optional(any()),
-    conditions: optional(array(conditionStruct)),
+    conditions: optional(array(any())),
 });
 
 const lightChipConfigStruct = object({

diff --git a/src/cards/chips-card/chips-card.ts b/src/cards/chips-card/chips-card.ts
@@ -1,5 +1,5 @@
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
-import { customElement, state } from "lit/decorators.js";
+import { customElement, property, state } from "lit/decorators.js";
 import {
     computeRTL,
     HomeAssistant,
@@ -13,7 +13,7 @@ import { registerCustomCard } from "../../utils/custom-cards";
 import { createChipElement } from "../../utils/lovelace/chip/chip-element";
 import { LovelaceChip, LovelaceChipConfig } from "../../utils/lovelace/chip/types";
 import "./chips";
-import { EntityChip } from "./chips";
+import { EntityChip } from "./chips/entity-chip";
 import { CHIPS_CARD_EDITOR_NAME, CHIPS_CARD_NAME } from "./const";
 
 export interface ChipsCardConfig extends LovelaceCardConfig {
@@ -42,6 +42,8 @@ export class ChipsCard extends LitElement implements LovelaceCard {
         };
     }
 
+    @property() public editMode?: boolean;
+
     @state() private _config?: ChipsCardConfig;
 
     private _hass?: HomeAssistant;
@@ -94,6 +96,7 @@ export class ChipsCard extends LitElement implements LovelaceCard {
         }
         if (this._hass) {
             element.hass = this._hass;
+            element.editMode = this.editMode;
         }
         return html`${element}`;
     }