Sort domains correctly, scroll to top on back (#19197)

This commit is contained in:
Bram Kragten 2023-12-30 18:39:21 +01:00 committed by GitHub
parent 721ec8e559
commit ee57f26415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -254,9 +254,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
return []; return [];
} }
const result: ListItem[] = []; const result: ListItem[] = [];
Object.keys(services) Object.keys(services).forEach((domain) => {
.sort()
.forEach((domain) => {
const manifest = manifests[domain]; const manifest = manifests[domain];
if ( if (
(type === undefined && (type === undefined &&
@ -265,9 +263,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
(type === "helper" && manifest?.integration_type === "helper") || (type === "helper" && manifest?.integration_type === "helper") ||
(type === "other" && (type === "other" &&
(ENTITY_DOMAINS_OTHER.has(domain) || (ENTITY_DOMAINS_OTHER.has(domain) ||
!["helper", "entity"].includes( !["helper", "entity"].includes(manifest?.integration_type || "")))
manifest?.integration_type || ""
)))
) { ) {
result.push({ result.push({
group: true, group: true,
@ -278,7 +274,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
}); });
} }
}); });
return result; return result.sort((a, b) =>
stringCompare(a.name, b.name, this.hass.locale.language)
);
} }
); );
@ -515,6 +513,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
} }
private _back() { private _back() {
this._dialog!.scrollToPos(0, 0);
if (this._filter) { if (this._filter) {
this._filter = ""; this._filter = "";
return; return;