mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-28 11:46:42 +00:00
Improve search in add automation element dialog (#25626)
* Improve search in add automation element dialog * Remove unexpected import * Take min character search into account
This commit is contained in:
parent
48a3e1fd63
commit
a1819d6189
@ -1,5 +1,4 @@
|
|||||||
import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js";
|
import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js";
|
||||||
import type { IFuseOptions } from "fuse.js";
|
|
||||||
import Fuse from "fuse.js";
|
import Fuse from "fuse.js";
|
||||||
import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
|
import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
|
||||||
import { LitElement, css, html, nothing } from "lit";
|
import { LitElement, css, html, nothing } from "lit";
|
||||||
@ -46,6 +45,7 @@ import { haStyle, haStyleDialog } from "../../../resources/styles";
|
|||||||
import type { HomeAssistant } from "../../../types";
|
import type { HomeAssistant } from "../../../types";
|
||||||
import type { AddAutomationElementDialogParams } from "./show-add-automation-element-dialog";
|
import type { AddAutomationElementDialogParams } from "./show-add-automation-element-dialog";
|
||||||
import { PASTE_VALUE } from "./show-add-automation-element-dialog";
|
import { PASTE_VALUE } from "./show-add-automation-element-dialog";
|
||||||
|
import { HaFuse } from "../../../resources/fuse";
|
||||||
|
|
||||||
const TYPES = {
|
const TYPES = {
|
||||||
trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS },
|
trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS },
|
||||||
@ -175,6 +175,40 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
|
|||||||
type: AddAutomationElementDialogParams["type"],
|
type: AddAutomationElementDialogParams["type"],
|
||||||
group: string | undefined,
|
group: string | undefined,
|
||||||
filter: string,
|
filter: string,
|
||||||
|
domains: Set<string> | undefined,
|
||||||
|
localize: LocalizeFunc,
|
||||||
|
services: HomeAssistant["services"],
|
||||||
|
manifests?: DomainManifestLookup
|
||||||
|
): ListItem[] => {
|
||||||
|
const items = this._items(type, group, localize, services, manifests);
|
||||||
|
|
||||||
|
const index = this._fuseIndex(items);
|
||||||
|
|
||||||
|
const fuse = new HaFuse(
|
||||||
|
items,
|
||||||
|
{ ignoreLocation: true, includeScore: true },
|
||||||
|
index
|
||||||
|
);
|
||||||
|
|
||||||
|
const results = fuse.multiTermsSearch(filter);
|
||||||
|
if (results) {
|
||||||
|
return results.map((result) => result.item);
|
||||||
|
}
|
||||||
|
return this._getGroupItems(
|
||||||
|
type,
|
||||||
|
group,
|
||||||
|
domains,
|
||||||
|
localize,
|
||||||
|
services,
|
||||||
|
manifests
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
private _items = memoizeOne(
|
||||||
|
(
|
||||||
|
type: AddAutomationElementDialogParams["type"],
|
||||||
|
group: string | undefined,
|
||||||
localize: LocalizeFunc,
|
localize: LocalizeFunc,
|
||||||
services: HomeAssistant["services"],
|
services: HomeAssistant["services"],
|
||||||
manifests?: DomainManifestLookup
|
manifests?: DomainManifestLookup
|
||||||
@ -189,24 +223,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const items = flattenGroups(groups).flat();
|
const items = flattenGroups(groups).flat();
|
||||||
|
|
||||||
if (type === "action") {
|
if (type === "action") {
|
||||||
items.push(...this._services(localize, services, manifests, group));
|
items.push(...this._services(localize, services, manifests, group));
|
||||||
}
|
}
|
||||||
|
return items;
|
||||||
const options: IFuseOptions<ListItem> = {
|
|
||||||
keys: ["key", "name", "description"],
|
|
||||||
isCaseSensitive: false,
|
|
||||||
ignoreLocation: true,
|
|
||||||
minMatchCharLength: Math.min(filter.length, 2),
|
|
||||||
threshold: 0.2,
|
|
||||||
ignoreDiacritics: true,
|
|
||||||
};
|
|
||||||
const fuse = new Fuse(items, options);
|
|
||||||
return fuse.search(filter).map((result) => result.item);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
private _fuseIndex = memoizeOne((items: ListItem[]) =>
|
||||||
|
Fuse.createIndex(["key", "name", "description"], items)
|
||||||
|
);
|
||||||
|
|
||||||
private _getGroupItems = memoizeOne(
|
private _getGroupItems = memoizeOne(
|
||||||
(
|
(
|
||||||
type: AddAutomationElementDialogParams["type"],
|
type: AddAutomationElementDialogParams["type"],
|
||||||
@ -449,6 +476,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
|
|||||||
this._params.type,
|
this._params.type,
|
||||||
this._group,
|
this._group,
|
||||||
this._filter,
|
this._filter,
|
||||||
|
this._domains,
|
||||||
this.hass.localize,
|
this.hass.localize,
|
||||||
this.hass.services,
|
this.hass.services,
|
||||||
this._manifests
|
this._manifests
|
||||||
|
Loading…
x
Reference in New Issue
Block a user