jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-25 18:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make JSON formatting optional when using MQTT subscribe from config entry page (#14830)

Browse Source
This commit is contained in:
Jan Bouwhuis 2022-12-27 22:03:14 +01:00 committed by GitHub
parent adb61ab99b
commit 81e3652446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/panels/config/integrations/integration-panels/mqtt/mqtt-subscribe-card.ts
View File

@ -9,6 +9,8 @@ import { MQTTMessage, subscribeMQTTTopic } from "../../../../../data/mqtt";
import { HomeAssistant } from "../../../../../types"; import { HomeAssistant } from "../../../../../types";
import "@material/mwc-list/mwc-list-item"; import "@material/mwc-list/mwc-list-item";
import { LocalStorage } from "../../../../../common/decorators/local-storage"; import { LocalStorage } from "../../../../../common/decorators/local-storage";
import "../../../../../components/ha-formfield";
import "../../../../../components/ha-switch";
const qosLevel = ["0", "1", "2"]; const qosLevel = ["0", "1", "2"];
@ -22,6 +24,9 @@ class MqttSubscribeCard extends LitElement {
@LocalStorage("panel-dev-mqtt-qos-subscribe", true, false) @LocalStorage("panel-dev-mqtt-qos-subscribe", true, false)
private _qos = "0"; private _qos = "0";
@LocalStorage("panel-dev-mqtt-json-format", true, false)
private _json_format = false;
@state() private _subscribed?: () => void; @state() private _subscribed?: () => void;
@state() private _messages: Array<{ @state() private _messages: Array<{
@ -47,6 +52,18 @@ class MqttSubscribeCard extends LitElement {
header=${this.hass.localize("ui.panel.config.mqtt.description_listen")} header=${this.hass.localize("ui.panel.config.mqtt.description_listen")}
> >
<form> <form>
<p>
<ha-formfield
label=${this.hass!.localize(
"ui.panel.config.mqtt.json_formatting"
)}
>
<ha-switch
@change=${this._handleJSONFormat}
.checked=${this._json_format}
></ha-switch>
</ha-formfield>
</p>
<div class="panel-dev-mqtt-subscribe-fields"> <div class="panel-dev-mqtt-subscribe-fields">
<ha-textfield <ha-textfield
.label=${this._subscribed .label=${this._subscribed
@ -114,6 +131,10 @@ class MqttSubscribeCard extends LitElement {
} }
} }
private _handleJSONFormat(ev: CustomEvent) {
this._json_format = (ev.target! as any).checked;
}
private async _handleSubmit(): Promise<void> { private async _handleSubmit(): Promise<void> {
if (this._subscribed) { if (this._subscribed) {
this._subscribed(); this._subscribed();
@ -132,9 +153,13 @@ class MqttSubscribeCard extends LitElement {
const tail = const tail =
this._messages.length > 30 ? this._messages.slice(0, 29) : this._messages; this._messages.length > 30 ? this._messages.slice(0, 29) : this._messages;
let payload: string; let payload: string;
try { if (this._json_format) {
payload = JSON.stringify(JSON.parse(message.payload), null, 4); try {
} catch (err: any) { payload = JSON.stringify(JSON.parse(message.payload), null, 4);
} catch (err: any) {
payload = message.payload;
}
} else {
payload = message.payload; payload = message.payload;
} }
this._messages = [ this._messages = [

1
src/translations/en.json
View File

@ -3217,6 +3217,7 @@
"payload": "Payload (template allowed)", "payload": "Payload (template allowed)",
"publish": "Publish", "publish": "Publish",
"description_listen": "Listen to a topic", "description_listen": "Listen to a topic",
"json_formatting": "Format JSON content",
"listening_to": "Listening to", "listening_to": "Listening to",
"subscribe_to": "Topic to subscribe to", "subscribe_to": "Topic to subscribe to",
"start_listening": "Start listening", "start_listening": "Start listening",