Skip to content
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

Performance tweaks in energy dashboard #18379

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Performance tweaks in energy dashboard #18379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200853f
Remove unneeded refresh from energy panel
bramkragten Oct 24, 2023
12d6bea
Optimize energy-period-selector
bramkragten Oct 24, 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
9 changes: 0 additions & 9 deletions src/panels/energy/ha-panel-energy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@ class PanelEnergy extends LitElement {
}
}

protected updated(changedProps: PropertyValues) {
if (
changedProps.has("narrow") &&
changedProps.get("narrow") !== undefined
) {
this._reloadView();
}
}

protected render(): TemplateResult {
return html`
<div class="header">
Expand Down
213 changes: 111 additions & 102 deletions src/panels/lovelace/components/hui-energy-period-selector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,57 @@
import "@material/mwc-button/mwc-button";
import type { RequestSelectedDetail } from "@material/mwc-list/mwc-list-item";
import { mdiDotsVertical } from "@mdi/js";
import {
addDays,
subDays,
addMonths,
differenceInDays,
differenceInMonths,
endOfDay,
endOfMonth,
endOfQuarter,
endOfToday,
endOfWeek,
endOfQuarter,
endOfYear,
isFirstDayOfMonth,
isLastDayOfMonth,
differenceInMonths,
startOfDay,
startOfMonth,
startOfWeek,
startOfQuarter,
startOfWeek,
startOfYear,
subDays,
} from "date-fns/esm";
import { UnsubscribeFunc } from "home-assistant-js-websocket";
import {
css,
CSSResultGroup,
html,
LitElement,
nothing,
PropertyValues,
css,
html,
nothing,
} from "lit";
import { customElement, property, state } from "lit/decorators";
import type { RequestSelectedDetail } from "@material/mwc-list/mwc-list-item";
import memoizeOne from "memoize-one";
import { calcDate, calcDateProperty } from "../../../common/datetime/calc_date";
import { firstWeekdayIndex } from "../../../common/datetime/first_weekday";
import {
formatDate,
formatDateMonthYear,
formatDateShort,
formatDateVeryShort,
formatDateMonthYear,
formatDateYear,
} from "../../../common/datetime/format_date";
import "../../../components/ha-icon-button-next";
import "../../../components/ha-icon-button-prev";
import { debounce } from "../../../common/util/debounce";
import "../../../components/ha-button-menu";
import "../../../components/ha-check-list-item";
import { EnergyData, getEnergyDataCollection } from "../../../data/energy";
import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { HomeAssistant } from "../../../types";
import "../../../components/ha-date-range-picker";
import type { DateRangePickerRanges } from "../../../components/ha-date-range-picker";
import "../../../components/ha-icon-button-next";
import "../../../components/ha-icon-button-prev";
import { EnergyData, getEnergyDataCollection } from "../../../data/energy";
import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { loadPolyfillIfNeeded } from "../../../resources/resize-observer.polyfill";
import { debounce } from "../../../common/util/debounce";
import { HomeAssistant } from "../../../types";

@customElement("hui-energy-period-selector")
export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
Expand Down Expand Up @@ -112,21 +113,28 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
if (!this.hasUpdated) {
this._measure();
}
const today = new Date();
const weekStartsOn = firstWeekdayIndex(this.hass.locale);

// pre defined date ranges
this._ranges = {
[this.hass.localize("ui.components.date-range-picker.ranges.today")]: [
calcDate(today, startOfDay, this.hass.locale, this.hass.config, {
weekStartsOn,
}),
calcDate(today, endOfDay, this.hass.locale, this.hass.config, {
weekStartsOn,
}),
],
[this.hass.localize("ui.components.date-range-picker.ranges.yesterday")]:
[
if (
!this.hasUpdated ||
(changedProps.has("hass") &&
this.hass?.localize !== changedProps.get("hass")?.localize)
) {
const today = new Date();
const weekStartsOn = firstWeekdayIndex(this.hass.locale);

// pre defined date ranges
this._ranges = {
[this.hass.localize("ui.components.date-range-picker.ranges.today")]: [
calcDate(today, startOfDay, this.hass.locale, this.hass.config, {
weekStartsOn,
}),
calcDate(today, endOfDay, this.hass.locale, this.hass.config, {
weekStartsOn,
}),
],
[this.hass.localize(
"ui.components.date-range-picker.ranges.yesterday"
)]: [
calcDate(
calcDate(today, subDays, this.hass.locale, this.hass.config, 1),
startOfDay,
Expand All @@ -146,40 +154,49 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
}
),
],
[this.hass.localize("ui.components.date-range-picker.ranges.this_week")]:
[
[this.hass.localize(
"ui.components.date-range-picker.ranges.this_week"
)]: [
calcDate(today, startOfWeek, this.hass.locale, this.hass.config, {
weekStartsOn,
}),
calcDate(today, endOfWeek, this.hass.locale, this.hass.config, {
weekStartsOn,
}),
],
[this.hass.localize("ui.components.date-range-picker.ranges.this_month")]:
[
[this.hass.localize(
"ui.components.date-range-picker.ranges.this_month"
)]: [
calcDate(today, startOfMonth, this.hass.locale, this.hass.config),
calcDate(today, endOfMonth, this.hass.locale, this.hass.config),
],
[this.hass.localize(
"ui.components.date-range-picker.ranges.this_quarter"
)]: [
calcDate(today, startOfQuarter, this.hass.locale, this.hass.config),
calcDate(today, endOfQuarter, this.hass.locale, this.hass.config),
],
[this.hass.localize("ui.components.date-range-picker.ranges.this_year")]:
[
[this.hass.localize(
"ui.components.date-range-picker.ranges.this_quarter"
)]: [
calcDate(today, startOfQuarter, this.hass.locale, this.hass.config),
calcDate(today, endOfQuarter, this.hass.locale, this.hass.config),
],
[this.hass.localize(
"ui.components.date-range-picker.ranges.this_year"
)]: [
calcDate(today, startOfYear, this.hass.locale, this.hass.config),
calcDate(today, endOfYear, this.hass.locale, this.hass.config),
],
};
};
}
}

protected render() {
if (!this.hass || !this._startDate) {
return nothing;
}

const simpleRange = this._simpleRange();
const simpleRange = this._simpleRange(
this._startDate,
this._endDate,
this.hass.locale,
this.hass.config
);

return html`
<div class="row">
Expand Down Expand Up @@ -266,73 +283,60 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
`;
}

private _simpleRange(): string {
if (differenceInDays(this._endDate!, this._startDate!) === 0) {
return "day";
}
if (
(calcDateProperty(
this._startDate!,
isFirstDayOfMonth,
this.hass.locale,
this.hass.config
) as boolean) &&
(calcDateProperty(
this._endDate!,
isLastDayOfMonth,
this.hass.locale,
this.hass.config
) as boolean)
) {
private _simpleRange = memoizeOne(
(startDate, endDate, locale, config): string => {
if (differenceInDays(endDate!, startDate!) === 0) {
return "day";
}
if (
(calcDateProperty(
this._endDate!,
differenceInMonths,
this.hass.locale,
this.hass.config,
this._startDate!
) as number) === 0
startDate,
isFirstDayOfMonth,
locale,
config
) as boolean) &&
(calcDateProperty(endDate, isLastDayOfMonth, locale, config) as boolean)
) {
return "month";
if (
(calcDateProperty(
endDate,
differenceInMonths,
locale,
config,
startDate
) as number) === 0
) {
return "month";
}
if (
(calcDateProperty(
endDate,
differenceInMonths,
locale,
config,
startDate
) as number) === 2 &&
startDate.getMonth() % 3 === 0
) {
return "quarter";
}
}
if (
(calcDateProperty(
this._endDate!,
calcDateProperty(startDate, isFirstDayOfMonth, locale, config) &&
calcDateProperty(endDate, isLastDayOfMonth, locale, config) &&
calcDateProperty(
endDate,
differenceInMonths,
this.hass.locale,
this.hass.config,
this._startDate!
) as number) === 2 &&
this._startDate!.getMonth() % 3 === 0
locale,
config,
startDate
) === 11
) {
return "quarter";
return "year";
}
return "other";
}
if (
calcDateProperty(
this._startDate!,
isFirstDayOfMonth,
this.hass.locale,
this.hass.config
) &&
calcDateProperty(
this._endDate!,
isLastDayOfMonth,
this.hass.locale,
this.hass.config
) &&
calcDateProperty(
this._endDate!,
differenceInMonths,
this.hass.locale,
this.hass.config,
this._startDate!
) === 11
) {
return "year";
}
return "other";
}
);

private _updateCollectionPeriod() {
const energyCollection = getEnergyDataCollection(this.hass, {
Expand Down Expand Up @@ -369,7 +373,12 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
private _pickToday() {
if (!this._startDate) return;

const range = this._simpleRange();
const range = this._simpleRange(
this._startDate,
this._endDate,
this.hass.locale,
this.hass.config
);
const today = new Date();
if (range === "month") {
this._startDate = calcDate(
Expand Down
2 changes: 1 addition & 1 deletion src/panels/map/ha-panel-map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class HaPanelMap extends LitElement {
></ha-menu-button>
<div slot="title">${this.hass.localize("panel.map")}</div>
${!__DEMO__ && this.hass.user?.is_admin
? html` <ha-icon-button
? html`<ha-icon-button
slot="actionItems"
.label=${this.hass!.localize("ui.panel.map.edit_zones")}
.path=${mdiPencil}
Expand Down