From 5abb3dd8c15c7ebb6a5889a9ae58deba65d3de53 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 17 May 2021 14:12:16 +0200
Subject: [PATCH] Use default behaviour for service target (#8650)

---
 src/components/ha-service-control.ts | 13 +--------
 src/data/entity.ts                   | 42 ----------------------------
 2 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts
index 50ae36f237..359183544d 100644
--- a/src/components/ha-service-control.ts
+++ b/src/components/ha-service-control.ts
@@ -19,7 +19,6 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeObjectId } from "../common/entity/compute_object_id";
-import { ENTITY_COMPONENT_DOMAINS } from "../data/entity";
 import { Selector } from "../data/selector";
 import { PolymerChangedEvent } from "../polymer-types";
 import { HomeAssistant } from "../types";
@@ -124,11 +123,6 @@ export class HaServiceControl extends LitElement {
     }
   }
 
-  private _domainFilter = memoizeOne((service: string) => {
-    const domain = computeDomain(service);
-    return ENTITY_COMPONENT_DOMAINS.includes(domain) ? [domain] : null;
-  });
-
   private _getServiceInfo = memoizeOne(
     (
       service?: string,
@@ -231,11 +225,7 @@ export class HaServiceControl extends LitElement {
               .hass=${this.hass}
               .selector=${serviceData.target
                 ? { target: serviceData.target }
-                : {
-                    target: {
-                      entity: { domain: computeDomain(this._value!.service) },
-                    },
-                  }}
+                : { target: {} }}
               @value-changed=${this._targetChanged}
               .value=${this._value?.target}
             ></ha-selector
@@ -245,7 +235,6 @@ export class HaServiceControl extends LitElement {
             .hass=${this.hass}
             .value=${this._value?.data?.entity_id}
             .label=${entityId.description}
-            .includeDomains=${this._domainFilter(this._value!.service)}
             @value-changed=${this._entityPicked}
             allow-custom-entity
           ></ha-entity-picker>`
diff --git a/src/data/entity.ts b/src/data/entity.ts
index 0ade5b2d15..829ee58c35 100644
--- a/src/data/entity.ts
+++ b/src/data/entity.ts
@@ -2,45 +2,3 @@ export const UNAVAILABLE = "unavailable";
 export const UNKNOWN = "unknown";
 
 export const UNAVAILABLE_STATES = [UNAVAILABLE, UNKNOWN];
-
-export const ENTITY_COMPONENT_DOMAINS = [
-  "air_quality",
-  "alarm_control_panel",
-  "alert",
-  "automation",
-  "binary_sensor",
-  "calendar",
-  "camera",
-  "counter",
-  "cover",
-  "dominos",
-  "fan",
-  "geo_location",
-  "group",
-  "image_processing",
-  "input_boolean",
-  "input_datetime",
-  "input_number",
-  "input_select",
-  "input_text",
-  "light",
-  "lock",
-  "mailbox",
-  "media_player",
-  "number",
-  "person",
-  "plant",
-  "remember_the_milk",
-  "remote",
-  "scene",
-  "script",
-  "sensor",
-  "switch",
-  "timer",
-  "utility_meter",
-  "vacuum",
-  "weather",
-  "wink",
-  "zha",
-  "zwave",
-];