Skip to content

Default hide disabled entities from entity registry #3863

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 3 commits into from
Oct 2, 2019
Merged

Default hide disabled entities from entity registry #3863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33686f1
Default hide disabled entities from entity registry
bramkragten Oct 2, 2019
decb0f7
localize
bramkragten Oct 2, 2019
0679afe
Use memoize
bramkragten Oct 2, 2019
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
96 changes: 63 additions & 33 deletions src/panels/config/entity_registry/ha-config-entity-registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
property,
} from "lit-element";
import "@polymer/paper-item/paper-icon-item";
import "@polymer/paper-item/paper-item";
import "@polymer/paper-item/paper-item-body";

import { HomeAssistant } from "../../../types";
Expand All @@ -19,6 +20,7 @@ import "../../../layouts/hass-subpage";
import "../../../layouts/hass-loading-screen";
import "../../../components/ha-card";
import "../../../components/ha-icon";
import "../../../components/ha-switch";
import { domainIcon } from "../../../common/entity/domain_icon";
import { stateIcon } from "../../../common/entity/state_icon";
import { computeDomain } from "../../../common/entity/compute_domain";
Expand All @@ -30,13 +32,24 @@ import {
import { UnsubscribeFunc } from "home-assistant-js-websocket";
import { compare } from "../../../common/string/compare";
import { classMap } from "lit-html/directives/class-map";
// tslint:disable-next-line
import { HaSwitch } from "../../../components/ha-switch";
import memoize from "memoize-one";

class HaConfigEntityRegistry extends LitElement {
@property() public hass!: HomeAssistant;
@property() public isWide?: boolean;
@property() private _entities?: EntityRegistryEntry[];
@property() private _showDisabled = false;
private _unsubEntities?: UnsubscribeFunc;

private _filteredEntities = memoize(
(entities: EntityRegistryEntry[], showDisabled: boolean) =>
showDisabled
? entities
: entities.filter((entity) => !Boolean(entity.disabled_by))
);

public disconnectedCallback() {
super.disconnectedCallback();
if (this._unsubEntities) {
Expand Down Expand Up @@ -78,40 +91,53 @@ class HaConfigEntityRegistry extends LitElement {
</a>
</span>
<ha-card>
${this._entities.map((entry) => {
const state = this.hass!.states[entry.entity_id];
return html`
<paper-icon-item
@click=${this._openEditEntry}
.entry=${entry}
class=${classMap({ "disabled-entry": !!entry.disabled_by })}
>
<ha-icon
slot="item-icon"
.icon=${state
? stateIcon(state)
: domainIcon(computeDomain(entry.entity_id))}
></ha-icon>
<paper-item-body two-line>
<div class="name">
${computeEntityRegistryName(this.hass!, entry) ||
`(${this.hass!.localize("state.default.unavailable")})`}
</div>
<div class="secondary entity-id">
${entry.entity_id}
<paper-item>
<ha-switch
?checked=${this._showDisabled}
@change=${this._showDisabledChanged}
>${this.hass.localize(
"ui.panel.config.entity_registry.picker.show_disabled"
)}</ha-switch
></paper-item
>
${this._filteredEntities(this._entities, this._showDisabled).map(
(entry) => {
const state = this.hass!.states[entry.entity_id];
return html`
<paper-icon-item
@click=${this._openEditEntry}
.entry=${entry}
class=${classMap({ "disabled-entry": !!entry.disabled_by })}
>
<ha-icon
slot="item-icon"
.icon=${state
? stateIcon(state)
: domainIcon(computeDomain(entry.entity_id))}
></ha-icon>
<paper-item-body two-line>
<div class="name">
${computeEntityRegistryName(this.hass!, entry) ||
`(${this.hass!.localize(
"state.default.unavailable"
)})`}
</div>
<div class="secondary entity-id">
${entry.entity_id}
</div>
</paper-item-body>
<div class="platform">
${entry.platform}
${entry.disabled_by
? html`
<br />(disabled)
`
: ""}
</div>
</paper-item-body>
<div class="platform">
${entry.platform}
${entry.disabled_by
? html`
<br />(disabled)
`
: ""}
</div>
</paper-icon-item>
`;
})}
</paper-icon-item>
`;
}
)}
</ha-card>
</ha-config-section>
</hass-subpage>
Expand All @@ -137,6 +163,10 @@ class HaConfigEntityRegistry extends LitElement {
}
}

private _showDisabledChanged(ev: Event) {
this._showDisabled = (ev.target as HaSwitch).checked;
}

private _openEditEntry(ev: MouseEvent): void {
const entry = (ev.currentTarget! as any).entry;
showEntityRegistryDetailDialog(this, {
Expand Down
3 changes: 2 additions & 1 deletion src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,8 @@
"header": "Entity Registry",
"introduction": "Home Assistant keeps a registry of every entity it has ever seen that can be uniquely identified. Each of these entities will have an entity ID assigned which will be reserved for just this entity.",
"introduction2": "Use the entity registry to override the name, change the entity ID or remove the entry from Home Assistant. Note, removing the entity registry entry won't remove the entity. To do that, follow the link below and remove it from the integrations page.",
"integrations_page": "Integrations page"
"integrations_page": "Integrations page",
"show_disabled": "Show disabled entities"
},
"editor": {
"unavailable": "This entity is not currently available.",
Expand Down