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

Don't do migration of service data in public prop (#8949)

Browse Source 
Fixes #8879
This commit is contained in:
Bram Kragten 2021-04-26 23:52:18 +02:00 committed by GitHub
parent e682abfb75
commit 7e0522c3b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,8 @@ export class HaServiceControl extends LitElement {
data?: Record<string, any>; data?: Record<string, any>;
}; };
@internalProperty() private _value!: this["value"];
@property({ reflect: true, type: Boolean }) public narrow!: boolean; @property({ reflect: true, type: Boolean }) public narrow!: boolean;
@property({ type: Boolean }) public showAdvanced?: boolean; @property({ type: Boolean }) public showAdvanced?: boolean;
@ -57,7 +59,7 @@ export class HaServiceControl extends LitElement {
@query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor; @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;
protected updated(changedProperties: PropertyValues) { protected updated(changedProperties: PropertyValues<this>) {
if (!changedProperties.has("value")) { if (!changedProperties.has("value")) {
return; return;
} }
@ -92,21 +94,23 @@ export class HaServiceControl extends LitElement {
target.device_id = this.value.data.device_id; target.device_id = this.value.data.device_id;
} }
this.value = { this._value = {
...this.value, ...this.value,
target, target,
data: { ...this.value.data }, data: { ...this.value.data },
}; };
delete this.value.data!.entity_id; delete this._value.data!.entity_id;
delete this.value.data!.device_id; delete this._value.data!.device_id;
delete this.value.data!.area_id; delete this._value.data!.area_id;
} else {
this._value = this.value;
} }
if (this.value?.data) { if (this._value?.data) {
const yamlEditor = this._yamlEditor; const yamlEditor = this._yamlEditor;
if (yamlEditor && yamlEditor.value !== this.value.data) { if (yamlEditor && yamlEditor.value !== this._value.data) {
yamlEditor.setValue(this.value.data); yamlEditor.setValue(this._value.data);
} }
} }
} }
@ -151,12 +155,12 @@ export class HaServiceControl extends LitElement {
}); });
protected render() { protected render() {
const serviceData = this._getServiceInfo(this.value?.service); const serviceData = this._getServiceInfo(this._value?.service);
const shouldRenderServiceDataYaml = const shouldRenderServiceDataYaml =
(serviceData?.fields.length && !serviceData.hasSelector.length) || (serviceData?.fields.length && !serviceData.hasSelector.length) ||
(serviceData && (serviceData &&
Object.keys(this.value?.data || {}).some( Object.keys(this._value?.data || {}).some(
(key) => !serviceData!.hasSelector.includes(key) (key) => !serviceData!.hasSelector.includes(key)
)); ));
@ -171,7 +175,7 @@ export class HaServiceControl extends LitElement {
return html`<ha-service-picker return html`<ha-service-picker
.hass=${this.hass} .hass=${this.hass}
.value=${this.value?.service} .value=${this._value?.service}
@value-changed=${this._serviceChanged} @value-changed=${this._serviceChanged}
></ha-service-picker> ></ha-service-picker>
<p>${serviceData?.description}</p> <p>${serviceData?.description}</p>
@ -195,19 +199,19 @@ export class HaServiceControl extends LitElement {
? { target: serviceData.target } ? { target: serviceData.target }
: { : {
target: { target: {
entity: { domain: computeDomain(this.value!.service) }, entity: { domain: computeDomain(this._value!.service) },
}, },
}} }}
@value-changed=${this._targetChanged} @value-changed=${this._targetChanged}
.value=${this.value?.target} .value=${this._value?.target}
></ha-selector ></ha-selector
></ha-settings-row>` ></ha-settings-row>`
: entityId : entityId
? html`<ha-entity-picker ? html`<ha-entity-picker
.hass=${this.hass} .hass=${this.hass}
.value=${this.value?.data?.entity_id} .value=${this._value?.data?.entity_id}
.label=${entityId.description} .label=${entityId.description}
.includeDomains=${this._domainFilter(this.value!.service)} .includeDomains=${this._domainFilter(this._value!.service)}
@value-changed=${this._entityPicked} @value-changed=${this._entityPicked}
allow-custom-entity allow-custom-entity
></ha-entity-picker>` ></ha-entity-picker>`
@ -218,15 +222,15 @@ export class HaServiceControl extends LitElement {
"ui.components.service-control.service_data" "ui.components.service-control.service_data"
)} )}
.name=${"data"} .name=${"data"}
.defaultValue=${this.value?.data} .defaultValue=${this._value?.data}
@value-changed=${this._dataChanged} @value-changed=${this._dataChanged}
></ha-yaml-editor>` ></ha-yaml-editor>`
: serviceData?.fields.map((dataField) => : serviceData?.fields.map((dataField) =>
dataField.selector && dataField.selector &&
(!dataField.advanced || (!dataField.advanced ||
this.showAdvanced || this.showAdvanced ||
(this.value?.data && (this._value?.data &&
this.value.data[dataField.key] !== undefined)) this._value.data[dataField.key] !== undefined))
? html`<ha-settings-row .narrow=${this.narrow}> ? html`<ha-settings-row .narrow=${this.narrow}>
${dataField.required ${dataField.required
? hasOptional ? hasOptional
@ -235,8 +239,8 @@ export class HaServiceControl extends LitElement {
: html`<ha-checkbox : html`<ha-checkbox
.key=${dataField.key} .key=${dataField.key}
.checked=${this._checkedKeys.has(dataField.key) || .checked=${this._checkedKeys.has(dataField.key) ||
(this.value?.data && (this._value?.data &&
this.value.data[dataField.key] !== undefined)} this._value.data[dataField.key] !== undefined)}
@change=${this._checkboxChanged} @change=${this._checkboxChanged}
slot="prefix" slot="prefix"
></ha-checkbox>`} ></ha-checkbox>`}
@ -245,15 +249,15 @@ export class HaServiceControl extends LitElement {
><ha-selector ><ha-selector
.disabled=${!dataField.required && .disabled=${!dataField.required &&
!this._checkedKeys.has(dataField.key) && !this._checkedKeys.has(dataField.key) &&
(!this.value?.data || (!this._value?.data ||
this.value.data[dataField.key] === undefined)} this._value.data[dataField.key] === undefined)}
.hass=${this.hass} .hass=${this.hass}
.selector=${dataField.selector} .selector=${dataField.selector}
.key=${dataField.key} .key=${dataField.key}
@value-changed=${this._serviceDataChanged} @value-changed=${this._serviceDataChanged}
.value=${this.value?.data && .value=${this._value?.data &&
this.value.data[dataField.key] !== undefined this._value.data[dataField.key] !== undefined
? this.value.data[dataField.key] ? this._value.data[dataField.key]
: dataField.default} : dataField.default}
></ha-selector ></ha-selector
></ha-settings-row>` ></ha-settings-row>`
@ -268,13 +272,13 @@ export class HaServiceControl extends LitElement {
this._checkedKeys.add(key); this._checkedKeys.add(key);
} else { } else {
this._checkedKeys.delete(key); this._checkedKeys.delete(key);
const data = { ...this.value?.data }; const data = { ...this._value?.data };
delete data[key]; delete data[key];
fireEvent(this, "value-changed", { fireEvent(this, "value-changed", {
value: { value: {
...this.value, ...this._value,
data, data,
}, },
}); });
@ -284,7 +288,7 @@ export class HaServiceControl extends LitElement {
private _serviceChanged(ev: PolymerChangedEvent<string>) { private _serviceChanged(ev: PolymerChangedEvent<string>) {
ev.stopPropagation(); ev.stopPropagation();
if (ev.detail.value === this.value?.service) { if (ev.detail.value === this._value?.service) {
return; return;
} }
fireEvent(this, "value-changed", { fireEvent(this, "value-changed", {
@ -295,17 +299,17 @@ export class HaServiceControl extends LitElement {
private _entityPicked(ev: CustomEvent) { private _entityPicked(ev: CustomEvent) {
ev.stopPropagation(); ev.stopPropagation();
const newValue = ev.detail.value; const newValue = ev.detail.value;
if (this.value?.data?.entity_id === newValue) { if (this._value?.data?.entity_id === newValue) {
return; return;
} }
let value; let value;
if (!newValue && this.value?.data) { if (!newValue && this._value?.data) {
value = { ...this.value }; value = { ...this._value };
delete value.data.entity_id; delete value.data.entity_id;
} else { } else {
value = { value = {
...this.value, ...this._value,
data: { ...this.value?.data, entity_id: ev.detail.value }, data: { ...this._value?.data, entity_id: ev.detail.value },
}; };
} }
fireEvent(this, "value-changed", { fireEvent(this, "value-changed", {
@ -316,15 +320,15 @@ export class HaServiceControl extends LitElement {
private _targetChanged(ev: CustomEvent) { private _targetChanged(ev: CustomEvent) {
ev.stopPropagation(); ev.stopPropagation();
const newValue = ev.detail.value; const newValue = ev.detail.value;
if (this.value?.target === newValue) { if (this._value?.target === newValue) {
return; return;
} }
let value; let value;
if (!newValue) { if (!newValue) {
value = { ...this.value }; value = { ...this._value };
delete value.target; delete value.target;
} else { } else {
value = { ...this.value, target: ev.detail.value }; value = { ...this._value, target: ev.detail.value };
} }
fireEvent(this, "value-changed", { fireEvent(this, "value-changed", {
value, value,
@ -336,13 +340,13 @@ export class HaServiceControl extends LitElement {
const key = (ev.currentTarget as any).key; const key = (ev.currentTarget as any).key;
const value = ev.detail.value; const value = ev.detail.value;
if ( if (
this.value?.data?.[key] === value || this._value?.data?.[key] === value ||
(!this.value?.data?.[key] && (value === "" || value === undefined)) (!this._value?.data?.[key] && (value === "" || value === undefined))
) { ) {
return; return;
} }
const data = { ...this.value?.data, [key]: value }; const data = { ...this._value?.data, [key]: value };
if (value === "" || value === undefined) { if (value === "" || value === undefined) {
delete data[key]; delete data[key];
@ -350,7 +354,7 @@ export class HaServiceControl extends LitElement {
fireEvent(this, "value-changed", { fireEvent(this, "value-changed", {
value: { value: {
...this.value, ...this._value,
data, data,
}, },
}); });
@ -363,7 +367,7 @@ export class HaServiceControl extends LitElement {
} }
fireEvent(this, "value-changed", { fireEvent(this, "value-changed", {
value: { value: {
...this.value, ...this._value,
data: ev.detail.value, data: ev.detail.value,
}, },
}); });