diff --git a/app/src/actions/Publish.ts b/app/src/actions/Publish.ts index 91130b4..a752251 100644 --- a/app/src/actions/Publish.ts +++ b/app/src/actions/Publish.ts @@ -2,7 +2,7 @@ import { Action, ActionTypes } from '../reducers/Publish' import { AppState } from '../reducers' import { Base64Message } from '../../../backend/src/Model/Base64Message' import { Dispatch } from 'redux' -import { makePublishEvent, rendererEvents } from '../../../events' +import { MqttMessage, makePublishEvent, rendererEvents } from '../../../events' export const setTopic = (topic?: string): Action => { return { @@ -41,7 +41,7 @@ export const publish = (connectionId: string) => (dispatch: Dispatch, ge } const publishEvent = makePublishEvent(connectionId) - const mqttMessage = { + const mqttMessage: Partial = { topic, payload: state.publish.payload ? Base64Message.fromString(state.publish.payload) : null, retain: state.publish.retain, diff --git a/app/src/actions/Settings.ts b/app/src/actions/Settings.ts index 257e5e5..80282e6 100644 --- a/app/src/actions/Settings.ts +++ b/app/src/actions/Settings.ts @@ -1,5 +1,5 @@ import * as q from '../../../backend/src/Model' -import { ActionTypes, SettingsStateModel, TopicOrder } from '../reducers/Settings' +import { ActionTypes, SettingsStateModel, TopicOrder, ValueRendererDisplayMode } from '../reducers/Settings' import { AppState } from '../reducers' import { autoExpandLimitSet } from '../components/SettingsDrawer/Settings' import { Base64Message } from '../../../backend/src/Model/Base64Message' @@ -68,13 +68,14 @@ export const selectTopicWithMouseOver = (doSelect: boolean) => (dispatch: Dispat dispatch(storeSettings()) } -export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch) => { - dispatch({ - valueRendererDisplayMode, - type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE, - }) - dispatch(storeSettings()) -} +export const setValueDisplayMode = + (valueRendererDisplayMode: ValueRendererDisplayMode) => (dispatch: Dispatch) => { + dispatch({ + valueRendererDisplayMode, + type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE, + }) + dispatch(storeSettings()) + } export const toggleHighlightTopicUpdates = () => (dispatch: Dispatch) => { dispatch({ @@ -117,7 +118,7 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch, get const messageMatches = node.message && node.message.payload && - Base64Message.toUnicodeString(node.message.payload).toLowerCase().indexOf(filterStr) !== -1 + node.message.payload.toUnicodeString().toLowerCase().indexOf(filterStr) !== -1 return Boolean(messageMatches) } diff --git a/app/src/actions/Tree.ts b/app/src/actions/Tree.ts index 0dd1896..25ddcc0 100644 --- a/app/src/actions/Tree.ts +++ b/app/src/actions/Tree.ts @@ -33,13 +33,8 @@ const debouncedSelectTopic = debounce( setTopicDispatch = setTopic(topic.path()) } - if (previouslySelectedTopic && previouslySelectedTopic.viewModel) { - previouslySelectedTopic.viewModel.setSelected(false) - } - - if (topic.viewModel) { - topic.viewModel.setSelected(true) - } + previouslySelectedTopic?.viewModel?.setSelected(false) + topic.viewModel?.setSelected(true) const selectTreeTopicDispatch = { selectedTopic: topic, diff --git a/app/src/components/ChartPanel/TopicChart.tsx b/app/src/components/ChartPanel/TopicChart.tsx index 3500860..33a943a 100644 --- a/app/src/components/ChartPanel/TopicChart.tsx +++ b/app/src/components/ChartPanel/TopicChart.tsx @@ -114,6 +114,7 @@ function TopicChart(props: Props) { , stat: Stats) { return null } - const str = node.message.payload ? Base64Message.toUnicodeString(node.message.payload) : '' + const str = node.message.payload ? node.message.payload.toUnicodeString() : '' let value = node.message && node.message.payload ? parseFloat(str) : NaN value = !isNaN(value) ? abbreviate(value) : str diff --git a/app/src/components/Sidebar/CodeDiff/ChartPreview.tsx b/app/src/components/Sidebar/CodeDiff/ChartPreview.tsx index 4d430c4..e41cf28 100644 --- a/app/src/components/Sidebar/CodeDiff/ChartPreview.tsx +++ b/app/src/components/Sidebar/CodeDiff/ChartPreview.tsx @@ -52,16 +52,16 @@ function ChartPreview(props: Props) { /> ) : ( - - - - ) + + + + ) return ( @@ -69,7 +69,7 @@ function ChartPreview(props: Props) { - {open ? : } + {open ? : } diff --git a/app/src/components/Sidebar/Sidebar.tsx b/app/src/components/Sidebar/Sidebar.tsx index 4e257cf..a24a981 100644 --- a/app/src/components/Sidebar/Sidebar.tsx +++ b/app/src/components/Sidebar/Sidebar.tsx @@ -1,10 +1,9 @@ import * as q from '../../../../backend/src/Model' import React, { useState, useEffect, useCallback } from 'react' -import ExpandMore from '@material-ui/icons/ExpandMore' import NodeStats from './NodeStats' import ValuePanel from './ValueRenderer/ValuePanel' import { AppState } from '../../reducers' -import { Badge, ExpansionPanel, ExpansionPanelDetails, ExpansionPanelSummary, Typography } from '@material-ui/core' +import { ExpansionPanelDetails } from '@material-ui/core' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { settingsActions, sidebarActions } from '../../actions' @@ -28,7 +27,7 @@ interface Props { } function useUpdateNodeWhenNodeReceivesUpdates(node?: q.TreeNode) { - const [lastUpdate, setLastUpdate] = useState(0) + const [, setLastUpdate] = useState(0) const updateNode = useCallback( throttle(() => { setLastUpdate(node ? node.lastUpdate : 0) @@ -52,7 +51,6 @@ function Sidebar(props: Props) { const { classes, tree, nodePath } = props const node = usePollingToFetchTreeNode(tree, nodePath || '') useUpdateNodeWhenNodeReceivesUpdates(node) - // console.log(node && node.path(), tree, nodePath) return (