Skip to content

Show disabled entities for a config_entry by default + number of hidden entities #7300

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
bramkragten merged 6 commits into from
Oct 12, 2020
Merged

Show disabled entities for a config_entry by default + number of hidden entities #7300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19bdb3d
Show disabled entities for a config_entry by default
spacegaier Oct 10, 2020
d433d53
Show number of hidden entities
spacegaier Oct 10, 2020
0ff33cc
Show number of hidden in filter box + PR review changes
spacegaier Oct 12, 2020
ffcd53d
Have number of hidden entities match the active filter
spacegaier Oct 12, 2020
281e59b
Remove not needed "navigate" + fix for active filters
spacegaier Oct 12, 2020
543d6b1
Update src/panels/config/entities/ha-config-entities.ts
spacegaier Oct 12, 2020
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
4 changes: 2 additions & 2 deletions src/panels/config/devices/ha-config-devices-dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ export class HaConfigDeviceDashboard extends LitElement {
filterTexts.push(
`${this.hass.localize(
"ui.panel.config.integrations.integration"
)} ${integrationName}${
)} "${integrationName}${
integrationName !== configEntry.title
? `: ${configEntry.title}`
: ""
}`
}"`
);
break;
}
Expand Down
103 changes: 88 additions & 15 deletions src/panels/config/entities/ha-config-entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {

@internalProperty() private _filter = "";

@internalProperty() private _numHiddenEntities = 0;

@internalProperty() private _searchParms = new URLSearchParams(
window.location.search
);
Expand All @@ -118,6 +120,10 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
filters.forEach((value, key) => {
switch (key) {
case "config_entry": {
// If we are requested to show the entities for a given config entry,
// also show the disabled ones by default.
this._showDisabled = true;

if (!entries) {
this._loadConfigEntries();
break;
Expand All @@ -132,11 +138,11 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
filterTexts.push(
`${this.hass.localize(
"ui.panel.config.integrations.integration"
)} ${integrationName}${
)} "${integrationName}${
integrationName !== configEntry.title
? `: ${configEntry.title}`
: ""
}`
}"`
);
break;
}
Expand Down Expand Up @@ -262,11 +268,9 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
showUnavailable: boolean,
showReadOnly: boolean
): EntityRow[] => {
if (!showDisabled) {
entities = entities.filter((entity) => !entity.disabled_by);
}

const result: EntityRow[] = [];
// If nothing gets filtered, this is our correct count of entities
let startLength = entities.length + stateEntities.length;

entities = showReadOnly ? entities.concat(stateEntities) : entities;

Expand All @@ -276,10 +280,23 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
entities = entities.filter(
(entity) => entity.config_entry_id === value
);
// If we have an active filter and `showReadOnly` is true, the length of `entities` is correct.
// If however, the read-only entities were not added before, we need to check how many would
// have matched the active filter and add that number to the count.
startLength = entities.length;
if (!showReadOnly) {
startLength += stateEntities.filter(
(entity) => entity.config_entry_id === value
).length;
}
break;
}
});

if (!showDisabled) {
entities = entities.filter((entity) => !entity.disabled_by);
}

for (const entry of entities) {
const entity = this.hass.states[entry.entity_id];
const unavailable = entity?.state === UNAVAILABLE;
Expand Down Expand Up @@ -315,6 +332,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
});
}

this._numHiddenEntities = startLength - result.length;
return result;
}
);
Expand Down Expand Up @@ -358,6 +376,16 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
this.hass.localize,
this._entries
);

const entityData = this._filteredEntities(
this._entities,
this._stateEntities,
this._searchParms,
this._showDisabled,
this._showUnavailable,
this._showReadOnly
);

const headerToolbar = this._selectedEntities.length
? html`
<p class="selected-txt">
Expand Down Expand Up @@ -441,18 +469,64 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
"ui.panel.config.filtering.filtering_by"
)}
${activeFilters.join(", ")}
${this._numHiddenEntities
? "(" +
this.hass.localize(
"ui.panel.config.entities.picker.filter.hidden_entities",
"number",
this._numHiddenEntities
) +
")"
: ""}
</paper-tooltip>
</div>`
: `${this.hass.localize(
"ui.panel.config.filtering.filtering_by"
)} ${activeFilters.join(", ")}`}
)} ${activeFilters.join(", ")}
${
this._numHiddenEntities
? "(" +
this.hass.localize(
"ui.panel.config.entities.picker.filter.hidden_entities",
"number",
this._numHiddenEntities
) +
")"
: ""
}
`}
<mwc-button @click=${this._clearFilter}
>${this.hass.localize(
"ui.panel.config.filtering.clear"
)}</mwc-button
>
</div>`
: ""}
${this._numHiddenEntities && !activeFilters
? html`<div class="active-filters">
${this.narrow
? html` <div>
<ha-icon icon="hass:filter-variant"></ha-icon>
<paper-tooltip animation-delay="0" position="left">
${this.hass.localize(
"ui.panel.config.entities.picker.filter.hidden_entities",
"number",
this._numHiddenEntities
)}
</paper-tooltip>
</div>`
: `${this.hass.localize(
"ui.panel.config.entities.picker.filter.hidden_entities",
"number",
this._numHiddenEntities
)}`}
<mwc-button @click=${this._showAll}
>${this.hass.localize(
"ui.panel.config.entities.picker.filter.show_all"
)}</mwc-button
>
</div>`
: ""}
<ha-button-menu corner="BOTTOM_START" multi>
<mwc-icon-button
slot="trigger"
Expand Down Expand Up @@ -517,14 +591,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
.route=${this.route}
.tabs=${configSections.integrations}
.columns=${this._columns(this.narrow, this.hass.language)}
.data=${this._filteredEntities(
this._entities,
this._stateEntities,
this._searchParms,
this._showDisabled,
this._showUnavailable,
this._showReadOnly
)}
.data=${entityData}
.filter=${this._filter}
selectable
@selection-changed=${this._handleSelectionChanged}
Expand Down Expand Up @@ -724,6 +791,12 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
navigate(this, window.location.pathname, true);
}

private _showAll() {
this._showDisabled = true;
this._showReadOnly = true;
this._showUnavailable = true;
}

static get styles(): CSSResult[] {
return [
haStyle,
Expand Down
4 changes: 3 additions & 1 deletion src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,9 @@
"filter": "Filter",
"show_disabled": "Show disabled entities",
"show_unavailable": "Show unavailable entities",
"show_readonly": "Show read-only entities"
"show_readonly": "Show read-only entities",
"hidden_entities": "{number} hidden {number, plural,\n one {entity}\n other {entities}\n}",
"show_all": "Show all"
},
"status": {
"restored": "Restored",
Expand Down