luneski/mqtt-explorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename leafes/nodes to topic

Browse Source
This commit is contained in:
Thomas Nordquist
2019-01-22 15:57:11 +01:00
parent 796233da18
commit 28cc72a868
7 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/index.html
View File

@@ -60,7 +60,6 @@
}
</style>
<script src="http://localhost:35729/livereload.js"></script>
</head>
<body>
<div id="splash"><div id="splash1"></div></div>

2
app/src/actions/Settings.ts
View File

@@ -53,7 +53,7 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, get
return Boolean(messageMatches)
}
const resultTree = tree.leafes()
const resultTree = tree.childTopics()
.filter(nodeFilter)
.map((node) => {
const clone = node.unconnectedClone()

2
app/src/components/Sidebar/NodeStats.tsx
View File

@@ -18,7 +18,7 @@ class NodeStats extends React.Component<Props, {}> {
return (
<div>
<Typography>Messages: #{node.messages}</Typography>
<Typography>Subtopics: {node.leafCount()}</Typography>
<Typography>Subtopics: {node.childTopicCount()}</Typography>
<Typography>Messages Subtopics: #{node.leafMessageCount()}</Typography>
</div>
)

2
app/src/components/Tree/Tree.tsx
View File

@@ -90,7 +90,7 @@ class Tree extends React.Component<Props, {}> {
animateChages={true}
isRoot={true}
treeNode={tree}
name="/"
name={'"root"'}
lastUpdate={tree.lastUpdate}
collapsed={false}
performanceCallback={this.performanceCallback}

2
app/src/components/Tree/TreeNodeSubnodes.tsx
View File

@@ -42,7 +42,7 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
nodes = nodes.sort((a, b) => b.leafMessageCount() - a.leafMessageCount())
}
if (topicOrder === TopicOrder.topics) {
nodes = nodes.sort((a, b) => b.leafCount() - a.leafCount())
nodes = nodes.sort((a, b) => b.childTopicCount() - a.childTopicCount())
}
return nodes

2
app/src/components/Tree/TreeNodeTitle.tsx
View File

@@ -84,7 +84,7 @@ class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
}
const messages = this.props.treeNode.leafMessageCount()
return <span style={this.getStyles().collapsedSubnodes}>({this.props.treeNode.leafCount()} nodes, {messages} messages)</span>
return <span style={this.getStyles().collapsedSubnodes}>({this.props.treeNode.childTopicCount()} topics, {messages} messages)</span>
}
}

41
backend/src/Model/TreeNode.ts
View File

@@ -16,9 +16,10 @@ export class TreeNode {
public onMessage = new EventDispatcher<Message, TreeNode>(this)
public isTree = false
private cachedLeafes?: TreeNode[]
private cachedPath?: string
private cachedChildTopics?: TreeNode[]
private cachedLeafMessageCount?: number
private cachedLeafCount?: number
private cachedChildTopicCount?: number
public unconnectedClone() {
const node = new TreeNode()
@@ -39,8 +40,8 @@ export class TreeNode {
message && this.setMessage(message)
this.onMerge.subscribe(() => {
this.cachedLeafes = undefined
this.cachedLeafCount = undefined
this.cachedChildTopics = undefined
this.cachedChildTopicCount = undefined
this.cachedLeafMessageCount = undefined
this.lastUpdate = Date.now()
})
@@ -67,10 +68,14 @@ export class TreeNode {
}
public path(): string {
return this.branch()
.map(node => (node.sourceEdge && node.sourceEdge.name))
.filter(name => name !== undefined)
.join('/')
if (!this.cachedPath) {
return this.branch()
.map(node => (node.sourceEdge && node.sourceEdge.name))
.filter(name => name !== undefined)
.join('/')
}
return this.cachedPath
}
private previous(): TreeNode | undefined {
@@ -117,30 +122,30 @@ export class TreeNode {
return this.cachedLeafMessageCount
}
public leafCount(): number {
if (this.cachedLeafCount === undefined) {
this.cachedLeafCount = this.edgeArray
.map(e => e.target.leafCount())
public childTopicCount(): number {
if (this.cachedChildTopicCount === undefined) {
this.cachedChildTopicCount = this.edgeArray
.map(e => e.target.childTopicCount())
.reduce((a, b) => a + b, this.edgeArray.length === 0 ? 1 : 0)
}
return this.cachedLeafCount
return this.cachedChildTopicCount
}
public edgeCount(): number {
return this.edgeArray.length
}
public leafes(): TreeNode[] {
if (this.cachedLeafes === undefined) {
public childTopics(): TreeNode[] {
if (this.cachedChildTopics === undefined) {
const initialValue = this.message && this.message.value ? [this] : []
this.cachedLeafes = this.edgeArray
.map(e => e.target.leafes())
this.cachedChildTopics = this.edgeArray
.map(e => e.target.childTopics())
.reduce((a, b) => a.concat(b), initialValue)
}
return this.cachedLeafes
return this.cachedChildTopics
}
private mergeEdges(node: TreeNode) {