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.

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

Only update dev tools yaml editor on entity change or submit #18575

Merged
merged 2 commits into from
Nov 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 26 additions & 16 deletions src/panels/developer-tools/state/developer-tools-state.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
import { addHours } from "date-fns/esm";
import "@material/mwc-button";
import {
mdiClipboardTextMultipleOutline,
mdiInformationOutline,
mdiRefresh,
} from "@mdi/js";
import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import { addHours } from "date-fns/esm";
import {
HassEntities,
HassEntity,
HassEntityAttributeBase,
} from "home-assistant-js-websocket";
import memoizeOne from "memoize-one";
import { dump } from "js-yaml";
import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time";
import { computeRTL } from "../../../common/util/compute_rtl";
import { storage } from "../../../common/decorators/storage";
import { fireEvent } from "../../../common/dom/fire_event";
import { toggleAttribute } from "../../../common/dom/toggle_attribute";
import { escapeRegExp } from "../../../common/string/escape_regexp";
import { computeRTL } from "../../../common/util/compute_rtl";
import { copyToClipboard } from "../../../common/util/copy-clipboard";
import "../../../components/entity/ha-entity-picker";
import "../../../components/ha-yaml-editor";
import "../../../components/ha-alert";
import "../../../components/ha-button";
import "../../../components/ha-checkbox";
import "../../../components/ha-expansion-panel";
import "../../../components/ha-icon-button";
import "../../../components/ha-svg-icon";
import "../../../components/ha-checkbox";
import "../../../components/ha-tip";
import "../../../components/ha-alert";
import "../../../components/ha-yaml-editor";
import type { HaYamlEditor } from "../../../components/ha-yaml-editor";
import "../../../components/search-input";
import "../../../components/ha-expansion-panel";
import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
import { haStyle } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
import { fireEvent } from "../../../common/dom/fire_event";
import { toggleAttribute } from "../../../common/dom/toggle_attribute";
import { storage } from "../../../common/decorators/storage";

@customElement("developer-tools-state")
class HaPanelDevState extends LitElement {
Expand Down Expand Up @@ -70,6 +71,8 @@ class HaPanelDevState extends LitElement {

@property({ type: Boolean, reflect: true }) public rtl = false;

@query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;

private _filteredEntities = memoizeOne(
(
entityFilter: string,
Expand Down Expand Up @@ -151,20 +154,19 @@ class HaPanelDevState extends LitElement {
)}
</p>
<ha-yaml-editor
autoUpdate
.value=${this._stateAttributes}
.error=${!this._validJSON}
@value-changed=${this._yamlChanged}
dir="ltr"
></ha-yaml-editor>
<div class="button-row">
<mwc-button
<ha-button
@click=${this._handleSetState}
.disabled=${!this._validJSON}
raised
>${this.hass.localize(
"ui.panel.developer-tools.tabs.states.set_state"
)}</mwc-button
)}</ha-button
>
<ha-icon-button
@click=${this._updateEntity}
Expand Down Expand Up @@ -343,10 +345,15 @@ class HaPanelDevState extends LitElement {
this._entity = entityState;
this._state = entityState.state;
this._stateAttributes = entityState.attributes;
this._updateEditor();
this._expanded = true;
ev.preventDefault();
}

private _updateEditor() {
this._yamlEditor?.setValue(this._stateAttributes);
}

private _entityIdChanged(ev: CustomEvent) {
this._entityId = ev.detail.value;
this._updateEntity();
Expand All @@ -357,6 +364,7 @@ class HaPanelDevState extends LitElement {
this._entity = undefined;
this._state = "";
this._stateAttributes = {};
this._updateEditor();
return;
piitaya marked this conversation as resolved.
Show resolved Hide resolved
}
const entityState = this.hass.states[this._entityId];
Expand All @@ -366,6 +374,7 @@ class HaPanelDevState extends LitElement {
this._entity = entityState;
this._state = entityState.state;
this._stateAttributes = entityState.attributes;
this._updateEditor();
this._expanded = true;
}

Expand Down Expand Up @@ -419,6 +428,7 @@ class HaPanelDevState extends LitElement {
});
return;
}
this._updateEditor();
try {
await this.hass.callApi("POST", "states/" + this._entityId, {
state: this._state,
Expand Down