From fcc560ef3f6daebea9d67e885a3ff47043407607 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Tue, 9 Apr 2019 00:04:36 +0200 Subject: [PATCH] Set keys in TreeNodeTitle --- app/src/components/Tree/TreeNodeTitle.tsx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/components/Tree/TreeNodeTitle.tsx b/app/src/components/Tree/TreeNodeTitle.tsx index 073fd34..0ca6e9b 100644 --- a/app/src/components/Tree/TreeNodeTitle.tsx +++ b/app/src/components/Tree/TreeNodeTitle.tsx @@ -1,10 +1,8 @@ import * as React from 'react' -import { connect } from 'react-redux' import * as q from '../../../../backend/src/Model' import { withStyles, Theme } from '@material-ui/core' import { TopicViewModel } from '../../model/TopicViewModel' import { Base64Message } from '../../../../backend/src/Model/Base64Message' -const debounce = require('lodash.debounce') export interface TreeNodeProps extends React.HTMLAttributes { treeNode: q.TreeNode @@ -20,12 +18,12 @@ class TreeNodeTitle extends React.Component { private renderSourceEdge() { const name = this.props.name || (this.props.treeNode.sourceEdge && this.props.treeNode.sourceEdge.name) - return {name} + return {name} } private renderValue() { return this.props.treeNode.message && this.props.treeNode.message.value && this.props.treeNode.message.length > 0 - ? = {Base64Message.toUnicodeString(this.props.treeNode.message.value).slice(0, 120)} + ? = {Base64Message.toUnicodeString(this.props.treeNode.message.value).slice(0, 120)} : null } @@ -34,23 +32,23 @@ class TreeNodeTitle extends React.Component { return null } - return {this.props.collapsed ? '▶' : '▼'} + return {this.props.collapsed ? '▶' : '▼'} } - private renderCollapsedSubnodes() { + private renderMetadata() { if (this.props.treeNode.edgeCount() === 0 || !this.props.collapsed) { return null } const messages = this.props.treeNode.leafMessageCount() - return ({this.props.treeNode.childTopicCount()} topics, {messages} messages) + return {`(${this.props.treeNode.childTopicCount()} topics, ${messages} messages)`} } + public render() { - const { style, className } = this.props return ([ this.renderExpander(), this.renderSourceEdge(), - this.renderCollapsedSubnodes(), + this.renderMetadata(), this.renderValue(), ]) }