Merge pull request #6 from FamousWolf/1-card-mod-not-applied

[BUGFIX] Fix config update and cleanup
FamousWolf · Mar 14, 2024 · d4ef70f · d4ef70f
2 parents 80be93a + 0217b94
commit d4ef70f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Custom Home Assistant card displaying a responsive overview of multiple days wit
     Add:
     ```yaml
     resources:
-      - url: /local/week-planner-card.js?version=1.0.0
+      - url: /local/week-planner-card.js?version=1.0.1
     type: module
     ```
   - **Using the graphical editor**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "week-planner-card",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Custom Home Assistant card to display events for a number of days from one or several calendars.",
   "source": "src/index.js",
   "module": "dist/week-planner-card.js",

diff --git a/src/card.js b/src/card.js
@@ -5,10 +5,15 @@ import moment from 'moment';
 export class WeekPlannerCard extends LitElement {
     static styles = styles;
 
-    _hass;
     _loading = 0;
     _events = {};
     _jsonDays = '';
+    _calendars;
+    _numberOfDays;
+    _updateInterval;
+    _noCardBackground;
+    _eventBackground;
+    _language;
 
     /**
      * Get properties
@@ -17,13 +22,8 @@ export class WeekPlannerCard extends LitElement {
      */
     static get properties() {
         return {
-            _calendars: { type: Array, state: true },
-            _numberOfDays: { type: Number, state: true },
-            _days: { type: Array, state: true },
-            _updateInterval: { type: Number, state: true },
-            _noCardBackground: { type: Boolean, state: true },
-            _eventBackground: { type: String, state: true },
-            _language: { type: Object, state: true }
+            _days: { type: Array },
+            _config: { type: Object }
         }
     }
 
@@ -33,6 +33,8 @@ export class WeekPlannerCard extends LitElement {
      * @param {Object} config
      */
     setConfig(config) {
+        this._config = config;
+
         if (!config.calendars) {
             throw new Error('No calendars are configured');
         }
@@ -61,23 +63,14 @@ export class WeekPlannerCard extends LitElement {
         );
     }
 
-    /**
-     * Set hass
-     *
-     * @param {Object} hass
-     */
-    set hass(hass) {
-        this._hass = hass;
-
-        this._updateEvents();
-    }
-
     /**
      * Render
      *
      * @return {Object}
      */
     render() {
+        this._waitForHassAndConfig();
+
         return html`
             <ha-card class="${this._noCardBackground ? 'nobackground' : ''}" style="--event-background-color: ${this._eventBackground}">
                 <div class="card-content">
@@ -137,24 +130,31 @@ export class WeekPlannerCard extends LitElement {
         `;
     }
 
-    _updateEvents() {
-        if (this._loading > 0) {
+    _waitForHassAndConfig() {
+        if (!this.hass || !this._calendars) {
+            window.setTimeout(() => {
+                this._waitForHassAndConfig();
+            }, 50)
             return;
         }
-        this._loading++;
 
-        this._events = {};
+        this._updateEvents();
+    }
 
-        if (!this._calendars) {
+    _updateEvents() {
+        if (this._loading > 0) {
             return;
         }
 
+        this._loading++;
+        this._events = {};
+
         let startDate = moment().startOf('day');
         let endDate = moment().startOf('day').add(this._numberOfDays, 'days');
 
         this._calendars.forEach(calendar => {
             this._loading++;
-            this._hass.callApi(
+            this.hass.callApi(
                 'get',
                 'calendars/' + calendar.entity + '?start=' + startDate.format('YYYY-MM-DD[T]HH:mm:ss[Z]') + '&end=' + endDate.format('YYYY-MM-DD[T]HH:mm:ss[Z]')
             ).then(response => {