Skip to content

Allow yaml in dev states #3859

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 2, 2019
Merged

Allow yaml in dev states #3859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a703e93
Allow yaml in dev states
bramkragten Oct 2, 2019
81477dd
remove json
bramkragten Oct 2, 2019
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
14 changes: 8 additions & 6 deletions src/panels/developer-tools/state/developer-tools-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import "@polymer/paper-input/paper-textarea";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import yaml from "js-yaml";

import "../../../components/entity/ha-entity-picker";
import "../../../resources/ha-style";
import { EventsMixin } from "../../../mixins/events-mixin";
Expand Down Expand Up @@ -88,7 +90,7 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
class="state-input"
></paper-input>
<paper-textarea
label="State attributes (JSON, optional)"
label="State attributes (YAML, optional)"
autocapitalize="none"
autocomplete="off"
spellcheck="false"
Expand Down Expand Up @@ -211,14 +213,14 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
var state = ev.model.entity;
this._entityId = state.entity_id;
this._state = state.state;
this._stateAttributes = JSON.stringify(state.attributes, null, " ");
this._stateAttributes = yaml.safeDump(state.attributes);
ev.preventDefault();
}

entityIdChanged() {
var state = this.hass.states[this._entityId];
this._state = state.state;
this._stateAttributes = JSON.stringify(state.attributes, null, " ");
this._stateAttributes = yaml.safeDump(state.attributes);
}

entityMoreInfo(ev) {
Expand All @@ -228,12 +230,12 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {

handleSetState() {
var attr;
var attrRaw = this._stateAttributes.replace(/^\s+|\s+$/g, "");

try {
attr = attrRaw ? JSON.parse(attrRaw) : {};
attr = this._stateAttributes ? yaml.safeLoad(this._stateAttributes) : {};
} catch (err) {
/* eslint-disable no-alert */
alert("Error parsing JSON: " + err);
alert("Error parsing YAML: " + err);
/* eslint-enable no-alert */
return;
}
Expand Down