Skip to content

Automation - State Condition display 'for:' in frontend #8124

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 2 commits into from
Jan 11, 2021
Merged

Automation - State Condition display 'for:' in frontend #8124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b07f9
Automation - State Condition display 'for:' in frontend
Nikfinn99 Jan 10, 2021
6865a2d
rename variable to better name
Nikfinn99 Jan 11, 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
1 change: 1 addition & 0 deletions src/data/automation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export interface StateCondition {
entity_id: string;
attribute?: string;
state: string | number;
for?: string | number | ForDict;
}

export interface NumericStateCondition {
Expand Down
27 changes: 26 additions & 1 deletion src/panels/config/automation/condition/types/ha-automation-condition-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "@polymer/paper-input/paper-input";
import { customElement, html, LitElement, property } from "lit-element";
import "../../../../../components/entity/ha-entity-attribute-picker";
import "../../../../../components/entity/ha-entity-picker";
import { StateCondition } from "../../../../../data/automation";
import { ForDict, StateCondition } from "../../../../../data/automation";
import { HomeAssistant } from "../../../../../types";
import {
ConditionElement,
Expand All @@ -21,6 +21,23 @@ export class HaStateCondition extends LitElement implements ConditionElement {

protected render() {
const { entity_id, attribute, state } = this.condition;
let trgFor = this.condition.for;

if (
trgFor &&

@bramkragten bramkragten Jan 11, 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.

Let give this variable a logical name, like for

@thomasloven thomasloven Jan 11, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe not exactly that, but something better, yes.
forTime?

@Nikfinn99 Nikfinn99 Jan 11, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I agree and the variable is now renamed

((trgFor as ForDict).hours ||
(trgFor as ForDict).minutes ||
(trgFor as ForDict).seconds)
) {
// If the trigger was defined using the yaml dict syntax, convert it to
// the equivalent string format
let { hours = 0, minutes = 0, seconds = 0 } = trgFor as ForDict;
hours = hours.toString().padStart(2, "0");
minutes = minutes.toString().padStart(2, "0");
seconds = seconds.toString().padStart(2, "0");

trgFor = `${hours}:${minutes}:${seconds}`;
}

return html`
<ha-entity-picker
Expand Down Expand Up @@ -49,6 +66,14 @@ export class HaStateCondition extends LitElement implements ConditionElement {
.value=${state}
@value-changed=${this._valueChanged}
></paper-input>
<paper-input
.label=${this.hass.localize(
"ui.panel.config.automation.editor.triggers.type.state.for"
)}
.name=${"for"}
.value=${trgFor}
@value-changed=${this._valueChanged}
></paper-input>
`;
}

Expand Down