Filter entities that will never have entries in the logbook card editor (#12876)

This commit is contained in:
J. Nick Koston 2022-06-05 18:45:58 -10:00 committed by GitHub
parent 4922e575f8
commit f464bcfc14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 14 deletions

View File

@ -6,7 +6,9 @@ import {
} from "../common/const"; } from "../common/const";
import { computeDomain } from "../common/entity/compute_domain"; import { computeDomain } from "../common/entity/compute_domain";
import { computeStateDisplay } from "../common/entity/compute_state_display"; import { computeStateDisplay } from "../common/entity/compute_state_display";
import { computeStateDomain } from "../common/entity/compute_state_domain";
import { LocalizeFunc } from "../common/translations/localize"; import { LocalizeFunc } from "../common/translations/localize";
import { HaEntityPickerEntityFilterFunc } from "../components/entity/ha-entity-picker";
import { HomeAssistant } from "../types"; import { HomeAssistant } from "../types";
import { UNAVAILABLE_STATES } from "./entity"; import { UNAVAILABLE_STATES } from "./entity";
@ -425,3 +427,10 @@ export const localizeStateMessage = (
: state : state
); );
}; };
export const filterLogbookCompatibleEntities: HaEntityPickerEntityFilterFunc = (
entity
) =>
computeStateDomain(entity) !== "sensor" ||
(entity.attributes.unit_of_measurement === undefined &&
entity.attributes.state_class === undefined);

View File

@ -12,7 +12,6 @@ import {
} from "date-fns/esm"; } from "date-fns/esm";
import { css, html, LitElement, PropertyValues } from "lit"; import { css, html, LitElement, PropertyValues } from "lit";
import { customElement, property, state } from "lit/decorators"; import { customElement, property, state } from "lit/decorators";
import { computeStateDomain } from "../../common/entity/compute_state_domain";
import { navigate } from "../../common/navigate"; import { navigate } from "../../common/navigate";
import { import {
createSearchParam, createSearchParam,
@ -20,11 +19,11 @@ import {
} from "../../common/url/search-params"; } from "../../common/url/search-params";
import { computeRTL } from "../../common/util/compute_rtl"; import { computeRTL } from "../../common/util/compute_rtl";
import "../../components/entity/ha-entity-picker"; import "../../components/entity/ha-entity-picker";
import type { HaEntityPickerEntityFilterFunc } from "../../components/entity/ha-entity-picker";
import "../../components/ha-date-range-picker"; import "../../components/ha-date-range-picker";
import type { DateRangePickerRanges } from "../../components/ha-date-range-picker"; import type { DateRangePickerRanges } from "../../components/ha-date-range-picker";
import "../../components/ha-icon-button"; import "../../components/ha-icon-button";
import "../../components/ha-menu-button"; import "../../components/ha-menu-button";
import { filterLogbookCompatibleEntities } from "../../data/logbook";
import "../../layouts/ha-app-layout"; import "../../layouts/ha-app-layout";
import { haStyle } from "../../resources/styles"; import { haStyle } from "../../resources/styles";
import { HomeAssistant } from "../../types"; import { HomeAssistant } from "../../types";
@ -89,7 +88,7 @@ export class HaPanelLogbook extends LitElement {
.label=${this.hass.localize( .label=${this.hass.localize(
"ui.components.entity.entity-picker.entity" "ui.components.entity.entity-picker.entity"
)} )}
.entityFilter=${this._entityFilter} .entityFilter=${filterLogbookCompatibleEntities}
@change=${this._entityPicked} @change=${this._entityPicked}
></ha-entity-picker> ></ha-entity-picker>
</div> </div>
@ -242,17 +241,6 @@ export class HaPanelLogbook extends LitElement {
this.shadowRoot!.querySelector("ha-logbook")?.refresh(); this.shadowRoot!.querySelector("ha-logbook")?.refresh();
} }
private _entityFilter: HaEntityPickerEntityFilterFunc = (entity) => {
if (computeStateDomain(entity) !== "sensor") {
return true;
}
return (
entity.attributes.unit_of_measurement === undefined &&
entity.attributes.state_class === undefined
);
};
static get styles() { static get styles() {
return [ return [
haStyle, haStyle,

View File

@ -17,6 +17,7 @@ import type { HomeAssistant } from "../../../../types";
import type { LogbookCardConfig } from "../../cards/types"; import type { LogbookCardConfig } from "../../cards/types";
import type { LovelaceCardEditor } from "../../types"; import type { LovelaceCardEditor } from "../../types";
import { baseLovelaceCardConfig } from "../structs/base-card-struct"; import { baseLovelaceCardConfig } from "../structs/base-card-struct";
import { filterLogbookCompatibleEntities } from "../../../../data/logbook";
const cardConfigStruct = assign( const cardConfigStruct = assign(
baseLovelaceCardConfig, baseLovelaceCardConfig,
@ -81,6 +82,7 @@ export class HuiLogbookCardEditor
<ha-entities-picker <ha-entities-picker
.hass=${this.hass} .hass=${this.hass}
.value=${this._entities} .value=${this._entities}
.entityFilter=${filterLogbookCompatibleEntities}
@value-changed=${this._entitiesChanged} @value-changed=${this._entitiesChanged}
> >
</ha-entities-picker> </ha-entities-picker>