Skip to content

Update UI when service schema change #9120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludeeus merged 2 commits into from
May 7, 2021
Merged

Update UI when service schema change #9120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
201ad43
Update UI when service schema change
bramkragten May 6, 2021
dffffdb
Update ha-service-control.ts
bramkragten May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 45 additions & 33 deletions src/components/ha-service-control.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { mdiHelpCircle } from "@mdi/js";
import { HassService, HassServiceTarget } from "home-assistant-js-websocket";
import {
HassService,
HassServices,
HassServiceTarget,
} from "home-assistant-js-websocket";
import {
css,
CSSResult,
Expand Down Expand Up @@ -73,7 +77,10 @@ export class HaServiceControl extends LitElement {
this._checkedKeys = new Set();
}

const serviceData = this._getServiceInfo(this.value?.service);
const serviceData = this._getServiceInfo(
this.value?.service,
this.hass.services
);

if (
serviceData &&
Expand Down Expand Up @@ -122,40 +129,45 @@ export class HaServiceControl extends LitElement {
return ENTITY_COMPONENT_DOMAINS.includes(domain) ? [domain] : null;
});

private _getServiceInfo = memoizeOne((service?: string):
| ExtHassService
| undefined => {
if (!service) {
return undefined;
}
const domain = computeDomain(service);
const serviceName = computeObjectId(service);
const serviceDomains = this.hass.services;
if (!(domain in serviceDomains)) {
return undefined;
}
if (!(serviceName in serviceDomains[domain])) {
return undefined;
}
private _getServiceInfo = memoizeOne(
(
service?: string,
serviceDomains?: HassServices
): ExtHassService | undefined => {
if (!service || !serviceDomains) {
return undefined;
}
const domain = computeDomain(service);
const serviceName = computeObjectId(service);
if (!(domain in serviceDomains)) {
return undefined;
}
if (!(serviceName in serviceDomains[domain])) {
return undefined;
}

const fields = Object.entries(
serviceDomains[domain][serviceName].fields
).map(([key, value]) => ({
key,
...value,
selector: value.selector as Selector | undefined,
}));
return {
...serviceDomains[domain][serviceName],
fields,
hasSelector: fields.length
? fields.filter((field) => field.selector).map((field) => field.key)
: [],
};
});
const fields = Object.entries(
serviceDomains[domain][serviceName].fields
).map(([key, value]) => ({
key,
...value,
selector: value.selector as Selector | undefined,
}));
return {
...serviceDomains[domain][serviceName],
fields,
hasSelector: fields.length
? fields.filter((field) => field.selector).map((field) => field.key)
: [],
};
}
);

protected render() {
const serviceData = this._getServiceInfo(this._value?.service);
const serviceData = this._getServiceInfo(
this._value?.service,
this.hass.services
);

const shouldRenderServiceDataYaml =
(serviceData?.fields.length && !serviceData.hasSelector.length) ||
Expand Down