Skip to content

Support for timestamp sensors in time trigger automation UI #15292

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
piitaya merged 6 commits into from
Feb 20, 2023
Merged

Support for timestamp sensors in time trigger automation UI #15292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11c41c0
Support for timestamp sensors in time trigger automation UI
karwosts Jan 31, 2023
04b7ba4
rename var
karwosts Feb 1, 2023
a961432
simply filter function
karwosts Feb 1, 2023
4e12cc8
rename var
karwosts Feb 1, 2023
8d4795b
Merge branch 'home-assistant:dev' into time-trigger-fix
karwosts Feb 20, 2023
062ee6e
use new entity filter options
karwosts Feb 20, 2023
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
24 changes: 20 additions & 4 deletions src/panels/config/automation/condition/types/ha-automation-condition-time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,14 @@ export class HaTimeCondition extends LitElement implements ConditionElement {
{
name: "after",
selector: inputModeAfter
? { entity: { domain: "input_datetime" } }
? {
entity: {
filter: [
{ domain: "input_datetime" },
{ domain: "sensor", device_class: "timestamp" },
],
},
}
: { time: {} },
},
{
Expand All @@ -88,7 +95,14 @@ export class HaTimeCondition extends LitElement implements ConditionElement {
{
name: "before",
selector: inputModeBefore
? { entity: { domain: "input_datetime" } }
? {
entity: {
filter: [
{ domain: "input_datetime" },
{ domain: "sensor", device_class: "timestamp" },
],
},
}
: { time: {} },
},
{
Expand All @@ -111,10 +125,12 @@ export class HaTimeCondition extends LitElement implements ConditionElement {
protected render() {
const inputModeBefore =
this._inputModeBefore ??
this.condition.before?.startsWith("input_datetime.");
(this.condition.before?.startsWith("input_datetime.") ||
this.condition.before?.startsWith("sensor."));
const inputModeAfter =
this._inputModeAfter ??
this.condition.after?.startsWith("input_datetime.");
(this.condition.after?.startsWith("input_datetime.") ||
this.condition.after?.startsWith("sensor."));

const schema = this._schema(
this.hass.localize,
Expand Down
9 changes: 8 additions & 1 deletion src/panels/config/automation/trigger/types/ha-automation-trigger-time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ export class HaTimeTrigger extends LitElement implements TriggerElement {
private _schema = memoizeOne(
(localize: LocalizeFunc, inputMode?: boolean) => {
const atSelector = inputMode
? { entity: { domain: "input_datetime" } }
? {
entity: {
filter: [
{ domain: "input_datetime" },
{ domain: "sensor", device_class: "timestamp" },
],
},
}
: { time: {} };

return [
Expand Down
2 changes: 1 addition & 1 deletion src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2130,7 +2130,7 @@
},
"time": {
"type_value": "Fixed time",
"type_input": "Value of a date/time helper",
"type_input": "Value of a date/time helper or timestamp-class sensor",
"label": "Time",
"at": "At time",
"mode": "Mode"
Expand Down