From e3b72fe0aaa325544cfb1561545385c5e5074797 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Tue, 16 Mar 2021 12:38:49 +0100
Subject: [PATCH] Use execute_script call in services developer tool (#8657)

---
 src/data/service.ts                                  |  8 ++++++++
 .../service/developer-tools-service.ts               | 12 +++---------
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 src/data/service.ts

diff --git a/src/data/service.ts b/src/data/service.ts
new file mode 100644
index 0000000000..120d3096c9
--- /dev/null
+++ b/src/data/service.ts
@@ -0,0 +1,8 @@
+import { HomeAssistant } from "../types";
+import { Action } from "./script";
+
+export const callExecuteScript = (hass: HomeAssistant, sequence: Action[]) =>
+  hass.callWS({
+    type: "execute_script",
+    sequence,
+  });
diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index 8488b93c0d..a477b8d5ff 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -21,6 +21,7 @@ import "../../../components/ha-service-picker";
 import "../../../components/ha-yaml-editor";
 import type { HaYamlEditor } from "../../../components/ha-yaml-editor";
 import { ServiceAction } from "../../../data/script";
+import { callExecuteScript } from "../../../data/service";
 import { haStyle } from "../../../resources/styles";
 import "../../../styles/polymer-ha-style";
 import { HomeAssistant } from "../../../types";
@@ -250,17 +251,10 @@ class HaPanelDevService extends LitElement {
   );
 
   private _callService() {
-    const domain = computeDomain(this._serviceData!.service);
-    const service = computeObjectId(this._serviceData!.service);
-    if (!domain || !service) {
+    if (!this._serviceData?.service) {
       return;
     }
-    this.hass.callService(
-      domain,
-      service,
-      this._serviceData!.data,
-      this._serviceData!.target
-    );
+    callExecuteScript(this.hass, [this._serviceData]);
   }
 
   private _toggleYaml() {