Skip to content

Compute the icon based on the logbook state and not the current state #12725

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
balloob merged 8 commits into from
May 20, 2022
Merged

Compute the icon based on the logbook state and not the current state #12725

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2984a8b
Compute the icon based on the logbook state and not the current state
bdraco May 18, 2022
07933ab
Instead of overriding the icon, override the state
bdraco May 18, 2022
0e38820
too much branching, lets try a different approach
bdraco May 18, 2022
08dec3b
revert
bdraco May 18, 2022
77f4852
rebuild the state instead
bdraco May 18, 2022
690376c
cleanup diff
bdraco May 18, 2022
4e61d11
cleanup diff
bdraco May 18, 2022
353a349
Update src/panels/logbook/ha-logbook-renderer.ts
bdraco May 19, 2022
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
63 changes: 36 additions & 27 deletions src/panels/logbook/ha-logbook-renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
PropertyValues,
TemplateResult,
} from "lit";
import type { HassEntity } from "home-assistant-js-websocket";
import { customElement, eventOptions, property } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import { DOMAINS_WITH_DYNAMIC_PICTURE } from "../../common/const";
Expand All @@ -15,7 +16,6 @@ import { formatTimeWithSeconds } from "../../common/datetime/format_time";
import { restoreScroll } from "../../common/decorators/restore-scroll";
import { fireEvent } from "../../common/dom/fire_event";
import { computeDomain } from "../../common/entity/compute_domain";
import { domainIconWithoutDefault } from "../../common/entity/domain_icon";
import { isComponentLoaded } from "../../common/config/is_component_loaded";
import { computeRTL, emitRTLDirection } from "../../common/util/compute_rtl";
import "../../components/entity/state-badge";
Expand Down Expand Up @@ -131,7 +131,7 @@ class HaLogbookRenderer extends LitElement {

const seenEntityIds: string[] = [];
const previous = this.entries[index - 1];
const stateObj = item.entity_id
const currentStateObj = item.entity_id
? this.hass.states[item.entity_id]
: undefined;
const item_username =
Expand All @@ -140,26 +140,37 @@ class HaLogbookRenderer extends LitElement {
? computeDomain(item.entity_id)
: // Domain is there if there is no entity ID.
item.domain!;
const overrideIcon =
item.icon ||
(item.domain && !stateObj
? domainIconWithoutDefault(item.domain!)
: undefined);
const overrideImage = !DOMAINS_WITH_DYNAMIC_PICTURE.has(domain)
? stateObj?.attributes.entity_picture_local ||
stateObj?.attributes.entity_picture ||
(!stateObj &&
!overrideIcon &&
item.domain &&
isComponentLoaded(this.hass, item.domain)
? brandsUrl({
domain: item.domain!,
type: "icon",
useFallback: true,
darkOptimized: this.hass.themes?.darkMode,
})
: undefined)
: undefined;
const historicStateObj = item.entity_id ? <HassEntity>(<unknown>{
entity_id: item.entity_id,
state: item.state,
attributes: {
// Rebuild the historical state by copying static attributes only
device_class: currentStateObj?.attributes.device_class,
source_type: currentStateObj?.attributes.source_type,
has_date: currentStateObj?.attributes.has_date,
has_time: currentStateObj?.attributes.has_time,
// We do not want to use dynamic entity pictures (e.g., from media player) for the log book rendering,
// as they would present a false state in the log (played media right now vs actual historic data).
entity_picture_local: DOMAINS_WITH_DYNAMIC_PICTURE.has(domain)
? undefined
: currentStateObj?.attributes.entity_picture_local,
entity_picture: DOMAINS_WITH_DYNAMIC_PICTURE.has(domain)
? undefined
: currentStateObj?.attributes.entity_picture,
},
}) : undefined;
const overrideImage =
!historicStateObj &&
!item.icon &&
domain &&
isComponentLoaded(this.hass, domain)
Copy link
Copy Markdown
Member

@bramkragten bramkragten May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we care if it is loaded?

Copy link
Copy Markdown
Member Author

@bdraco bdraco May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#12713 (comment)

? brandsUrl({
domain: domain!,
type: "icon",
useFallback: true,
darkOptimized: this.hass.themes?.darkMode,
})
: undefined;

return html`
<div class="entry-container">
Expand All @@ -178,14 +189,12 @@ class HaLogbookRenderer extends LitElement {
<div class="entry ${classMap({ "no-entity": !item.entity_id })}">
<div class="icon-message">
${!this.noIcon
? // We do not want to use dynamic entity pictures (e.g., from media player) for the log book rendering,
// as they would present a false state in the log (played media right now vs actual historic data).
html`
? html`
<state-badge
.hass=${this.hass}
.overrideIcon=${overrideIcon}
.overrideIcon=${item.icon}
.overrideImage=${overrideImage}
.stateObj=${stateObj}
.stateObj=${item.icon ? undefined : historicStateObj}
.stateColor=${false}
></state-badge>
`
Expand Down