From 62d471888f020f2d226ca750d035605abe22f770 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Sun, 15 Nov 2020 16:18:58 -0600
Subject: [PATCH] Only allow selectable attributes in dropdown

---
 .../entity/ha-entity-attribute-picker.ts      | 58 +++++++++++++++++--
 .../config-elements/hui-entity-card-editor.ts |  1 +
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/components/entity/ha-entity-attribute-picker.ts b/src/components/entity/ha-entity-attribute-picker.ts
index 5b1dbfc080..8e8ffb2adb 100644
--- a/src/components/entity/ha-entity-attribute-picker.ts
+++ b/src/components/entity/ha-entity-attribute-picker.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-icon-button/mwc-icon-button";
 import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
@@ -14,13 +15,13 @@ import {
   query,
   TemplateResult,
 } from "lit-element";
+import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
+import { formatAttributeName } from "../../util/hass-attributes-util";
 import "../ha-svg-icon";
 import "./state-badge";
-import { formatAttributeName } from "../../util/hass-attributes-util";
-import "@material/mwc-icon-button/mwc-icon-button";
 
 export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
 
@@ -41,6 +42,41 @@ const rowRenderer = (root: HTMLElement, _owner, model: { item: string }) => {
   );
 };
 
+const SELECTABLE_ATTRIBUTES: { [key: string]: string[] } = {
+  light: ["brightness"],
+  climate: [
+    "current_temperature",
+    "fan_mode",
+    "preset_mode",
+    "swing_mode",
+    "temperature",
+    "current_hundity",
+    "humidity",
+    "hvac_action",
+  ],
+  fan: ["speed"],
+  air_quality: [
+    "nitrogen_oxide",
+    "particulate_matter_10",
+    "particulate_matter_2_5",
+  ],
+  cover: ["current_position", "current_tilt_position"],
+  device_tracker: ["battery"],
+  humidifier: ["humidty"],
+  media_player: ["media_title"],
+  vacuum: ["battery_level", "status"],
+  water_heater: ["current_temperature", "temperature", "operation_mode"],
+  weather: [
+    "temperature",
+    "humidity",
+    "ozone",
+    "pressure",
+    "wind_bearing",
+    "wind_speed",
+    "visibility",
+  ],
+};
+
 @customElement("ha-entity-attribute-picker")
 class HaEntityAttributePicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -68,9 +104,8 @@ class HaEntityAttributePicker extends LitElement {
 
   protected updated(changedProps: PropertyValues) {
     if (changedProps.has("_opened") && this._opened) {
-      const state = this.entityId ? this.hass.states[this.entityId] : undefined;
-      (this._comboBox as any).items = state
-        ? Object.keys(state.attributes)
+      (this._comboBox as any).items = this.entityId
+        ? this._selectableAttributes(this.entityId)
         : [];
     }
   }
@@ -137,6 +172,19 @@ class HaEntityAttributePicker extends LitElement {
     `;
   }
 
+  private _selectableAttributes = memoizeOne((entity: string) => {
+    const stateObj = this.hass.states[entity];
+    if (!stateObj) {
+      return [];
+    }
+
+    return Object.keys(stateObj.attributes).filter((attr) =>
+      SELECTABLE_ATTRIBUTES[entity.substring(0, entity.indexOf("."))].includes(
+        attr
+      )
+    );
+  });
+
   private _clearValue(ev: Event) {
     ev.stopPropagation();
     this._setValue("");
diff --git a/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
index f4d8f54921..c2dc9c2664 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
@@ -115,6 +115,7 @@ export class HuiEntityCardEditor extends LitElement
         </div>
         <div class="side-by-side">
           <ha-entity-attribute-picker
+            allow-custom-value
             .hass=${this.hass}
             .entityId=${this._entity}
             .label="${this.hass.localize(