github
/
ha-frontend
mirror of https://github.com/home-assistant/frontend
1
Fork 0
Code Releases Activity

Label filters for devices & entities (#20253) 

More label filters
This commit is contained in:
Simon Lamon 2024-03-29 16:41:18 +01:00 committed by GitHub
parent abd02eda0f
commit f539516252
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/panels/config/devices/ha-config-devices-dashboard.ts
View File

@ -32,6 +32,7 @@ import "../../../components/ha-filter-devices";
import "../../../components/ha-filter-floor-areas";
import "../../../components/ha-filter-integrations";
import "../../../components/ha-filter-states";
import "../../../components/ha-filter-labels";
import "../../../components/ha-icon-button";
import "../../../components/ha-alert";
import { ConfigEntry, sortConfigEntries } from "../../../data/config_entries";
@ -221,16 +222,16 @@ export class HaConfigDeviceDashboard extends LitElement {
const filteredDomains = new Set<string>();
Object.entries(filters).forEach(([key, flter]) => {
if (key === "config_entry" && flter.value?.length) {
Object.entries(filters).forEach(([key, filter]) => {
if (key === "config_entry" && filter.value?.length) {
outputDevices = outputDevices.filter((device) =>
device.config_entries.some((entryId) =>
flter.value?.includes(entryId)
filter.value?.includes(entryId)
)
);
const configEntries = entries.filter(
(entry) => entry.entry_id && flter.value?.includes(entry.entry_id)
(entry) => entry.entry_id && filter.value?.includes(entry.entry_id)
);
configEntries.forEach((configEntry) => {
@ -239,17 +240,21 @@ export class HaConfigDeviceDashboard extends LitElement {
if (configEntries.length === 1) {
filteredConfigEntry = configEntries[0];
}
} else if (key === "ha-filter-integrations" && flter.value?.length) {
} else if (key === "ha-filter-integrations" && filter.value?.length) {
const entryIds = entries
.filter((entry) => flter.value!.includes(entry.domain))
.filter((entry) => filter.value!.includes(entry.domain))
.map((entry) => entry.entry_id);
outputDevices = outputDevices.filter((device) =>
device.config_entries.some((entryId) => entryIds.includes(entryId))
);
flter.value!.forEach((domain) => filteredDomains.add(domain));
} else if (flter.items) {
filter.value!.forEach((domain) => filteredDomains.add(domain));
} else if (key === "ha-filter-labels" && filter.value?.length) {
outputDevices = outputDevices.filter((device) =>
flter.items!.has(device.id)
device.labels.some((lbl) => filter.value!.includes(lbl))
);
} else if (filter.items) {
outputDevices = outputDevices.filter((device) =>
filter.items!.has(device.id)
);
}
});
@ -531,6 +536,15 @@ export class HaConfigDeviceDashboard extends LitElement {
.narrow=${this.narrow}
@expanded-changed=${this._filterExpanded}
></ha-filter-states>
<ha-filter-labels
.hass=${this.hass}
.value=${this._filters["ha-filter-labels"]?.value}
@data-table-filter-changed=${this._filterChanged}
slot="filter-pane"
.expanded=${this._expandedFilter === "ha-filter-labels"}
.narrow=${this.narrow}
@expanded-changed=${this._filterExpanded}
></ha-filter-labels>
</hass-tabs-subpage-data-table>
`;
}

32
src/panels/config/entities/ha-config-entities.ts
View File

@ -43,6 +43,7 @@ import "../../../components/ha-filter-devices";
import "../../../components/ha-filter-floor-areas";
import "../../../components/ha-filter-integrations";
import "../../../components/ha-filter-states";
import "../../../components/ha-filter-labels";
import "../../../components/ha-icon";
import "../../../components/ha-icon-button";
import "../../../components/ha-svg-icon";
@ -337,12 +338,12 @@ export class HaConfigEntities extends LitElement {
let filteredConfigEntry: ConfigEntry | undefined;
const filteredDomains = new Set<string>();
Object.entries(filters).forEach(([key, flter]) => {
if (key === "config_entry" && flter.value?.length) {
Object.entries(filters).forEach(([key, filter]) => {
if (key === "config_entry" && filter.value?.length) {
filteredEntities = filteredEntities.filter(
(entity) =>
entity.config_entry_id &&
flter.value?.includes(entity.config_entry_id)
filter.value?.includes(entity.config_entry_id)
);
if (!entries) {
@ -351,7 +352,7 @@ export class HaConfigEntities extends LitElement {
}
const configEntries = entries.filter(
(entry) => entry.entry_id && flter.value?.includes(entry.entry_id)
(entry) => entry.entry_id && filter.value?.includes(entry.entry_id)
);
configEntries.forEach((configEntry) => {
@ -360,23 +361,27 @@ export class HaConfigEntities extends LitElement {
if (configEntries.length === 1) {
filteredConfigEntry = configEntries[0];
}
} else if (key === "ha-filter-integrations" && flter.value?.length) {
} else if (key === "ha-filter-integrations" && filter.value?.length) {
if (!entries) {
this._loadConfigEntries();
return;
}
const entryIds = entries
.filter((entry) => flter.value!.includes(entry.domain))
.filter((entry) => filter.value!.includes(entry.domain))
.map((entry) => entry.entry_id);
filteredEntities = filteredEntities.filter(
(entity) =>
entity.config_entry_id &&
entryIds.includes(entity.config_entry_id)
);
flter.value!.forEach((domain) => filteredDomains.add(domain));
} else if (flter.items) {
filter.value!.forEach((domain) => filteredDomains.add(domain));
} else if (key === "ha-filter-labels" && filter.value?.length) {
filteredEntities = filteredEntities.filter((entity) =>
flter.items!.has(entity.entity_id)
entity.labels.some((lbl) => filter.value!.includes(lbl))
);
} else if (filter.items) {
filteredEntities = filteredEntities.filter((entity) =>
filter.items!.has(entity.entity_id)
);
}
});
@ -633,6 +638,15 @@ export class HaConfigEntities extends LitElement {
.narrow=${this.narrow}
@expanded-changed=${this._filterExpanded}
></ha-filter-states>
<ha-filter-labels
.hass=${this.hass}
.value=${this._filters["ha-filter-labels"]?.value}
@data-table-filter-changed=${this._filterChanged}
slot="filter-pane"
.expanded=${this._expandedFilter === "ha-filter-labels"}
.narrow=${this.narrow}
@expanded-changed=${this._filterExpanded}
></ha-filter-labels>
${includeAddDeviceFab
? html`<ha-fab
.label=${this.hass.localize("ui.panel.config.devices.add_device")}