Skip to content

Ensure timer row uses correct state translation keys #9143

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 5 commits into from
May 24, 2021
Merged

Ensure timer row uses correct state translation keys #9143

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2a9dae
Ensure timer row uses correct state translation keys
spacegaier May 9, 2021
c4de695
Changes from review
spacegaier May 10, 2021
d5eca0b
Update src/panels/lovelace/entity-rows/hui-timer-entity-row.ts
spacegaier May 16, 2021
07b447c
Merge branch 'dev' of https://github.com/home-assistant/frontend into…
spacegaier May 21, 2021
3982aa3
Move logic to data/timer
spacegaier May 21, 2021
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
7 changes: 5 additions & 2 deletions src/panels/lovelace/entity-rows/hui-timer-entity-row.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,17 @@ class HuiTimerEntityRow extends LitElement {

if (stateObj.state === "idle" || this._timeRemaining === 0) {
return (
this.hass!.localize(`state.timer.${stateObj.state}`) || stateObj.state
this.hass!.localize(`component.timer.state._.${stateObj.state}`) ||

@bramkragten bramkragten May 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Use computeStateDisplay so we don't have this again if we change logic there :-)

@spacegaier spacegaier May 10, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Made the change, but that lead me to something else: The more-info dialog also was not aligned, which I fixed now, but that meant duplicating code. But since the computeStateDisplay() function does only accept a stateObj we cannot pass the remaining seconds to make it completely capsuled in computeStateDisplay().

We could add an optional parameter to computeStateDisplay() for a generic value to be provided by the caller and to be used in the domain specific handling for timer then.

@bramkragten bramkragten May 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Isn't it the same as stateObj.attributes.duration?

@spacegaier spacegaier May 10, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I don't think so. stateObj.attributes.duration is the defined runtime that this timer runs to reach 0. timeRemaining is the remaining seconds from the start of the timer until the duration is reached.

@bramkragten bramkragten May 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yeah I meant stateObj.attributes.remaining

@spacegaier spacegaier May 10, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Does not work, because the backend attribute does only get updated when the timers pauses (and perhaps periodically?), but not each second as the frontend needs it to. The "live" timeRemaining is only known in the frontend.

@bramkragten bramkragten May 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

OK, let's move it to data/timer then

@bramkragten bramkragten May 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

timerTimeRemaining should move there too btw

@spacegaier spacegaier May 21, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Code is moved. Have a look if that is what you had in mind.

stateObj.state
);
}

let display = secondsToDuration(this._timeRemaining || 0);

if (stateObj.state === "paused") {
display += ` (${this.hass!.localize("state.timer.paused")})`;
display += ` (${this.hass!.localize(
`component.timer.state._.${stateObj.state}`
)})`;
}

return display;
Expand Down