jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-31 21:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process review comments

Browse Source
This commit is contained in:
Franck Nijhof 2021-03-12 14:52:46 +01:00
parent 1fbd3a71c0
commit da1768aa21
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/panels/developer-tools/service/developer-tools-service.ts
View File

@ -4,7 +4,6 @@ import {
CSSResultArray, CSSResultArray,
html, html,
LitElement, LitElement,
internalProperty,
property, property,
query, query,
} from "lit-element"; } from "lit-element";
@ -33,8 +32,6 @@ class HaPanelDevService extends LitElement {
@property() public narrow!: boolean; @property() public narrow!: boolean;
@internalProperty() private _error?: string;
@LocalStorage("panel-dev-service-state-service-data", true) @LocalStorage("panel-dev-service-state-service-data", true)
private _serviceData?: ServiceAction = { service: "", target: {}, data: {} }; private _serviceData?: ServiceAction = { service: "", target: {}, data: {} };
@ -79,7 +76,7 @@ class HaPanelDevService extends LitElement {
this._serviceData?.service this._serviceData?.service
); );
const isValid = this._isValid(this._serviceData, fields, target); const { isValid, error } = this._isValid(this._serviceData, fields, target);
return html` return html`
<div class="content"> <div class="content">
@ -108,7 +105,7 @@ class HaPanelDevService extends LitElement {
@value-changed=${this._serviceDataChanged} @value-changed=${this._serviceDataChanged}
></ha-service-control></div ></ha-service-control></div
></ha-card>`} ></ha-card>`}
${this._error ? html` <p class="error">Error: ${this._error}</p> ` : ""} ${error ? html` <p class="error">Error: ${error}</p> ` : ""}
</div> </div>
<div class="button-row"> <div class="button-row">
<div class="buttons"> <div class="buttons">
@ -195,23 +192,20 @@ class HaPanelDevService extends LitElement {
fields.filter((field) => !field.selector) fields.filter((field) => !field.selector)
); );
private _isValid = memoizeOne((serviceData, fields, target): boolean => { private _isValid = memoizeOne((serviceData, fields, target): {
isValid: boolean;
error?: string;
} => {
if (!serviceData?.service) { if (!serviceData?.service) {
return false; return { isValid: false };
} }
if (hasTemplate(this._serviceData!)) {
this._error = this.hass.localize(
"ui.panel.developer-tools.tabs.services.no_templates"
);
return false;
}
this._error = undefined;
const domain = computeDomain(serviceData.service); const domain = computeDomain(serviceData.service);
const service = computeObjectId(serviceData.service); const service = computeObjectId(serviceData.service);
if (!domain || !service) { if (!domain || !service) {
return false; return {
isValid: false,
};
} }
if ( if (
target && target &&
@ -220,17 +214,27 @@ class HaPanelDevService extends LitElement {
!serviceData.data?.device_id && !serviceData.data?.device_id &&
!serviceData.data?.area_id !serviceData.data?.area_id
) { ) {
return false; return { isValid: false };
} }
for (const field of fields) { for (const field of fields) {
if ( if (
field.required && field.required &&
(!serviceData.data || serviceData.data[field.key] === undefined) (!serviceData.data || serviceData.data[field.key] === undefined)
) { ) {
return false; return { isValid: false };
} }
} }
return true;
if (hasTemplate(this._serviceData!)) {
return {
isValid: false,
error: this.hass.localize(
"ui.panel.developer-tools.tabs.services.no_templates"
),
};
}
return { isValid: true };
}); });
private _fields = memoizeOne( private _fields = memoizeOne(