Skip to content

Allow yaml in dev services #3860

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 services #3860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71178e9
Allow yaml in dev services
bramkragten Oct 2, 2019
310e95f
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
29 changes: 19 additions & 10 deletions src/panels/developer-tools/service/developer-tools-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,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 { ENTITY_COMPONENT_DOMAINS } from "../../../data/entity";
import "../../../components/entity/ha-entity-picker";
import "../../../components/ha-service-picker";
Expand Down Expand Up @@ -109,7 +111,7 @@ class HaPanelDevService extends PolymerElement {
</template>
<paper-textarea
always-float-label
label="Service Data (JSON, optional)"
label="Service Data (YAML, optional)"
value="{{serviceData}}"
autocapitalize="none"
autocomplete="off"
Expand All @@ -119,7 +121,7 @@ class HaPanelDevService extends PolymerElement {
Call Service
</mwc-button>
<template is="dom-if" if="[[!validJSON]]">
<span class="error">Invalid JSON</span>
<span class="error">Invalid YAML</span>
</template>
</div>

Expand Down Expand Up @@ -249,7 +251,7 @@ class HaPanelDevService extends PolymerElement {

_computeParsedServiceData(serviceData) {
try {
return serviceData ? JSON.parse(serviceData) : {};
return serviceData ? yaml.safeLoad(serviceData) : {};
} catch (err) {
return ERROR_SENTINEL;
}
Expand Down Expand Up @@ -283,17 +285,24 @@ class HaPanelDevService extends PolymerElement {
_fillExampleData() {
const example = {};
this._attributes.forEach((attribute) => {
example[attribute.key] = attribute.example;
if (attribute.example) {
let value = "";
try {
value = yaml.safeLoad(attribute.example);
} catch (err) {
value = attribute.example;
}
example[attribute.key] = value;
}
});
this.serviceData = JSON.stringify(example, null, 2);
this.serviceData = yaml.safeDump(example);
}

_entityPicked(ev) {
this.serviceData = JSON.stringify(
{ ...this.parsedJSON, entity_id: ev.target.value },
null,
2
);
this.serviceData = yaml.safeDump({
...this.parsedJSON,
entity_id: ev.target.value,
});
}
}

Expand Down