Skip to content

Add entity filter to history panel #7401

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
Oct 20, 2020
Merged

Add entity filter to history panel #7401

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
7aa8ae1
Add entity filter to history panel
spacegaier Oct 20, 2020
fe49bc7
Changes from review
spacegaier Oct 20, 2020
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/data/history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,14 @@ export const fetchRecent = (
export const fetchDate = (
hass: HomeAssistant,
startTime: Date,
endTime: Date
endTime: Date,
entityId
): Promise<HassEntity[][]> => {
return hass.callApi(
"GET",
`history/period/${startTime.toISOString()}?end_time=${endTime.toISOString()}&minimal_response`
`history/period/${startTime.toISOString()}?end_time=${endTime.toISOString()}&minimal_response${
entityId ? `&filter_entity_id=${entityId}` : ``
}`
);
};

Expand Down
41 changes: 40 additions & 1 deletion src/panels/history/ha-panel-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { haStyle } from "../../resources/styles";
import { HomeAssistant } from "../../types";
import type { DateRangePickerRanges } from "../../components/ha-date-range-picker";
import "../../components/ha-date-range-picker";
import "../../components/entity/ha-entity-picker";
import { fetchDate, computeHistory } from "../../data/history";
import "../../components/ha-circular-progress";

Expand Down Expand Up @@ -77,6 +78,16 @@ class HaPanelHistory extends LitElement {
.ranges=${this._ranges}
@change=${this._dateRangeChanged}
></ha-date-range-picker>

<ha-entity-picker
.hass=${this.hass}
.value=${this._entityId}
.label=${this.hass.localize(
"ui.components.entity.entity-picker.entity"
)}
.disabled=${this._isLoading}
@change=${this._entityPicked}
></ha-entity-picker>
</div>
${this._isLoading
? html`<div class="progress-wrapper">
Expand Down Expand Up @@ -170,7 +181,8 @@ class HaPanelHistory extends LitElement {
const dateHistory = await fetchDate(
this.hass,
this._startDate,
this._endDate
this._endDate,
this._entityId
);
this._stateHistory = computeHistory(
this.hass,
Expand All @@ -191,6 +203,10 @@ class HaPanelHistory extends LitElement {
this._endDate = endDate;
}

private _entityPicked(ev) {
this._entityId = ev.target.value;
}

static get styles() {
return [
haStyle,
Expand All @@ -211,12 +227,35 @@ class HaPanelHistory extends LitElement {
position: relative;
}

ha-date-range-picker {
margin-right: 16px;
max-width: 100%;
}

:host([narrow]) ha-date-range-picker {
margin-right: 0;
}

ha-circular-progress {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}

ha-entity-picker {
display: inline-block;
flex-grow: 1;
max-width: 400px;
--paper-input-suffix: {
height: 24px;
}
Comment thread
spacegaier marked this conversation as resolved.
Outdated
}

:host([narrow]) ha-entity-picker {
max-width: none;
width: 100%;
}
`,
];
}
Expand Down