jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-28 11:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix filters for entity/device from integrations dashboard (#20953)

Browse Source
This commit is contained in:
Brynley McDonald 2024-06-04 03:50:40 +12:00 committed by GitHub
parent 250f87cfd8
commit f2b2da9877
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,38 +199,28 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
} }
private _setFiltersFromUrl() { private _setFiltersFromUrl() {
if (this._searchParms.has("domain")) { const domain = this._searchParms.get("domain");
this._filters = { const configEntry = this._searchParms.get("config_entry");
...this._filters,
"ha-filter-states": { this._filters = {
value: [ ...this._filters,
...((this._filters["ha-filter-states"]?.value as string[]) || []), "ha-filter-states": {
"disabled", value: [
], ...((this._filters["ha-filter-states"]?.value as string[]) || []),
items: undefined, "disabled",
}, ],
"ha-filter-integrations": { items: undefined,
value: [this._searchParms.get("domain")!], },
items: undefined, "ha-filter-integrations": {
}, value: domain ? [domain] : [],
}; items: undefined,
} },
if (this._searchParms.has("config_entry")) { config_entry: {
this._filters = { value: configEntry ? [configEntry] : [],
...this._filters, items: undefined,
"ha-filter-states": { },
value: [ };
...((this._filters["ha-filter-states"]?.value as string[]) || []),
"disabled",
],
items: undefined,
},
config_entry: {
value: [this._searchParms.get("config_entry")!],
items: undefined,
},
};
}
if (this._searchParms.has("label")) { if (this._searchParms.has("label")) {
this._filterLabel(); this._filterLabel();
} }

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

@ -943,6 +943,7 @@ ${
} }
protected firstUpdated() { protected firstUpdated() {
this._setFiltersFromUrl();
if (Object.keys(this._filters).length) { if (Object.keys(this._filters).length) {
return; return;
} }
@ -952,39 +953,31 @@ ${
items: undefined, items: undefined,
}, },
}; };
this._setFiltersFromUrl();
fetchEntitySourcesWithCache(this.hass).then((sources) => { fetchEntitySourcesWithCache(this.hass).then((sources) => {
this._entitySources = sources; this._entitySources = sources;
}); });
} }
private _setFiltersFromUrl() { private _setFiltersFromUrl() {
if (this._searchParms.has("domain")) { const domain = this._searchParms.get("domain");
this._filters = { const configEntry = this._searchParms.get("config_entry");
...this._filters,
"ha-filter-states": { this._filters = {
value: [], ...this._filters,
items: undefined, "ha-filter-states": {
}, value: [],
"ha-filter-integrations": { items: undefined,
value: [this._searchParms.get("domain")!], },
items: undefined, "ha-filter-integrations": {
}, value: domain ? [domain] : [],
}; items: undefined,
} },
if (this._searchParms.has("config_entry")) { config_entry: {
this._filters = { value: configEntry ? [configEntry] : [],
...this._filters, items: undefined,
"ha-filter-states": { },
value: [], };
items: undefined,
},
config_entry: {
value: [this._searchParms.get("config_entry")!],
items: undefined,
},
};
}
if (this._searchParms.has("label")) { if (this._searchParms.has("label")) {
this._filterLabel(); this._filterLabel();
} }