Fix base64 encoded string

This commit is contained in:
Thomas Nordquist
2019-04-03 01:36:52 +02:00
parent 5caa3564d1
commit 84a92ad522
4 changed files with 7 additions and 6 deletions

View File

@@ -5,7 +5,7 @@ import { Theme, withStyles } from '@material-ui/core/styles'
interface HistoryItem { interface HistoryItem {
title: JSX.Element | string title: JSX.Element | string
value: string | any value: string
selected?: boolean selected?: boolean
} }

View File

@@ -53,7 +53,7 @@ class MessageHistory extends React.Component<Props, State> {
const history = node.messageHistory.toArray() const history = node.messageHistory.toArray()
const historyElements = history.reverse().map(message => ({ const historyElements = history.reverse().map(message => ({
title: <DateFormatter date={message.received} />, title: <DateFormatter date={message.received} />,
value: message.value, value: message.value ? Base64Message.toUnicodeString(message.value) : '',
selected: message && message === this.props.selected, selected: message && message === this.props.selected,
})) }))

View File

@@ -37,7 +37,7 @@ class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
private renderValue() { private renderValue() {
return this.props.treeNode.message && this.props.treeNode.message.value && this.props.treeNode.message.length > 0 return this.props.treeNode.message && this.props.treeNode.message.value && this.props.treeNode.message.length > 0
? <span className={this.props.classes.value}> = {Base64Message.toUnicodeString(this.props.treeNode.message.value).toString().slice(0, 120)}</span> ? <span className={this.props.classes.value}> = {Base64Message.toUnicodeString(this.props.treeNode.message.value).slice(0, 120)}</span>
: null : null
} }

View File

@@ -1,3 +1,6 @@
import { Base64Message } from './Model/Base64Message'
import { DataSource, MqttSource } from './DataSource'
import { UpdateInfo } from 'builder-util-runtime'
import { import {
AddMqttConnection, AddMqttConnection,
EventDispatcher, EventDispatcher,
@@ -12,8 +15,6 @@ import {
updateAvailable, updateAvailable,
} from '../../events' } from '../../events'
import { DataSource, MqttSource } from './DataSource'
import { UpdateInfo } from 'builder-util-runtime'
export class ConnectionManager { export class ConnectionManager {
private connections: {[s: string]: DataSource<any>} = {} private connections: {[s: string]: DataSource<any>} = {}
@@ -57,7 +58,7 @@ export class ConnectionManager {
buffer = buffer.slice(0, 10000) buffer = buffer.slice(0, 10000)
} }
backendEvents.emit(messageEvent, { topic, payload: buffer.toString(), qos: packet.qos, retain: packet.retain }) backendEvents.emit(messageEvent, { topic, payload: Base64Message.fromBuffer(buffer), qos: packet.qos, retain: packet.retain })
}) })
} }