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

WIP: use template selector per field

Browse Source
This commit is contained in:
Paul Bottein 2024-10-29 15:11:16 +01:00
parent 42f2341e06
commit 85b24afc10
No known key found for this signature in database
3 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/ha-service-control.ts
View File

@ -34,6 +34,7 @@ import {
expandLabelTarget, expandLabelTarget,
Selector, Selector,
TargetSelector, TargetSelector,
TemplateSelector,
} from "../data/selector"; } from "../data/selector";
import { HomeAssistant, ValueChangedEvent } from "../types"; import { HomeAssistant, ValueChangedEvent } from "../types";
import { documentationUrl } from "../util/documentation-url"; import { documentationUrl } from "../util/documentation-url";
@ -45,6 +46,7 @@ import "./ha-settings-row";
import "./ha-yaml-editor"; import "./ha-yaml-editor";
import type { HaYamlEditor } from "./ha-yaml-editor"; import type { HaYamlEditor } from "./ha-yaml-editor";
import "./ha-service-section-icon"; import "./ha-service-section-icon";
import { hasTemplate } from "../common/string/has-template";
const attributeFilter = (values: any[], attribute: any) => { const attributeFilter = (values: any[], attribute: any) => {
if (typeof attribute === "object") { if (typeof attribute === "object") {
@ -79,6 +81,8 @@ interface ExtHassService extends Omit<HassService, "fields"> {
hasSelector: string[]; hasSelector: string[];
} }
const TEMPLATE_SELECTOR: TemplateSelector = { template: {} };
@customElement("ha-service-control") @customElement("ha-service-control")
export class HaServiceControl extends LitElement { export class HaServiceControl extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant; @property({ attribute: false }) public hass!: HomeAssistant;
@ -478,7 +482,8 @@ export class HaServiceControl extends LitElement {
>${this.hass.localize( >${this.hass.localize(
"ui.components.service-control.target_secondary" "ui.components.service-control.target_secondary"
)}</span )}</span
><ha-selector >
<ha-selector
.hass=${this.hass} .hass=${this.hass}
.selector=${this._targetSelector( .selector=${this._targetSelector(
serviceData.target as TargetSelector serviceData.target as TargetSelector
@ -639,6 +644,18 @@ export class HaServiceControl extends LitElement {
`component.${domain}.services.${serviceName}.fields.${dataField.key}.description` `component.${domain}.services.${serviceName}.fields.${dataField.key}.description`
) || dataField?.description}</span ) || dataField?.description}</span
> >
${hasTemplate(this._value?.data?.[dataField.key])
? html`
<ha-selector
.selector=${TEMPLATE_SELECTOR}
.key=${dataField.key}
.hass=${this.hass}
.value=${this._value?.data?.[dataField.key]}
.disabled=${this.disabled}
@value-changed=${this._serviceDataChanged}
></ha-selector>
`
: html`
<ha-selector <ha-selector
.disabled=${this.disabled || .disabled=${this.disabled ||
(showOptional && (showOptional &&
@ -649,13 +666,12 @@ export class HaServiceControl extends LitElement {
.selector=${enhancedSelector} .selector=${enhancedSelector}
.key=${dataField.key} .key=${dataField.key}
@value-changed=${this._serviceDataChanged} @value-changed=${this._serviceDataChanged}
.value=${this._value?.data .value=${this._value?.data?.[dataField.key]}
? this._value.data[dataField.key]
: undefined}
.placeholder=${dataField.default} .placeholder=${dataField.default}
.localizeValue=${this._localizeValueCallback} .localizeValue=${this._localizeValueCallback}
@item-moved=${this._itemMoved} @item-moved=${this._itemMoved}
></ha-selector> ></ha-selector>
`}
</ha-settings-row>` </ha-settings-row>`
: ""; : "";
}; };

2
src/panels/developer-tools/action/developer-tools-action.ts
View File

@ -529,7 +529,7 @@ class HaPanelDevAction extends LitElement {
) { ) {
return false; return false;
} }
return hasTemplate(val); return false;
}))) })))
) { ) {
this._yamlMode = true; this._yamlMode = true;

14
src/panels/lovelace/common/handle-action.ts
View File

@ -3,6 +3,7 @@ import { navigate } from "../../../common/navigate";
import { forwardHaptic } from "../../../data/haptics"; import { forwardHaptic } from "../../../data/haptics";
import { domainToName } from "../../../data/integration"; import { domainToName } from "../../../data/integration";
import { ActionConfig } from "../../../data/lovelace/config/action"; import { ActionConfig } from "../../../data/lovelace/config/action";
import { callExecuteScript } from "../../../data/service";
import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box"; import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
import { showVoiceCommandDialog } from "../../../dialogs/voice-command-dialog/show-ha-voice-command-dialog"; import { showVoiceCommandDialog } from "../../../dialogs/voice-command-dialog/show-ha-voice-command-dialog";
import { HomeAssistant } from "../../../types"; import { HomeAssistant } from "../../../types";
@ -159,14 +160,11 @@ export const handleAction = async (
forwardHaptic("failure"); forwardHaptic("failure");
return; return;
} }
const [domain, service] = (actionConfig.perform_action || callExecuteScript(hass, {
actionConfig.service)!.split(".", 2); action: actionConfig.perform_action || actionConfig.service,
hass.callService( target: actionConfig.target,
domain, data: actionConfig.data ?? actionConfig.service_data,
service, });
actionConfig.data ?? actionConfig.service_data,
actionConfig.target
);
forwardHaptic("light"); forwardHaptic("light");
break; break;
} }