From 53901f50c49187ded47edeb3dde0a375d3fd5f1a Mon Sep 17 00:00:00 2001
From: Igor Panteleyev <panteleev.igor69@gmail.com>
Date: Mon, 29 Jul 2024 17:57:56 +0300
Subject: [PATCH] Fix issue when card has an error and it don't rendered after
 page request

---
 src/qr-code-card.ts | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/qr-code-card.ts b/src/qr-code-card.ts
index c2ef88b..952e00a 100644
--- a/src/qr-code-card.ts
+++ b/src/qr-code-card.ts
@@ -9,7 +9,8 @@ import type {QRCodeCardConfig, TranslatableString } from "./types/types";
 import { localize, localizeWithHass } from "./localize/localize";
 import { getWatchedEntities, hasConfigOrAnyEntityChanged } from "./utils"
 import { version } from '../package.json';
-import { generateQR } from "./models/generator";
+import { getInputString } from "./models/data-builder";
+import { generateQR } from "./generator";
 import { validateConfig } from "./validators";
 import { SourceType } from "./models/source-type";
 import { CARD_CUSTOM_ELEMENT_NAME, EDITOR_CUSTOM_ELEMENT_NAME } from "./const";
@@ -47,6 +48,7 @@ export class QRCodeCard extends LitElement {
 
     private config!: QRCodeCardConfig;
     private watchedEntities: string[] = [];
+    private inputString!: string;
     @property({ attribute: false }) public _hass!: HomeAssistant;
     @state() private errors: string[] = [];
     @state() private dataUrl = "";
@@ -76,7 +78,8 @@ export class QRCodeCard extends LitElement {
 
     private async _updateQR(): Promise<void> {
         try {
-            this.dataUrl = await generateQR(this.hass, this.config);
+            this.inputString = getInputString(this.hass, this.config)
+            this.dataUrl = await generateQR(this.inputString);
         } catch (e: unknown) {
             if (e instanceof TranslatableError) {
                 this.errors = [e.message]
@@ -98,13 +101,15 @@ export class QRCodeCard extends LitElement {
     }
 
     protected async update(changedProperties: PropertyValues): Promise<void> {
-        await this._updateQR();
+        if (this.errors.length == 0) {
+            await this._updateQR();
+        }
         super.update(changedProperties);
   }
 
     protected render(): TemplateResult {
         if (this.errors.length > 0) {
-            return this._showErrors(this.errors);
+            return this._showErrors();
         }
 
         if (!this.dataUrl) {
@@ -125,15 +130,16 @@ export class QRCodeCard extends LitElement {
           `
     }
 
-    private _showErrors(errors: string[]): TemplateResult {
-        errors.forEach(e => console.error(e));
+    private _showErrors(): TemplateResult {
+        this.errors.forEach(e => console.error(e));
         const errorCard = document.createElement("hui-error-card") as LovelaceCard;
-        errorCard.setConfig({
-            type: "error",
-            error: errors[0],
-            origConfig: this.config,
+        customElements.whenDefined("hui-error-card").then(() => {
+            errorCard.setConfig({
+                type: "error",
+                error: this.errors[0],
+                origConfig: this.config,
+            });
         });
-
         return html` ${errorCard} `;
     }