Merge pull request #19 from snootched/dev

Pull from dev - multimeter and form fixes
snootched · Jan 3, 2025 · 6578bdb · 6578bdb
2 parents adaab44 + 790794f
commit 6578bdb
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 45 deletions.
diff --git a/dist/cb-lcars-card-editor-forms.yaml b/dist/cb-lcars-card-editor-forms.yaml
@@ -2570,7 +2570,7 @@ cb-lcars-base-controls:
                   headerLevel: 4
                   icon: "mdi:format-list-bulleted"
                   noCollapse: false
-                  visibilityCondition: "this._config.variables.animation.cascade.pattern === 'custom'"
+                  visibilityCondition: "(this._config?.variables?.animation?.cascade?.pattern ?? '') === 'custom'"
                   rows:
                     - controls:
                         - type: Message
@@ -5930,12 +5930,12 @@ cb-lcars-multimeter-card:
                       cssClass: "form-row two-controls"
                       controls:
                         - <<: *colorLCARSListControl
-                          configValue: "variables.slider_track.meter.gradient_start_color"
+                          configValue: "variables.slider_track.gradient_start_color"
                         - <<: *colorControl
-                          configValue: "variables.slider_track.meter.gradient_start_color"
+                          configValue: "variables.slider_track.gradient_start_color"
                     - controls:
                         - <<: *colorPreviewControl
-                          configValue: "variables.slider_track.meter.gradient_start_color"
+                          configValue: "variables.slider_track.gradient_start_color"
                 - controls:
                     - label: "Gradient: Match [Right/Bottom] to Entity Color"
                       configValue: "variables.entity_match_slider_end"
@@ -5955,9 +5955,9 @@ cb-lcars-multimeter-card:
                       cssClass: "form-row two-controls"
                       controls:
                         - <<: *colorLCARSListControl
-                          configValue: "variables.slider_track.meter.gradient_end_color"
+                          configValue: "variables.slider_track.gradient_end_color"
                         - <<: *colorControl
-                          configValue: "variables.slider_track.meter.gradient_end_color"
+                          configValue: "variables.slider_track.gradient_end_color"
                     - controls:
                         - <<: *colorPreviewControl
-                          configValue: "variables.slider_track.meter.gradient_end_color"
+                          configValue: "variables.slider_track.gradient_end_color"
diff --git a/dist/cb-lcars-lovelace.yaml b/dist/cb-lcars-lovelace.yaml
@@ -1,5 +1,5 @@
 cblcars:
-  version: 2025.01.1a
+  version: 2025.01.1b
   manage_config: true
 cblcars_card_templates:
   cb-lcars-button-capped:

diff --git a/dist/cb-lcars.js b/dist/cb-lcars.js
diff --git a/dist/cb-lcars.js.map b/dist/cb-lcars.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cb-lcars",
-  "version": "2025.01.1a",
+  "version": "2025.01.1b",
   "description": "Home Assistant LCARS libary built on custom-button-card",
   "main": "index.js",
   "author": "Jason Weyermars",
@@ -29,7 +29,7 @@
     "webpack-dev-server": "^5.0.4"
   },
   "dependencies": {
-    "ha-card-formbuilder": "github:snootched/ha-card-formbuilder",
+    "ha-editor-formbuilder-yaml": "github:snootched/ha-card-formbuilder",
     "js-yaml": "^4.1.0"
   }
-}
+}
diff --git a/src/cb-lcars-card-editor-forms.yaml b/src/cb-lcars-card-editor-forms.yaml
@@ -2570,7 +2570,7 @@ cb-lcars-base-controls:
                   headerLevel: 4
                   icon: "mdi:format-list-bulleted"
                   noCollapse: false
-                  visibilityCondition: "this._config.variables.animation.cascade.pattern === 'custom'"
+                  visibilityCondition: "(this._config?.variables?.animation?.cascade?.pattern ?? '') === 'custom'"
                   rows:
                     - controls:
                         - type: Message
@@ -5930,12 +5930,12 @@ cb-lcars-multimeter-card:
                       cssClass: "form-row two-controls"
                       controls:
                         - <<: *colorLCARSListControl
-                          configValue: "variables.slider_track.meter.gradient_start_color"
+                          configValue: "variables.slider_track.gradient_start_color"
                         - <<: *colorControl
-                          configValue: "variables.slider_track.meter.gradient_start_color"
+                          configValue: "variables.slider_track.gradient_start_color"
                     - controls:
                         - <<: *colorPreviewControl
-                          configValue: "variables.slider_track.meter.gradient_start_color"
+                          configValue: "variables.slider_track.gradient_start_color"
                 - controls:
                     - label: "Gradient: Match [Right/Bottom] to Entity Color"
                       configValue: "variables.entity_match_slider_end"
@@ -5955,9 +5955,9 @@ cb-lcars-multimeter-card:
                       cssClass: "form-row two-controls"
                       controls:
                         - <<: *colorLCARSListControl
-                          configValue: "variables.slider_track.meter.gradient_end_color"
+                          configValue: "variables.slider_track.gradient_end_color"
                         - <<: *colorControl
-                          configValue: "variables.slider_track.meter.gradient_end_color"
+                          configValue: "variables.slider_track.gradient_end_color"
                     - controls:
                         - <<: *colorPreviewControl
-                          configValue: "variables.slider_track.meter.gradient_end_color"
+                          configValue: "variables.slider_track.gradient_end_color"
diff --git a/src/editor/cb-lcars-editor.js b/src/editor/cb-lcars-editor.js
@@ -4,7 +4,7 @@ import { readYamlFile } from '../utils/cb-lcars-fileutils.js';
 
 import { html, css, unsafeCSS } from 'lit';
 
-import EditorForm from 'ha-card-formbuilder';
+import EditorForm from 'ha-editor-formbuilder-yaml';
 
 export class CBLCARSCardEditor extends EditorForm {