From 89175f8e85fce8d65af24c142ee63159f6db6a69 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 25 Nov 2020 15:10:08 +0100
Subject: [PATCH] Add description and device class (#7816)

https://github.com/home-assistant/core/pull/43321
---
 .../ha-selector/ha-selector-entity.ts         |  8 +++
 src/data/blueprint.ts                         |  1 +
 src/data/selector.ts                          |  1 +
 .../automation/blueprint-automation-editor.ts | 67 ++++++++++---------
 4 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/components/ha-selector/ha-selector-entity.ts b/src/components/ha-selector/ha-selector-entity.ts
index be4bfda550..c32f995ae4 100644
--- a/src/components/ha-selector/ha-selector-entity.ts
+++ b/src/components/ha-selector/ha-selector-entity.ts
@@ -56,6 +56,14 @@ export class HaEntitySelector extends SubscribeMixin(LitElement) {
         return false;
       }
     }
+    if (this.selector.entity.device_class) {
+      if (
+        !entity.attributes.device_class ||
+        entity.attributes.device_class !== this.selector.entity.device_class
+      ) {
+        return false;
+      }
+    }
     if (this.selector.entity.integration) {
       if (
         !this._entities ||
diff --git a/src/data/blueprint.ts b/src/data/blueprint.ts
index d7dd60ad36..4a3283b565 100644
--- a/src/data/blueprint.ts
+++ b/src/data/blueprint.ts
@@ -11,6 +11,7 @@ export interface Blueprint {
 export interface BlueprintMetaData {
   domain: string;
   name: string;
+  description?: string;
   input: Record<string, BlueprintInput | null>;
 }
 
diff --git a/src/data/selector.ts b/src/data/selector.ts
index f002adaa88..fd20dbce95 100644
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -4,6 +4,7 @@ export interface EntitySelector {
   entity: {
     integration?: string;
     domain?: string;
+    device_class?: string;
   };
 }
 
diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts
index 7b8103e904..7153cee0ee 100644
--- a/src/panels/config/automation/blueprint-automation-editor.ts
+++ b/src/panels/config/automation/blueprint-automation-editor.ts
@@ -156,39 +156,42 @@ export class HaBlueprintAutomationEditor extends LitElement {
                 ? html`<p class="warning">
                     There is an error in this Blueprint: ${blueprint.error}
                   </p>`
-                : blueprint?.metadata?.input &&
+                : html`${blueprint?.metadata.description
+                    ? html`<p>${blueprint.metadata.description}</p>`
+                    : ""}
+                  ${blueprint?.metadata?.input &&
                   Object.keys(blueprint.metadata.input).length
-                ? html`<h3>
-                      ${this.hass.localize(
-                        "ui.panel.config.automation.editor.blueprint.inputs"
-                      )}
-                    </h3>
-                    ${Object.entries(blueprint.metadata.input).map(
-                      ([key, value]) =>
-                        html`<div>
-                          ${value?.description}
-                          ${value?.selector
-                            ? html`<ha-selector
-                                .hass=${this.hass}
-                                .selector=${value.selector}
-                                .key=${key}
-                                .label=${value?.name || key}
-                                .value=${this.config.use_blueprint.input &&
-                                this.config.use_blueprint.input[key]}
-                                @value-changed=${this._inputChanged}
-                              ></ha-selector>`
-                            : html`<paper-input
-                                .key=${key}
-                                .label=${value?.name || key}
-                                .value=${this.config.use_blueprint.input &&
-                                this.config.use_blueprint.input[key]}
-                                @value-changed=${this._inputChanged}
-                              ></paper-input>`}
-                        </div>`
-                    )}`
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.blueprint.no_inputs"
-                  )
+                    ? html`<h3>
+                          ${this.hass.localize(
+                            "ui.panel.config.automation.editor.blueprint.inputs"
+                          )}
+                        </h3>
+                        ${Object.entries(blueprint.metadata.input).map(
+                          ([key, value]) =>
+                            html`<div>
+                              ${value?.description}
+                              ${value?.selector
+                                ? html`<ha-selector
+                                    .hass=${this.hass}
+                                    .selector=${value.selector}
+                                    .key=${key}
+                                    .label=${value?.name || key}
+                                    .value=${this.config.use_blueprint.input &&
+                                    this.config.use_blueprint.input[key]}
+                                    @value-changed=${this._inputChanged}
+                                  ></ha-selector>`
+                                : html`<paper-input
+                                    .key=${key}
+                                    .label=${value?.name || key}
+                                    .value=${this.config.use_blueprint.input &&
+                                    this.config.use_blueprint.input[key]}
+                                    @value-changed=${this._inputChanged}
+                                  ></paper-input>`}
+                            </div>`
+                        )}`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.blueprint.no_inputs"
+                      )}`
               : ""}
           </div>
         </ha-card>