jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run script in script editor open more info if fields (#19982)

Browse Source 
* Run script in script editor open more info if fields

* Extract function
This commit is contained in:
Paulus Schoutsen 2024-03-04 16:23:14 -05:00 committed by Bram Kragten
parent 7f44e89829
commit 9de59131f4
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/data/script.ts
View File

@ -26,6 +26,7 @@ import {
Trigger,
} from "./automation";
import { BlueprintInput } from "./blueprint";
import { computeObjectId } from "../common/entity/compute_object_id";
export const MODES = ["single", "restart", "queued", "parallel"] as const;
export const MODES_MAX = ["queued", "parallel"] as const;
@ -404,3 +405,11 @@ export const getActionType = (action: Action): ActionType => {
}
return "unknown";
};
export const hasScriptFields = (
hass: HomeAssistant,
entityId: string
): boolean => {
const fields = hass.services.script[computeObjectId(entityId)]?.fields;
return fields !== undefined && Object.keys(fields).length > 0;
};

10
src/panels/config/script/ha-script-editor.ts
View File

@ -48,6 +48,7 @@ import {
fetchScriptFileConfig,
getScriptEditorInitData,
getScriptStateConfig,
hasScriptFields,
isMaxMode,
showScriptEditor,
triggerScript,
@ -62,6 +63,7 @@ import { showToast } from "../../../util/toast";
import "./blueprint-script-editor";
import "./manual-script-editor";
import type { HaManualScriptEditor } from "./manual-script-editor";
import { showMoreInfoDialog } from "../../../dialogs/more-info/show-ha-more-info-dialog";
export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
@ -611,6 +613,14 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
private async _runScript(ev: CustomEvent) {
ev.stopPropagation();
if (hasScriptFields(this.hass, this._entityId!)) {
showMoreInfoDialog(this, {
entityId: this._entityId!,
});
return;
}
await triggerScript(this.hass, this.scriptId!);
showToast(this, {
message: this.hass.localize("ui.notification_toast.triggered", {

8
src/panels/lovelace/entity-rows/hui-script-entity-row.ts
View File

@ -9,13 +9,12 @@ import {
} from "lit";
import { customElement, property, state } from "lit/decorators";
import { isUnavailableState } from "../../../data/entity";
import { canRun, ScriptEntity } from "../../../data/script";
import { canRun, hasScriptFields, ScriptEntity } from "../../../data/script";
import { HomeAssistant } from "../../../types";
import { hasConfigOrEntityChanged } from "../common/has-changed";
import "../components/hui-generic-entity-row";
import { createEntityNotFoundWarning } from "../components/hui-warning";
import { ActionRowConfig, LovelaceRow } from "./types";
import { computeObjectId } from "../../../common/entity/compute_object_id";
import { showMoreInfoDialog } from "../../../dialogs/more-info/show-ha-more-info-dialog";
@customElement("hui-script-entity-row")
@ -95,10 +94,7 @@ class HuiScriptEntityRow extends LitElement implements LovelaceRow {
private _runScript(ev): void {
ev.stopPropagation();
const fields =
this.hass!.services.script[computeObjectId(this._config!.entity)]?.fields;
if (fields && Object.keys(fields).length > 0) {
if (hasScriptFields(this.hass!, this._config!.entity)) {
showMoreInfoDialog(this, { entityId: this._config!.entity });
} else {
this._callService("turn_on");

9
src/state-summary/state-card-script.ts
View File

@ -5,10 +5,9 @@ import { customElement, property } from "lit/decorators";
import "../components/entity/ha-entity-toggle";
import "../components/entity/state-info";
import { isUnavailableState } from "../data/entity";
import { canRun, ScriptEntity } from "../data/script";
import { canRun, hasScriptFields, ScriptEntity } from "../data/script";
import { haStyle } from "../resources/styles";
import { HomeAssistant } from "../types";
import { computeObjectId } from "../common/entity/compute_object_id";
import { showMoreInfoDialog } from "../dialogs/more-info/show-ha-more-info-dialog";
@customElement("state-card-script")
@ -59,11 +58,7 @@ class StateCardScript extends LitElement {
private _runScript(ev: Event) {
ev.stopPropagation();
const fields =
this.hass!.services.script[computeObjectId(this.stateObj.entity_id)]
?.fields;
if (fields && Object.keys(fields).length > 0) {
if (hasScriptFields(this.hass, this.stateObj.entity_id)) {
showMoreInfoDialog(this, { entityId: this.stateObj.entity_id });
} else {
this._callService("turn_on");