Add bad examples

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot[bot] <support@github.com>

.cspell.json

@@ -0,0 +1,48 @@
+{
+  "language": "en",
+  "words": [
+    "thomasnordquist",
+    "nowrap",
+    "subheader",
+    "basepath",
+    "webdriverio",
+    "repo",
+    "hexagonalize",
+    "pixelize",
+    "Transistions",
+    "squashfs",
+    "squashfs",
+    "provisionprofile",
+    "Nsis",
+    "Appx",
+    "Hashable",
+    "clickaway",
+    "Resizer",
+    "Subnodes",
+    "Unmount",
+    "Monokai",
+    "plottable",
+    "snackbar",
+    "webdriverio",
+    "prismjs",
+    "Nordquist",
+    "debounced",
+    "mosquitto",
+    "snapcraft",
+    "unsquashfs",
+    "armv",
+    "livingroom",
+    "selectall",
+    "toggledevtools",
+    "Octo",
+    "zigbee",
+    "memoization",
+    "submenu",
+    "AGPL",
+    "Oooooops",
+    "DEVTOOLS",
+    "mixins",
+    "Explorerdmg",
+    "heapsnapshot"
+  ]
+}

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+patreon: thomasnordquist
+custom: https://paypal.me/ThomasNordquist
+

.gitignore

@@ -7,3 +7,5 @@ build
 test.dot
 test.png
 .awcache
+.scannerwork
+screen*.png

.prettierignore

@@ -0,0 +1,2 @@
+node_modules
+build

.travis.yml

@@ -17,6 +17,8 @@ os:
   - linux
   - osx
 
+osx_image: xcode10.2
+
 dist: xenial
 
 services:
@@ -28,10 +30,11 @@ install:
 
 script:
   - yarn run build
+  - yarn lint
   - yarn test
   - export TRAVIS_BUILD_NUMBER="" # Override travis build number since it is uses for tagging the binary version https://github.com/electron-userland/electron-builder/issues/3730
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -e GH_TOKEN=$GH_TOKEN -e GIT_TAG=$TRAVIS_TAG --rm -v `pwd`:/app thomasnordquist/ui-test-recording-env sh -c "cd app && docker/testMounted.sh"; fi
   - if [[ "$TRAVIS_TAG" != "" ]]; then yarn run prepare-release; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package linux; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- mac; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- win; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then unset CSC_LINK; yarn run package -- win; fi

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "editor.formatOnSave": true,
+  "files.exclude": {
+    "**/node_modules": true,
+    "build/": true
+  }
+}

LICENSE.md

@@ -0,0 +1,158 @@
+## creative commons
+
+# Attribution-NoDerivatives 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+### Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
+
+* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
+
+## Creative Commons Attribution-NoDerivatives 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+b. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+c. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+d. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+e. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+f. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+g. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
+
+h. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+i. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+j. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. ___License grant.___
+
+   1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+       A. reproduce and Share the Licensed Material, in whole or in part; and
+
+       B. produce and reproduce, but not Share, Adapted Material.
+
+   2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+   3. __Term.__ The term of this Public License is specified in Section 6(a).
+
+   4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+   5. __Downstream recipients.__
+
+       A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+       B. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+   6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+b. ___Other rights.___
+
+   1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+   2. Patent and trademark rights are not licensed under this Public License.
+
+   3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+a. ___Attribution.___
+
+   1. If You Share the Licensed Material, You must:
+
+       A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+         i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+         ii. a copyright notice;
+
+         iii. a notice that refers to this Public License;
+
+         iv. a notice that refers to the disclaimer of warranties;
+
+         v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+       B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+       C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+       For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+
+   2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+   3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;
+
+b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
+
+b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
+
+c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+   1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+   2. upon express reinstatement by the Licensor.
+
+   For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+>
+> Creative Commons may be contacted at creativecommons.org
+

Readme.md

@@ -8,7 +8,7 @@
 
 |   |   |   |
 |:---:|:---:|:---:|
-|[![screen1_small](https://user-images.githubusercontent.com/7721625/53954800-84b34c00-40d7-11e9-842d-bf655c569600.jpg)](https://user-images.githubusercontent.com/7721625/53954364-52551f00-40d6-11e9-93cf-d5a9601897ea.png)|[![screen2_small](https://user-images.githubusercontent.com/7721625/53954801-84b34c00-40d7-11e9-913a-42572e675620.jpg)](https://user-images.githubusercontent.com/7721625/53954365-52551f00-40d6-11e9-823f-afd66f19ed01.png)|[![screen3_small](https://user-images.githubusercontent.com/7721625/53954802-854be280-40d7-11e9-973c-08f23c8dbf89.jpg)](https://user-images.githubusercontent.com/7721625/53954366-52551f00-40d6-11e9-9738-74db830d03ac.png)|
+|[![screen_composite](https://mqtt-explorer.com/img/screen-composite_small.png)](https://mqtt-explorer.com/img/screen-composite.png)|[![screen2_small](https://mqtt-explorer.com/img/screen2_small.png)](https://mqtt-explorer.com/img/screen2.png)|[![screen3_small](https://mqtt-explorer.com/img/screen3_small.png)](https://mqtt-explorer.com/img/screen3.png)|
 
 # The App has moved to [mqtt-explorer.com](https://mqtt-explorer.com)
 MQTT Explorer is a comprehensive and easy-to-use MQTT Client.  
@@ -56,4 +56,11 @@ Compile and execute tests
 ```bash
 npm run build
 node dist/src/spec/webdriverio.js
-```
+```
+
+## License
+
+![CC-BY-ND 4.0](https://img.shields.io/badge/License-CC%20BY--ND%204.0-blue.svg)  
+[CC-BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0/)
+
+The license is a little restrictive to distributing derived work, this may change in the future if the interest arises or more people work on this project.

app/index.html

@@ -1,115 +1,180 @@
 <!DOCTYPE html>
 <html>
-    <head>
-      <meta charset="UTF-8" />
-      <title>MQTT Explorer</title>
-      <script src="./bugtracking.bundle.js"></script>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" />
+    <title>MQTT Explorer</title>
+    <script src="./bugtracking.bundle.js"></script>
 
-      <style>
-        body, html {
-          margin: 0;
-          padding: 0;
-        }
+    <style>
+      body,
+      html {
+        margin: 0;
+        padding: 0;
+      }
 
-        @keyframes updateDark {
-          0%   {background-color: none;}
-          25%  {background-color: #3f51b5;}
-          50%  {background-color: #3f51b5;}
-          100% {background-color: none;}
-        }
+      [tabindex] {
+        outline: none;
+      }
 
-        @keyframes updateLight {
-          0%   {background-color: none; color: inherit}
-          25%  {background-color: #bfc9c8; color: #000}
-          50%  {background-color: #bfc9c8; color: #000}
-          100% {background-color: none; color: inherit}
+      @keyframes updateDark {
+        0% {
+          background-color: none;
         }
+        25% {
+          background-color: #595585;
+        }
+        50% {
+          background-color: #595585;
+        }
+        100% {
+          background-color: none;
+        }
+      }
 
-        ::-webkit-scrollbar {
-          width: 8px;
-          height: 8px;
+      @keyframes updateLight {
+        0% {
+          background-color: none;
+          color: inherit;
         }
+        25% {
+          background-color: #c0c8c0;
+        }
+        50% {
+          background-color: #c0c8c0;
+        }
+        100% {
+          background-color: none;
+          color: inherit;
+        }
+      }
 
-        ::-webkit-scrollbar-corner {
-          background-color: rgba(0, 0, 0, 0.0);
-        }
+      ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+      }
 
-        ::-webkit-scrollbar-track {
-          -webkit-box-shadow: inset 0 0 6px rgba(30,30,30,0.3);
-        }
+      ::-webkit-scrollbar-corner {
+        background-color: rgba(0, 0, 0, 0);
+      }
 
-        ::-webkit-scrollbar-thumb {
-          background-color: rgba(140,140,140,0.8);
-        }
-      </style>
-      <style>
-        .Resizer {
-            background: #eee;
-            opacity: .2;
-            z-index: 1;
-            -moz-box-sizing: border-box;
-            -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-            -moz-background-clip: padding;
-            -webkit-background-clip: padding;
-            background-clip: padding-box;
-        }
+      ::-webkit-scrollbar-track {
+        -webkit-box-shadow: inset 0 0 6px rgba(60, 60, 60, 0.5);
+        background-color: rgba(140, 140, 140, 0.1);
+      }
 
-        .Resizer:hover {
-            -webkit-transition: all 0.3s ease-out;
-            transition: all 0.3s ease-out;
-        }
+      ::-webkit-scrollbar-thumb {
+        background-color: rgba(140, 140, 140, 0.8);
+      }
+    </style>
+    <style>
+      .Resizer {
+        background: rgba(200, 200, 200, 0);
+        z-index: 10;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        -moz-background-clip: padding;
+        -webkit-background-clip: padding;
+        background-clip: padding-box;
+      }
 
-        .Resizer.horizontal {
-            height: 11px;
-            margin: -5px 0;
-            border-top: 5px solid rgba(255, 255, 255, 0);
-            border-bottom: 5px solid rgba(255, 255, 255, 0);
-            cursor: row-resize;
-            width: 100%;
-        }
+      .Resizer:hover {
+        -webkit-transition: all 0.3s ease-out;
+        transition: all 0.3s ease-out;
+      }
 
-        .Resizer.horizontal:hover {
-            border-top: 5px solid rgba(0, 0, 0, 0.5);
-            border-bottom: 5px solid rgba(0, 0, 0, 0.5);
-        }
+      .Resizer.horizontal {
+        height: 10px;
+        margin: -10px 0 0 0;
+        border-top: 5px solid rgba(255, 255, 255, 0);
+        border-bottom: 5px solid rgba(255, 255, 255, 0);
+        cursor: row-resize;
+        width: 100%;
+      }
 
-        .Resizer.vertical {
-            width: 11px;
-            margin: 0 -5px;
-            border-left: 5px solid rgba(255, 255, 255, 0);
-            border-right: 5px solid rgba(255, 255, 255, 0);
-            cursor: col-resize;
-        }
+      .Resizer.horizontal::before {
+        content: '•••';
+        display: inline-block;
+        vertical-align: middle;
+        text-align: center;
+        width: 100%;
+        margin-top: -22px;
+        color: #aaa;
+        opacity: 1;
+      }
 
-        .Resizer.vertical:hover {
-            border-left: 5px solid rgba(255, 255, 255, 0.5);
-            border-right: 5px solid rgba(255, 255, 255, 0.5);
-        }
-        .Resizer.disabled {
-          cursor: not-allowed;
-        }
-        .Resizer.disabled:hover {
-          border-color: transparent;
-        }
+      .Resizer.horizontal:hover {
+        border-top: 5px solid rgba(120, 120, 120, 0.3);
+        border-bottom: 5px solid rgba(120, 120, 120, 0.3);
+      }
 
-      </style>
-    </head>
-    <body>
-        <div id="app" style="font:-webkit-control"></div>
-        <script>
-            function loadScript(path) {
-              var script = document.createElement("script");
-              script.src = path
-              document.head.appendChild(script);
-            }
-    
-            document.addEventListener('DOMContentLoaded', onLoad(), false);
-            function onLoad() {
-              // <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %>loadScript("<%- file %>");<% }); %>
-              // loadScript("<%= JSON.stringify(htmlWebpackPlugin) %>")
-            }
-          </script>
-          <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %><script src="<%- file %>"></script><% }); %>
-    </body>
+      .Resizer.vertical {
+        width: 2px;
+        margin: 0px -8px 0px 0px;
+        border-left: 0px solid rgba(128, 128, 128, 0);
+        border-right: 8px solid rgba(128, 128, 128, 0);
+        cursor: col-resize;
+      }
+
+      .Resizer.vertical::before {
+        content: '•••';
+        margin-left: -11px;
+        height: 3em;
+        margin-top: calc(50vh - 32px);
+        display: inline-block;
+        vertical-align: middle;
+        text-align: center;
+        color: #aaa;
+        opacity: 1;
+        writing-mode: vertical-lr;
+        text-orientation: sideways;
+      }
+
+      .Resizer.vertical:hover {
+        border-left: 0px solid rgba(130, 130, 130, 0.3);
+        border-right: 8px solid rgba(140, 140, 140, 0.3);
+      }
+
+      .Resizer.disabled {
+        cursor: not-allowed;
+      }
+      .Resizer.disabled:hover {
+        border-color: transparent;
+      }
+
+      .example-enter {
+        opacity: 0;
+      }
+      .example-enter-active {
+        opacity: 1;
+        transition: opacity 300ms ease-in;
+      }
+      .example-exit {
+        opacity: 1;
+      }
+      .example-exit-active {
+        opacity: 0;
+        transition: opacity 300ms ease-in;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="app" style="font:-webkit-control"></div>
+    <script>
+      function loadScript(path) {
+        var script = document.createElement('script')
+        script.src = path
+        document.head.appendChild(script)
+      }
+
+      document.addEventListener('DOMContentLoaded', onLoad(), false)
+      function onLoad() {
+        // <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %>loadScript("<%- file %>");<% }); %>
+        // loadScript("<%= JSON.stringify(htmlWebpackPlugin) %>")
+      }
+    </script>
+    <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %><script src="<%- file %>"></script
+    ><% }); %>
+  </body>
 </html>

app/package.json

@@ -4,23 +4,31 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "webpack --mode production",
-    "dev": "node_modules/.bin/webpack-dev-server --mode development --progress"
+    "build": "yarn rebuild && webpack --mode production",
+    "dev": "node_modules/.bin/webpack-dev-server --mode development --progress",
+    "rebuild": "cd node_modules/heapdump && node-gyp rebuild --target=5.0.7 --arch=x64 --dist-url=https://atom.io/download/electron || echo Could not build heapdump; cd -"
   },
   "author": "",
-  "license": "ISC",
+  "license": "CC-BY-ND-4.0",
   "dependencies": {
-    "@material-ui/core": "^4.0.0-alpha.6",
-    "@material-ui/icons": "^4.0.0-alpha.1",
-    "@material-ui/lab": "^4.0.0-alpha.6",
-    "@material-ui/styles": "^4.0.0-alpha.6",
+    "@material-ui/core": "^4",
+    "@material-ui/icons": "^4",
+    "@material-ui/lab": "^4.0.0-alpha",
+    "@material-ui/styles": "^4",
+    "@types/react-transition-group": "^2.9.2",
+    "axios": "^0.19.0",
     "brace": "^0.11.1",
     "compare-versions": "^3.4.0",
-    "copy-text-to-clipboard": "^1.0.4",
+    "copy-text-to-clipboard": "^2.1.0",
+    "d3": "^5.9.2",
+    "d3-shape": "^1.3.5",
     "diff": "^4.0.1",
+    "dot-prop": "^5.0.0",
     "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
+    "file-loader": "^4.0.0",
     "get-value": "^3.0.1",
     "immutable": "^4.0.0-rc.12",
+    "in-viewport": "^3.6.0",
     "js-base64": "^2.5.1",
     "json-to-ast": "^2.1.0",
     "lodash.debounce": "^4.0.8",
@@ -28,13 +36,15 @@
     "moment": "^2.24.0",
     "moving-average": "^1.0.0",
     "number-abbreviate": "^2.0.0",
+    "parse-duration": "^0.1.1",
     "prismjs": "^1.15.0",
     "react": "16.8",
-    "react-ace": "^6.3.2",
+    "react-ace": "^7.0.1",
     "react-dom": "^16.7.0",
-    "react-redux": "^6.0.0",
-    "react-resize-detector": "^3.4.0",
+    "react-redux": "^7.0.3",
+    "react-resize-detector": "^4.1.4",
     "react-split-pane": "^0.1.85",
+    "react-transition-group": "^4.1.1",
     "react-vis": "^1.11.6",
     "redux": "^4.0.1",
     "redux-batched-actions": "^0.4.1",
@@ -44,22 +54,25 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
+    "@types/d3": "^5.7.2",
     "@types/diff": "^4.0.1",
     "@types/get-value": "^3.0.1",
-    "@types/node": "^10.12.18",
+    "@types/node": "^12.0.4",
     "@types/prismjs": "^1.9.1",
     "@types/react": "^16.7.18",
     "@types/react-dom": "^16.0.11",
-    "@types/react-redux": "^6.0.12",
-    "@types/react-resize-detector": "^3.1.0",
+    "@types/react-redux": "^7.0.9",
+    "@types/react-resize-detector": "^4.0.1",
     "@types/sha1": "^1.1.1",
     "@types/socket.io-client": "^1.4.32",
     "@types/uuid": "^3.4.4",
     "@types/vis": "^4.21.9",
     "awesome-typescript-loader": "^5.2.1",
-    "css-loader": "^2.1.0",
+    "css-loader": "^3.0.0",
     "hard-source-webpack-plugin": "^0.13.1",
+    "heapdump": "^0.3.12",
     "html-webpack-plugin": "^4.0.0-beta.5",
+    "node-loader": "^0.6.0",
     "source-map-loader": "^0.2.4",
     "style-loader": "^0.23.1",
     "typescript": "^3.2.2",
@@ -67,5 +80,8 @@
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.14"
+  },
+  "peerDependencies": {
+    "electron": "^5.0.5"
   }
 }

app/src/actions/Charts.ts

@@ -0,0 +1,128 @@
+import { Action, ActionTypes, ChartParameters } from '../reducers/Charts'
+import { AppState } from '../reducers'
+import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
+import { Dispatch } from 'redux'
+import { showError, showNotification } from './Global'
+
+interface ConnectionViewState {
+  charts: Array<ChartParameters>
+}
+
+interface ConnectionViewStateDictionary {
+  [s: string]: ConnectionViewState
+}
+const connectionViewStateIdentifier: StorageIdentifier<ConnectionViewStateDictionary> = {
+  id: 'connection_view_state',
+}
+
+export const loadCharts = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const connectionId = getState().connection.connectionId
+  if (!connectionId) {
+    return
+  }
+
+  let viewStates: ConnectionViewStateDictionary | undefined
+  try {
+    viewStates = await persistentStorage.load(connectionViewStateIdentifier)
+  } catch (error) {
+    dispatch(showError(error))
+  }
+
+  if (!viewStates || !viewStates[connectionId]) {
+    dispatch(setCharts([]))
+    return
+  }
+
+  const viewState = viewStates[connectionId]
+  if (viewState) {
+    dispatch(setCharts(viewState.charts))
+  }
+}
+
+export const saveCharts = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const connectionId = getState().connection.connectionId
+  if (!connectionId) {
+    return
+  }
+
+  const charts = getState()
+    .charts.get('charts')
+    .toArray()
+
+  let viewStates: ConnectionViewStateDictionary | undefined
+  try {
+    viewStates = (await persistentStorage.load(connectionViewStateIdentifier)) || {}
+    const state: ConnectionViewState = viewStates[connectionId] || { charts: [] }
+    state.charts = charts
+
+    viewStates[connectionId] = state
+    await persistentStorage.store(connectionViewStateIdentifier, viewStates)
+  } catch (error) {
+    dispatch(showError(error))
+  }
+}
+
+export const addChart = (chartParameters: ChartParameters) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
+  const chartExists = Boolean(
+    getState()
+      .charts.get('charts')
+      .find(chart => chart.topic === chartParameters.topic && chart.dotPath === chartParameters.dotPath)
+  )
+  if (chartExists) {
+    dispatch(showNotification('Already added'))
+    return
+  }
+
+  dispatch({
+    type: ActionTypes.CHARTS_ADD,
+    chart: chartParameters,
+  })
+  dispatch(saveCharts())
+  dispatch(showNotification('Added to chart panel'))
+}
+
+export const updateChart = (chartParameters: ChartParameters) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
+  dispatch({
+    type: ActionTypes.CHARTS_UPDATE,
+    topic: chartParameters.topic,
+    dotPath: chartParameters.dotPath,
+    parameters: chartParameters,
+  })
+  dispatch(saveCharts())
+}
+
+export const removeChart = (chartParameters: ChartParameters) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
+  dispatch({
+    chart: chartParameters,
+    type: ActionTypes.CHARTS_REMOVE,
+  })
+  dispatch(saveCharts())
+}
+
+export const moveChartUp = (parameters: { topic: string; dotPath?: string }) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
+  dispatch({
+    topic: parameters.topic,
+    dotPath: parameters.dotPath,
+    type: ActionTypes.CHARTS_MOVE_UP,
+  })
+  dispatch(saveCharts())
+}
+
+export const setCharts = (charts: Array<ChartParameters>): Action => {
+  return {
+    charts,
+    type: ActionTypes.CHARTS_SET,
+  }
+}

app/src/actions/Connection.ts

@@ -1,28 +1,26 @@
 import * as q from '../../../backend/src/Model'
 import * as url from 'url'
 import { Action, ActionTypes } from '../reducers/Connection'
+import { ActionTypes as SettingsActionTypes } from '../reducers/Settings'
 import { AppState } from '../reducers'
 import { DataSourceState, MqttOptions } from '../../../backend/src/DataSource'
 import { Dispatch } from 'redux'
 import { globalActions } from '.'
+import { resetStore as resetTreeStore, showTree } from './Tree'
 import { showError } from './Global'
-import { showTree } from './Tree'
 import { TopicViewModel } from '../model/TopicViewModel'
-import {
-  addMqttConnectionEvent,
-  makeConnectionStateEvent,
-  removeConnection,
-  rendererEvents,
-} from '../../../events'
+import { addMqttConnectionEvent, makeConnectionStateEvent, removeConnection, rendererEvents } from '../../../events'
 
-export const connect = (options: MqttOptions, connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const connect = (options: MqttOptions, connectionId: string) => (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
   dispatch(connecting(connectionId))
   rendererEvents.emit(addMqttConnectionEvent, { options, id: connectionId })
   const event = makeConnectionStateEvent(connectionId)
   const host = url.parse(options.url).hostname
 
-  rendererEvents.subscribe(event, (dataSourceState) => {
-    console.log(dataSourceState)
+  rendererEvents.subscribe(event, dataSourceState => {
     if (dataSourceState.connected) {
       const didReconnect = Boolean(getState().connection.tree)
       if (!didReconnect) {
@@ -52,15 +50,16 @@ const updateHealth = (dataSourceState: DataSourceState) => (dispatch: Dispatch<a
     state = undefined
   }
 
-  console.log(state)
-
   dispatch({
     type: ActionTypes.CONNECTION_SET_HEALTH,
     health: state,
   })
 }
 
-export const connected: (tree: q.Tree<TopicViewModel>, host: string) => Action = (tree: q.Tree<TopicViewModel>, host: string) => ({
+export const connected: (tree: q.Tree<TopicViewModel>, host: string) => Action = (
+  tree: q.Tree<TopicViewModel>,
+  host: string
+) => ({
   tree,
   host,
   type: ActionTypes.CONNECTION_SET_CONNECTED,
@@ -79,9 +78,17 @@ export const disconnect = () => (dispatch: Dispatch<any>, getState: () => AppSta
   }
 
   tree && tree.stopUpdating()
+  tree && tree.destroy()
 
-  dispatch(showTree(undefined))
+  // Clear topic filter
+  dispatch({
+    topicFilter: '',
+    type: SettingsActionTypes.SETTINGS_FILTER_TOPICS,
+  })
+
+  dispatch(resetTreeStore())
   dispatch({
     type: ActionTypes.CONNECTION_SET_DISCONNECTED,
   })
+  dispatch(showTree(undefined))
 }

app/src/actions/ConnectionManager.ts

@@ -1,6 +1,11 @@
 import { AppState } from '../reducers'
 import { clearLegacyConnectionOptions, loadLegacyConnectionOptions } from '../model/LegacyConnectionSettings'
-import { ConnectionOptions, createEmptyConnection, makeDefaultConnections, CertificateParameters } from '../model/ConnectionOptions'
+import {
+  ConnectionOptions,
+  createEmptyConnection,
+  makeDefaultConnections,
+  CertificateParameters,
+} from '../model/ConnectionOptions'
 import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
 import { Dispatch } from 'redux'
 import { showError } from './Global'
@@ -8,12 +13,12 @@ import { remote } from 'electron'
 import * as fs from 'fs'
 import * as path from 'path'
 
-import {
-  ActionTypes,
-  Action,
-} from '../reducers/ConnectionManager'
+import { ActionTypes, Action } from '../reducers/ConnectionManager'
 
-const storedConnectionsIdentifier: StorageIdentifier<{[s: string]: ConnectionOptions}> = {
+interface ConnectionDictionary {
+  [s: string]: ConnectionOptions
+}
+const storedConnectionsIdentifier: StorageIdentifier<ConnectionDictionary> = {
   id: 'ConnectionManager_connections',
 }
 
@@ -37,15 +42,19 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getS
   }
 }
 
-export const selectCertificate = (connectionId: string) => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+export type CertificateTypes = 'selfSignedCertificate' | 'clientCertificate' | 'clientKey'
+export const selectCertificate = (type: CertificateTypes, connectionId: string) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
   try {
     const certificate = await openCertificate()
-    console.log(certificate)
-    dispatch(updateConnection(connectionId, {
-      selfSignedCertificate: certificate,
-    }))
+    dispatch(
+      updateConnection(connectionId, {
+        [type]: certificate,
+      })
+    )
   } catch (error) {
-    console.log(error)
     dispatch(showError(error))
   }
 }
@@ -57,30 +66,33 @@ async function openCertificate(): Promise<CertificateParameters> {
   }
 
   return new Promise((resolve, reject) => {
-    remote.dialog.showOpenDialog({ properties: ['openFile'], securityScopedBookmarks: true }, (filePaths?: string[]) => {
-      const selectedFile = filePaths && filePaths[0]
-      if (!selectedFile) {
-        reject(rejectReasons.noCertificateSelected)
-        return
-      }
-
-      fs.readFile(selectedFile, (error, data) => {
-        if (error) {
-          reject(error)
+    remote.dialog.showOpenDialog(
+      { properties: ['openFile'], securityScopedBookmarks: true },
+      (filePaths?: Array<string>) => {
+        const selectedFile = filePaths && filePaths[0]
+        if (!selectedFile) {
+          reject(rejectReasons.noCertificateSelected)
           return
         }
 
-        if (data.length > 16_384 || data.length < 128) {
-          reject(rejectReasons.certificateSizeDoesNotMatch)
-          return
-        }
+        fs.readFile(selectedFile, (error, data) => {
+          if (error) {
+            reject(error)
+            return
+          }
 
-        resolve({
-          data: data.toString('base64'),
-          name: path.basename(selectedFile),
+          if (data.length > 16_384 || data.length < 128) {
+            reject(rejectReasons.certificateSizeDoesNotMatch)
+            return
+          }
+
+          resolve({
+            data: data.toString('base64'),
+            name: path.basename(selectedFile),
+          })
         })
-      })
-    })
+      }
+    )
   })
 }
 
@@ -117,7 +129,7 @@ export const createConnection = () => (dispatch: Dispatch<any>) => {
   dispatch(selectConnection(newConnection.id))
 }
 
-export const setConnections = (connections: {[s: string]: ConnectionOptions}): Action => ({
+export const setConnections = (connections: { [s: string]: ConnectionOptions }): Action => ({
   connections,
   type: ActionTypes.CONNECTION_MANAGER_SET_CONNECTIONS,
 })
@@ -132,10 +144,14 @@ export const addConnection = (connection: ConnectionOptions): Action => ({
   type: ActionTypes.CONNECTION_MANAGER_ADD_CONNECTION,
 })
 
-export const toggleAdvancedSettings = (): Action  => ({
+export const toggleAdvancedSettings = (): Action => ({
   type: ActionTypes.CONNECTION_MANAGER_TOGGLE_ADVANCED_SETTINGS,
 })
 
+export const toggleCertificateSettings = (): Action => ({
+  type: ActionTypes.CONNECTION_MANAGER_TOGGLE_CERTIFICATE_SETTINGS,
+})
+
 export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   const connectionIds = Object.keys(getState().connectionManager.connections)
   const connectionIdLocation = connectionIds.indexOf(connectionId)
@@ -155,16 +171,44 @@ export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<an
 }
 
 async function ensureConnectionsHaveBeenInitialized() {
-  const connections = await persistentStorage.load(storedConnectionsIdentifier)
+  let connections = await persistentStorage.load(storedConnectionsIdentifier)
   const requiresInitialization = !connections
   if (requiresInitialization) {
     const migratedConnection = loadLegacyConnectionOptions()
     const defaultConnections = makeDefaultConnections()
-    persistentStorage.store(storedConnectionsIdentifier, {
+    connections = {
       ...migratedConnection,
       ...defaultConnections,
-    })
+    }
+    await persistentStorage.store(storedConnectionsIdentifier, connections)
 
     clearLegacyConnectionOptions()
   }
+
+  // Migrate connections, rewrite dictionary to "keep" it "ordered" (dictionaries do not have a guaranteed order)
+  const mayNeedMigrations = connections && connections['iot.eclipse.org']
+  if (connections && mayNeedMigrations) {
+    let newConnections = {}
+    for (const connection of Object.values(connections)) {
+      addMigratedConnection(newConnections, connection)
+    }
+
+    await persistentStorage.store(storedConnectionsIdentifier, newConnections)
+  }
+}
+
+function addMigratedConnection(newConnections: { [key: string]: ConnectionOptions }, connection: ConnectionOptions) {
+  // The host has been renamed, only change the host if it has not been changed
+  // Also check for ssl since SSL is not yet working
+  if (
+    connection.id === 'iot.eclipse.org' &&
+    connection.host === 'iot.eclipse.org' &&
+    connection.port === 1883 &&
+    !connection.encryption
+  ) {
+    connection.id = 'mqtt.eclipse.org'
+    connection.host = 'mqtt.eclipse.org'
+    connection.name = 'mqtt.eclipse.org'
+  }
+  newConnections[connection.id] = connection
 }

app/src/actions/Global.ts

@@ -1,4 +1,5 @@
-import { ActionTypes } from '../reducers'
+import { ActionTypes, ConfirmationRequest } from '../reducers/Global'
+import { Dispatch } from 'redux'
 
 export const showError = (error?: string) => ({
   error,
@@ -13,3 +14,36 @@ export const showNotification = (notification?: string) => ({
 export const didLaunch = () => ({
   type: ActionTypes.didLaunch,
 })
+
+export const toggleSettingsVisibility = () => (dispatch: Dispatch<any>) => {
+  dispatch({
+    type: ActionTypes.toggleSettingsVisibility,
+  })
+}
+
+export const requestConfirmation = (title: string, inquiry: string) => (dispatch: Dispatch<any>) => {
+  return new Promise(resolve => {
+    const confirmationRequest = {
+      title,
+      inquiry,
+      callback: (confirmed: boolean) => {
+        resolve(confirmed)
+        dispatch(removeConfirmationRequest(confirmationRequest))
+      },
+    }
+
+    dispatch({
+      confirmationRequest,
+      type: ActionTypes.requestConfirmation,
+    })
+  })
+}
+
+export const removeConfirmationRequest = (confirmationRequest: ConfirmationRequest) => (dispatch: Dispatch<any>) => {
+  return new Promise((resolve, reject) => {
+    dispatch({
+      confirmationRequest,
+      type: ActionTypes.removeConfirmationRequest,
+    })
+  })
+}

app/src/actions/Publish.ts

@@ -32,7 +32,7 @@ export const setEditorMode = (editorMode: string): Action => {
   }
 }
 
-export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, getState: () => AppState)  => {
+export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, getState: () => AppState) => {
   const state = getState()
   const topic = state.publish.topic
 

app/src/actions/Settings.ts

@@ -1,27 +1,23 @@
 import * as q from '../../../backend/src/Model'
+import { ActionTypes, SettingsStateModel, TopicOrder } from '../reducers/Settings'
 import { AppState } from '../reducers'
 import { autoExpandLimitSet } from '../components/SettingsDrawer/Settings'
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
 import { batchActions } from 'redux-batched-actions'
 import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
 import { Dispatch } from 'redux'
+import { globalActions } from './'
 import { showError } from './Global'
 import { showTree } from './Tree'
 import { TopicViewModel } from '../model/TopicViewModel'
-import {
-  ActionTypes,
-  SettingsState,
-  TopicOrder,
-} from '../reducers/Settings'
-import { Base64Message } from '../../../backend/src/Model/Base64Message'
-import { globalActions } from '.'
 
-const settingsIdentifier: StorageIdentifier<Partial<SettingsState>> = {
+const settingsIdentifier: StorageIdentifier<Partial<SettingsStateModel>> = {
   id: 'Settings',
 }
 
 export const loadSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
   try {
-    const settings = await persistentStorage.load(settingsIdentifier) || {}
+    const settings = (await persistentStorage.load(settingsIdentifier)) || {}
     dispatch({
       settings: getState().settings.merge(settings),
       type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS,
@@ -35,6 +31,7 @@ export const loadSettings = () => async (dispatch: Dispatch<any>, getState: () =
 export const storeSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
   const settings = {
     ...getState().settings.toJS(),
+    autoExpandLimit: undefined,
     topicFilter: undefined,
     visible: undefined,
   }
@@ -51,6 +48,13 @@ export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Di
     autoExpandLimit,
     type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
   })
+}
+
+export const setTimeLocale = (timeLocale: string) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    timeLocale,
+    type: ActionTypes.SETTINGS_SET_TIME_LOCALE,
+  })
   dispatch(storeSettings())
 }
 
@@ -70,13 +74,6 @@ export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') =>
   dispatch(storeSettings())
 }
 
-export const toggleSettingsVisibility = () => (dispatch: Dispatch<any>) => {
-  dispatch({
-    type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY,
-  })
-  dispatch(storeSettings())
-}
-
 export const toggleHighlightTopicUpdates = () => (dispatch: Dispatch<any>) => {
   dispatch({
     type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY,
@@ -101,26 +98,34 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, get
   })
 
   if (!filterStr || !tree) {
-    dispatch(batchActions([setAutoExpandLimit(0), (showTree(tree) as any)]))
+    dispatch(batchActions([setAutoExpandLimit(0), showTree(tree) as any]))
     return
   }
 
   const topicFilter = filterStr.toLowerCase()
 
   const nodeFilter = (node: q.TreeNode<TopicViewModel>): boolean => {
-    const topicMatches = node.path().toLowerCase().indexOf(topicFilter) !== -1
+    const topicMatches =
+      node
+        .path()
+        .toLowerCase()
+        .indexOf(topicFilter) !== -1
     if (topicMatches) {
       return true
     }
 
-    const messageMatches = node.message
-      && node.message.value
-      && Base64Message.toUnicodeString(node.message.value).toLowerCase().indexOf(filterStr) !== -1
+    const messageMatches =
+      node.message &&
+      node.message.value &&
+      Base64Message.toUnicodeString(node.message.value)
+        .toLowerCase()
+        .indexOf(filterStr) !== -1
 
     return Boolean(messageMatches)
   }
 
-  const resultTree = tree.childTopics()
+  const resultTree = tree
+    .childTopics()
     .filter(nodeFilter)
     .map((node: q.TreeNode<TopicViewModel>) => {
       const clone = node.unconnectedClone()
@@ -137,16 +142,17 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, get
     nextTree.updateWithConnection(tree.updateSource, tree.connectionId, nodeFilter)
   }
 
-  dispatch(batchActions([setAutoExpandLimit(autoExpandLimitForTree(nextTree)), (showTree(nextTree) as any)]))
+  dispatch(batchActions([setAutoExpandLimit(autoExpandLimitForTree(nextTree)), showTree(nextTree) as any]))
 }
 
 function autoExpandLimitForTree(tree: q.Tree<TopicViewModel>) {
   if (!tree) {
     return 0
   }
+
   function closestExistingLimit(i: number): number {
-    const sorted = autoExpandLimitSet.sort((a, b) => Math.abs(a.limit - i) - Math.abs(b.limit - i))
-    return sorted[0]!.limit
+    const sorted = [...autoExpandLimitSet].sort((a, b) => Math.abs(a.limit - i) - Math.abs(b.limit - i))
+    return sorted[0].limit
   }
 
   const count = tree.childTopicCount()
@@ -157,7 +163,10 @@ function autoExpandLimitForTree(tree: q.Tree<TopicViewModel>) {
 
 export const toggleTheme = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
   dispatch({
-    type: getState().settings.get('theme') === 'light' ? ActionTypes.SETTINGS_SET_THEME_DARK : ActionTypes.SETTINGS_SET_THEME_LIGHT,
+    type:
+      getState().settings.get('theme') === 'light'
+        ? ActionTypes.SETTINGS_SET_THEME_DARK
+        : ActionTypes.SETTINGS_SET_THEME_LIGHT,
   })
   dispatch(storeSettings())
 }

app/src/actions/Sidebar.ts

@@ -1,10 +1,13 @@
 import * as q from '../../../backend/src/Model'
-import { Dispatch } from 'redux'
+import { ActionTypes } from '../reducers/Sidebar'
 import { AppState } from '../reducers'
-import { makePublishEvent, rendererEvents } from '../../../events'
+import { Dispatch } from 'redux'
+import { clearTopic } from './clearTopic'
+
+export { clearTopic } from './clearTopic'
 
 export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
-  const { selectedTopic } = getState().tree
+  const selectedTopic = getState().tree.get('selectedTopic')
   if (!selectedTopic) {
     return
   }
@@ -12,35 +15,9 @@ export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () =
   dispatch(clearTopic(selectedTopic, false))
 }
 
-export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean, subtopicClearLimit = 50) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
-  const { connectionId } = getState().connection
-  if (!connectionId) {
-    return
-  }
-
-  const publishEvent = makePublishEvent(connectionId)
-  const mqttMessage = {
-    topic: topic.path(),
-    payload: null,
-    retain: true,
-    qos: 0 as 0,
-  }
-  console.log('deleting', topic.path())
-  rendererEvents.emit(publishEvent, mqttMessage)
-
-  if (recursive) {
-    topic.childTopics()
-      .filter(topic => Boolean(topic.message && topic.message.value))
-      .slice(0, subtopicClearLimit)
-      .forEach((topic) => {
-        console.log('deleting', topic.path())
-        const mqttMessage = {
-          topic: topic.path(),
-          payload: null,
-          retain: true,
-          qos: 0 as 0,
-        }
-        rendererEvents.emit(publishEvent, mqttMessage)
-      })
-  }
+export const setCompareMessage = (message?: q.Message) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    message,
+    type: ActionTypes.SIDEBAR_SET_COMPARE_MESSAGE,
+  })
 }

app/src/actions/Tree.ts

@@ -1,57 +1,92 @@
 import * as q from '../../../backend/src/Model'
 import { ActionTypes } from '../reducers/Tree'
+import { ActionTypes as SidebarActionTypes } from '../reducers/Sidebar'
 import { AnyAction, Dispatch } from 'redux'
 import { AppState } from '../reducers'
 import { batchActions } from 'redux-batched-actions'
+import { globalActions } from './'
 import { setTopic } from './Publish'
 import { TopicViewModel } from '../model/TopicViewModel'
-import { globalActions } from '.';
 const debounce = require('lodash.debounce')
+export { clearTopic } from './clearTopic'
 
-export const selectTopic = (topic: q.TreeNode<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export { moveSelectionUpOrDownwards, moveInward, moveOutward } from './visibleTreeTraversal'
+
+export const selectTopic = (topic: q.TreeNode<TopicViewModel>) => (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
   debouncedSelectTopic(topic, dispatch, getState)
 }
 
-const debouncedSelectTopic = debounce((topic: q.TreeNode<TopicViewModel>, dispatch: Dispatch<any>, getState: () => AppState) => {
-  const { selectedTopic } = getState().tree
-  if (selectedTopic === topic) {
-    return
-  }
+const debouncedSelectTopic = debounce(
+  (topic: q.TreeNode<TopicViewModel>, dispatch: Dispatch<any>, getState: () => AppState) => {
+    const previouslySelectedTopic = getState().tree.get('selectedTopic')
 
-  // Update publish topic
-  let setTopicDispatch: any | undefined
-  if (selectedTopic && (selectedTopic.path() === getState().publish.topic || !getState().publish.topic)) {
-    setTopicDispatch = setTopic(topic.path())
-  }
+    if (previouslySelectedTopic === topic) {
+      return
+    }
 
-  if (selectedTopic && selectedTopic.viewModel) {
-    selectedTopic.viewModel.setSelected(false)
-  }
+    // Update publish topic
+    let setTopicDispatch: any | undefined
+    if (!getState().publish.topic) {
+      setTopicDispatch = setTopic(topic.path())
+    } else if (previouslySelectedTopic && previouslySelectedTopic.path() === getState().publish.topic) {
+      setTopicDispatch = setTopic(topic.path())
+    }
 
-  if (topic.viewModel) {
-    topic.viewModel.setSelected(true)
-  }
+    if (previouslySelectedTopic && previouslySelectedTopic.viewModel) {
+      previouslySelectedTopic.viewModel.setSelected(false)
+    }
 
-  const selectTreeTopicDispatch = {
-    selectedTopic: topic,
-    type: ActionTypes.TREE_SELECT_TOPIC,
-  }
+    if (topic.viewModel) {
+      topic.viewModel.setSelected(true)
+    }
 
-  if (setTopicDispatch) {
-    dispatch(batchActions([selectTreeTopicDispatch, setTopicDispatch]))
-  } else {
-    dispatch(selectTreeTopicDispatch)
-  }
-}, 70)
+    const selectTreeTopicDispatch = {
+      selectedTopic: topic,
+      type: ActionTypes.TREE_SELECT_TOPIC,
+    }
 
-export const showTree = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
-  const visibleTree = getState().tree.tree
-  const connectionTree = getState().connection.tree
+    dispatch({
+      type: SidebarActionTypes.SIDEBAR_SET_COMPARE_MESSAGE,
+      message: undefined,
+    })
+
+    if (setTopicDispatch) {
+      dispatch(batchActions([selectTreeTopicDispatch, setTopicDispatch]))
+    } else {
+      dispatch(selectTreeTopicDispatch)
+    }
+  },
+  70
+)
+
+function destroyUnreferencedTree(state: AppState) {
+  const visibleTree = state.tree.get('tree')
+  const connectionTree = state.connection.tree
 
   // Stop updates of old tree
-  if (visibleTree !== connectionTree && visibleTree) {
+  if (visibleTree && visibleTree !== connectionTree) {
+    console.warn('destroy')
     visibleTree.stopUpdating()
+    visibleTree.destroy()
   }
+}
+
+export const resetStore = () => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
+  destroyUnreferencedTree(getState())
+
+  return dispatch({
+    type: ActionTypes.TREE_RESET_STORE,
+  })
+}
+
+export const showTree = (tree: q.Tree<TopicViewModel> | undefined) => (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+): AnyAction => {
+  destroyUnreferencedTree(getState())
 
   return dispatch({
     tree,
@@ -60,25 +95,26 @@ export const showTree = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<a
 }
 
 export const togglePause = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState) => {
-  const paused = getState().tree.paused
-  const tree = getState().tree.tree
+  const paused = getState().tree.get('paused')
+  const tree = getState().tree.get('tree')
   const changes = tree ? tree.unmergedChanges().length : 0
 
+  if (tree) {
+    paused ? tree.resume() : tree.pause()
+  }
+
   if (paused && changes > 0) {
     dispatch(globalActions.showNotification('Applying recorded changes.'))
   }
 
   // Allow for notification to be displayed
   setTimeout(() => {
-    tree && tree.applyUnmergedChanges()
     if (paused && changes > 0) {
-      dispatch(globalActions.showNotification(`Sucessfully applied ${changes} changes.`))
+      dispatch(globalActions.showNotification(`Successfully applied ${changes} changes.`))
     }
   }, 50)
 
   dispatch({
     type: paused ? ActionTypes.TREE_RESUME_UPDATES : ActionTypes.TREE_PAUSE_UPDATES,
   })
-
-
 }

app/src/actions/UpdateNotifier.ts

@@ -1,13 +1,13 @@
-import { ActionTypes, CustomAction } from '../reducers'
+import { ActionTypes, GlobalAction } from '../reducers/Global'
 
-export const showUpdateNotification = (show: boolean): CustomAction => {
+export const showUpdateNotification = (show: boolean): GlobalAction => {
   return {
     type: ActionTypes.showUpdateNotification,
     showUpdateNotification: show,
   }
 }
 
-export const showUpdateDetails = (show: boolean): CustomAction => {
+export const showUpdateDetails = (show: boolean): GlobalAction => {
   return {
     type: ActionTypes.showUpdateDetails,
     showUpdateDetails: show,

app/src/actions/clearTopic.ts

@@ -0,0 +1,55 @@
+import * as q from '../../../backend/src/Model'
+import { AppState } from '../reducers'
+import { Dispatch } from 'redux'
+import { makePublishEvent, rendererEvents } from '../../../events'
+import { moveSelectionUpOrDownwards } from './visibleTreeTraversal'
+import { globalActions } from '.'
+
+export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
+  const topicsForPurging = recursive ? [topic, ...topic.childTopics()] : [topic]
+
+  if (recursive) {
+    const topicCount = topic.childTopicCount()
+
+    const topicDelta = topic.hasMessage() ? -1 : 0
+    const childTopicsMessage =
+      topicCount + topicDelta > 0
+        ? ` and ${topicCount + topicDelta} child ${topicCount + topicDelta === 1 ? 'topic' : 'topics'}`
+        : ''
+
+    const confirmed = await dispatch(
+      globalActions.requestConfirmation(
+        'Confirm delete',
+        `Do you want to clear "${topic.path()}"${childTopicsMessage}?\n\nThis function will send an empty payload (QoS 0, retain) to this and every subtopic, clearing retained topics in the process. Only use this function if you know what you are doing.`
+      )
+    )
+    if (!confirmed) {
+      return
+    }
+  }
+
+  dispatch(moveSelectionUpOrDownwards('next'))
+
+  const { connectionId } = getState().connection
+  if (!connectionId) {
+    return
+  }
+  const publishEvent = makePublishEvent(connectionId)
+
+  topicsForPurging
+    .filter(t => t.path() !== '' && t.hasMessage())
+    .map(t => t.path())
+    .forEach((path, idx) => {
+      const mqttMessage = {
+        topic: path,
+        payload: null,
+        retain: true,
+        qos: 0 as 0,
+      }
+      // Rate limit deletion
+      setTimeout(() => rendererEvents.emit(publishEvent, mqttMessage), 20 * idx)
+    })
+}

app/src/actions/index.ts

@@ -1,3 +1,4 @@
+import * as chartActions from './Charts'
 import * as connectionActions from './Connection'
 import * as connectionManagerActions from './ConnectionManager'
 import * as globalActions from './Global'
@@ -7,4 +8,14 @@ import * as sidebarActions from './Sidebar'
 import * as treeActions from './Tree'
 import * as updateNotifierActions from './UpdateNotifier'
 
-export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActions, connectionManagerActions, globalActions }
+export {
+  settingsActions,
+  treeActions,
+  chartActions,
+  publishActions,
+  updateNotifierActions,
+  connectionActions,
+  sidebarActions,
+  connectionManagerActions,
+  globalActions,
+}

app/src/actions/visibleTreeTraversal.ts

@@ -0,0 +1,135 @@
+import * as q from '../../../backend/src/Model'
+import { AppState } from '../reducers'
+import { Dispatch } from 'redux'
+import { selectTopic } from './Tree'
+import { SettingsState } from '../reducers/Settings'
+import { sortedNodes } from '../sortedNodes'
+import { TopicViewModel } from '../model/TopicViewModel'
+
+export const moveSelectionUpOrDownwards = (direction: 'next' | 'previous') => (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+): any => {
+  const state = getState()
+  const selected = state.tree.get('selectedTopic')
+  const tree = state.tree.get('tree')
+
+  if (!selected || !tree) {
+    if (tree) {
+      dispatch(selectTopic(tree))
+    }
+    return
+  }
+  const nextTreeNode = nextVisibleElementInTree(state.settings, tree, selected, direction)
+  if (nextTreeNode && nextTreeNode.viewModel) {
+    dispatch(selectTopic(nextTreeNode))
+  }
+}
+
+export const moveInward = () => (dispatch: Dispatch<any>, getState: () => AppState): any => {
+  const state = getState()
+  const selected = state.tree.get('selectedTopic')
+  if (!selected || !selected.viewModel) {
+    return
+  }
+
+  if (!selected.viewModel.isExpanded() && selected.edgeCount() > 0) {
+    selected.viewModel.setExpanded(true, true)
+  } else {
+    dispatch(moveSelectionUpOrDownwards('next'))
+  }
+}
+
+export const moveOutward = () => (dispatch: Dispatch<any>, getState: () => AppState): any => {
+  const state = getState()
+  const selected = state.tree.get('selectedTopic')
+  if (!selected || !selected.viewModel) {
+    return
+  }
+
+  if (selected.viewModel.isExpanded() && selected.edgeCount() > 0) {
+    selected.viewModel.setExpanded(false, true)
+  } else {
+    dispatch(moveSelectionUpOrDownwards('previous'))
+  }
+}
+
+function isTreeNodeVisible(treeNode: q.TreeNode<any>) {
+  return Boolean(treeNode.viewModel)
+}
+
+function nextVisibleElementInTree(
+  settings: SettingsState,
+  tree: q.Tree<TopicViewModel>,
+  node: q.TreeNode<TopicViewModel>,
+  direction: 'next' | 'previous'
+): q.TreeNode<TopicViewModel> | undefined {
+  if (direction === 'next') {
+    return findNextNodeDownward(settings, node)
+  } else {
+    return findNextNodeUpward(settings, node)
+  }
+}
+
+/** Not very efficient but easy to implement, complexity should not be an issue here  */
+function findNextNodeUpward(
+  settings: SettingsState,
+  treeNode: q.TreeNode<TopicViewModel>
+): q.TreeNode<TopicViewModel> | undefined {
+  const parent = treeNode.sourceEdge && treeNode.sourceEdge.source
+  if (!parent) {
+    return undefined
+  }
+
+  const neighborNodes = sortedNodes(settings, parent)
+  const nodeIdx = neighborNodes.findIndex(n => n.path() === treeNode.path())
+  if (nodeIdx === 0) {
+    return parent
+  }
+  const upwardNeighbor = neighborNodes[nodeIdx - 1]
+  if (upwardNeighbor) {
+    return lastVisibleChild(settings, upwardNeighbor)
+  } else {
+    return findNextNodeUpward(settings, parent)
+  }
+}
+
+function lastVisibleChild(settings: SettingsState, treeNode: q.TreeNode<TopicViewModel>): q.TreeNode<TopicViewModel> {
+  const nodes = sortedNodes(settings, treeNode).filter(isTreeNodeVisible)
+  if (nodes.length === 0) {
+    return treeNode
+  }
+  return lastVisibleChild(settings, nodes[nodes.length - 1])
+}
+
+function findNextNodeDownward(
+  settings: SettingsState,
+  treeNode: q.TreeNode<TopicViewModel>
+): q.TreeNode<TopicViewModel> | undefined {
+  const children = sortedNodes(settings, treeNode).filter(isTreeNodeVisible)
+  const firstChild = children[0]
+  if (firstChild) {
+    return firstChild
+  }
+
+  return findNextNodeDownwardNeighbor(settings, treeNode)
+}
+
+function findNextNodeDownwardNeighbor(
+  settings: SettingsState,
+  treeNode: q.TreeNode<TopicViewModel>
+): q.TreeNode<TopicViewModel> | undefined {
+  const parent = treeNode.sourceEdge && treeNode.sourceEdge.source
+  if (!parent) {
+    return undefined
+  }
+
+  const neighborNodes = sortedNodes(settings, parent).filter(isTreeNodeVisible)
+  const nodeIdx = neighborNodes.findIndex(n => n.path() === treeNode.path())
+  const downwardNeighbor = neighborNodes[nodeIdx + 1]
+  if (downwardNeighbor) {
+    return downwardNeighbor
+  } else {
+    return findNextNodeDownwardNeighbor(settings, parent)
+  }
+}

app/src/components/App.tsx

@@ -1,12 +1,14 @@
-import * as React from 'react'
+import ConfirmationDialog from './ConfirmationDialog'
 import ConnectionSetup from './ConnectionSetup/ConnectionSetup'
 import CssBaseline from '@material-ui/core/CssBaseline'
 import ErrorBoundary from './ErrorBoundary'
 import Notification from './Layout/Notification'
+import React from 'react'
 import TitleBar from './Layout/TitleBar'
-import UpdateNotifier from '../UpdateNotifier'
+import UpdateNotifier from './UpdateNotifier'
 import { AppState } from '../reducers'
 import { bindActionCreators } from 'redux'
+import { ConfirmationRequest } from '../reducers/Global'
 import { connect } from 'react-redux'
 import { globalActions, settingsActions } from '../actions'
 import { Theme, withStyles } from '@material-ui/core/styles'
@@ -23,12 +25,13 @@ interface Props {
   actions: typeof globalActions
   settingsActions: typeof settingsActions
   launching: boolean
+  confirmationRequests: Array<ConfirmationRequest>
 }
 
 class App extends React.PureComponent<Props, {}> {
   constructor(props: any) {
     super(props)
-    this.state = { }
+    this.state = {}
   }
 
   private renderNotification() {
@@ -41,7 +44,9 @@ class App extends React.PureComponent<Props, {}> {
         <Notification
           message={str}
           type={isError ? 'error' : 'notification'}
-          onClose={() => { isError ? this.props.actions.showError(undefined) : this.props.actions.showNotification(undefined) }}
+          onClose={() => {
+            isError ? this.props.actions.showError(undefined) : this.props.actions.showNotification(undefined)
+          }}
         />
       )
     }
@@ -65,8 +70,9 @@ class App extends React.PureComponent<Props, {}> {
       <div className={centerContent}>
         <CssBaseline />
         <ErrorBoundary>
-        {this.renderNotification()}
-          <React.Suspense fallback={<div>Loading...</div>}>
+          <ConfirmationDialog confirmationRequests={this.props.confirmationRequests} />
+          {this.renderNotification()}
+          <React.Suspense fallback={<div></div>}>
             <Settings />
           </React.Suspense>
           <div className={centerContent}>
@@ -74,8 +80,12 @@ class App extends React.PureComponent<Props, {}> {
               <TitleBar />
             </div>
             <div className={settingsVisible ? contentShift : content}>
-              <React.Suspense fallback={<div>Loading...</div>}>
-                <ContentView heightProperty={heightProperty} connectionId={this.props.connectionId} paneDefaults={paneDefaults} />
+              <React.Suspense fallback={<div></div>}>
+                <ContentView
+                  heightProperty={heightProperty}
+                  connectionId={this.props.connectionId}
+                  paneDefaults={paneDefaults}
+                />
               </React.Suspense>
             </div>
           </div>
@@ -89,15 +99,18 @@ class App extends React.PureComponent<Props, {}> {
 
 const styles = (theme: Theme) => {
   const drawerWidth = 300
+  const contentBaseStyle = {
+    width: '100vw',
+    backgroundColor: theme.palette.background.default,
+  }
+
   return {
     heightProperty: {
-      height: 'calc(100vh - 64px) !important',
+      height: '100%', // 'calc(100vh - 64px) !important',
     },
     paneDefaults: {
       backgroundColor: theme.palette.background.default,
       color: theme.palette.text.primary,
-      overflowY: 'scroll' as 'scroll',
-      overflowX: 'hidden' as 'hidden',
       display: 'block' as 'block',
       height: 'calc(100vh - 64px)',
     },
@@ -106,9 +119,7 @@ const styles = (theme: Theme) => {
       overflow: 'hidden' as 'hidden',
     },
     content: {
-      width: '100vw',
-      overflowX: 'hidden' as 'hidden',
-      backgroundColor: theme.palette.background.default,
+      ...contentBaseStyle,
       transition: theme.transitions.create('transform', {
         easing: theme.transitions.easing.sharp,
         duration: theme.transitions.duration.leavingScreen,
@@ -116,9 +127,7 @@ const styles = (theme: Theme) => {
       transform: 'translateX(0px)',
     },
     contentShift: {
-      overflowX: 'hidden' as 'hidden',
-      width: '100vw',
-      padding: 0,
+      ...contentBaseStyle,
       backgroundColor: theme.palette.background.default,
       transition: theme.transitions.create('transform', {
         easing: theme.transitions.easing.easeOut,
@@ -138,13 +147,19 @@ const mapDispatchToProps = (dispatch: any) => {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    settingsVisible: state.settings.get('visible'),
+    settingsVisible: state.globalState.get('settingsVisible'),
     connectionId: state.connection.connectionId,
-    error: state.globalState.error,
-    notification: state.globalState.notification,
+    error: state.globalState.get('error'),
+    notification: state.globalState.get('notification'),
     highlightTopicUpdates: state.settings.get('highlightTopicUpdates'),
-    launching: state.globalState.launching,
+    launching: state.globalState.get('launching'),
+    confirmationRequests: state.globalState.get('confirmationRequests'),
   }
 }
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(App))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(App)
+)

app/src/components/Chart/Chart.tsx

@@ -0,0 +1,105 @@
+import DateFormatter from '../helper/DateFormatter'
+import NoData from './NoData'
+import NumberFormatter from '../helper/NumberFormatter'
+import React, { memo, useCallback } from 'react'
+import TooltipComponent from './TooltipComponent'
+import { default as ReactResizeDetector } from 'react-resize-detector'
+import { emphasize } from '@material-ui/core/styles'
+import { mapCurveType } from './mapCurveType'
+import { PlotCurveTypes } from '../../reducers/Charts'
+import { Point, Tooltip } from './Model'
+import { Theme, withTheme } from '@material-ui/core'
+import { useCustomXDomain } from './effects/useCustomXDomain'
+import { useCustomYDomain } from './effects/useCustomYDomain'
+import 'react-vis/dist/style.css'
+const { XYPlot, LineMarkSeries, YAxis, HorizontalGridLines, Hint } = require('react-vis')
+const abbreviate = require('number-abbreviate')
+
+export interface Props {
+  data: Array<{ x: number; y: number }>
+  theme: Theme
+  interpolation?: PlotCurveTypes
+  range?: [number?, number?]
+  timeRangeStart?: number
+  color?: string
+}
+
+export default withTheme(
+  memo((props: Props) => {
+    const [width, setWidth] = React.useState(300)
+    const [tooltip, setTooltip] = React.useState<Tooltip | undefined>()
+    const detectResize = React.useCallback(newWidth => setWidth(newWidth), [])
+
+    const hintFormatter = React.useCallback(
+      (point: any) => [
+        { title: <b>Time</b>, value: <DateFormatter timeFirst={true} date={new Date(point.x)} /> },
+        { title: <b>Value</b>, value: <NumberFormatter value={point.y} /> },
+        { title: <b>Raw</b>, value: <span>{point.y}</span> },
+      ],
+      []
+    )
+
+    const onMouseLeave = React.useCallback(() => {
+      setTooltip(undefined)
+    }, [])
+
+    const showTooltip = React.useCallback((point: Point, something: { event: MouseEvent }) => {
+      if (!something) {
+        return
+      }
+      setTooltip({ point, value: hintFormatter(point), element: something.event.target as any })
+    }, [])
+
+    const paletteColor =
+      props.theme.palette.type === 'light' ? props.theme.palette.secondary.dark : props.theme.palette.primary.light
+    const color = props.color ? props.color : paletteColor
+
+    const highlightSelectedPoint = useCallback(
+      (point: Point) => {
+        const highlight = tooltip && tooltip.point.x === point.x && tooltip.point.y === point.y
+        return highlight ? emphasize(color, 0.8) : color
+      },
+      [tooltip, color]
+    )
+
+    const formatYAxis = useCallback((num: number) => abbreviate(num), [])
+
+    const xDomain = useCustomXDomain(props)
+    const yDomain = useCustomYDomain(props)
+
+    const data = props.data
+    const hasData = data.length > 0
+    const dummyDomain = [-1, 1]
+    const dummyData = [{ x: -2, y: -2 }]
+    return (
+      <div>
+        <div style={{ height: '150px', width: '100%', position: 'relative' }}>
+          {data.length === 0 ? <NoData /> : null}
+          <XYPlot
+            width={width}
+            height={180}
+            yDomain={hasData ? yDomain : dummyDomain}
+            xDomain={hasData ? xDomain : dummyDomain}
+            onMouseLeave={onMouseLeave}
+          >
+            <HorizontalGridLines />
+            <YAxis width={45} tickFormat={formatYAxis} />
+            <LineMarkSeries
+              color={color}
+              colorType="literal"
+              getColor={highlightSelectedPoint}
+              onValueMouseOver={showTooltip}
+              size={3}
+              data={hasData ? data : dummyData}
+              curve={mapCurveType(props.interpolation)}
+            />
+            <Hint value={{ x: 0, y: 0 }} style={{ pointerEvents: 'none' }}>
+              <TooltipComponent tooltip={tooltip} theme={props.theme} />
+            </Hint>
+          </XYPlot>
+          <ReactResizeDetector handleWidth={true} onResize={detectResize} />
+        </div>
+      </div>
+    )
+  })
+)

app/src/components/Chart/Model.ts

@@ -0,0 +1,15 @@
+export interface Point {
+  x: number
+  y: number
+}
+
+export interface Tooltip {
+  value: Array<TooltipRows>
+  point: Point
+  element: Element | null
+}
+
+export interface TooltipRows {
+  title: React.ReactElement
+  value: React.ReactElement
+}

app/src/components/Chart/NoData.tsx

@@ -0,0 +1,27 @@
+import React, { memo } from 'react'
+import { Typography } from '@material-ui/core'
+
+function NoData() {
+  return (
+    <div
+      style={{
+        height: '100%',
+        position: 'absolute',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        width: '100%',
+        color: '#ccc',
+        verticalAlign: 'middle',
+        paddingLeft: '30px',
+        zIndex: 10,
+      }}
+    >
+      <Typography style={{ fontWeight: 'bold' }} variant="h5">
+        No Data
+      </Typography>
+    </div>
+  )
+}
+
+export default memo(NoData)

app/src/components/Chart/TooltipComponent.tsx

@@ -0,0 +1,59 @@
+import React, { memo } from 'react'
+import { fade } from '@material-ui/core/styles'
+import { Fade, Grow, Paper, Popper, Theme, Typography, withTheme } from '@material-ui/core'
+import { Tooltip } from './Model'
+
+function TooltipComponent(props: { tooltip?: Tooltip; theme: Theme }) {
+  const { tooltip } = props
+  return (
+    <Popper
+      style={Boolean(tooltip) ? { transition: 'all 0.1s ease-out' } : undefined}
+      open={Boolean(tooltip)}
+      transition={true}
+      placement="top"
+      anchorEl={tooltip && tooltip.element}
+    >
+      <div
+        style={{
+          paddingBottom: '8px',
+          transition: 'all 0.5s ease',
+        }}
+      >
+        <Fade in={Boolean(tooltip)} timeout={300}>
+          <Grow in={Boolean(tooltip)} timeout={300}>
+            <Paper
+              style={{
+                padding: '4px',
+                marginTop: '-12px',
+                backgroundColor: fade(
+                  props.theme.palette.type === 'light'
+                    ? props.theme.palette.background.paper
+                    : props.theme.palette.background.default,
+                  0.7
+                ),
+              }}
+            >
+              <table style={{ lineHeight: '1.25em' }}>
+                <tbody>
+                  {tooltip &&
+                    tooltip.value.map((v: any, idx: number) => (
+                      <tr key={idx}>
+                        <td>
+                          <Typography style={{ lineHeight: '1.2' }}>{v.title}</Typography>
+                        </td>
+                        <td>
+                          <Typography style={{ lineHeight: '1.2' }}>{v.value}</Typography>
+                        </td>
+                      </tr>
+                    ))}
+                </tbody>
+              </table>
+            </Paper>
+          </Grow>
+        </Fade>
+      </div>
+    </Popper>
+  )
+}
+
+export default withTheme(memo(TooltipComponent))

app/src/components/Chart/effects/useCustomXDomain.tsx

@@ -0,0 +1,10 @@
+import { useMemo } from 'react'
+import { Props } from '../Chart'
+
+export function useCustomXDomain(props: Props): [number, number] | undefined {
+  return useMemo(() => {
+    const lastDataPoint = [...props.data].sort((a, b) => b.x - a.x)[0]
+    const lastDataDate = lastDataPoint ? lastDataPoint.x : Date.now()
+    return props.timeRangeStart ? [Date.now() - props.timeRangeStart, lastDataDate] : undefined
+  }, [props.data, props.timeRangeStart])
+}

app/src/components/Chart/effects/useCustomYDomain.tsx

@@ -0,0 +1,39 @@
+import { Props } from '../Chart'
+import { useMemo } from 'react'
+import { Point } from '../Model'
+
+export function useCustomYDomain(props: Props) {
+  return useMemo(() => {
+    const data = props.data
+    const calculatedDomain = domainForData(data)
+    const yDomain: [number, number] = props.range
+      ? [props.range[0] || calculatedDomain[0], props.range[1] || calculatedDomain[1]]
+      : calculatedDomain
+
+    return yDomain
+  }, [props.data])
+}
+
+function domainForData(data: Array<Point>): [number, number] {
+  if (!data[0]) {
+    const defaultDomain: [number, number] = [-1, 1]
+    return defaultDomain
+  }
+  let max = data[0].y
+  let min = data[0].y
+  data.forEach(d => {
+    if (max < d.y) {
+      max = d.y
+    }
+    if (min > d.y) {
+      min = d.y
+    }
+  })
+  if ((max === 1 || max === 0) && (min === 1 || min === 0)) {
+    return [0, 1]
+  }
+  if (min === max) {
+    return [min - 0.5 * min, min + 0.5 * min]
+  }
+  return [min, max]
+}

app/src/components/Chart/mapCurveType.tsx

@@ -0,0 +1,17 @@
+import { PlotCurveTypes } from '../../reducers/Charts'
+export function mapCurveType(type: PlotCurveTypes | undefined) {
+  switch (type) {
+    case 'curve':
+      return 'curveMonotoneX'
+    case 'linear':
+      return 'curveLinear'
+    case 'cubic_basis_spline':
+      return 'curveBasis'
+    case 'step_after':
+      return 'curveStepAfter'
+    case 'step_before':
+      return 'curveStepBefore'
+    default:
+      return 'curveMonotoneX'
+  }
+}

app/src/components/ChartPanel/ChartActions.tsx

@@ -0,0 +1,34 @@
+import React, { useRef } from 'react'
+import Play from '@material-ui/icons/PlayArrow'
+import Pause from '@material-ui/icons/PauseCircleFilled'
+import Clear from '@material-ui/icons/Clear'
+import CustomIconButton from '../helper/CustomIconButton'
+import { ChartParameters } from '../../reducers/Charts'
+import { SettingsButton } from './ChartSettings/SettingsButton'
+
+export function ChartActions(props: {
+  paused: boolean
+  togglePause: () => void
+  parameters: ChartParameters
+  onRemove: () => void
+  resetDataAction: () => void
+}) {
+  const menuAnchor = useRef()
+  return (
+    <div style={{ display: 'flex' }}>
+      <CustomIconButton tooltip={props.paused ? 'Resume chart' : 'Pause chart'} onClick={props.togglePause}>
+        {props.paused ? <Play /> : <Pause />}
+      </CustomIconButton>
+      <SettingsButton menuAnchor={menuAnchor} parameters={props.parameters} resetDataAction={props.resetDataAction} />
+      <CustomIconButton tooltip="Remove chart" onClick={props.onRemove}>
+        <Clear data-test-type="RemoveChart" data-test={`${props.parameters.topic}-${props.parameters.dotPath || ''}`} />
+      </CustomIconButton>
+      <div style={{ width: 0, overflow: 'hidden' }}>
+        {/* Helper element to provide an anchor element for the menu,
+         * so the menu prefers not to overlap with the chart
+         */}
+        <div style={{ marginLeft: '11px' }} ref={menuAnchor as any} />
+      </div>
+    </div>
+  )
+}

app/src/components/ChartPanel/ChartSettings/ColorSettings.tsx

@@ -0,0 +1,71 @@
+import React, { memo } from 'react'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+import { ChartParameters } from '../../../reducers/Charts'
+import { connect } from 'react-redux'
+import { Menu, MenuItem } from '@material-ui/core'
+import { colors as createColors } from './colors'
+
+function chartParametersForColor(chart: ChartParameters, color?: string) {
+  return {
+    color,
+    topic: chart.topic,
+    dotPath: chart.dotPath,
+  }
+}
+
+const colors: Array<string> = createColors()
+
+function ColorSettings(props: {
+  chart: ChartParameters
+  actions: {
+    chart: typeof chartActions
+  }
+  anchorEl?: Element
+  open: boolean
+  close: () => void
+}) {
+  const setColor = React.useCallback(
+    (color?: string) => props.actions.chart.updateChart(chartParametersForColor(props.chart, color)),
+    [props.chart]
+  )
+
+  const menuItems = React.useMemo(() => {
+    return colors.map(color => (
+      <MenuItem
+        style={{ minWidth: '8em', minHeight: '36px', backgroundColor: color, textAlign: 'center' }}
+        key={color}
+        onClick={() => setColor(color)}
+      >
+        {props.chart.color === color ? 'X' : ''}
+      </MenuItem>
+    ))
+  }, [colors, props.chart])
+
+  return (
+    <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.close}>
+      <MenuItem
+        style={{ minWidth: '8em', minHeight: '36px', textAlign: 'center' }}
+        key="none"
+        onClick={() => setColor()}
+        selected={props.chart.color === undefined}
+      >
+        default
+      </MenuItem>
+      {menuItems}
+    </Menu>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(memo(ColorSettings))

app/src/components/ChartPanel/ChartSettings/InterpolationSettings.tsx

@@ -0,0 +1,66 @@
+import * as React from 'react'
+import { AppState } from '../../../reducers'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+import { ChartParameters, PlotCurveTypes } from '../../../reducers/Charts'
+import { connect } from 'react-redux'
+import { Menu, MenuItem, Typography } from '@material-ui/core'
+
+function chartParametersForAction(chart: ChartParameters, action: string) {
+  return {
+    topic: chart.topic,
+    dotPath: chart.dotPath,
+    interpolation: action as any,
+  }
+}
+
+const curves: Array<PlotCurveTypes> = ['curve', 'linear', 'step_after', 'step_before', 'cubic_basis_spline']
+
+function InterpolationSettings(props: {
+  chart: ChartParameters
+  actions: {
+    chart: typeof chartActions
+  }
+  anchorEl?: Element
+  open: boolean
+  close: () => void
+}) {
+  const callbacks = React.useMemo(() => {
+    const createCurveCallback = (curve: PlotCurveTypes) => () => {
+      props.actions.chart.updateChart(chartParametersForAction(props.chart, curve))
+    }
+
+    const callbacks: { [key: string]: () => void } = {}
+    for (const curve of curves) {
+      callbacks[curve] = createCurveCallback(curve)
+    }
+    return callbacks
+  }, [curves])
+
+  const menuItems = React.useMemo(() => {
+    return curves.map(curve => (
+      <MenuItem key={curve} onClick={callbacks[curve]} selected={props.chart.interpolation === curve}>
+        <Typography variant="inherit">{curve.replace(/_/g, ' ')}</Typography>
+      </MenuItem>
+    ))
+  }, [curves, props.chart])
+
+  return (
+    <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.close}>
+      {menuItems}
+    </Menu>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(InterpolationSettings)

app/src/components/ChartPanel/ChartSettings/MoveUp.tsx

@@ -0,0 +1,39 @@
+import * as React from 'react'
+import ArrowUpward from '@material-ui/icons/ArrowUpward'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+import { ChartParameters } from '../../../reducers/Charts'
+import { connect } from 'react-redux'
+import { MenuItem, Typography, ListItemIcon } from '@material-ui/core'
+
+function MoveUp(props: { actions: { chart: typeof chartActions }; chart: ChartParameters; close: () => void }) {
+  const moveUp = React.useCallback(() => {
+    props.actions.chart.moveChartUp({
+      topic: props.chart.topic,
+      dotPath: props.chart.dotPath,
+    })
+    props.close()
+  }, [props.chart])
+
+  return (
+    <MenuItem key="size" onClick={moveUp}>
+      <ListItemIcon>
+        <ArrowUpward />
+      </ListItemIcon>
+      <Typography variant="inherit">Move up</Typography>
+    </MenuItem>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(MoveUp)

app/src/components/ChartPanel/ChartSettings/RangeSettings.tsx

@@ -0,0 +1,120 @@
+import React, { useCallback, useState, ChangeEvent, MouseEvent, useRef, useEffect, useMemo } from 'react'
+import { ChartParameters } from '../../../reducers/Charts'
+import { Menu, TextField, Typography } from '@material-ui/core'
+import { connect } from 'react-redux'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+import { KeyCodes } from '../../../utils/KeyCodes'
+
+interface Props {
+  actions: { chart: typeof chartActions }
+  chart: ChartParameters
+  anchorEl?: Element
+  open: boolean
+  onClose: () => void
+}
+
+function RangeSettings(props: Props) {
+  const dismissClick = useCallback((e: MouseEvent) => e.stopPropagation(), [])
+  const [rangeFrom, setRangeFrom] = useState<string | number | undefined>(props.chart.range && props.chart.range.from)
+  const [rangeTo, setRangeTo] = useState<string | number | undefined>(props.chart.range && props.chart.range.to)
+  useRangeStateToFireUpdateAction(rangeFrom, rangeTo, props)
+  const rangeFromRef = useRef<HTMLInputElement>()
+  const rangeToRef = useRef<HTMLInputElement>()
+
+  useEffect(() => {
+    rangeFromRef.current && rangeFromRef.current.focus()
+  }, [props.open])
+
+  const handleKeyEvents = (e: React.KeyboardEvent<any>) => {
+    if (e.keyCode === KeyCodes.tab) {
+      // Switch focus between those two
+      if (document.activeElement === rangeFromRef.current) {
+        rangeToRef.current && rangeToRef.current.focus()
+      } else {
+        rangeFromRef.current && rangeFromRef.current.focus()
+      }
+
+      // Prevent closing the menu
+      e.stopPropagation()
+      // Prevent default tab behavior (focus/blur)
+      e.preventDefault()
+    } else if (e.keyCode === KeyCodes.enter) {
+      props.onClose()
+    }
+  }
+
+  const setFromHandler = useCallback((e: ChangeEvent<HTMLInputElement>) => setRangeFrom(e.target.value), [])
+  const setToHandler = useCallback((e: ChangeEvent<HTMLInputElement>) => setRangeTo(e.target.value), [])
+  return useMemo(
+    () => (
+      <Menu
+        style={{ textAlign: 'center' }}
+        keepMounted={true}
+        anchorEl={props.anchorEl}
+        open={props.open}
+        onClose={props.onClose}
+        onKeyDownCapture={handleKeyEvents}
+      >
+        <div style={{ padding: '0 16px', width: '275px' }}>
+          <Typography>Define custom ranges for the Y-Axis</Typography>
+          <TextField
+            inputProps={{
+              ref: rangeFromRef,
+            }}
+            autoFocus={true}
+            style={{ marginTop: '0' }}
+            label="from"
+            value={rangeFrom}
+            onChange={setFromHandler}
+            margin="normal"
+          />
+          <TextField
+            inputProps={{
+              ref: rangeToRef,
+            }}
+            style={{ marginLeft: '8px', marginTop: '0' }}
+            onClick={dismissClick}
+            label="to"
+            value={rangeTo}
+            onChange={setToHandler}
+            margin="normal"
+          />
+        </div>
+      </Menu>
+    ),
+    [rangeFrom, rangeTo, props.open]
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(RangeSettings)
+
+function useRangeStateToFireUpdateAction(
+  rangeFrom: string | number | undefined,
+  rangeTo: string | number | undefined,
+  props: Props
+) {
+  React.useEffect(() => {
+    const from = parseFloat(rangeFrom as any)
+    const to = parseFloat(rangeTo as any)
+    props.actions.chart.updateChart({
+      topic: props.chart.topic,
+      dotPath: props.chart.dotPath,
+      range: {
+        from: isNaN(from) ? undefined : from,
+        to: isNaN(to) ? undefined : to,
+      },
+    })
+  }, [rangeFrom, rangeTo])
+}

app/src/components/ChartPanel/ChartSettings/SettingsButton.tsx

@@ -0,0 +1,38 @@
+import * as React from 'react'
+import ChartSettings from '.'
+import CustomIconButton from '../../helper/CustomIconButton'
+import MoreVertIcon from '@material-ui/icons/Settings'
+import { ChartParameters } from '../../../reducers/Charts'
+
+export function SettingsButton(props: {
+  parameters: ChartParameters
+  resetDataAction: () => void
+  menuAnchor: React.MutableRefObject<undefined>
+}) {
+  const [visible, setVisible] = React.useState(false)
+  const toggleSettings = React.useCallback(() => {
+    setVisible(!visible)
+  }, [visible])
+
+  const close = React.useCallback(() => {
+    setVisible(false)
+  }, [])
+
+  return (
+    <span>
+      <ChartSettings
+        open={visible}
+        close={close}
+        anchorEl={props.menuAnchor}
+        chart={props.parameters}
+        resetDataAction={props.resetDataAction}
+      />
+      <CustomIconButton tooltip="Chart settings" onClick={toggleSettings}>
+        <MoreVertIcon
+          data-test-type="ChartSettings"
+          data-test={`${props.parameters.topic}-${props.parameters.dotPath || ''}`}
+        />
+      </CustomIconButton>
+    </span>
+  )
+}

app/src/components/ChartPanel/ChartSettings/Size.tsx

@@ -0,0 +1,53 @@
+import React, { memo } from 'react'
+import { ChartParameters } from '../../../reducers/Charts'
+import { Menu, MenuItem, TextField, Typography } from '@material-ui/core'
+import { connect } from 'react-redux'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+
+function Size(props: {
+  actions: { chart: typeof chartActions }
+  chart: ChartParameters
+  anchorEl?: Element
+  open: boolean
+  close: () => void
+}) {
+  const setChartWidth = (width?: 'big' | 'medium' | 'small') => () => {
+    props.actions.chart.updateChart({
+      width,
+      topic: props.chart.topic,
+      dotPath: props.chart.dotPath,
+    })
+    props.close()
+  }
+
+  return (
+    <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.close}>
+      <MenuItem selected={props.chart.width === undefined} onClick={setChartWidth()}>
+        <Typography variant="inherit">auto</Typography>
+      </MenuItem>
+      <MenuItem selected={props.chart.width === 'big'} onClick={setChartWidth('big')}>
+        <Typography variant="inherit">100% width</Typography>
+      </MenuItem>
+      <MenuItem selected={props.chart.width === 'medium'} onClick={setChartWidth('medium')}>
+        <Typography variant="inherit">50% width</Typography>
+      </MenuItem>
+      <MenuItem selected={props.chart.width === 'small'} onClick={setChartWidth('small')}>
+        <Typography variant="inherit">33% width</Typography>
+      </MenuItem>
+    </Menu>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(memo(Size))

app/src/components/ChartPanel/ChartSettings/TimeRangeSettings.tsx

@@ -0,0 +1,102 @@
+import React, { ChangeEvent, MouseEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { bindActionCreators } from 'redux'
+import { Button, Menu, TextField, Typography } from '@material-ui/core'
+import { chartActions } from '../../../actions'
+import { ChartParameters } from '../../../reducers/Charts'
+import { connect } from 'react-redux'
+const parseDuration = require('parse-duration')
+
+interface Props {
+  actions: { chart: typeof chartActions }
+  chart: ChartParameters
+  anchorEl?: Element
+  open: boolean
+  onClose: () => void
+}
+
+function TimeRangeSettings(props: Props) {
+  const dismissClick = useCallback((e: MouseEvent) => e.stopPropagation(), [])
+  const [value, setValue] = useState<string | undefined>(
+    props.chart.timeRange ? props.chart.timeRange.until : undefined
+  )
+  const ranges = ['all', '10s', '30s', '1m', '5m', '15m', '1h', '6h', '1d']
+
+  const manuallySetIntervalHandler = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    setValue(e.target.value)
+  }, [])
+
+  useEffect(() => {
+    if (!value) {
+      props.actions.chart.updateChart({
+        ...props.chart,
+        timeRange: undefined,
+      })
+      return
+    }
+
+    const canBeParsed = Boolean(parseDuration(value))
+    if (canBeParsed) {
+      props.actions.chart.updateChart({
+        ...props.chart,
+        timeRange: {
+          until: value,
+        },
+      })
+    }
+  }, [value])
+
+  return useMemo(() => {
+    const createRangeHandler = (range: string) => (e: React.MouseEvent) => setValue(range === 'all' ? undefined : range)
+
+    return (
+      <Menu
+        style={{ textAlign: 'center' }}
+        keepMounted={true}
+        anchorEl={props.anchorEl}
+        open={props.open}
+        onClose={props.onClose}
+      >
+        <Typography>Chart data within a time interval</Typography>
+        <div style={{ padding: '0 16px', width: '275px', textAlign: 'center' }}>
+          {ranges.map(r => {
+            return (
+              <Button
+                style={{ margin: '4px', textTransform: 'none' }}
+                variant="contained"
+                key={r}
+                onClick={createRangeHandler(r)}
+              >
+                {r}
+              </Button>
+            )
+          })}
+        </div>
+        <Typography style={{ fontSize: '0.75em' }}>
+          <i>Limited to 500 data points</i>
+        </Typography>
+        <br />
+        <TextField
+          style={{ marginLeft: '8px', marginTop: '0' }}
+          onClick={dismissClick}
+          label="custom interval"
+          value={value || ''}
+          onChange={manuallySetIntervalHandler}
+          margin="normal"
+        />
+      </Menu>
+    )
+  }, [value, props.open])
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(TimeRangeSettings)

app/src/components/ChartPanel/ChartSettings/colors.ts

@@ -0,0 +1,46 @@
+import {
+  amber,
+  orange,
+  pink,
+  purple,
+  deepPurple,
+  teal,
+  red,
+  green,
+  lime,
+  indigo,
+  yellow,
+  brown,
+  blueGrey,
+} from '@material-ui/core/colors'
+
+export function colors() {
+  function colorToInt(color: string): [number, number, number] {
+    const str = color.replace('#', '')
+    return [parseInt(str.slice(0, 2), 16), parseInt(str.slice(2, 4), 16), parseInt(str.slice(4, 6), 16)]
+  }
+  function colorCompare(colorA: string, colorB: string) {
+    const a = colorToInt(colorA)
+    const b = colorToInt(colorB)
+    return Math.sqrt(Math.pow(a[0] - b[0], 2) + Math.pow(a[1] - b[1], 2) + Math.pow(a[2] - b[2], 2))
+  }
+  const colors: Array<string> = [
+    brown,
+    blueGrey,
+    amber,
+    orange,
+    pink,
+    purple,
+    deepPurple,
+    teal,
+    red,
+    green,
+    lime,
+    indigo,
+    yellow,
+  ]
+    .map(color => [color[200], color[500], color[700]])
+    .reduce((a, b) => a.concat(b), [])
+    .sort((a, b) => colorCompare(a, b))
+  return colors
+}

app/src/components/ChartPanel/ChartSettings/index.tsx

@@ -0,0 +1,124 @@
+import BarChart from '@material-ui/icons/BarChart'
+import Clear from '@material-ui/icons/Refresh'
+import ColorLens from '@material-ui/icons/ColorLens'
+import ColorSettings from './ColorSettings'
+import InterpolationSettings from './InterpolationSettings'
+import MoveUp from './MoveUp'
+import MultilineChart from '@material-ui/icons/MultilineChart'
+import RangeSettings from './RangeSettings'
+import React, { memo } from 'react'
+import Size from './Size'
+import Sort from '@material-ui/icons/Sort'
+import TimeRangeSettings from './TimeRangeSettings'
+import { ChartParameters } from '../../../reducers/Charts'
+import { Menu, MenuItem, ListItemIcon, Typography } from '@material-ui/core'
+
+function ChartSettings(props: {
+  open: boolean
+  close: () => void
+  resetDataAction: () => void
+  chart: ChartParameters
+  anchorEl: React.MutableRefObject<undefined>
+}) {
+  const [rangeVisible, setRangeVisible] = React.useState(false)
+  const [timeRangeVisible, setTimeRangeVisible] = React.useState(false)
+  const [interpolationVisible, setInterpolationVisible] = React.useState(false)
+  const [sizeVisible, setSizeVisible] = React.useState(false)
+  const [colorVisible, setColorVisible] = React.useState(false)
+
+  const toggleRange = React.useCallback(() => {
+    if (open) {
+      props.close()
+    }
+    setRangeVisible(!rangeVisible)
+  }, [rangeVisible, open])
+
+  const toggleTimeRange = React.useCallback(() => {
+    if (open) {
+      props.close()
+    }
+    setTimeRangeVisible(!timeRangeVisible)
+  }, [timeRangeVisible, open])
+
+  const toggleInterpolation = React.useCallback(() => {
+    if (open) {
+      props.close()
+    }
+    setInterpolationVisible(!interpolationVisible)
+  }, [interpolationVisible, open])
+
+  const toggleSize = React.useCallback(() => {
+    if (open) {
+      props.close()
+    }
+    setSizeVisible(!sizeVisible)
+  }, [sizeVisible, open])
+
+  const toggleColor = React.useCallback(() => {
+    if (open) {
+      props.close()
+    }
+    setColorVisible(!colorVisible)
+  }, [colorVisible, open])
+
+  return (
+    <span>
+      <Menu id="long-menu" anchorEl={props.anchorEl.current} open={props.open} onClose={props.close}>
+        <MenuItem key="range" onClick={toggleRange}>
+          <ListItemIcon>
+            <BarChart />
+          </ListItemIcon>
+          <Typography variant="inherit">Y-Axis range (Values)</Typography>
+        </MenuItem>
+        <MenuItem key="timeRange" onClick={toggleTimeRange}>
+          <ListItemIcon>
+            <BarChart />
+          </ListItemIcon>
+          <Typography variant="inherit">X-Axis range (Time)</Typography>
+        </MenuItem>
+        <MenuItem key="interpolation" onClick={toggleInterpolation}>
+          <ListItemIcon>
+            <MultilineChart />
+          </ListItemIcon>
+          <Typography variant="inherit">Curve interpolation</Typography>
+        </MenuItem>
+        <MenuItem key="size" onClick={toggleSize}>
+          <ListItemIcon>
+            <Sort />
+          </ListItemIcon>
+          <Typography variant="inherit">Size</Typography>
+        </MenuItem>
+        <MenuItem key="color" onClick={toggleColor}>
+          <ListItemIcon>
+            <ColorLens />
+          </ListItemIcon>
+          <Typography variant="inherit">Color</Typography>
+        </MenuItem>
+        <MenuItem key="clear" onClick={props.resetDataAction}>
+          <ListItemIcon>
+            <Clear />
+          </ListItemIcon>
+          <Typography variant="inherit">Clear data</Typography>
+        </MenuItem>
+        <MoveUp chart={props.chart} close={props.close} />
+      </Menu>
+      <RangeSettings chart={props.chart} anchorEl={props.anchorEl.current} open={rangeVisible} onClose={toggleRange} />
+      <TimeRangeSettings
+        chart={props.chart}
+        anchorEl={props.anchorEl.current}
+        open={timeRangeVisible}
+        onClose={toggleTimeRange}
+      />
+      <InterpolationSettings
+        chart={props.chart}
+        anchorEl={props.anchorEl.current}
+        open={interpolationVisible}
+        close={toggleInterpolation}
+      />
+      <Size chart={props.chart} anchorEl={props.anchorEl.current} open={sizeVisible} close={toggleSize} />
+      <ColorSettings chart={props.chart} anchorEl={props.anchorEl.current} open={colorVisible} close={toggleColor} />
+    </span>
+  )
+}
+
+export default memo(ChartSettings)

app/src/components/ChartPanel/ChartTitle.tsx

@@ -0,0 +1,29 @@
+import * as React from 'react'
+import { ChartParameters } from '../../reducers/Charts'
+import { Typography, Theme, withStyles } from '@material-ui/core'
+
+function ChartTitle(props: { parameters: ChartParameters; classes: any }) {
+  const { classes, parameters } = props
+  return (
+    <div style={{ flexGrow: 1, overflow: 'hidden', textOverflow: 'ellipsis' }}>
+      <Typography variant="caption" className={classes.topic}>
+        {parameters.dotPath ? parameters.dotPath : parameters.topic}
+      </Typography>
+      <br />
+      <Typography variant="caption" className={classes.topic}>
+        {parameters.dotPath ? parameters.topic : <span dangerouslySetInnerHTML={{ __html: '&nbsp;' }}></span>}
+      </Typography>
+    </div>
+  )
+}
+
+const styles = (theme: Theme) => ({
+  topic: {
+    wordBreak: 'break-all' as 'break-all',
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+    textOverflow: 'ellipsis' as 'ellipsis',
+  },
+})
+
+export default withStyles(styles)(ChartTitle)

app/src/components/ChartPanel/ChartWithTreeNode.tsx

@@ -0,0 +1,20 @@
+import * as q from '../../../../backend/src/Model'
+import React from 'react'
+import TopicChart from './TopicChart'
+import { ChartParameters } from '../../reducers/Charts'
+import { usePollingToFetchTreeNode } from '../helper/usePollingToFetchTreeNode'
+
+interface Props {
+  tree?: q.Tree<any>
+  parameters: ChartParameters
+}
+
+export function ChartWithTreeNode(props: Props) {
+  const { tree, parameters } = props
+  if (!tree) {
+    return null
+  }
+
+  const treeNode = usePollingToFetchTreeNode(tree, parameters.topic)
+  return <TopicChart treeNode={treeNode} parameters={parameters} />
+}

app/src/components/ChartPanel/TopicChart.tsx

@@ -0,0 +1,139 @@
+import * as q from '../../../../backend/src/Model'
+import ChartTitle from './ChartTitle'
+import React, { useState, useCallback, memo, useRef } from 'react'
+import TopicPlot from '../TopicPlot'
+import { bindActionCreators } from 'redux'
+import { ChartActions } from './ChartActions'
+import { chartActions } from '../../actions'
+import { ChartParameters } from '../../reducers/Charts'
+import { connect } from 'react-redux'
+import { Paper } from '@material-ui/core'
+const throttle = require('lodash.throttle')
+
+class ClearableMessageBuffer extends q.RingBuffer<q.Message> {
+  public clear() {
+    this.items = []
+    this.start = 0
+    this.end = 0
+  }
+
+  public static fromMessageBuffer(buffer: q.RingBuffer<q.Message>): ClearableMessageBuffer {
+    return new ClearableMessageBuffer(buffer.capacity, buffer.maxItems, buffer.compactionFactor, buffer)
+  }
+
+  public clone(): ClearableMessageBuffer {
+    return ClearableMessageBuffer.fromMessageBuffer(this)
+  }
+}
+
+interface Props {
+  parameters: ChartParameters
+  treeNode?: q.TreeNode<any>
+  actions: {
+    chart: typeof chartActions
+  }
+}
+
+/**
+ * Subscribes to onMessages, stores more data points then the default
+ */
+function useMessageSubscriptionToUpdate(treeNode?: q.TreeNode<any>) {
+  const [lastUpdated, setLastUpdate] = useState(0)
+  const [messageHistory, setMessageHistory] = useState<ClearableMessageBuffer | undefined>()
+  let amendMessageCallback: any
+
+  function subscribeToMessageUpdates() {
+    const throttledUpdate = throttle(() => setLastUpdate(treeNode ? treeNode.lastUpdate : 0), 300)
+
+    if (treeNode) {
+      const newMessageHistory = ClearableMessageBuffer.fromMessageBuffer(treeNode.messageHistory)
+      newMessageHistory.setCapacity(500, 2 * 500 * 10000)
+
+      amendMessageCallback = (message: q.Message) => {
+        newMessageHistory.add(message)
+        throttledUpdate()
+      }
+      treeNode.onMessage.subscribe(amendMessageCallback)
+      setMessageHistory(newMessageHistory)
+    }
+
+    return function cleanup() {
+      treeNode && treeNode.onMessage.unsubscribe(amendMessageCallback)
+      setMessageHistory(undefined)
+    }
+  }
+  React.useEffect(subscribeToMessageUpdates, [treeNode])
+
+  return messageHistory
+}
+
+function useResetDataCallback(messageHistory: ClearableMessageBuffer | undefined) {
+  const [lastUpdated, setLastUpdate] = useState(0)
+
+  return React.useCallback(() => {
+    messageHistory && messageHistory.clear()
+    setLastUpdate(Date.now())
+  }, [messageHistory])
+}
+
+function TopicChart(props: Props) {
+  const { parameters, treeNode } = props
+  const [frozenHistory, setFrozenHistory] = useState<q.MessageHistory | undefined>()
+  const messageHistory = useMessageSubscriptionToUpdate(treeNode)
+
+  const togglePause = useCallback(() => {
+    if (!treeNode) {
+      return
+    }
+
+    setFrozenHistory(frozenHistory ? undefined : messageHistory && messageHistory.clone())
+  }, [props.treeNode, frozenHistory, messageHistory])
+
+  const onRemove = React.useCallback(() => {
+    props.actions.chart.removeChart(props.parameters)
+  }, [props.parameters])
+
+  const resetData = useResetDataCallback(messageHistory)
+
+  return (
+    <Paper
+      style={{ padding: '8px' }}
+      data-test-type="ChartPaper"
+      data-test={`${props.parameters.topic}-${props.parameters.dotPath || ''}`}
+    >
+      <div style={{ display: 'flex' }}>
+        <div style={{ display: 'flex', flexGrow: 1, overflow: 'hidden' }}>
+          <ChartTitle parameters={parameters} />
+          <ChartActions
+            resetDataAction={resetData}
+            parameters={parameters}
+            onRemove={onRemove}
+            paused={Boolean(frozenHistory)}
+            togglePause={togglePause}
+          />
+        </div>
+      </div>
+      <TopicPlot
+        color={props.parameters.color}
+        interpolation={props.parameters.interpolation}
+        timeInterval={props.parameters.timeRange ? props.parameters.timeRange.until : undefined}
+        range={props.parameters.range ? [props.parameters.range.from, props.parameters.range.to] : undefined}
+        history={frozenHistory || messageHistory || new ClearableMessageBuffer(1)}
+        dotPath={parameters.dotPath}
+      />
+    </Paper>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(memo(TopicChart))

app/src/components/ChartPanel/index.tsx

@@ -0,0 +1,132 @@
+import * as q from '../../../../backend/src/Model'
+import * as React from 'react'
+import ShowChart from '@material-ui/icons/ShowChart'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../actions'
+import { ChartParameters } from '../../reducers/Charts'
+import { ChartWithTreeNode } from './ChartWithTreeNode'
+import { connect } from 'react-redux'
+import { Grid, Theme, Typography, withStyles } from '@material-ui/core'
+import { List } from 'immutable'
+const { TransitionGroup, CSSTransition } = require('react-transition-group/esm')
+
+interface Props {
+  charts: List<ChartParameters>
+  connectionId?: string
+  tree?: q.Tree<any>
+  actions: {
+    chart: typeof chartActions
+  }
+  classes: any
+}
+
+function spacingForChartCount(count: number): 4 | 6 | 12 {
+  if (count >= 5) {
+    return 4
+  } else if (count >= 2) {
+    return 6
+  } else {
+    return 12
+  }
+}
+
+function mapWidth(width: 'big' | 'medium' | 'small' | undefined, calculatedSpacing: 4 | 6 | 12): 4 | 6 | 12 {
+  switch (width) {
+    case 'big':
+      return 12
+    case 'medium':
+      return 6
+    case 'small':
+      return 4
+    default:
+      return calculatedSpacing
+  }
+}
+
+function ChartPanel(props: Props) {
+  const chartsInView = props.charts.count()
+
+  const [spacing, setSpacing] = React.useState(spacingForChartCount(chartsInView))
+
+  React.useEffect(() => {
+    props.actions.chart.loadCharts()
+  }, [props.connectionId])
+
+  // Update spacing after animations have completed
+  React.useEffect(() => {
+    const newSpacing = spacingForChartCount(chartsInView)
+    if (newSpacing > spacing) {
+      setTimeout(() => setSpacing(newSpacing), 500)
+    } else {
+      setSpacing(newSpacing)
+    }
+  }, [chartsInView])
+
+  const charts = props.charts.map(chartParameters => (
+    <CSSTransition
+      key={`${chartParameters.topic}-${chartParameters.dotPath || ''}`}
+      timeout={{ enter: 500, exit: 500 }}
+      classNames="example"
+    >
+      <Grid item xs={mapWidth(chartParameters.width, spacing)}>
+        <ChartWithTreeNode tree={props.tree} parameters={chartParameters} />
+      </Grid>
+    </CSSTransition>
+  ))
+
+  return (
+    <div className={props.classes.container}>
+      <Grid container spacing={1}>
+        <TransitionGroup component={null} className="example">
+          {charts}
+        </TransitionGroup>
+        {chartsInView === 0 ? <NoCharts key="noCharts" /> : null}
+      </Grid>
+    </div>
+  )
+}
+
+function NoCharts() {
+  return (
+    <div style={{ width: '100%', textAlign: 'center' }}>
+      <Typography variant="h2">No charts selected</Typography>
+      <Typography>Select a numeric values from the value preview.</Typography>
+      <Typography>
+        Click on <ShowChart /> to add a topic / value to this panel.
+      </Typography>
+    </div>
+  )
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    charts: state.charts.get('charts'),
+    connectionId: state.connection.connectionId,
+    tree: state.connection.tree,
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+const styles = (theme: Theme) => ({
+  container: {
+    backgroundColor: theme.palette.background.default,
+    width: '100%',
+    height: '100%',
+    padding: '8px',
+    flex: 1,
+    overflow: 'hidden scroll',
+  },
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ChartPanel))

app/src/components/ConfirmationDialog.tsx

@@ -0,0 +1,61 @@
+import React, { useRef, useCallback, memo } from 'react'
+import { ConfirmationRequest } from '../reducers/Global'
+import { Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions, Button } from '@material-ui/core'
+import { KeyCodes } from '../utils/KeyCodes'
+
+function ConfirmationDialog(props: { confirmationRequests: Array<ConfirmationRequest> }) {
+  const request = props.confirmationRequests[0]
+  const yesRef = useRef<HTMLButtonElement>()
+  const noRef = useRef<HTMLButtonElement>()
+  const arrowKeyHandler = useCallback((event: React.KeyboardEvent) => {
+    const isArrowKey = event.keyCode === KeyCodes.arrow_left || event.keyCode === KeyCodes.arrow_right
+    if (!isArrowKey) {
+      return
+    }
+
+    event.stopPropagation()
+    if (document.activeElement === noRef.current) {
+      yesRef.current && yesRef.current.focus()
+    } else {
+      noRef.current && noRef.current.focus()
+    }
+  }, [])
+
+  const confirm = React.useCallback(() => {
+    request && request.callback(true)
+  }, [request])
+  const reject = React.useCallback(() => {
+    request && request.callback(false)
+  }, [request])
+
+  if (!request) {
+    return null
+  }
+
+  return (
+    <Dialog
+      open={true}
+      onClose={reject}
+      aria-labelledby="alert-dialog-title"
+      aria-describedby="alert-dialog-description"
+      onKeyDown={arrowKeyHandler}
+    >
+      <DialogTitle id="alert-dialog-title">{request.title}</DialogTitle>
+      <DialogContent>
+        <DialogContentText id="alert-dialog-description" style={{ whiteSpace: 'pre-wrap' }}>
+          {request.inquiry}
+        </DialogContentText>
+      </DialogContent>
+      <DialogActions>
+        <Button ref={yesRef as any} variant="contained" onClick={confirm} color="primary" autoFocus>
+          Yes
+        </Button>
+        <Button ref={noRef as any} variant="contained" onClick={reject} color="secondary" style={{ marginLeft: '8px' }}>
+          No
+        </Button>
+      </DialogActions>
+    </Dialog>
+  )
+}
+
+export default memo(ConfirmationDialog)

app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx

@@ -8,19 +8,9 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
-import {
-  Button,
-  Grid,
-  IconButton,
-  TextField,
-  List,
-  ListItem,
-  ListItemText,
-  Tooltip,
-  Typography,
-} from '@material-ui/core'
+import { Button, Grid, IconButton, TextField, List, ListItem, ListItemText, Tooltip } from '@material-ui/core'
 
 interface Props {
   connection: ConnectionOptions
@@ -44,29 +34,6 @@ class ConnectionSettings extends React.Component<Props, State> {
     })
   }
 
-  private renderCertificateInfo() {
-    if (!this.props.connection.selfSignedCertificate) {
-      return null
-    }
-
-    return (
-      <span>
-        <Tooltip title={this.props.connection.selfSignedCertificate.name}>
-          <Typography className={this.props.classes.certificateName}>
-            <ClearAdornment action={this.clearCertificate} value={this.props.connection.selfSignedCertificate.name} />
-            {this.props.connection.selfSignedCertificate.name}
-          </Typography>
-      </Tooltip>
-     </span>
-    )
-  }
-
-  private clearCertificate = () => {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      selfSignedCertificate: undefined,
-    })
-  }
-
   private renderSubscriptions() {
     const connection = this.props.connection
     return connection.subscriptions.map(subscription => (
@@ -89,27 +56,26 @@ class ConnectionSettings extends React.Component<Props, State> {
                 className={classes.fullWidth}
                 label="Subscription"
                 margin="normal"
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => this.setState({ subscription: event.target.value })}
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                  this.setState({ subscription: event.target.value })
+                }
               />
             </Grid>
             <Grid item={true} xs={2} className={classes.gridPadding}>
               <Button
                 className={classes.button}
                 color="secondary"
-                onClick={() => this.props.managerActions.addSubscription(this.state.subscription, this.props.connection.id)}
+                onClick={() =>
+                  this.props.managerActions.addSubscription(this.state.subscription, this.props.connection.id)
+                }
                 variant="contained"
               >
                 <Add /> Add
               </Button>
             </Grid>
             <Grid item={true} xs={12} style={{ padding: 0 }}>
-              <List
-                className={`${classes.topicList} advanced-connection-settings-topic-list`}
-                component="nav"
-              >
-                <div className={classes.list}>
-                  {this.renderSubscriptions()}
-                </div>
+              <List className={`${classes.topicList} advanced-connection-settings-topic-list`} component="nav">
+                <div className={classes.list}>{this.renderSubscriptions()}</div>
               </List>
             </Grid>
             <Grid item={true} xs={7} className={classes.gridPadding}>
@@ -123,16 +89,15 @@ class ConnectionSettings extends React.Component<Props, State> {
             </Grid>
             <Grid item={true} xs={3} className={classes.gridPadding}>
               <div>
-                <Tooltip title="Select certificate to verify authenticity of a self-signed certificate" placement="top">
+                <Tooltip title="Manage tls connection certificates" placement="top">
                   <Button
                     variant="contained"
                     className={classes.button}
-                    onClick={() => this.props.managerActions.selectCertificate(this.props.connection.id)}
+                    onClick={() => this.props.managerActions.toggleCertificateSettings()}
                   >
-                    <Lock /> Certificate
+                    <Lock /> Certificates
                   </Button>
                 </Tooltip>
-                {this.renderCertificateInfo()}
               </div>
             </Grid>
             <Grid item={true} xs={2} className={classes.gridPadding}>
@@ -151,17 +116,15 @@ class ConnectionSettings extends React.Component<Props, State> {
   }
 }
 
-const Subscription = (props: {
-  subscription: string,
-  deleteAction: any,
-}) => {
+const Subscription = (props: { subscription: string; deleteAction: any }) => {
   return (
     <ListItem style={{ padding: '0 0 0 8px' }}>
       <ListItemText>
         <IconButton onClick={props.deleteAction} style={{ padding: '6px' }}>
           <Delete />
         </IconButton>
-        {props.subscription}</ListItemText>
+        {props.subscription}
+      </ListItemText>
     </ListItem>
   )
 }
@@ -172,33 +135,26 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-const styles: StyleRulesCallback<string> = (theme: Theme) => {
-  return {
-    fullWidth: {
-      width: '100%',
-    },
-    gridPadding: {
-      padding: '0 12px !important',
-    },
-    topicList: {
-      height: '180px',
-      overflowY: 'scroll' as 'scroll',
-      margin: '8px 16px',
-      backgroundColor: theme.palette.background.default,
-    },
-    button: {
-      marginTop: theme.spacing(3),
-      float: 'right',
-    },
-    certificateName: {
-      width: '100%',
-      height: 'calc(1em + 4px)',
-      overflow: 'hidden' as 'hidden',
-      whiteSpace: 'nowrap' as 'nowrap',
-      textOverflow: 'ellipsis' as 'ellipsis',
-      color: theme.palette.text.hint,
-    },
-  }
-}
+const styles = (theme: Theme) => ({
+  fullWidth: {
+    width: '100%',
+  },
+  gridPadding: {
+    padding: '0 12px !important',
+  },
+  topicList: {
+    height: '180px',
+    overflowY: 'scroll' as 'scroll',
+    margin: '8px 16px',
+    backgroundColor: theme.palette.background.default,
+  },
+  button: {
+    marginTop: theme.spacing(3),
+    float: 'right' as 'right',
+  },
+})
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/CertificateFileSelection.tsx

@@ -0,0 +1,87 @@
+import * as React from 'react'
+import Add from '@material-ui/icons/Add'
+import ClearAdornment from '../helper/ClearAdornment'
+import Delete from '@material-ui/icons/Delete'
+import Lock from '@material-ui/icons/Lock'
+import { bindActionCreators } from 'redux'
+import { Button, Theme, Tooltip, Typography } from '@material-ui/core'
+import { CertificateParameters, ConnectionOptions } from '../../model/ConnectionOptions'
+import { CertificateTypes } from '../../actions/ConnectionManager'
+import { connect } from 'react-redux'
+import { connectionManagerActions } from '../../actions'
+import { withStyles } from '@material-ui/styles'
+
+function CertificateFileSelection(props: {
+  certificateType: CertificateTypes
+  title: string
+  certificate?: CertificateParameters
+  classes: any
+  actions: {
+    connectionManager: typeof connectionManagerActions
+  }
+  connection: ConnectionOptions
+}) {
+  const clearCertificate = React.useCallback(() => {
+    props.actions.connectionManager.updateConnection(props.connection.id, {
+      [props.certificateType]: undefined,
+    })
+  }, [props.connection, props.certificateType])
+
+  return (
+    <span>
+      <Tooltip title="Select certificate" placement="top">
+        <Button
+          variant="contained"
+          className={props.classes.button}
+          onClick={() => props.actions.connectionManager.selectCertificate(props.certificateType, props.connection.id)}
+        >
+          <Lock /> {props.title}
+        </Button>
+      </Tooltip>
+      <ClearCertificate classes={props.classes} certificate={props.certificate} action={clearCertificate} />
+    </span>
+  )
+}
+
+function ClearCertificate(props: { classes: any; certificate?: CertificateParameters; action: () => void }) {
+  if (!props.certificate) {
+    return null
+  }
+
+  return (
+    <Tooltip title={props.certificate.name}>
+      <Typography className={props.classes.certificateName}>
+        <ClearAdornment action={props.action} value={props.certificate.name} />
+        {props.certificate.name}
+      </Typography>
+    </Tooltip>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      connectionManager: bindActionCreators(connectionManagerActions, dispatch),
+    },
+  }
+}
+
+const styles = (theme: Theme) => ({
+  certificateName: {
+    width: '100%',
+    height: 'calc(1em + 4px)',
+    overflow: 'hidden' as 'hidden',
+    whiteSpace: 'nowrap' as 'nowrap',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    color: theme.palette.text.hint,
+  },
+  button: {
+    marginTop: theme.spacing(3),
+    marginRight: theme.spacing(2),
+  },
+})
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(CertificateFileSelection))

app/src/components/ConnectionSetup/Certificates.tsx

@@ -0,0 +1,110 @@
+import * as React from 'react'
+import CertificateFileSelection from './CertificateFileSelection'
+import Undo from '@material-ui/icons/Undo'
+import { bindActionCreators } from 'redux'
+import { Button, Grid } from '@material-ui/core'
+import { connect } from 'react-redux'
+import { connectionManagerActions } from '../../actions'
+import { ConnectionOptions } from '../../model/ConnectionOptions'
+import { Theme, withStyles } from '@material-ui/core/styles'
+
+interface Props {
+  connection: ConnectionOptions
+  classes: any
+  managerActions: typeof connectionManagerActions
+}
+
+interface State {
+  subscription: string
+}
+
+class Certificates extends React.PureComponent<Props, State> {
+  constructor(props: any) {
+    super(props)
+    this.state = { subscription: '' }
+  }
+
+  private handleChange = (name: string) => (event: any) => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      [name]: event.target.value,
+    })
+  }
+
+  private renderCertificateInfo() {
+    if (!this.props.connection.selfSignedCertificate) {
+      return null
+    }
+
+    return <span />
+  }
+
+  public render() {
+    const { classes } = this.props
+    return (
+      <div>
+        <form noValidate={true} autoComplete="off">
+          <Grid container={true} spacing={3}>
+            <Grid item={true} xs={12} className={classes.gridPadding}>
+              <CertificateFileSelection
+                connection={this.props.connection}
+                certificate={this.props.connection.selfSignedCertificate}
+                title="Server Certificate (CA)"
+                certificateType="selfSignedCertificate"
+              />
+            </Grid>
+            <Grid item={true} xs={12} className={classes.gridPadding}>
+              <CertificateFileSelection
+                connection={this.props.connection}
+                certificate={this.props.connection.clientCertificate}
+                title="Client Certificate"
+                certificateType="clientCertificate"
+              />
+            </Grid>
+            <Grid item={true} xs={12} className={classes.gridPadding}>
+              <CertificateFileSelection
+                connection={this.props.connection}
+                certificate={this.props.connection.clientKey}
+                title="Client Key"
+                certificateType="clientKey"
+              />
+            </Grid>
+            <Grid item={true} xs={2} className={classes.gridPadding}>
+              <br />
+              <Button
+                variant="contained"
+                className={classes.button}
+                onClick={this.props.managerActions.toggleCertificateSettings}
+              >
+                <Undo /> Back
+              </Button>
+            </Grid>
+          </Grid>
+        </form>
+      </div>
+    )
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    managerActions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+const styles = (theme: Theme) => ({
+  fullWidth: {
+    width: '100%',
+  },
+  gridPadding: {
+    padding: '0 12px !important',
+  },
+  button: {
+    marginTop: theme.spacing(3),
+    marginRight: theme.spacing(2),
+  },
+})
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(Certificates))

app/src/components/ConnectionSetup/ConnectButton.tsx

@@ -0,0 +1,25 @@
+import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
+import PowerSettingsNew from '@material-ui/icons/PowerSettingsNew'
+import React from 'react'
+import { Button } from '@material-ui/core'
+
+function ConnectButton(props: { connecting: boolean; classes: any; toggle: () => void }) {
+  const { classes, toggle, connecting } = props
+
+  if (connecting) {
+    return (
+      <Button variant="contained" color="primary" className={classes.button} onClick={toggle}>
+        <ConnectionHealthIndicator />
+        &nbsp;&nbsp;Abort
+      </Button>
+    )
+  }
+
+  return (
+    <Button variant="contained" color="primary" className={classes.button} onClick={toggle}>
+      <PowerSettingsNew /> Connect
+    </Button>
+  )
+}
+
+export default ConnectButton

app/src/components/ConnectionSetup/ConnectionSettings.tsx

@@ -1,8 +1,8 @@
-import * as React from 'react'
+import ConnectButton from './ConnectButton'
 import Delete from '@material-ui/icons/Delete'
-import Settings from '@material-ui/icons/Settings'
-import PowerSettingsNew from '@material-ui/icons/PowerSettingsNew'
+import React, { useCallback, useState } from 'react'
 import Save from '@material-ui/icons/Save'
+import Settings from '@material-ui/icons/Settings'
 import Visibility from '@material-ui/icons/Visibility'
 import VisibilityOff from '@material-ui/icons/VisibilityOff'
 import { AppState } from '../../reducers'
@@ -10,88 +10,93 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { connectionActions, connectionManagerActions } from '../../actions'
 import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-
+import { KeyCodes } from '../../utils/KeyCodes'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { ToggleSwitch } from './ToggleSwitch'
+import { useGlobalKeyEventHandler } from '../../effects/useGlobalKeyEventHandler'
 import {
   Button,
   FormControl,
-  FormControlLabel,
   Grid,
   IconButton,
   Input,
   InputAdornment,
   InputLabel,
   MenuItem,
-  Switch,
   TextField,
 } from '@material-ui/core'
-import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
 
 interface Props {
   connection: ConnectionOptions
-  classes: {[s: string]: string}
-  actions: typeof connectionActions,
+  classes: { [s: string]: string }
+  actions: typeof connectionActions
   managerActions: typeof connectionManagerActions
   connected: boolean
   connecting: boolean
 }
 
-const protocols = [
-  'mqtt',
-  'ws',
-]
+const protocols = ['mqtt', 'ws']
 
-interface State {
-  showPassword: boolean
-}
+function ConnectionSettings(props: Props) {
+  const [showPassword, setShowPassword] = useState(false)
 
-class ConnectionSettings extends React.Component<Props, State> {
-  constructor(props: any) {
-    super(props)
-
-    this.state = {
-      showPassword: false,
+  const toggleConnect = useCallback(() => {
+    if (props.connecting) {
+      props.actions.disconnect()
+      return
     }
+
+    if (!props.connection) {
+      return
+    }
+
+    const mqttOptions = toMqttConnection(props.connection)
+    if (mqttOptions) {
+      props.actions.connect(mqttOptions, props.connection.id)
+    }
+  }, [props.connection, props.connecting])
+
+  useGlobalKeyEventHandler(KeyCodes.escape, props.actions.disconnect)
+  useGlobalKeyEventHandler(KeyCodes.enter, toggleConnect, [props.connecting])
+
+  const handleClickShowPassword = useCallback(() => {
+    setShowPassword(!showPassword)
+  }, [showPassword])
+
+  function requiresBasePath() {
+    return props.connection.protocol !== 'mqtt'
   }
 
-  private handleClickShowPassword = () => {
-    this.setState({ showPassword: !this.state.showPassword })
-  }
-
-  private requiresBasePath() {
-    return this.props.connection.protocol !== 'mqtt'
-  }
-
-  private renderBasePathInput() {
+  function renderBasePathInput() {
     return (
       <Grid item={true} xs={4}>
         <TextField
           label="Basepath"
-          className={this.props.classes.textField}
-          value={this.props.connection.basePath}
-          onChange={this.handleChange('basePath')}
+          className={props.classes.textField}
+          value={props.connection.basePath}
+          onChange={handleChange('basePath')}
           margin="normal"
         />
       </Grid>
     )
   }
 
-  private handleChange = (name: string) => (event: any) => {
-    if (!this.props.connection) {
+  const handleChange = (name: string) => (event: any) => {
+    if (!props.connection) {
       return
     }
 
-    this.updateConnection(name, event.target.value)
+    updateConnection(name, event.target.value)
   }
 
-  private updateConnection(name: string, value: any) {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
+  const updateConnection = (name: string, value: any) => {
+    props.managerActions.updateConnection(props.connection.id, {
       [name]: value,
     })
   }
 
-  private renderProtocols() {
-    const { classes, connection } = this.props
+  const renderProtocols = () => {
+    const { classes, connection } = props
 
     const protocolItems = protocols.map((value: string) => (
       <MenuItem key={value} value={value}>
@@ -105,7 +110,7 @@ class ConnectionSettings extends React.Component<Props, State> {
         label="Protocol"
         className={classes.textField}
         value={connection.protocol}
-        onChange={this.updateProtocol}
+        onChange={updateProtocol}
         margin="normal"
       >
         {protocolItems}
@@ -113,198 +118,142 @@ class ConnectionSettings extends React.Component<Props, State> {
     )
   }
 
-  private updateProtocol = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const updateProtocol = (event: React.ChangeEvent<HTMLInputElement>) => {
     const value = event.target.value
-    this.updateConnection('protocol', value)
+    updateConnection('protocol', value)
     if (event.target.value === 'mqtt') {
-      this.updateConnection('basePath', undefined)
+      updateConnection('basePath', undefined)
     } else {
-      this.updateConnection('basePath', 'ws')
+      updateConnection('basePath', 'ws')
     }
   }
 
-  private renderCertValidationSwitch() {
-    const { classes, connection } = this.props
-
-    const certSwitch = (
-      <Switch
-        checked={connection.certValidation}
-        onChange={this.toggleCertValidation}
-        color="primary"
-      />
-    )
-
-    return (
-      <div className={classes.switch}>
-        <FormControlLabel
-          control={certSwitch}
-          label="Validate certificate"
-          labelPlacement="bottom"
-        />
-      </div>
-    )
-  }
-
-  private toggleCertValidation = () => {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      certValidation: !this.props.connection.certValidation,
+  const toggleCertValidation = () => {
+    props.managerActions.updateConnection(props.connection.id, {
+      certValidation: !props.connection.certValidation,
     })
   }
 
-  private renderTlsSwitch() {
-    const { classes, connection } = this.props
-
-    const tlsSwitch = (
-      <Switch
-        checked={connection.encryption}
-        onChange={this.toggleTls}
-        color="primary"
-      />
-    )
-
-    return (
-      <div className={classes.switch}>
-        <FormControlLabel
-          control={tlsSwitch}
-          label="Encryption (tls)"
-          labelPlacement="bottom"
-        />
-      </div>
-    )
-  }
-
-  private toggleTls = () => {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      encryption: !this.props.connection.encryption,
+  const toggleTls = () => {
+    props.managerActions.updateConnection(props.connection.id, {
+      encryption: !props.connection.encryption,
     })
   }
 
-  private renderConnectButton() {
-    const { classes, actions } = this.props
-
-    if (this.props.connecting) {
-      return (
-        <Button variant="contained" color="primary" className={classes.button} onClick={actions.disconnect}>
-          <ConnectionHealthIndicator />&nbsp;&nbsp;Abort
-        </Button>
-      )
-    }
+  function PasswordVisibilityButton(props: { showPassword: boolean; toggle: () => void }) {
     return (
-       <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
-        <PowerSettingsNew /> Connect
-      </Button>
-    )
-  }
-
-  private onClickConnect = () => {
-    if (!this.props.connection) {
-      return
-    }
-
-    const mqttOptions = toMqttConnection(this.props.connection)
-    if (mqttOptions) {
-      this.props.actions.connect(mqttOptions, this.props.connection.id)
-    }
-  }
-
-  public render() {
-    const { classes, connection } = this.props
-
-    const passwordVisibilityButton = (
       <InputAdornment position="end">
-        <IconButton
-          aria-label="Toggle password visibility"
-          onClick={this.handleClickShowPassword}
-        >
-          {this.state.showPassword ? <Visibility /> : <VisibilityOff />}
+        <IconButton aria-label="Toggle password visibility" onClick={props.toggle}>
+          {props.showPassword ? <Visibility /> : <VisibilityOff />}
         </IconButton>
       </InputAdornment>
     )
-
-    return (
-      <div>
-        <form className={classes.container} noValidate={true} autoComplete="off">
-          <Grid container={true} spacing={3}>
-            <Grid item={true} xs={5}>
-              <TextField
-                label="Name"
-                className={classes.textField}
-                value={connection.name}
-                onChange={this.handleChange('name')}
-                margin="normal"
-              />
-            </Grid>
-            <Grid item={true} xs={4}>
-              {this.renderCertValidationSwitch()}
-            </Grid>
-            <Grid item={true} xs={3}>
-              {this.renderTlsSwitch()}
-            </Grid>
-            <Grid item={true} xs={2}>
-              {this.renderProtocols()}
-            </Grid>
-            <Grid item={true} xs={7}>
-              <TextField
-                label="Host"
-                className={classes.textField}
-                value={connection.host}
-                onChange={this.handleChange('host')}
-                margin="normal"
-              />
-            </Grid>
-            <Grid item={true} xs={3}>
-              <TextField
-                label="Port"
-                className={classes.textField}
-                value={connection.port}
-                onChange={this.handleChange('port')}
-                margin="normal"
-              />
-            </Grid>
-            {this.requiresBasePath() ? this.renderBasePathInput() : null}
-            <Grid item={true} xs={this.requiresBasePath() ? 4 : 6}>
-              <TextField
-                label="Username"
-                className={classes.textField}
-                value={connection.username}
-                onChange={this.handleChange('username')}
-                margin="normal"
-              />
-            </Grid>
-            <Grid item={true} xs={this.requiresBasePath() ? 4 : 6}>
-              <FormControl className={`${classes.textField} ${classes.inputFormControl}`}>
-                <InputLabel htmlFor="adornment-password">Password</InputLabel>
-                <Input
-                  id="adornment-password"
-                  type={this.state.showPassword ? 'text' : 'password'}
-                  value={connection.password}
-                  onChange={this.handleChange('password')}
-                  endAdornment={passwordVisibilityButton}
-                />
-              </FormControl>
-            </Grid>
-          </Grid>
-          <br />
-          <div>
-            <div style={{ float: 'left' }}>
-              <Button variant="contained" className={classes.button} onClick={() => this.props.managerActions.deleteConnection(this.props.connection.id)}>
-                Delete <Delete />
-              </Button>
-              <Button variant="contained" className={classes.button} onClick={this.props.managerActions.toggleAdvancedSettings}>
-                <Settings /> Advanced
-              </Button>
-            </div>
-            <div style={{ float : 'right' }}>
-              <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.managerActions.saveConnectionSettings}>
-                <Save /> Save
-              </Button>
-              {this.renderConnectButton()}
-            </div>
-          </div>
-        </form>
-      </div>
-    )
   }
+
+  const { classes, connection } = props
+
+  return (
+    <div>
+      <form className={classes.container} noValidate={true} autoComplete="off">
+        <Grid container={true} spacing={3}>
+          <Grid item={true} xs={5}>
+            <TextField
+              autoFocus={true}
+              label="Name"
+              className={classes.textField}
+              value={connection.name}
+              onChange={handleChange('name')}
+              margin="normal"
+            />
+          </Grid>
+          <Grid item={true} xs={4}>
+            <ToggleSwitch
+              label="Validate certificate"
+              classes={classes}
+              value={connection.certValidation}
+              toggle={toggleCertValidation}
+            />
+          </Grid>
+          <Grid item={true} xs={3}>
+            <ToggleSwitch label="Encryption (tls)" classes={classes} value={connection.encryption} toggle={toggleTls} />
+          </Grid>
+          <Grid item={true} xs={2}>
+            {renderProtocols()}
+          </Grid>
+          <Grid item={true} xs={7}>
+            <TextField
+              label="Host"
+              className={classes.textField}
+              value={connection.host}
+              onChange={handleChange('host')}
+              margin="normal"
+            />
+          </Grid>
+          <Grid item={true} xs={3}>
+            <TextField
+              label="Port"
+              className={classes.textField}
+              value={connection.port}
+              onChange={handleChange('port')}
+              margin="normal"
+            />
+          </Grid>
+          {requiresBasePath() ? renderBasePathInput() : null}
+          <Grid item={true} xs={requiresBasePath() ? 4 : 6}>
+            <TextField
+              label="Username"
+              className={classes.textField}
+              value={connection.username}
+              onChange={handleChange('username')}
+              margin="normal"
+            />
+          </Grid>
+          <Grid item={true} xs={requiresBasePath() ? 4 : 6}>
+            <FormControl className={`${classes.textField} ${classes.inputFormControl}`}>
+              <InputLabel htmlFor="adornment-password">Password</InputLabel>
+              <Input
+                id="adornment-password"
+                type={showPassword ? 'text' : 'password'}
+                value={connection.password}
+                onChange={handleChange('password')}
+                endAdornment={<PasswordVisibilityButton showPassword={showPassword} toggle={handleClickShowPassword} />}
+              />
+            </FormControl>
+          </Grid>
+        </Grid>
+        <br />
+        <div>
+          <div style={{ float: 'left' }}>
+            <Button
+              variant="contained"
+              className={classes.button}
+              onClick={() => props.managerActions.deleteConnection(props.connection.id)}
+            >
+              Delete <Delete />
+            </Button>
+            <Button
+              variant="contained"
+              className={classes.button}
+              onClick={props.managerActions.toggleAdvancedSettings}
+            >
+              <Settings /> Advanced
+            </Button>
+          </div>
+          <div style={{ float: 'right' }}>
+            <Button
+              variant="contained"
+              color="secondary"
+              className={classes.button}
+              onClick={props.managerActions.saveConnectionSettings}
+            >
+              <Save /> Save
+            </Button>
+            <ConnectButton toggle={toggleConnect} connecting={props.connecting} classes={classes} />
+          </div>
+        </div>
+      </form>
+    </div>
+  )
 }
 
 const mapStateToProps = (state: AppState) => {
@@ -321,21 +270,22 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-const styles: StyleRulesCallback<string> = (theme: Theme) => {
-  return {
-    textField: {
-      width: '100%',
-    },
-    switch: {
-      marginTop: 0,
-    },
-    button: {
-      margin: theme.spacing(1),
-    },
-    inputFormControl: {
-      marginTop: '16px',
-    },
-  }
-}
+const styles = (theme: Theme) => ({
+  textField: {
+    width: '100%',
+  },
+  switch: {
+    marginTop: 0,
+  },
+  button: {
+    margin: theme.spacing(1),
+  },
+  inputFormControl: {
+    marginTop: '16px',
+  },
+})
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/ConnectionSetup.tsx

@@ -7,14 +7,9 @@ import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
 import { Theme, withStyles } from '@material-ui/core/styles'
-import {
-  Modal,
-  Paper,
-  Toolbar,
-  Typography,
-  Collapse,
-} from '@material-ui/core'
+import { Modal, Paper, Toolbar, Typography, Collapse } from '@material-ui/core'
 import AdvancedConnectionSettings from './AdvancedConnectionSettings'
+import Certificates from './Certificates'
 
 interface Props {
   actions: any
@@ -22,23 +17,31 @@ interface Props {
   connection?: ConnectionOptions
   visible: boolean
   showAdvancedSettings: boolean
+  showCertificateSettings: boolean
 }
 
-class ConnectionSetup extends React.Component<Props, {}> {
+class ConnectionSetup extends React.PureComponent<Props, {}> {
   constructor(props: Props) {
     super(props)
   }
 
   private renderSettings() {
-    const { connection, showAdvancedSettings } = this.props
+    const { connection, showAdvancedSettings, showCertificateSettings } = this.props
     if (!connection) {
       return null
     }
 
     return (
       <div>
-        <Collapse in={!showAdvancedSettings}><ConnectionSettings connection={connection} /></Collapse>
-        <Collapse in={showAdvancedSettings}><AdvancedConnectionSettings connection={connection} /></Collapse>
+        <Collapse in={!showAdvancedSettings && !showCertificateSettings}>
+          <ConnectionSettings connection={connection} />
+        </Collapse>
+        <Collapse in={showAdvancedSettings && !showCertificateSettings}>
+          <AdvancedConnectionSettings connection={connection} />
+        </Collapse>
+        <Collapse in={showCertificateSettings}>
+          <Certificates connection={connection} />
+        </Collapse>
       </div>
     )
   }
@@ -54,13 +57,15 @@ class ConnectionSetup extends React.Component<Props, {}> {
       <div>
         <Modal open={visible} disableAutoFocus={true}>
           <Paper className={classes.root}>
-            <div className={classes.left}><ProfileList /></div>
+            <div className={classes.left}>
+              <ProfileList />
+            </div>
             <div className={classes.right} key={connection && connection.id}>
               <Toolbar>
-                <Typography className={classes.title} variant="h6" color="inherit">MQTT Connection</Typography>
-                <Typography className={classes.connectionUri}>
-                  {mqttConnection && mqttConnection.url}
+                <Typography className={classes.title} variant="h6" color="inherit">
+                  MQTT Connection
                 </Typography>
+                <Typography className={classes.connectionUri}>{mqttConnection && mqttConnection.url}</Typography>
               </Toolbar>
               {this.renderSettings()}
             </div>
@@ -90,9 +95,10 @@ const styles = (theme: Theme) => ({
     borderRadius: `${theme.shape.borderRadius}px 0 0 ${theme.shape.borderRadius}px`,
     paddingTop: theme.spacing(2),
     flex: 3,
-    overflow: 'hidden',
+    overflow: 'hidden' as 'hidden',
     backgroundColor: theme.palette.background.default,
     color: theme.palette.text.primary,
+    overflowY: 'auto' as 'auto',
   },
   right: {
     borderRadius: `0 ${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0`,
@@ -115,7 +121,10 @@ const mapStateToProps = (state: AppState) => {
   return {
     visible: !state.connection.connected,
     showAdvancedSettings: state.connectionManager.showAdvancedSettings,
-    connection: state.connectionManager.selected ? state.connectionManager.connections[state.connectionManager.selected] : undefined,
+    showCertificateSettings: state.connectionManager.showCertificateSettings,
+    connection: state.connectionManager.selected
+      ? state.connectionManager.connections[state.connectionManager.selected]
+      : undefined,
   }
 }
 
@@ -125,4 +134,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSetup))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSetup))

app/src/components/ConnectionSetup/ProfileList.tsx

@@ -1,113 +0,0 @@
-import * as React from 'react'
-import { AddButton } from './AddButton'
-import { AppState } from '../../reducers'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { connectionManagerActions } from '../../actions'
-import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
-import { Theme, withStyles } from '@material-ui/core/styles'
-import {
-  List,
-  ListItem,
-  ListSubheader,
-  Typography,
-} from '@material-ui/core'
-
-interface Props {
-  classes: any
-  selected?: string
-  connections: {[s: string]: ConnectionOptions}
-  actions: any
-}
-
-class ProfileList extends React.Component<Props, {}> {
-  constructor(props: Props) {
-    super(props)
-  }
-
-  private addConnectionButton() {
-    return <span id="addProfileButton" style={{ marginRight: '12px' }}><AddButton action={this.props.actions.createConnection} /></span>
-  }
-
-  public render() {
-    return (
-      <List
-        style={{ height: '100%' }}
-        component="nav"
-        subheader={<ListSubheader component="div">{this.addConnectionButton()}Connections</ListSubheader>}
-      >
-        <div className={this.props.classes.list}>
-          {Object.values(this.props.connections).map(connection => <ConnectionItem connection={connection} key={connection.id} selected={this.props.selected === connection.id} />)}
-        </div>
-      </List>
-    )
-  }
-}
-
-const styles = (theme: Theme) => ({
-  list: {
-    marginTop: theme.spacing(1),
-    height: `calc(100% - ${theme.spacing(6)})`,
-    overflowY: 'auto' as 'auto',
-  },
-})
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(connectionManagerActions, dispatch),
-  }
-}
-
-interface ConnectionItemProps {
-  connection: ConnectionOptions,
-  actions: any,
-  selected: boolean,
-  classes: any
-}
-
-const connectionItemStyle = (theme: Theme) => ({
-  name: {
-    width: '100%',
-    textOverflow: 'ellipsis' as 'ellipsis',
-    whiteSpace: 'nowrap' as 'nowrap',
-    overflow: 'hidden' as 'hidden',
-  },
-  details: {
-    width: '100%',
-    textOverflow: 'ellipsis' as 'ellipsis',
-    whiteSpace: 'nowrap' as 'nowrap',
-    overflow: 'hidden' as 'hidden',
-    color: theme.palette.text.hint,
-    fontSize: '0.7em',
-  },
-})
-
-const connectionItemRenderer = withStyles(connectionItemStyle)((props: ConnectionItemProps) => {
-  const connection = props.connection.host && toMqttConnection(props.connection)
-  return (
-    <ListItem
-      button={true}
-      selected={props.selected}
-      style={{ display: 'block' }}
-      onClick={() => props.actions.selectConnection(props.connection.id)}
-    >
-      <Typography className={props.classes.name}>
-        {props.connection.name || 'mqtt broker'}
-      </Typography>
-      <Typography className={props.classes.details}>
-        {connection && connection.url}
-      </Typography>
-    </ListItem>
-  )
-})
-
-const ConnectionItem = connect(null, mapDispatchToProps)(connectionItemRenderer)
-
-const mapStateToProps = (state: AppState) => {
-  return {
-    connections: state.connectionManager.connections,
-    selected: state.connectionManager.selected,
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ProfileList))

app/src/components/ConnectionSetup/ProfileList/AddButton.tsx

@@ -14,19 +14,12 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export const AddButton = withStyles(styles)((props: {
-  classes: any,
-  action: any,
-}) => {
+export const AddButton = withStyles(styles)((props: { classes: any; action: any }) => {
   return (
-    <Fab
-      size="small"
-      color="secondary"
-      aria-label="Add"
-      className={props.classes.addButton}
-      onClick={props.action}
-    >
-      <Add className={props.classes.addIcon} />
-    </Fab>
+    <span id="addProfileButton" style={{ marginRight: '12px' }}>
+      <Fab size="small" color="secondary" aria-label="Add" className={props.classes.addButton} onClick={props.action}>
+        <Add className={props.classes.addIcon} />
+      </Fab>
+    </span>
   )
 })

app/src/components/ConnectionSetup/ProfileList/ConnectionItem.tsx

@@ -0,0 +1,57 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import { ListItem, Typography } from '@material-ui/core'
+import { toMqttConnection, ConnectionOptions } from '../../../model/ConnectionOptions'
+import { withStyles, Theme } from '@material-ui/core/styles'
+import { bindActionCreators } from 'redux'
+import { connectionManagerActions } from '../../../actions'
+
+export interface Props {
+  connection: ConnectionOptions
+  actions: any
+  selected: boolean
+  classes: any
+}
+
+const ConnectionItem = (props: Props) => {
+  const connection = props.connection.host && toMqttConnection(props.connection)
+  return (
+    <ListItem
+      button={true}
+      selected={props.selected}
+      style={{ display: 'block' }}
+      onClick={() => props.actions.selectConnection(props.connection.id)}
+    >
+      <Typography className={props.classes.name}>{props.connection.name || 'mqtt broker'}</Typography>
+      <Typography className={props.classes.details}>{connection && connection.url}</Typography>
+    </ListItem>
+  )
+}
+
+export const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+export const connectionItemStyle = (theme: Theme) => ({
+  name: {
+    width: '100%',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+  },
+  details: {
+    width: '100%',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+    color: theme.palette.text.hint,
+    fontSize: '0.7em',
+  },
+})
+
+export default connect(
+  null,
+  mapDispatchToProps
+)(withStyles(connectionItemStyle)(ConnectionItem))

app/src/components/ConnectionSetup/ProfileList/index.tsx

@@ -0,0 +1,83 @@
+import ConnectionItem from './ConnectionItem'
+import React from 'react'
+import { AddButton } from './AddButton'
+import { AppState } from '../../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { connectionManagerActions } from '../../../actions'
+import { ConnectionOptions } from '../../../model/ConnectionOptions'
+import { KeyCodes } from '../../../utils/KeyCodes'
+import { List, ListSubheader } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { useGlobalKeyEventHandler } from '../../../effects/useGlobalKeyEventHandler'
+
+interface Props {
+  classes: any
+  selected?: string
+  connections: { [s: string]: ConnectionOptions }
+  actions: typeof connectionManagerActions
+}
+
+function ProfileList(props: Props) {
+  const { actions, classes, connections, selected } = props
+
+  const selectConnection = (dir: 'next' | 'previous') => (event: KeyboardEvent) => {
+    if (!selected) {
+      return
+    }
+    const indexDirection = dir === 'next' ? 1 : -1
+    const connectionArray = Object.values(connections)
+    const selectedIndex = connectionArray.map(connection => connection.id).indexOf(selected)
+    const nextConnection = connectionArray[selectedIndex + indexDirection]
+    if (nextConnection) {
+      actions.selectConnection(nextConnection.id)
+    }
+    event.preventDefault()
+  }
+
+  useGlobalKeyEventHandler(KeyCodes.arrow_down, selectConnection('next'))
+  useGlobalKeyEventHandler(KeyCodes.arrow_up, selectConnection('previous'))
+
+  const createConnectionButton = (
+    <div style={{ padding: '8px 16px' }}>
+      <AddButton action={actions.createConnection} />
+      Connections
+    </div>
+  )
+
+  return (
+    <List style={{ height: '100%' }} component="nav" subheader={createConnectionButton}>
+      <div className={classes.list}>
+        {Object.values(connections).map(connection => (
+          <ConnectionItem connection={connection} key={connection.id} selected={selected === connection.id} />
+        ))}
+      </div>
+    </List>
+  )
+}
+
+const styles = (theme: Theme) => ({
+  list: {
+    marginTop: theme.spacing(1),
+    height: `calc(100% - ${theme.spacing(6)})`,
+    overflowY: 'auto' as 'auto',
+  },
+})
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    connections: state.connectionManager.connections,
+    selected: state.connectionManager.selected,
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ProfileList))

app/src/components/ConnectionSetup/ToggleSwitch.tsx

@@ -0,0 +1,12 @@
+import React from 'react'
+import { FormControlLabel, Switch } from '@material-ui/core'
+
+export function ToggleSwitch(props: { value: boolean; classes: any; toggle: () => void; label: string }) {
+  const { classes, value, toggle, label } = props
+  const toggleSwitch = <Switch checked={value} onChange={toggle} color="primary" />
+  return (
+    <div className={classes.switch}>
+      <FormControlLabel control={toggleSwitch} label={label} labelPlacement="bottom" />
+    </div>
+  )
+}

app/src/components/Demo/Key.tsx

@@ -13,7 +13,6 @@ class Key extends React.Component<Props, {}> {
   }
 
   public render() {
-
     return (
       <div className={this.props.classes.keyStyle}>
         <div className={this.props.classes.keyTextStyle}>{this.props.keyboardKey}</div>

app/src/components/Demo/Mouse.tsx

@@ -1,15 +1,16 @@
 import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
+const cursor = require('./cursor.png')
 
 interface State {
   enabled: boolean
-  target: {x: number, y: number}
-  position: {x: number, y: number}
-  stepSizeX: number,
-  stepSizeY: number,
+  target: { x: number; y: number }
+  position: { x: number; y: number }
+  stepSizeX: number
+  stepSizeY: number
 }
 
-class Demo extends React.Component<{classes: any}, State> {
+class Demo extends React.Component<{ classes: any }, State> {
   private timer: any
   private frameInterval = 20
 
@@ -31,8 +32,8 @@ class Demo extends React.Component<{classes: any}, State> {
 
     this.setState({
       position: {
-        x: this.state.position.x + (dirX * steSizeX),
-        y: this.state.position.y + (dirY * steSizeY),
+        x: this.state.position.x + dirX * steSizeX,
+        y: this.state.position.y + dirY * steSizeY,
       },
     })
 
@@ -42,10 +43,10 @@ class Demo extends React.Component<{classes: any}, State> {
   }
 
   public componentDidMount() {
-    (window as any).demo.enableMouse = () => {
+    ;(window as any).demo.enableMouse = () => {
       this.setState({ enabled: true })
     }
-    (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
+    ;(window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
       const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval)
       const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval)
       this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } })
@@ -58,14 +59,12 @@ class Demo extends React.Component<{classes: any}, State> {
       return null
     }
 
-    const style = {
+    const cursorStyle = {
       left: this.state.position.x + 2,
       top: this.state.position.y + 2,
     }
 
-    return (
-      <img src="../cursor.png" style={style} className={this.props.classes.cursor} />
-    )
+    return <img src={cursor} style={cursorStyle} className={this.props.classes.cursor} />
   }
 }
 
@@ -76,7 +75,8 @@ const style = (theme: Theme) => ({
     position: 'fixed' as 'fixed',
     zIndex: 1000000,
     filter: theme.palette.type === 'light' ? undefined : 'invert(100%)',
-  }
+    pointerEvents: 'none' as 'none',
+  },
 })
 
 export default withStyles(style)(Demo)

app/src/components/Demo/ShowText.tsx

@@ -4,11 +4,11 @@ import Key from './Key'
 
 interface State {
   message?: string
-  keys: string[]
+  keys: Array<string>
   location: string
 }
 
-class Demo extends React.Component<{classes: any}, State> {
+class Demo extends React.Component<{ classes: any }, State> {
   private timer: any
   constructor(props: any) {
     super(props)
@@ -20,20 +20,24 @@ class Demo extends React.Component<{classes: any}, State> {
   }
 
   public componentDidMount() {
-    (window as any).demo.showMessage = (message: string, location: string, duration: number, keys: string[] = []) => {
+    ;(window as any).demo.showMessage = (
+      message: string,
+      location: string,
+      duration: number,
+      keys: Array<string> = []
+    ) => {
       this.clearTimer()
       this.setState({ message, location, keys })
       this.timer = setTimeout(() => this.setState({ message: undefined }), duration)
     }
-
-    (window as any).demo.hideMessage = () => {
+    ;(window as any).demo.hideMessage = () => {
       this.clearTimer()
       this.setState({ message: undefined })
     }
   }
 
   public render() {
-    const positions: {[s: string]: number} = {
+    const positions: { [s: string]: number } = {
       top: 0,
       bottom: -65,
       middle: -32,
@@ -52,16 +56,16 @@ class Demo extends React.Component<{classes: any}, State> {
       color: 'white',
       backgroundColor: 'rgba(0, 0, 0, 0.8)',
       borderRadius: '16px',
-
     }
 
     if (!this.state.message) {
       return null
     }
 
-    let keys: any[] = []
+    let keys: Array<any> = []
     if (this.state.keys.length > 0) {
-      keys = this.state.keys.map(key => [<Key key={key} keyboardKey={key} />])
+      keys = this.state.keys
+        .map(key => [<Key key={key} keyboardKey={key} />])
         .reduce((prev, current) => {
           return [prev, '+' as any, current]
         })

app/src/components/Demo/index.tsx

@@ -1,8 +1,20 @@
 import * as React from 'react'
 import ShowText from './ShowText'
 import Mouse from './Mouse'
+let heapdump: any
 
-(window as any).demo = {}
+function writeHeapdump(path?: string) {
+  if (!heapdump) {
+    heapdump = require('heapdump')
+  }
+
+  heapdump.writeSnapshot(path || `${Date.now()}.heapsnapshot`)
+  return path
+}
+
+;(window as any).demo = {
+  writeHeapdump,
+}
 
 export default function render(props: any) {
   return (

app/src/components/ErrorBoundary.tsx

@@ -2,15 +2,9 @@ import * as React from 'react'
 import PersistentStorage from '../utils/PersistentStorage'
 import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
 import Warning from '@material-ui/icons/Warning'
-import { electronRendererTelementry } from 'electron-telemetry'
+import { electronRendererTelemetry } from 'electron-telemetry'
 import { Theme, withStyles } from '@material-ui/core/styles'
-import {
-  Button,
-  Modal,
-  Paper,
-  Toolbar,
-  Typography,
-} from '@material-ui/core'
+import { Button, Modal, Paper, Toolbar, Typography } from '@material-ui/core'
 
 interface State {
   error?: Error
@@ -20,8 +14,7 @@ interface Props {
   classes: any
 }
 
-class ErrorBoundary extends React.Component<Props, State> {
-
+class ErrorBoundary extends React.PureComponent<Props, State> {
   public static getDerivedStateFromError(error: Error) {
     return { error }
   }
@@ -40,7 +33,7 @@ class ErrorBoundary extends React.Component<Props, State> {
   }
 
   public componentDidCatch(error: Error, errorInfo: any) {
-    electronRendererTelementry.trackError(error)
+    electronRendererTelemetry.trackError(error)
     console.log('did catch', error)
   }
 
@@ -54,23 +47,36 @@ class ErrorBoundary extends React.Component<Props, State> {
       <Modal open={true} disableAutoFocus={true}>
         <Paper className={classes.root}>
           <Toolbar style={{ padding: '0' }}>
-            <Typography className={classes.title} variant="h6" color="inherit"><Warning /> Oooooops!</Typography>
+            <Typography className={classes.title} variant="h6" color="inherit">
+              <Warning /> Oooooops!
+            </Typography>
           </Toolbar>
-          <Typography className={classes.centered}>I hoped that you would never see this window, but MQTT-Explorer had an unexpected error.</Typography>
-          <Typography className={classes.centered}><SentimentDissatisfied /></Typography>
+          <Typography className={classes.centered}>
+            I hoped that you would never see this window, but MQTT-Explorer had an unexpected error.
+          </Typography>
+          <Typography className={classes.centered}>
+            <SentimentDissatisfied />
+          </Typography>
           <pre className={classes.textColor} style={{ maxHeight: '35vh', overflow: 'scroll' }}>
-            <code className={classes.textColor}>
-              {this.state.error.stack}
-            </code>
+            <code className={classes.textColor}>{this.state.error.stack}</code>
           </pre>
           <Typography>
             Please report this issue with a short description of what happened to
-            <span> <a className={classes.textColor} href="https://github.com/thomasnordquist/MQTT-Explorer/issues">https://github.com/thomasnordquist/MQTT-Explorer/issues</a></span>
+            <span>
+              {' '}
+              <a className={classes.textColor} href="https://github.com/thomasnordquist/MQTT-Explorer/issues">
+                https://github.com/thomasnordquist/MQTT-Explorer/issues
+              </a>
+            </span>
           </Typography>
           <div>
             <div className={classes.buttonPositioning}>
-              <Button className={classes.button} variant="contained" color="secondary" onClick={this.clearStorage}>Start Fresh</Button>
-              <Button className={classes.button} variant="contained" color="primary" onClick={this.restart}>Restart</Button>
+              <Button className={classes.button} variant="contained" color="secondary" onClick={this.clearStorage}>
+                Start Fresh
+              </Button>
+              <Button className={classes.button} variant="contained" color="primary" onClick={this.restart}>
+                Restart
+              </Button>
             </div>
           </div>
         </Paper>
@@ -98,6 +104,7 @@ const styles = (theme: Theme) => ({
   },
   textColor: {
     color: theme.palette.text.primary,
+    userSelect: 'all' as 'all',
   },
   centered: {
     textAlign: 'center' as 'center',

app/src/components/Layout/ContentView.tsx

@@ -1,28 +1,116 @@
 import * as React from 'react'
+import ChartPanel from '../ChartPanel'
 import ReactSplitPane from 'react-split-pane'
+import Tree from '../Tree'
+import { AppState } from '../../reducers'
+import { ChartParameters } from '../../reducers/Charts'
+import { connect } from 'react-redux'
+import { List } from 'immutable'
 import { Sidebar } from '../Sidebar'
-import Tree from '../Tree/Tree'
+import ReactResizeDetector from 'react-resize-detector'
+
+interface Props {
+  heightProperty: any
+  paneDefaults: any
+  connectionId?: string
+  chartPanelItems: List<ChartParameters>
+}
+
+function ContentView(props: Props) {
+  const [height, setHeight] = React.useState<string | number>('100%')
+  const [sidebarWidth, setSidebarWidth] = React.useState<string | number>('40%')
+  const [detectedHeight, setDetectedHeight] = React.useState(0)
+  const [detectedSidebarWidth, setDetectedSidebarWidth] = React.useState(0)
+  const detectSize = React.useCallback((width, newHeight) => {
+    setDetectedHeight(newHeight)
+  }, [])
+
+  const detectSidebarSize = React.useCallback(width => {
+    setDetectedSidebarWidth(width)
+  }, [])
+
+  const closeDrawerCompletelyIfItSitsOnTheEdge = React.useCallback(() => {
+    if (detectedHeight < 30) {
+      setHeight('100%')
+    }
+  }, [detectedHeight])
+
+  const closeSidebarCompletelyIfItSitsOnTheEdge = React.useCallback(() => {
+    if (detectedSidebarWidth < 30) {
+      setSidebarWidth('0%')
+    }
+  }, [detectedSidebarWidth])
+
+  // Open chart panel on start and when a new chart is added but the panel is closed
+  React.useEffect(() => {
+    const almostClosed = !isNaN(height as any) && detectedHeight < 30
+    if ((!height || height === '100%' || almostClosed) && props.chartPanelItems.count() > 0) {
+      setHeight('calc(100% - 250px)')
+    }
+
+    if (props.chartPanelItems.count() === 0) {
+      setHeight('100%')
+    }
+  }, [props.chartPanelItems])
 
-export default function ContentView(props: {heightProperty: any, paneDefaults: any, connectionId: any}) {
   return (
-    <ReactSplitPane
-      step={20}
-      primary="second"
-      className={props.heightProperty}
-      split="vertical"
-      minSize={250}
-      defaultSize={500}
-      resizerStyle={{ width: '2px', margin: '0 -10px 0 0px' }}
-      allowResize={true}
-      style={{ position: 'relative' }}
-      pane1Style={{ overflow: 'hidden' }}
-    >
-      <div className={props.paneDefaults}>
-        <Tree />
-      </div>
-      <div className={props.paneDefaults}>
-        <Sidebar connectionId={props.connectionId} />
-      </div>
-    </ReactSplitPane>
+    <div className={props.paneDefaults}>
+      <span>
+        <ReactSplitPane
+          step={20}
+          primary="second"
+          className={props.heightProperty}
+          split="vertical"
+          minSize={0}
+          size={sidebarWidth}
+          onChange={setSidebarWidth}
+          onDragFinished={closeSidebarCompletelyIfItSitsOnTheEdge}
+          allowResize={true}
+          style={{ height: '100%' }}
+          pane1Style={{ overflowX: 'hidden' }}
+          resizerStyle={{ height: '100%' }}
+        >
+          <span>
+            <ReactSplitPane
+              step={10}
+              split="horizontal"
+              minSize={0}
+              size={height}
+              allowResize={true}
+              style={{ height: 'calc(100vh - 64px)' }}
+              pane1Style={{ maxHeight: '100%' }}
+              pane2Style={{ borderTop: '1px solid #999', display: 'flex' }}
+              onChange={setHeight}
+              onDragFinished={closeDrawerCompletelyIfItSitsOnTheEdge}
+            >
+              <Tree />
+              {/** Passing height constraints via flex options down */}
+              <div style={{ flex: 1, display: 'flex', height: '100%', width: '100%' }}>
+                {/** Resize detector must not be in the scroll zone, it needs to detect actual available size */}
+                <ReactResizeDetector handleHeight={true} onResize={detectSize} />
+                <ChartPanel />
+              </div>
+            </ReactSplitPane>
+          </span>
+          <div style={{ height: '100%' }}>
+            <ReactResizeDetector handleWidth={true} onResize={detectSidebarSize} />
+            <div
+              className={props.paneDefaults}
+              style={{ minWidth: '250px', height: '100%', overflowY: 'auto', overflowX: 'hidden' }}
+            >
+              <Sidebar connectionId={props.connectionId} />
+            </div>
+          </div>
+        </ReactSplitPane>
+      </span>
+    </div>
   )
 }
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    chartPanelItems: state.charts.get('charts'),
+  }
+}
+
+export default connect(mapStateToProps)(ContentView)

app/src/components/Layout/Notification.tsx

@@ -11,7 +11,7 @@ interface Props {
   classes: any
 }
 
-class Notification extends React.Component<Props, {}> {
+class Notification extends React.PureComponent<Props, {}> {
   constructor(props: Props) {
     super(props)
   }
@@ -37,7 +37,7 @@ class Notification extends React.Component<Props, {}> {
       <Snackbar
         anchorOrigin={snackbarAnchor}
         open={Boolean(this.props.message)}
-        autoHideDuration={this.props.type === 'error' ? 10000 : 3000}
+        autoHideDuration={this.props.type === 'error' ? 10000 : 2000}
         onClose={this.props.onClose}
       >
         <SnackbarContent

app/src/components/Layout/PauseButton.tsx

@@ -2,26 +2,33 @@ import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
 import CustomIconButton from '../helper/CustomIconButton'
 import Pause from '@material-ui/icons/PauseCircleFilled'
-import Resume from '@material-ui/icons/PlayCircleFilled'
+import Resume from '@material-ui/icons/PlayArrow'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { treeActions } from '../../actions'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import { Tooltip } from '@material-ui/core'
+import { withStyles, Theme } from '@material-ui/core/styles'
 
-const styles: StyleRulesCallback = theme => ({ })
+const styles = (theme: Theme) => ({
+  icon: {
+    color: theme.palette.primary.contrastText,
+    verticalAlign: 'middle' as 'middle',
+  },
+  bufferStats: {
+    minWidth: '8em',
+  },
+})
 
 interface Props {
   classes: any
   actions: {
-    tree: typeof treeActions,
+    tree: typeof treeActions
   }
   paused: boolean
   tree?: q.Tree<any>
 }
 
-class PauseButton extends React.Component<Props, {changes: number}> {
+class PauseButton extends React.PureComponent<Props, { changes: number }> {
   private timer?: any
   constructor(props: Props) {
     super(props)
@@ -34,8 +41,9 @@ class PauseButton extends React.Component<Props, {changes: number}> {
     }
 
     return (
-      <span>
-        {this.state.changes} changes<br />
+      <span className={this.props.classes.bufferStats}>
+        {this.state.changes} changes
+        <br />
         buffer at {Math.round(this.props.tree.unmergedChanges().fillState() * 10000) / 100}%
       </span>
     )
@@ -59,16 +67,18 @@ class PauseButton extends React.Component<Props, {changes: number}> {
   }
 
   public render() {
-    const message = this.props.paused ? 'Resumes updating the tree, after applying all recorded changes' : 'Stops all updates, records changes until the buffer is full.'
+    const message = this.props.paused
+      ? 'Resumes updating the tree, after applying all recorded changes'
+      : 'Stops all updates, records changes until the buffer is full.'
     return (
       <div style={{ display: 'inline-flex' }}>
         <span>
-          <CustomIconButton onClick={this.props.actions.tree.togglePause} >
-            <Tooltip title={message}>
-              <div /* Required so tooltip does not loose the anchor when the icon changes */>
-                {this.props.paused ? <Resume /> : <Pause />}
-              </div>
-            </Tooltip>
+          <CustomIconButton onClick={this.props.actions.tree.togglePause} tooltip={message}>
+            {this.props.paused ? (
+              <Resume className={this.props.classes.icon} />
+            ) : (
+              <Pause className={this.props.classes.icon} />
+            )}
           </CustomIconButton>
         </span>
         {this.props.paused ? this.renderBufferStats() : null}
@@ -79,8 +89,8 @@ class PauseButton extends React.Component<Props, {changes: number}> {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    paused: state.tree.paused,
-    tree: state.tree.tree,
+    paused: state.tree.get('paused'),
+    tree: state.tree.get('tree'),
   }
 }
 
@@ -92,4 +102,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(PauseButton))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(PauseButton))

app/src/components/Layout/SearchBar.tsx

@@ -0,0 +1,146 @@
+import React, { useCallback, useState, useRef } from 'react'
+import ClearAdornment from '../helper/ClearAdornment'
+import Search from '@material-ui/icons/Search'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { InputBase } from '@material-ui/core'
+import { settingsActions } from '../../actions'
+import { fade, Theme, withStyles } from '@material-ui/core/styles'
+import { useGlobalKeyEventHandler } from '../../effects/useGlobalKeyEventHandler'
+import { KeyCodes } from '../../utils/KeyCodes'
+
+function SearchBar(props: {
+  classes: any
+  topicFilter?: string
+  hasConnection: boolean
+  actions: {
+    settings: typeof settingsActions
+  }
+}) {
+  const { actions, classes, hasConnection, topicFilter } = props
+
+  const [hasFocus, setHasFocus] = useState(false)
+  const inputRef = useRef<HTMLInputElement>()
+  const onFocus = useCallback(() => setHasFocus(true), [])
+  const onBlur = useCallback(() => setHasFocus(false), [])
+
+  const clearFilter = useCallback(() => {
+    actions.settings.filterTopics('')
+  }, [])
+
+  const onFilterChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
+    actions.settings.filterTopics(event.target.value)
+  }, [])
+
+  useGlobalKeyEventHandler(undefined, event => {
+    const isCharacter = event.key.length === 1
+    const isAllowedControlCharacter = event.keyCode === KeyCodes.backspace || event.keyCode === KeyCodes.delete
+    const tagNameBlacklist = ['INPUT', 'TEXTAREA', 'RADIO', 'CHECKBOX', 'OPTION', 'FORM']
+
+    const tagElementIsNotBlacklisted =
+      document.activeElement && tagNameBlacklist.indexOf(document.activeElement.tagName) === -1
+
+    if (
+      (isCharacter || isAllowedControlCharacter) &&
+      !event.defaultPrevented &&
+      !hasFocus &&
+      tagElementIsNotBlacklisted &&
+      hasConnection
+    ) {
+      // Focus input field, no preventDefault the event will reach the input element after it has been focussed
+      inputRef.current && inputRef.current.focus()
+    }
+  })
+
+  return (
+    <div className={classes.search}>
+      <div className={classes.searchIcon}>
+        <Search />
+      </div>
+      <InputBase
+        value={topicFilter}
+        inputProps={{
+          onFocus,
+          onBlur,
+          ref: inputRef,
+        }}
+        onChange={onFilterChange}
+        placeholder="Search…"
+        endAdornment={
+          <div style={{ width: '24px', paddingRight: '8px' }}>
+            <ClearAdornment variant="primary" action={clearFilter} value={topicFilter} />
+          </div>
+        }
+        classes={{ root: classes.inputRoot, input: classes.inputInput }}
+      />
+    </div>
+  )
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    topicFilter: state.settings.get('topicFilter'),
+    hasConnection: Boolean(state.connection.connectionId),
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+    },
+  }
+}
+
+const styles = (theme: Theme) => ({
+  search: {
+    position: 'relative' as 'relative',
+    borderRadius: theme.shape.borderRadius,
+    backgroundColor: fade(theme.palette.common.white, 0.15),
+    '&:hover': {
+      backgroundColor: fade(theme.palette.common.white, 0.25),
+    },
+    marginRight: theme.spacing(2),
+    marginLeft: 0,
+    flexGrow: 1,
+    maxWidth: '60%',
+
+    [theme.breakpoints.up('md')]: {
+      maxWidth: '30%',
+
+      marginLeft: theme.spacing(4),
+      width: 'auto' as 'auto',
+    },
+    [theme.breakpoints.up(750)]: {
+      marginLeft: theme.spacing(4),
+      width: 'auto' as 'auto',
+    },
+  },
+  searchIcon: {
+    width: theme.spacing(6),
+    height: '100%',
+    position: 'absolute' as 'absolute',
+    pointerEvents: 'none' as 'none',
+    display: 'flex' as 'flex',
+    alignItems: 'center' as 'center',
+    justifyContent: 'center' as 'center',
+  },
+  inputRoot: {
+    color: 'inherit' as 'inherit',
+    width: '100%',
+  },
+  inputInput: {
+    paddingTop: theme.spacing(1),
+    paddingRight: theme.spacing(1),
+    paddingBottom: theme.spacing(1),
+    paddingLeft: theme.spacing(6),
+    transition: theme.transitions.create('width'),
+    width: '100%',
+  },
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(SearchBar))

app/src/components/Layout/TitleBar.tsx

@@ -1,70 +1,30 @@
 import * as React from 'react'
-import ClearAdornment from '../helper/ClearAdornment'
 import CloudOff from '@material-ui/icons/CloudOff'
 import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
 import Menu from '@material-ui/icons/Menu'
-import Search from '@material-ui/icons/Search'
+import PauseButton from './PauseButton'
+import SearchBar from './SearchBar'
+import { AppBar, Button, IconButton, Toolbar, Typography } from '@material-ui/core'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { connectionActions, settingsActions, treeActions } from '../../actions'
-import { fade } from '@material-ui/core/styles/colorManipulator'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import {
-  AppBar,
-  Button,
-  IconButton,
-  InputBase,
-  Toolbar,
-  Typography,
-} from '@material-ui/core'
-import PauseButton from './PauseButton'
+import { connectionActions, globalActions, settingsActions } from '../../actions'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
-const styles: StyleRulesCallback = theme => ({
+const styles = (theme: Theme) => ({
   title: {
-    display: 'none',
-    [theme.breakpoints.up('sm')]: {
-      display: 'block',
+    display: 'none' as 'none',
+    [theme.breakpoints.up(750)]: {
+      display: 'block' as 'block',
     },
+    whiteSpace: 'nowrap' as 'nowrap',
   },
-  search: {
-    position: 'relative',
-    borderRadius: theme.shape.borderRadius,
-    backgroundColor: fade(theme.palette.common.white, 0.15),
-    '&:hover': {
-      backgroundColor: fade(theme.palette.common.white, 0.25),
-    },
-    marginRight: theme.spacing(2),
-    marginLeft: 0,
-    width: '100%',
-    [theme.breakpoints.up('sm')]: {
-      marginLeft: theme.spacing(3),
-      width: 'auto',
-    },
-  },
-  searchIcon: {
-    width: theme.spacing(8),
-    height: '100%',
-    position: 'absolute',
-    pointerEvents: 'none',
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  inputRoot: {
-    color: 'inherit',
-    width: '100%',
-  },
-  inputInput: {
-    paddingTop: theme.spacing(1),
-    paddingRight: theme.spacing(1),
-    paddingBottom: theme.spacing(1),
-    paddingLeft: theme.spacing(10),
-    transition: theme.transitions.create('width'),
-    width: '100%',
-    [theme.breakpoints.up('md')]: {
-      width: 200,
+  disconnectIcon: {
+    [theme.breakpoints.down('xs')]: {
+      display: 'none' as 'none',
     },
+    marginRight: '8px',
+    paddingLeft: '8px',
   },
   menuButton: {
     marginLeft: -12,
@@ -72,6 +32,8 @@ const styles: StyleRulesCallback = theme => ({
   },
   disconnect: {
     margin: 'auto 8px auto auto',
+  },
+  disconnectLabel: {
     color: theme.palette.primary.contrastText,
   },
 })
@@ -79,43 +41,17 @@ const styles: StyleRulesCallback = theme => ({
 interface Props {
   classes: any
   actions: {
-    settings: typeof settingsActions,
-    connection: typeof connectionActions,
+    settings: typeof settingsActions
+    connection: typeof connectionActions
+    global: typeof globalActions
   }
   topicFilter?: string
 }
 
-class TitleBar extends React.Component<Props, {}> {
+class TitleBar extends React.PureComponent<Props, {}> {
   constructor(props: any) {
     super(props)
-    this.state = { }
-  }
-
-  private renderSearch() {
-    const { classes, topicFilter } = this.props
-
-    return (
-      <div className={classes.search}>
-        <div className={classes.searchIcon}>
-          <Search />
-        </div>
-        <InputBase
-          value={topicFilter}
-          onChange={this.onFilterChange}
-          placeholder="Search…"
-          endAdornment={<div style={{ width: '24px', paddingRight: '8px' }}><ClearAdornment action={this.clearFilter} value={topicFilter} /></div>}
-          classes={{ root: classes.inputRoot, input: classes.inputInput }}
-        />
-      </div>
-    )
-  }
-
-  private clearFilter = () => {
-    this.props.actions.settings.filterTopics('')
-  }
-
-  private onFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    this.props.actions.settings.filterTopics(event.target.value)
+    this.state = {}
   }
 
   public render() {
@@ -124,14 +60,25 @@ class TitleBar extends React.Component<Props, {}> {
     return (
       <AppBar position="static">
         <Toolbar>
-          <IconButton className={classes.menuButton} color="inherit" aria-label="Menu" onClick={actions.settings.toggleSettingsVisibility}>
+          <IconButton
+            className={classes.menuButton}
+            color="inherit"
+            aria-label="Menu"
+            onClick={actions.global.toggleSettingsVisibility}
+          >
             <Menu />
           </IconButton>
-          <Typography className={classes.title} variant="h6" color="inherit">MQTT Explorer</Typography>
-          {this.renderSearch()}
+          <Typography className={classes.title} variant="h6" color="inherit">
+            MQTT Explorer
+          </Typography>
+          <SearchBar />
           <PauseButton />
-          <Button className={classes.disconnect} onClick={actions.connection.disconnect}>
-            Disconnect <CloudOff style={{ marginRight: '8px', paddingLeft: '8px' }}/>
+          <Button
+            className={classes.disconnect}
+            classes={{ label: classes.disconnectLabel }}
+            onClick={actions.connection.disconnect}
+          >
+            Disconnect <CloudOff className={classes.disconnectIcon} />
           </Button>
           <ConnectionHealthIndicator withBackground={true} />
         </Toolbar>
@@ -150,9 +97,13 @@ const mapDispatchToProps = (dispatch: any) => {
   return {
     actions: {
       settings: bindActionCreators(settingsActions, dispatch),
+      global: bindActionCreators(globalActions, dispatch),
       connection: bindActionCreators(connectionActions, dispatch),
     },
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(TitleBar))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(TitleBar))

app/src/components/SettingsDrawer/BooleanSwitch.tsx

@@ -0,0 +1,36 @@
+import * as React from 'react'
+import { InputLabel, Switch, Theme, Tooltip } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
+const sha1 = require('sha1')
+
+function BooleanSwitch(props: { title: string; value: boolean; tooltip: string; action: () => void; classes: any }) {
+  const { tooltip, value, action, title, classes } = props
+
+  const clickHandler = (e: React.MouseEvent) => {
+    e.stopPropagation()
+    e.preventDefault()
+    action()
+  }
+
+  return (
+    <div style={{ padding: '8px', display: 'flex' }}>
+      <Tooltip title={tooltip}>
+        <InputLabel htmlFor={`toggle-${sha1(title)}`} onClick={clickHandler} className={classes.label}>
+          {title}
+        </InputLabel>
+      </Tooltip>
+      <Tooltip title={tooltip}>
+        <Switch name={`toggle-${sha1(title)}`} checked={value} onChange={action} color="primary" />
+      </Tooltip>
+    </div>
+  )
+}
+
+const styles = (theme: Theme) => ({
+  label: {
+    flex: '1',
+    paddingTop: theme.spacing(1.5),
+  },
+})
+
+export default withStyles(styles)(BooleanSwitch)

app/src/components/SettingsDrawer/BrokerStatistics.tsx

@@ -1,13 +1,13 @@
 import * as q from '../../../../backend/src/Model'
-import * as React from 'react'
+import React, { useMemo } from 'react'
 import { AppState } from '../../reducers'
+import { Base64Message } from '../../../../backend/src/Model/Base64Message'
 import { connect } from 'react-redux'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { TopicViewModel } from '../../model/TopicViewModel'
 import { Typography } from '@material-ui/core'
-import { Base64Message } from '../../../../backend/src/Model/Base64Message'
-import teal from '@material-ui/core/colors/teal'
-
+import { usePollingToFetchTreeNode } from '../helper/usePollingToFetchTreeNode'
+import { useUpdateComponentWhenNodeUpdates } from '../helper/useUpdateComponentWhenNodeUpdates'
 const abbreviate = require('number-abbreviate')
 
 interface Stats {
@@ -15,11 +15,7 @@ interface Stats {
   title: string
 }
 
-const styles: StyleRulesCallback = theme => ({
-  flex: {
-    display: 'flex',
-    width: '100%',
-  },
+const styles = (theme: Theme) => ({
   container: {
     width: '100%',
     height: '224px',
@@ -34,24 +30,13 @@ interface Props {
   tree?: q.Tree<TopicViewModel>
 }
 
-class BrokerStatistics extends React.Component<Props, {}> {
-  constructor(props: any) {
-    super(props)
-    this.state = {}
-  }
+function BrokerStatistics(props: Props) {
+  const { tree, classes } = props
+  const sysTopic = usePollingToFetchTreeNode(props.tree, '$SYS')
+  useUpdateComponentWhenNodeUpdates(sysTopic)
 
-  private renderPair(tree: q.Tree<TopicViewModel>, a: Stats, b: Stats) {
-    return (
-      <div className={this.props.classes.flex}>
-        <div style={{ flex: 1 }}>{this.renderStat(tree, a)}</div>
-        <div style={{ flex: 1 }}>{this.renderStat(tree, b)}</div>
-      </div>
-    )
-  }
-
-  public render() {
-    const { tree, classes } = this.props
-    if (!tree || !tree.findNode('$SYS/broker/clients/total')) {
+  return useMemo(() => {
+    if (!Boolean(sysTopic)) {
       return null
     }
 
@@ -94,34 +79,20 @@ class BrokerStatistics extends React.Component<Props, {}> {
       },
     }
 
-    return (
-      <div className={classes.container}>
-        {this.renderStat(tree, stats.broker)}
-        {this.renderPair(tree, stats.sent, stats.received)}
-        {this.renderPair(tree, stats.clients, stats.subscriptions)}
-        {this.renderPair(tree, stats.sent5m, stats.received5m)}
-        {this.renderPair(tree, stats.heap, stats.heapMax)}
-      </div>
-    )
-  }
-
-  public renderStat(tree: q.Tree<TopicViewModel>, stat: Stats) {
-    const node = tree.findNode(stat.topic)
-    if (!node || !node.message) {
+    if (!tree) {
       return null
     }
 
-    const str = node.message.value ? Base64Message.toUnicodeString(node.message.value) : ''
-    let value = (node.message && node.message.value) ? parseFloat(str) : NaN
-    value = !isNaN(value) ? abbreviate(value) : str
-
     return (
-      <div key={stat.title}>
-        <Typography><b>{stat.title}</b></Typography>
-        <Typography style={{ paddingLeft: '8px' }}><i>{value}</i></Typography>
+      <div className={classes.container}>
+        {renderStat(tree, stats.broker)}
+        {renderPair(tree, stats.sent, stats.received)}
+        {renderPair(tree, stats.clients, stats.subscriptions)}
+        {renderPair(tree, stats.sent5m, stats.received5m)}
+        {renderPair(tree, stats.heap, stats.heapMax)}
       </div>
     )
-  }
+  }, [sysTopic && sysTopic.lastUpdate, props.classes])
 }
 
 const mapStateToProps = (state: AppState) => {
@@ -131,3 +102,39 @@ const mapStateToProps = (state: AppState) => {
 }
 
 export default withStyles(styles)(connect(mapStateToProps)(BrokerStatistics))
+
+function renderPair(tree: q.Tree<TopicViewModel>, a: Stats, b: Stats) {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        width: '100%',
+      }}
+    >
+      <div style={{ flex: 1 }}>{renderStat(tree, a)}</div>
+      <div style={{ flex: 1 }}>{renderStat(tree, b)}</div>
+    </div>
+  )
+}
+
+function renderStat(tree: q.Tree<TopicViewModel>, stat: Stats) {
+  const node = tree.findNode(stat.topic)
+  if (!node || !node.message) {
+    return null
+  }
+
+  const str = node.message.value ? Base64Message.toUnicodeString(node.message.value) : ''
+  let value = node.message && node.message.value ? parseFloat(str) : NaN
+  value = !isNaN(value) ? abbreviate(value) : str
+
+  return (
+    <div key={stat.title}>
+      <Typography>
+        <b>{stat.title}</b>
+      </Typography>
+      <Typography style={{ paddingLeft: '8px' }}>
+        <i>{value}</i>
+      </Typography>
+    </div>
+  )
+}

app/src/components/SettingsDrawer/Settings.tsx

@@ -1,12 +1,14 @@
 import * as React from 'react'
+import BooleanSwitch from './BooleanSwitch'
 import BrokerStatistics from './BrokerStatistics'
 import ChevronRight from '@material-ui/icons/ChevronRight'
+import TimeLocale from './TimeLocale'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { settingsActions } from '../../actions'
+import { globalActions, settingsActions } from '../../actions'
 import { shell } from 'electron'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { TopicOrder } from '../../reducers/Settings'
 
 import {
@@ -18,29 +20,37 @@ import {
   MenuItem,
   Select,
   Typography,
-  Switch,
   Tooltip,
 } from '@material-ui/core'
-const sha1 = require('sha1')
 
-export const autoExpandLimitSet = [{
-  limit: 0,
-  name: 'Collapsed',
-}, {
-  limit: 2,
-  name: 'Few',
-}, {
-  limit: 3,
-  name: 'Some',
-}, {
-  limit: 10,
-  name: 'Most',
-}, {
-  limit: 1E6,
-  name: 'All',
-}]
+export const autoExpandLimitSet = [
+  {
+    limit: 0,
+    name: 'Collapsed',
+  },
+  {
+    limit: 2,
+    name: 'Few',
+  },
+  {
+    limit: 5,
+    name: 'Some',
+  },
+  {
+    limit: 15,
+    name: 'Most',
+  },
+  {
+    limit: 30,
+    name: 'Most',
+  },
+  {
+    limit: 1e6,
+    name: 'All',
+  },
+]
 
-const styles: StyleRulesCallback = theme => ({
+const styles = (theme: Theme) => ({
   drawer: {
     backgroundColor: theme.palette.background.default,
     flexShrink: 0,
@@ -63,13 +73,13 @@ const styles: StyleRulesCallback = theme => ({
     color: theme.palette.text.hint,
     cursor: 'pointer' as 'pointer',
   },
-  switchBase: {
-    height: theme.spacing(4),
-  },
 })
 
 interface Props {
-  actions: typeof settingsActions
+  actions: {
+    settings: typeof settingsActions
+    global: typeof globalActions
+  }
   autoExpandLimit: number
   classes: any
   highlightTopicUpdates: boolean
@@ -80,7 +90,7 @@ interface Props {
   theme: 'light' | 'dark'
 }
 
-class Settings extends React.Component<Props, {}> {
+class Settings extends React.PureComponent<Props, {}> {
   constructor(props: any) {
     super(props)
     this.state = {}
@@ -93,69 +103,63 @@ class Settings extends React.Component<Props, {}> {
   private renderHighlightTopicUpdates() {
     const { highlightTopicUpdates, actions } = this.props
 
-    return this.renderSwitch('Show Activity', highlightTopicUpdates, actions.toggleHighlightTopicUpdates, 'Topics blink when a new message arrives')
-  }
-
-  private renderSwitch(title: string, checked: boolean, action: any, tooltip: string) {
-    const { classes } = this.props
-
-    const clickHandler = (e: React.MouseEvent) => {
-      e.stopPropagation()
-      e.preventDefault()
-      action()
-    }
-
     return (
-      <div style={{ padding: '8px', display: 'flex' }}>
-        <Tooltip title={tooltip}>
-          <InputLabel
-            htmlFor={`toggle-${sha1(title)}`}
-            onClick={clickHandler}
-            style={{ flex: '1', paddingTop: '8px' }}
-          >
-            {title}
-          </InputLabel>
-        </Tooltip>
-        <Tooltip title={tooltip}>
-          <Switch
-            name={`toggle-${sha1(title)}`}
-            checked={checked}
-            onChange={action}
-            color="primary"
-            classes={{ switchBase: classes.switchBase }}
-          />
-        </Tooltip>
-      </div>
+      <BooleanSwitch
+        title="Show Activity"
+        tooltip="Topics blink when a new message arrives"
+        value={highlightTopicUpdates}
+        action={actions.settings.toggleHighlightTopicUpdates}
+      />
     )
   }
 
   private selectTopicsOnMouseOver() {
     const { actions, selectTopicWithMouseOver } = this.props
-    const toggle = () => actions.selectTopicWithMouseOver(!selectTopicWithMouseOver)
+    const toggle = () => actions.settings.selectTopicWithMouseOver(!selectTopicWithMouseOver)
 
-    return this.renderSwitch('Quick Preview', selectTopicWithMouseOver, toggle, 'Select topics on mouse over')
+    return (
+      <BooleanSwitch
+        title="Quick Preview"
+        tooltip="Select topics on mouse over"
+        value={selectTopicWithMouseOver}
+        action={toggle}
+      />
+    )
   }
 
   private toggleTheme() {
     const { actions, theme } = this.props
 
-    return this.renderSwitch('Theme', theme === 'light', actions.toggleTheme, 'Select a theme')
+    return (
+      <BooleanSwitch
+        title="Dark Mode"
+        tooltip="Enable dark theme"
+        value={theme === 'dark'}
+        action={actions.settings.toggleTheme}
+      />
+    )
   }
 
   private renderAutoExpand() {
     const { classes, autoExpandLimit } = this.props
 
-    const limits = autoExpandLimitSet.map(limit => <MenuItem key={limit.limit} value={limit.limit}>{limit.name}</MenuItem>)
+    const limits = autoExpandLimitSet.map(limit => (
+      <MenuItem key={limit.limit} value={limit.limit}>
+        {limit.limit < 10000 && limit.limit > 0 ? `≤ ${limit.limit} topics` : limit.name}
+      </MenuItem>
+    ))
     return (
       <div style={{ padding: '8px', display: 'flex' }}>
-        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>Auto Expand</InputLabel>
+        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>
+          Auto Expand
+        </InputLabel>
         <Select
-            value={autoExpandLimit}
-            onChange={this.onChangeAutoExpand}
-            input={<Input name="auto-expand" id="auto-expand-label-placeholder" />}
-            name="auto-expand"
-            className={classes.input}
-            style={{ flex: '1' }}
+          value={autoExpandLimit}
+          onChange={this.onChangeAutoExpand}
+          input={<Input name="auto-expand" id="auto-expand-label-placeholder" />}
+          name="auto-expand"
+          className={classes.input}
+          style={{ flex: '1' }}
         >
           {limits}
         </Select>
@@ -163,8 +167,8 @@ class Settings extends React.Component<Props, {}> {
     )
   }
 
-  private onChangeAutoExpand = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    this.props.actions.setAutoExpandLimit(parseInt(e.target.value, 10))
+  private onChangeAutoExpand = (e: React.ChangeEvent<{ value: unknown }>) => {
+    this.props.actions.settings.setAutoExpandLimit(parseInt(String(e.target.value), 10))
   }
 
   private renderNodeOrder() {
@@ -172,7 +176,9 @@ class Settings extends React.Component<Props, {}> {
 
     return (
       <div style={{ padding: '8px', display: 'flex' }}>
-        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>Topic Order</InputLabel>
+        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>
+          Topic Order
+        </InputLabel>
         <Select
           value={topicOrder}
           onChange={this.onChangeSorting}
@@ -182,43 +188,38 @@ class Settings extends React.Component<Props, {}> {
           className={classes.input}
           style={{ flex: '1' }}
         >
-          <MenuItem value={TopicOrder.none}><em>default</em></MenuItem>
+          <MenuItem value={TopicOrder.none}>
+            <em>default</em>
+          </MenuItem>
           <MenuItem value={TopicOrder.abc}>a-z</MenuItem>
           <MenuItem value={TopicOrder.messages}>{TopicOrder.messages}</MenuItem>
           <MenuItem value={TopicOrder.topics}>{TopicOrder.topics}</MenuItem>
         </Select>
-    </div>)
+      </div>
+    )
   }
 
-  private onChangeSorting = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    this.props.actions.setTopicOrder(e.target.value as TopicOrder)
+  private onChangeSorting = (e: React.ChangeEvent<{ value: unknown }>) => {
+    this.props.actions.settings.setTopicOrder(e.target.value as TopicOrder)
   }
 
   public render() {
     const { classes, actions, visible } = this.props
     return (
-      <Drawer
-        anchor="left"
-        className={classes.drawer}
-        open={visible}
-        variant="persistent"
-      >
-        <div
-          className={classes.paper}
-          tabIndex={0}
-          role="button"
-        >
-
+      <Drawer anchor="left" className={classes.drawer} open={visible} variant="persistent">
+        <div className={classes.paper} tabIndex={0} role="button">
           <Typography className={classes.title} variant="h6" color="inherit">
-            <IconButton onClick={actions.toggleSettingsVisibility}>
+            <IconButton onClick={actions.global.toggleSettingsVisibility}>
               <ChevronRight />
             </IconButton>
             Settings
           </Typography>
-          <Divider />
-
+          <Divider style={{ userSelect: 'none' }} />
+        </div>
+        <div>
           {this.renderAutoExpand()}
           {this.renderNodeOrder()}
+          <TimeLocale />
           {this.renderHighlightTopicUpdates()}
           {this.selectTopicsOnMouseOver()}
           {this.toggleTheme()}
@@ -238,7 +239,7 @@ const mapStateToProps = (state: AppState) => {
   return {
     autoExpandLimit: state.settings.get('autoExpandLimit'),
     topicOrder: state.settings.get('topicOrder'),
-    visible: state.settings.get('visible'),
+    visible: state.globalState.get('settingsVisible'),
     highlightTopicUpdates: state.settings.get('highlightTopicUpdates'),
     selectTopicWithMouseOver: state.settings.get('selectTopicWithMouseOver'),
     theme: state.settings.get('theme'),
@@ -247,8 +248,16 @@ const mapStateToProps = (state: AppState) => {
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: bindActionCreators(settingsActions, dispatch),
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+      global: bindActionCreators(globalActions, dispatch),
+    },
   }
 }
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Settings))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(Settings)
+)

app/src/components/SettingsDrawer/TimeLocale.tsx

@@ -0,0 +1,90 @@
+import * as React from 'react'
+import DateFormatter from '../helper/DateFormatter'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { Input, InputLabel, MenuItem, Select, StyleRulesCallback, Theme } from '@material-ui/core'
+import { settingsActions } from '../../actions'
+import { withStyles } from '@material-ui/styles'
+const moment = require('moment/min/moment-with-locales')
+
+interface Props {
+  actions: {
+    settings: typeof settingsActions
+  }
+  timeLocale: string
+  classes: any
+}
+
+function TimeLocaleSettings(props: Props) {
+  const { classes, timeLocale, actions } = props
+  const locales = moment.locales()
+  const date = new Date()
+  const localeMenuItems = locales.map((l: string) => (
+    <MenuItem key={l} value={l}>
+      <div>
+        Locale: <b>{l}</b>, Format:{' '}
+        <b>
+          <DateFormatter date={date} overrideLocale={l} />
+        </b>
+      </div>
+    </MenuItem>
+  ))
+
+  function updateLocale(e: React.ChangeEvent<{ value: unknown }>) {
+    const locale = e.target.value ? String(e.target.value) : ''
+    actions.settings.setTimeLocale(locale)
+  }
+
+  return (
+    <div style={{ padding: '8px', display: 'flex' }}>
+      <InputLabel htmlFor="time-locale" style={{ flex: '1', marginTop: '8px' }}>
+        Time Locale
+      </InputLabel>
+      <Select
+        value={timeLocale}
+        onChange={updateLocale}
+        input={<Input name="time-locale" id="time-locale-label-placeholder" />}
+        name="time-locale"
+        className={classes.input}
+        renderValue={v => <span>{String(v)}</span>}
+        style={{ flex: '1' }}
+      >
+        {localeMenuItems}
+      </Select>
+    </div>
+  )
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    timeLocale: state.settings.get('timeLocale'),
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+    },
+  }
+}
+
+const styles = (theme: Theme) => ({
+  input: {
+    minWidth: '150px',
+    margin: `auto ${theme.spacing(1)} auto ${theme.spacing(2)}px`,
+  },
+  selected: {
+    '& div': {
+      display: 'none',
+    },
+  },
+})
+
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(TimeLocaleSettings)
+)

app/src/components/Sidebar/CodeBlockColors.ts

@@ -16,4 +16,4 @@ export enum CodeBlockColorsBraceMonokai {
   string = '#E6DB74',
   variable = '#A6E22E',
   gutters = '#2F3129',
-}
+}

app/src/components/Sidebar/CodeDiff.tsx

@@ -1,181 +0,0 @@
-import * as diff from 'diff'
-import * as Prism from 'prismjs'
-import * as React from 'react'
-import { Theme, withStyles } from '@material-ui/core'
-import 'prismjs/components/prism-json'
-import 'prismjs/themes/prism-tomorrow.css'
-import { CodeBlockColors, CodeBlockColorsBraceMonokai } from './CodeBlockColors'
-
-interface Props {
-  previous: string
-  current: string
-  nameOfCompareMessage: string
-  language?: 'json'
-  classes: any
-}
-
-class CodeDiff extends React.Component<Props, {}> {
-  constructor(props: Props) {
-    super(props)
-  }
-
-  private renderChangeAmount(changes: Diff.Change[]) {
-    const additions = changes.map(change => (change.added === true) ? (change.count || 0) : 0).reduce((a, b) => a + b)
-    const deletions = changes.map(change => (change.removed === true) ? (change.count || 0) : 0).reduce((a, b) => a + b)
-    if (additions === 0 && deletions === 0) {
-      return null
-    }
-
-    return (
-      <span style={{ display: 'block', marginBottom: '8px', float: 'right' }}>
-        <span>
-          Comparing with <b>{this.props.nameOfCompareMessage}</b> message:&nbsp;
-
-          <span className={this.props.classes.additions}>+ {additions} line{additions === 1 ? '' : 's'}</span>
-          , <span className={this.props.classes.deletions}>- {deletions} line{deletions === 1 ? '' : 's'}</span>
-        </span>
-      </span>
-    )
-  }
-
-  private trimNewlineRight(str: string) {
-    if (str.slice(-1) === '\n') {
-      return str.slice(0, -1)
-    }
-
-    return str
-  }
-
-  private cssClassForChange(change: diff.Change) {
-    if (change.added === true) {
-      return this.props.classes.addition
-    }
-
-    if (change.removed === true) {
-      return this.props.classes.deletion
-    }
-
-    return this.props.classes.noChange
-  }
-
-  public render() {
-    const changes = diff.diffLines(this.props.previous, this.props.current)
-    const styledLines = Prism.highlight(this.props.current, Prism.languages.json, 'json').split('\n')
-
-    let lineNumber = 0
-    const code = changes.map((change, key) => {
-      const hasStyledCode = change.removed !== true
-      const changedLines = change.count || 0
-      if (hasStyledCode && this.props.language === 'json') {
-        const currentLines = styledLines.slice(lineNumber, lineNumber + changedLines)
-        const lines = currentLines.map((html: string, idx: number) => {
-          return <div key={`${key}-${idx}`} className={this.props.classes.line}><span className={this.cssClassForChange(change)} dangerouslySetInnerHTML={{ __html: html }} /></div>
-        })
-        lineNumber += changedLines
-
-        return <div key={key}>{lines}</div>
-      }
-
-      return this.trimNewlineRight(change.value)
-        .split('\n')
-        .map((line, idx) => {
-          return <div key={`${key}-${idx}`} className={this.props.classes.line}><span className={this.cssClassForChange(change)}>{line}</span></div>
-        })
-    })
-
-    return (
-      <div className={this.props.classes.gutters}>
-        <pre className={`language-json ${this.props.classes.codeBlock}`}>
-          {code}
-        </pre>
-        {this.renderChangeAmount(changes)}
-      </div>
-    )
-  }
-}
-
-const style = (theme: Theme) => {
-  const codeBlockColors = theme.palette.type === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai
-  const baseStyle = {
-    width: '100%',
-  }
-  const before = {
-    margin: '0 2px 0 -9px',
-    color: codeBlockColors.text,
-  }
-
-  return {
-    additions: {
-      color: 'rgb(10, 255, 10)',
-    },
-    deletions: {
-      color: 'rgb(255, 10, 10)',
-    },
-    line: {
-      lineHeight: 'normal',
-    },
-    gutters: {
-      backgroundColor: codeBlockColors.gutters,
-    },
-    codeBlock: {
-      fontSize: '12px',
-      maxHeight: '200px',
-      marginLeft: '33px !important',
-      backgroundColor: `${codeBlockColors.background} !important`,
-      '& span': {
-        color: codeBlockColors.text,
-      },
-      '& .token.number': {
-        color: codeBlockColors.numeric,
-      },
-      '& .token.boolean': {
-        color: codeBlockColors.numeric,
-      },
-      '& .token.property': {
-        color: codeBlockColors.variable,
-      },
-      '& .token.string': {
-        color: codeBlockColors.string,
-      },
-      '& .token': {
-        color: codeBlockColors.text,
-      },
-      '& .token.operator': {
-        color: codeBlockColors.text,
-      },
-      '& .token.punctuation': {
-        color: codeBlockColors.text,
-      },
-    },
-    noChange: {
-      ...baseStyle,
-      '&:before': {
-        ...before,
-      },
-    },
-    deletion: {
-      ...baseStyle,
-      backgroundColor: 'rgba(255, 10, 10, 0.3)',
-      '&:before': {
-        ...before,
-        content: "'-'",
-      },
-      '&:hover': {
-        backgroundColor: 'rgba(255, 10, 10, 0.6)',
-      },
-    },
-    addition: {
-      ...baseStyle,
-      backgroundColor: 'rgba(10, 255, 10, 0.3)',
-      '&:hover': {
-        backgroundColor: 'rgba(10, 255, 10, 0.5)',
-      },
-      '&:before': {
-        ...before,
-        content: "'+'",
-      },
-    },
-  }
-}
-
-export default withStyles(style)(CodeDiff)

app/src/components/Sidebar/CodeDiff/ChartPreview.tsx

@@ -0,0 +1,91 @@
+import * as q from '../../../../../backend/src/Model'
+import * as React from 'react'
+import ShowChart from '@material-ui/icons/ShowChart'
+import TopicPlot from '../../TopicPlot'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+import { connect } from 'react-redux'
+import { Fade, Paper, Popper, Tooltip } from '@material-ui/core'
+import { JsonPropertyLocation } from '../../../../../backend/src/JsonAstParser'
+
+interface Props {
+  treeNode: q.TreeNode<any>
+  classes: any
+  literal: JsonPropertyLocation
+  actions: {
+    chart: typeof chartActions
+  }
+}
+
+function ChartPreview(props: Props) {
+  const chartIconRef = React.useRef(null)
+  const [open, setOpen] = React.useState(false)
+
+  const onClick = React.useCallback(() => {
+    props.actions.chart.addChart({
+      topic: props.treeNode.path(),
+      dotPath: props.literal.path !== '' ? props.literal.path : undefined,
+    })
+    setOpen(false)
+  }, [props.literal.path, props.treeNode])
+
+  const mouseOver = React.useCallback(() => {
+    setOpen(true)
+  }, [])
+
+  const mouseOut = React.useCallback(() => {
+    setOpen(false)
+  }, [])
+
+  const hasEnoughDataToDisplayDiagrams = props.treeNode.messageHistory.count() > 1
+
+  const addChartToPanelButton = hasEnoughDataToDisplayDiagrams ? (
+    <Tooltip title="Add to chart panel">
+      <ShowChart
+        ref={chartIconRef}
+        className={props.classes.icon}
+        onMouseEnter={mouseOver}
+        onMouseLeave={mouseOut}
+        onClick={onClick}
+        data-test-type="ShowChart"
+        data-test={props.literal.path}
+      />
+    </Tooltip>
+  ) : (
+    <Tooltip title="Add to chart panel, not enough data for preview">
+      <ShowChart
+        onClick={onClick}
+        className={props.classes.icon}
+        style={{ color: '#aaa' }}
+        data-test-type="ShowChart"
+        data-test={props.literal.path}
+      />
+    </Tooltip>
+  )
+
+  return (
+    <span>
+      {addChartToPanelButton}
+      <Popper open={open} anchorEl={chartIconRef.current} placement="left-end">
+        <Fade in={open} timeout={300}>
+          <Paper style={{ width: '300px' }}>
+            {open ? <TopicPlot history={props.treeNode.messageHistory} dotPath={props.literal.path} /> : <span />}
+          </Paper>
+        </Fade>
+      </Popper>
+    </span>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      chart: bindActionCreators(chartActions, dispatch),
+    },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(ChartPreview)

app/src/components/Sidebar/CodeDiff/DiffCount.tsx

@@ -0,0 +1,45 @@
+import * as React from 'react'
+import { Theme } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
+
+interface Props {
+  changes: Array<Diff.Change>
+  classes: { [s: string]: any }
+  nameOfCompareMessage: string
+}
+
+function changeAmount(props: Props) {
+  const additions = props.changes.map(change => (change.added === true ? change.count || 0 : 0)).reduce((a, b) => a + b)
+  const deletions = props.changes
+    .map(change => (change.removed === true ? change.count || 0 : 0))
+    .reduce((a, b) => a + b)
+  if (additions === 0 && deletions === 0) {
+    return null
+  }
+
+  return (
+    <span style={{ display: 'block', textAlign: 'right' }}>
+      <span>
+        Comparing with <b>{props.nameOfCompareMessage}</b> message:&nbsp;
+        <span className={props.classes.additions}>
+          + {additions} line{additions === 1 ? '' : 's'}
+        </span>
+        ,{' '}
+        <span className={props.classes.deletions}>
+          - {deletions} line{deletions === 1 ? '' : 's'}
+        </span>
+      </span>
+    </span>
+  )
+}
+
+const style = (theme: Theme) => ({
+  additions: {
+    color: 'rgb(10, 255, 10)',
+  },
+  deletions: {
+    color: 'rgb(255, 10, 10)',
+  },
+})
+
+export default withStyles(style)(changeAmount)

app/src/components/Sidebar/CodeDiff/Gutters.tsx

@@ -0,0 +1,104 @@
+import * as diff from 'diff'
+import * as q from '../../../../../backend/src/Model'
+import * as React from 'react'
+import Add from '@material-ui/icons/Add'
+import ChartPreview from './ChartPreview'
+import Remove from '@material-ui/icons/Remove'
+import { JsonPropertyLocation } from '../../../../../backend/src/JsonAstParser'
+import { lineChangeStyle, trimNewlineRight } from './util'
+import { Theme } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
+
+interface Props {
+  changes: Array<diff.Change>
+  literalPositions: Array<JsonPropertyLocation>
+  classes: any
+  className: string
+  treeNode: q.TreeNode<any>
+}
+
+const style = (theme: Theme) => {
+  const icon = {
+    verticalAlign: 'top',
+    width: '12px',
+    height: '12px',
+    marginTop: '2px',
+    borderRadius: '50%',
+  }
+
+  return {
+    icon,
+    iconButton: {
+      ...icon,
+      marginTop: '0px',
+      width: '16px',
+      height: '16px',
+      padding: '2px',
+      '&:hover': {
+        color: theme.palette.primary.contrastText,
+        backgroundColor: theme.palette.primary.main,
+      },
+    },
+    gutterLine: {
+      textAlign: 'right' as 'right',
+      paddingRight: theme.spacing(0.5),
+      height: '16px',
+      width: '100%',
+    },
+  }
+}
+
+function tokensForLine(change: diff.Change, line: number, props: Props) {
+  const { classes, literalPositions } = props
+  const literal = literalPositions[line]
+
+  const chartPreview = Boolean(literal) ? (
+    <ChartPreview
+      key="chartPreview"
+      treeNode={props.treeNode}
+      classes={{ icon: props.classes.iconButton }}
+      literal={literal}
+    />
+  ) : null
+
+  if (change.added) {
+    return [chartPreview, <Add key="add" className={classes.icon} />]
+  } else if (change.removed) {
+    return [<Remove key="remove" className={classes.icon} />]
+  } else {
+    return [
+      chartPreview,
+      <div
+        key="placeholder"
+        style={{ width: '12px', display: 'inline-block' }}
+        dangerouslySetInnerHTML={{ __html: '&nbsp;' }}
+      />,
+    ]
+  }
+}
+
+function Gutters(props: Props) {
+  let currentLine = -1
+  const gutters = props.changes
+    .map((change, key) => {
+      return trimNewlineRight(change.value)
+        .split('\n')
+        .map((_, idx) => {
+          currentLine = !change.removed ? currentLine + 1 : currentLine
+          return (
+            <div key={`${key}-${idx}`} style={lineChangeStyle(change)} className={props.classes.gutterLine}>
+              {tokensForLine(change, currentLine, props)}
+            </div>
+          )
+        })
+    })
+    .reduce((a, b) => a.concat(b), [])
+
+  return (
+    <span>
+      <pre className={props.className}>{gutters}</pre>
+    </span>
+  )
+}
+
+export default withStyles(style)(Gutters)

app/src/components/Sidebar/CodeDiff/index.tsx

@@ -0,0 +1,109 @@
+import * as diff from 'diff'
+import * as Prism from 'prismjs'
+import * as q from '../../../../../backend/src/Model'
+import * as React from 'react'
+import DiffCount from './DiffCount'
+import Gutters from './Gutters'
+import { isPlottable, lineChangeStyle, trimNewlineRight } from './util'
+import { JsonPropertyLocation, literalsMappedByLines } from '../../../../../backend/src/JsonAstParser'
+import { selectTextWithCtrlA } from '../../../utils/handleTextSelectWithCtrlA'
+import { style } from './style'
+import { withStyles, Typography } from '@material-ui/core'
+import 'prismjs/components/prism-json'
+
+interface Props {
+  treeNode: q.TreeNode<any>
+  previous: string
+  current: string
+  nameOfCompareMessage: string
+  language?: 'json'
+  title?: string
+  classes: any
+}
+
+interface State {}
+
+class CodeDiff extends React.PureComponent<Props, State> {
+  private handleCtrlA = selectTextWithCtrlA({ targetSelector: 'pre ~ pre' })
+
+  constructor(props: Props) {
+    super(props)
+    this.state = {}
+  }
+
+  private isValidJson(str: string) {
+    try {
+      JSON.parse(str)
+      return true
+    } catch (error) {
+      return false
+    }
+  }
+
+  private plottableLiteralsIndexedWithLineNumbers() {
+    const allLiterals = this.isValidJson(this.props.current) ? literalsMappedByLines(this.props.current) || [] : []
+
+    return allLiterals.map((l: JsonPropertyLocation) => (isPlottable(l.value) ? l : undefined)) as Array<
+      JsonPropertyLocation
+    >
+  }
+
+  private renderStyledCodeLines(changes: Array<Diff.Change>) {
+    const styledLines = Prism.highlight(this.props.current, Prism.languages.json, 'json').split('\n')
+    let lineNumber = 0
+
+    return changes
+      .map((change, key) => {
+        const hasStyledCode = change.removed !== true
+        const changedLines = change.count || 0
+        if (hasStyledCode && this.props.language === 'json') {
+          const currentLines = styledLines.slice(lineNumber, lineNumber + changedLines)
+          const lines = currentLines.map((html: string, idx: number) => {
+            return (
+              <div key={`${key}-${idx}`} style={lineChangeStyle(change)} className={this.props.classes.line}>
+                <span dangerouslySetInnerHTML={{ __html: html }} />
+              </div>
+            )
+          })
+          lineNumber += changedLines
+
+          return [<div key={key}>{lines}</div>]
+        }
+
+        return trimNewlineRight(change.value)
+          .split('\n')
+          .map((line, idx) => {
+            return (
+              <div key={`${key}-${idx}`} style={lineChangeStyle(change)} className={this.props.classes.line}>
+                <span>{line}</span>
+              </div>
+            )
+          })
+      })
+      .reduce((a, b) => a.concat(b), [])
+  }
+
+  public render() {
+    const changes = diff.diffLines(this.props.previous, this.props.current)
+    const literalPositions = this.plottableLiteralsIndexedWithLineNumbers()
+    const code = this.renderStyledCodeLines(changes)
+
+    return (
+      <div style={{ marginTop: '8px' }}>
+        {this.props.title ? <Typography className={this.props.classes.title}>{this.props.title}</Typography> : null}
+        <div tabIndex={0} onKeyDown={this.handleCtrlA} className={this.props.classes.codeWrapper}>
+          <Gutters
+            className={this.props.classes.gutters}
+            changes={changes}
+            treeNode={this.props.treeNode}
+            literalPositions={literalPositions}
+          />
+          <pre className={this.props.classes.codeBlock}>{code}</pre>
+        </div>
+        <DiffCount changes={changes} nameOfCompareMessage={this.props.nameOfCompareMessage} />
+      </div>
+    )
+  }
+}
+
+export default withStyles(style)(CodeDiff)

app/src/components/Sidebar/CodeDiff/style.tsx

@@ -0,0 +1,67 @@
+import { CodeBlockColors, CodeBlockColorsBraceMonokai } from '../CodeBlockColors'
+import { Theme } from '@material-ui/core'
+
+export const style = (theme: Theme) => {
+  const codeBlockColors = theme.palette.type === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai
+  const codeBaseStyle = {
+    font: "12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace",
+    display: 'inline-grid' as 'inline-grid',
+    margin: '0',
+    padding: '1px 0 0 0',
+  }
+
+  return {
+    title: {
+      font: codeBaseStyle.font,
+      paddingLeft: '4px',
+      backgroundColor: codeBlockColors.gutters,
+    },
+    line: {
+      lineHeight: 'normal' as 'normal',
+      paddingLeft: '4px',
+      width: '100%',
+      height: '16px',
+    },
+    codeWrapper: {
+      display: 'flex',
+      maxHeight: '15em',
+      overflow: 'auto',
+      backgroundColor: `${codeBlockColors.background}`,
+    },
+    gutters: {
+      ...codeBaseStyle,
+      width: '33px',
+      backgroundColor: codeBlockColors.gutters,
+      userSelect: 'none' as 'none',
+    },
+    codeBlock: {
+      ...codeBaseStyle,
+      width: 'calc(100% - 33px)',
+      backgroundColor: 'inherit !important',
+      '& span': {
+        color: codeBlockColors.text,
+      },
+      '& .token.number': {
+        color: codeBlockColors.numeric,
+      },
+      '& .token.boolean': {
+        color: codeBlockColors.numeric,
+      },
+      '& .token.property': {
+        color: codeBlockColors.variable,
+      },
+      '& .token.string': {
+        color: codeBlockColors.string,
+      },
+      '& .token': {
+        color: codeBlockColors.text,
+      },
+      '& .token.operator': {
+        color: codeBlockColors.text,
+      },
+      '& .token.punctuation': {
+        color: codeBlockColors.text,
+      },
+    },
+  }
+}

app/src/components/Sidebar/CodeDiff/util.tsx

@@ -0,0 +1,69 @@
+export function trimNewlineRight(str: string) {
+  if (str.slice(-1) === '\n') {
+    return str.slice(0, -1)
+  }
+
+  return str
+}
+
+const gutterBaseStyle = {}
+
+const additionStyle = {
+  ...gutterBaseStyle,
+  backgroundColor: 'rgba(10, 255, 10, 0.3)',
+}
+
+const deletionStyle = {
+  ...gutterBaseStyle,
+  backgroundColor: 'rgba(255, 10, 10, 0.3)',
+}
+
+export function lineChangeStyle(change: Diff.Change) {
+  if (change.added === true) {
+    return additionStyle
+  }
+
+  if (change.removed === true) {
+    return deletionStyle
+  }
+
+  return gutterBaseStyle
+}
+
+export function toPlottableValue(value: any): number | undefined {
+  if (typeof value === 'number') {
+    return value
+  }
+
+  if (typeof value === 'boolean') {
+    return value ? 1 : 0
+  }
+
+  const isNumber = !isNaN(value)
+  const floatVal = parseFloat(value)
+  if (isNumber && !isNaN(floatVal)) {
+    return floatVal
+  }
+
+  const intVal = parseInt(value, undefined)
+  if (isNumber && !isNaN(intVal)) {
+    return intVal
+  }
+
+  // Convert "on" / "off" to int 1 / 0
+  if (typeof value === 'string') {
+    if (/^(on$)|(off$)/i.test(value)) {
+      return value.toLowerCase() === 'on' ? 1 : 0
+    }
+    if (/^[0-9]*,[0-9]+$/.test(value)) {
+      let parsedFloat = parseFloat(value.replace(',', '.'))
+      if (!isNaN(parsedFloat)) {
+        return parsedFloat
+      }
+    }
+  }
+}
+
+export function isPlottable(value: any) {
+  return !isNaN(toPlottableValue(value) as any)
+}

app/src/components/Sidebar/History.tsx

@@ -1,104 +0,0 @@
-import * as React from 'react'
-
-import { Badge, Typography } from '@material-ui/core'
-import { Theme, withStyles } from '@material-ui/core/styles'
-
-interface HistoryItem {
-  title: JSX.Element | string
-  value: string
-  selected?: boolean
-}
-
-interface Props {
-  items: HistoryItem[]
-  onClick?: (index: number, element: EventTarget) => void
-  classes: any
-  contentTypeIndicator?: JSX.Element
-  theme: Theme
-}
-
-interface State {
-  collapsed: boolean
-}
-
-class MessageHistory extends React.Component<Props, State> {
-  constructor(props: any) {
-    super(props)
-    this.state = {
-      collapsed: true,
-    }
-  }
-
-  private toggle = () => {
-    this.setState({ collapsed: !this.state.collapsed })
-  }
-
-  public renderHistory() {
-    const style = (element: HistoryItem) => ({
-      backgroundColor: element.selected ? this.props.theme.palette.action.selected : this.props.theme.palette.action.hover,
-      margin: '8px',
-      padding: '8px 8px 0 8px',
-      cursor: this.props.onClick ? 'pointer' : 'inherit',
-    })
-
-    const messageStyle: React.CSSProperties = { textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }
-    const elements = this.props.items.map((element, index) => (
-      <div
-        key={index}
-        style={style(element)}
-        onClick={(event: React.MouseEvent) => this.props.onClick && this.props.onClick(index, event.target)}
-      >
-        <div><i>{element.title}</i></div>
-        <div style={messageStyle}>
-          <span><pre>{element.value}</pre></span>
-        </div>
-      </div>
-    ))
-
-    const visible = this.props.items.length > 0 && this.state.collapsed
-
-    return (
-      <div className={this.props.classes.main}>
-        <Typography
-          component={'span'}
-          onClick={this.toggle}
-          style={{ cursor: 'pointer' }}
-        >
-          <Badge
-            classes={{ badge: this.props.classes.badge }}
-            invisible={!visible}
-            badgeContent={this.props.items.length}
-            color="primary"
-          >
-            {this.state.collapsed ? '▶ History' : '▼ History'}
-          </Badge>
-          <div style={{ float: 'right' }}>{this.state.collapsed ? this.props.contentTypeIndicator : null}</div>
-        </Typography>
-        <div style={{ maxHeight: '230px', overflowY: 'scroll'  }}>
-          {this.state.collapsed ? null : this.props.children}
-          {this.state.collapsed ? null : elements}
-        </div>
-      </div>
-    )
-  }
-
-  public render() {
-    return (
-      <div
-        style={{ display: 'block', width: '100%' }}
-      >
-        {this.renderHistory()}
-      </div>
-    )
-  }
-}
-
-const styles = (theme: Theme) => ({
-  main: {
-    backgroundColor: 'rgba(170, 170, 170, 0.2)',
-    marginTop: '16px',
-  },
-  badge: { right: '-25px' },
-})
-
-export default withStyles(styles, { withTheme: true })(MessageHistory)

app/src/components/Sidebar/HistoryDrawer.tsx

@@ -0,0 +1,116 @@
+import React, { useCallback, useState, useEffect, memo } from 'react'
+import { Badge, Typography } from '@material-ui/core'
+import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA'
+import { Theme, withStyles, emphasize } from '@material-ui/core/styles'
+
+interface HistoryItem {
+  key: string
+  title: JSX.Element | string
+  value: string
+  selected?: boolean
+}
+
+interface Props {
+  items: Array<HistoryItem>
+  onClick?: (index: number, element: EventTarget) => void
+  classes: any
+  contentTypeIndicator?: JSX.Element
+  autoOpen?: boolean
+  theme: Theme
+  children?: any
+}
+
+function HistoryDrawer(props: Props) {
+  const handleCtrlA = selectTextWithCtrlA({ targetSelector: 'pre' })
+  const [expanded, setExpanded] = useState<boolean | undefined>(undefined)
+
+  const toggle = useCallback(() => {
+    setExpanded(!expanded)
+  }, [expanded])
+
+  useEffect(() => {
+    if (props.autoOpen && expanded === undefined && props.items.length > 0) {
+      setExpanded(true)
+    }
+  }, [props.autoOpen, expanded, props.items])
+
+  const createSelectionHandler = (index: number) => (event: React.MouseEvent) => {
+    props.onClick && props.onClick(index, event.target)
+    event.preventDefault()
+    event.stopPropagation()
+  }
+
+  function renderHistory() {
+    const style = (element: HistoryItem) => ({
+      backgroundColor: element.selected
+        ? emphasize(props.theme.palette.background.default, 0.2)
+        : emphasize(props.theme.palette.background.default, 0.07),
+      margin: '8px',
+      padding: '8px 8px 0 8px',
+      cursor: props.onClick ? 'pointer' : 'inherit',
+    })
+
+    const messageStyle: React.CSSProperties = { textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }
+    const elements = props.items.map((element, index) => (
+      <div
+        key={element.key}
+        style={style(element)}
+        onClick={createSelectionHandler(index)}
+        tabIndex={0}
+        onKeyDown={handleCtrlA}
+      >
+        <div>
+          <i>{element.title}</i>
+        </div>
+        <div style={messageStyle}>
+          <span>
+            <pre>{element.value}</pre>
+          </span>
+        </div>
+      </div>
+    ))
+
+    const visible = props.items.length > 0 && !expanded
+
+    return (
+      <div className={props.classes.main}>
+        <div
+          style={{
+            backgroundColor: emphasize(props.theme.palette.background.default, 0.07),
+            borderBottom: expanded ? `1px solid ${emphasize(props.theme.palette.background.default, 0.2)}` : undefined,
+          }}
+        >
+          <Typography component={'span'} onClick={toggle} style={{ cursor: 'pointer', display: 'flex' }}>
+            <span style={{ flexGrow: 1 }}>
+              <Badge
+                classes={{ badge: props.classes.badge }}
+                invisible={!visible}
+                badgeContent={props.items.length}
+                color="primary"
+              >
+                {expanded ? '▼ History' : '▶ History'}
+              </Badge>
+            </span>
+            <span>{props.contentTypeIndicator}</span>
+          </Typography>
+        </div>
+        <div style={{ maxHeight: '230px', overflowY: 'scroll' }}>
+          {expanded ? props.children : null}
+          {expanded ? elements : null}
+        </div>
+      </div>
+    )
+  }
+
+  return <div style={{ display: 'block', width: '100%' }}>{renderHistory()}</div>
+}
+
+const styles = (theme: Theme) => ({
+  main: {
+    backgroundColor: theme.palette.background.default,
+    marginTop: '16px',
+  },
+  badge: { right: '-25px' },
+})
+
+export default withStyles(styles, { withTheme: true })(memo(HistoryDrawer))

app/src/components/Sidebar/NodeStats.tsx

@@ -4,7 +4,7 @@ import { TopicViewModel } from '../../model/TopicViewModel'
 import { Typography } from '@material-ui/core'
 
 interface Props {
-  node: q.TreeNode<TopicViewModel>
+  node?: q.TreeNode<TopicViewModel>
 }
 
 class NodeStats extends React.Component<Props, {}> {
@@ -14,6 +14,9 @@ class NodeStats extends React.Component<Props, {}> {
 
   public render() {
     const { node } = this.props
+    if (!node) {
+      return null
+    }
 
     return (
       <div>

app/src/components/Sidebar/Panel.tsx

@@ -0,0 +1,33 @@
+import React from 'react'
+import ExpandMore from '@material-ui/icons/ExpandMore'
+import { ExpansionPanel, ExpansionPanelDetails, ExpansionPanelSummary, Typography, Theme } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
+
+const styles = (theme: Theme) => ({
+  summary: { minHeight: '0' },
+  details: { padding: '0px 16px 8px 8px', display: 'block' },
+  heading: {
+    fontSize: theme.typography.pxToRem(15),
+    fontWeight: theme.typography.fontWeightRegular,
+  },
+})
+
+const Panel = (props: {
+  classes: any
+  children: [React.ReactElement, React.ReactElement]
+  disabled?: boolean
+  detailsHidden?: boolean
+}) => {
+  return (
+    <ExpansionPanel defaultExpanded={true} disabled={props.disabled}>
+      <ExpansionPanelSummary expandIcon={<ExpandMore />} className={props.classes.summary}>
+        <Typography className={props.classes.heading}>{props.children[0]}</Typography>
+      </ExpansionPanelSummary>
+      {props.detailsHidden ? null : (
+        <ExpansionPanelDetails className={props.classes.detail}>{props.children[1]}</ExpansionPanelDetails>
+      )}
+    </ExpansionPanel>
+  )
+}
+
+export default withStyles(styles)(Panel)

app/src/components/Sidebar/Publish/Editor.tsx

@@ -0,0 +1,39 @@
+import * as React from 'react'
+import { default as AceEditor } from 'react-ace'
+import { Theme, withTheme } from '@material-ui/core'
+import 'brace/mode/json'
+import 'brace/theme/dawn'
+import 'brace/theme/monokai'
+import 'brace/mode/xml'
+import 'brace/mode/text'
+import 'react-ace'
+
+function Editor(props: {
+  editorMode: string
+  theme: Theme
+  value: string | undefined
+  onChange: (value: string) => void
+}) {
+  const editorOptions = {
+    showLineNumbers: false,
+    tabSize: 2,
+  }
+
+  return (
+    <AceEditor
+      style={{}}
+      mode={props.editorMode}
+      theme={props.theme.palette.type === 'dark' ? 'monokai' : 'dawn'}
+      name="UNIQUE_ID_OF_DIV"
+      width="100%"
+      height="200px"
+      showGutter={true}
+      value={props.value}
+      onChange={props.onChange}
+      setOptions={editorOptions}
+      editorProps={{ $blockScrolling: true }}
+    />
+  )
+}
+
+export default withTheme(Editor)

app/src/components/Sidebar/Publish/EditorModeSelect.tsx

@@ -0,0 +1,40 @@
+import * as React from 'react'
+import { FormControlLabel, Radio, RadioGroup } from '@material-ui/core'
+
+interface Props {
+  value: string
+  onChange: (event: React.ChangeEvent<{}>, value: string) => void
+}
+export function EditorModeSelect(props: Props) {
+  const labelStyle = { margin: '0 8px 0 8px' }
+  return (
+    <RadioGroup
+      style={{ display: 'inline-block', float: 'left' }}
+      value={props.value}
+      onChange={props.onChange}
+      row={true}
+    >
+      <FormControlLabel
+        value="text"
+        style={labelStyle}
+        control={<Radio color="primary" />}
+        label="raw"
+        labelPlacement="top"
+      />
+      <FormControlLabel
+        value="xml"
+        style={labelStyle}
+        control={<Radio color="primary" />}
+        label="xml"
+        labelPlacement="top"
+      />
+      <FormControlLabel
+        value="json"
+        style={labelStyle}
+        control={<Radio color="primary" />}
+        label="json"
+        labelPlacement="top"
+      />
+    </RadioGroup>
+  )
+}

app/src/components/Sidebar/Publish/Publish.tsx

@@ -1,45 +1,20 @@
-import 'react-ace'
-import 'brace/mode/json'
-import 'brace/mode/text'
-import 'brace/mode/xml'
-import 'brace/theme/monokai'
-import 'brace/theme/dawn'
-
-import * as React from 'react'
-import * as q from '../../../../../backend/src/Model'
-
-import {
-  Button,
-  FormControlLabel,
-  Radio,
-  RadioGroup,
-  TextField,
-  FormControl,
-  InputLabel,
-  Input,
-  Checkbox,
-  MenuItem,
-  Tooltip,
-  Fab,
-  Theme,
-  withTheme,
-} from '@material-ui/core'
-
-// tslint:disable-next-line
-import { default as AceEditor } from 'react-ace'
-import { AppState } from '../../../reducers'
-import History from '../History'
+import Editor from './Editor'
+import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
 import Message from './Model/Message'
 import Navigation from '@material-ui/icons/Navigation'
-import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
+import PublishHistory from './PublishHistory'
+import React, { useCallback, useMemo, useState } from 'react'
+import RetainSwitch from './RetainSwitch'
+import TopicInput from './TopicInput'
+import { AppState } from '../../../reducers'
 import { bindActionCreators } from 'redux'
+import { Button, Fab, Theme, Tooltip, withTheme } from '@material-ui/core'
 import { connect } from 'react-redux'
-import { publishActions, globalActions } from '../../../actions'
-import ClearAdornment from '../../helper/ClearAdornment'
-import { TopicViewModel } from '../../../model/TopicViewModel'
+import { EditorModeSelect } from './EditorModeSelect'
+import { globalActions, publishActions } from '../../../actions'
+import { KeyCodes } from '../../../utils/KeyCodes'
 
 interface Props {
-  node?: q.TreeNode<TopicViewModel>
   connectionId?: string
   topic?: string
   payload?: string
@@ -47,285 +22,149 @@ interface Props {
   globalActions: typeof globalActions
   retain: boolean
   editorMode: string
-  qos: 0 | 1 | 2
   theme: Theme
 }
 
-interface State {
-  history: Message[]
+function useHistory(): [Array<Message>, (topic: string, payload?: string) => void] {
+  const [history, setHistory] = useState<Array<Message>>([])
+  const amendToHistory = useCallback(
+    (topic: string, payload?: string) => {
+      // Remove duplicates
+      let filteredHistory = history.filter(e => e.payload !== payload || e.topic !== topic)
+      filteredHistory = filteredHistory.slice(-7)
+      setHistory([...filteredHistory, { topic, payload, sent: new Date() }])
+    },
+    [history]
+  )
+
+  return [history, amendToHistory]
 }
 
-class Publish extends React.Component<Props, State> {
+function Publish(props: Props) {
+  const [history, amendToHistory] = useHistory()
 
-  private editorOptions = {
-    showLineNumbers: false,
-    tabSize: 2,
-  }
-  constructor(props: any) {
-    super(props)
-    this.state = { history: [] }
-  }
-
-  private updatePayload = (payload: string, event?: any) => {
-    this.props.actions.setPayload(payload)
-  }
-
-  private updateTopic = (e: React.ChangeEvent<HTMLInputElement>) => {
-    this.props.actions.setTopic(e.target.value)
-  }
-
-  private updateMode = (e: React.ChangeEvent<{}>, value: string) => {
-    this.props.actions.setEditorMode(value)
-  }
-
-  private publish = (e: React.MouseEvent) => {
-    e.stopPropagation()
-    if (!this.props.connectionId) {
+  const publish = useCallback(() => {
+    if (!props.connectionId) {
       return
     }
 
-    this.props.actions.publish(this.props.connectionId)
+    props.actions.publish(props.connectionId)
 
-    const topic = this.props.topic || ''
-    const payload = this.props.payload
-    if (this.props.connectionId && topic) {
-      this.addMessageToHistory(topic, payload)
+    const topic = props.topic || ''
+    const payload = props.payload
+    if (props.connectionId && topic) {
+      amendToHistory(topic, payload)
     }
-  }
+  }, [props, props.connectionId, props.topic, props.payload, amendToHistory])
 
-  private addMessageToHistory(topic: string, payload?: string) {
-    // Remove duplicates
-    let filteredHistory = this.state.history.filter(e => e.payload !== payload || e.topic !== topic)
-    filteredHistory = filteredHistory.slice(-7)
-    const history: Message[] = [...filteredHistory, { topic, payload, sent: new Date() }]
-    this.setState({ history })
-  }
+  const handleSubmit = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (e.keyCode === KeyCodes.enter && (e.metaKey || e.ctrlKey)) {
+        e.preventDefault()
+        e.stopPropagation()
+        publish()
+      }
+    },
+    [publish]
+  )
 
-  private clearTopic = () => {
-    this.props.actions.setTopic('')
-  }
-
-  private topic() {
-    const topicStr = this.props.topic || ''
-
-    return (
-      <div>
-        <FormControl style={{ width: '100%' }}>
-            <InputLabel htmlFor="publish-topic">Topic</InputLabel>
-            <Input
-              id="publish-topic"
-              value={topicStr}
-              startAdornment={<span/>}
-              endAdornment={<ClearAdornment action={this.clearTopic} value={topicStr} />}
-              onBlur={this.onTopicBlur}
-              onChange={this.updateTopic}
-              multiline={true}
-              placeholder="example/topic"
-            />
-          </FormControl>
+  return useMemo(
+    () => (
+      <div style={{ flexGrow: 1 }} onKeyDown={handleSubmit}>
+        <TopicInput />
+        <div style={{ width: '100%', display: 'block' }}>
+          <EditorMode
+            actions={props.actions}
+            globalActions={props.globalActions}
+            payload={props.payload}
+            editorMode={props.editorMode}
+            publish={publish}
+          />
+          <Editor value={props.payload} editorMode={props.editorMode} onChange={props.actions.setPayload} />
+          <RetainSwitch />
+        </div>
+        <PublishHistory history={history} />
       </div>
-    )
-  }
+    ),
+    [props.payload, props.editorMode, history, handleSubmit, publish]
+  )
+}
 
-  private onTopicBlur = (e: React.FocusEvent<HTMLInputElement>) => {
-    if (!e.target.value) {
-      this.props.actions.setTopic(undefined)
-    }
-  }
+function EditorMode(props: {
+  payload?: string
+  editorMode: string
+  actions: typeof publishActions
+  globalActions: typeof globalActions
+  publish: () => void
+}) {
+  const updatePayload = props.actions.setPayload
 
-  private publishButton() {
-    return (
-      <Button
-        variant="contained"
-        size="small"
-        color="primary"
-        onClick={this.publish}
-        id="publish-button"
-      >
-        <Navigation style={{ marginRight: '8px' }} /> Publish
-      </Button>
-    )
-  }
+  const updateMode = useCallback((e: React.ChangeEvent<{}>, value: string) => {
+    props.actions.setEditorMode(value)
+  }, [])
 
-  private formatJson = () => {
-    if (this.props.payload) {
+  const formatJson = useCallback(() => {
+    if (props.payload) {
       try {
-        const str = JSON.stringify(JSON.parse(this.props.payload), undefined, '  ')
-        this.updatePayload(str)
+        const str = JSON.stringify(JSON.parse(props.payload), undefined, '  ')
+        updatePayload(str)
       } catch (error) {
-        this.props.globalActions.showError(`Format error: ${error.message}`)
+        props.globalActions.showError(`Format error: ${error.message}`)
       }
     }
-  }
+  }, [props.payload])
 
-  private renderFormatJson() {
-    if (this.props.editorMode !== 'json') {
+  const renderFormatJson = useCallback(() => {
+    if (props.editorMode !== 'json') {
       return null
     }
 
     return (
       <Tooltip title="Format JSON">
-        <Fab style={{ width: '36px', height: '36px', marginLeft: '8px' }} onClick={this.formatJson} id="sidebar-publish-format-json">
+        <Fab
+          style={{ width: '36px', height: '36px', margin: '0 8px' }}
+          onClick={formatJson}
+          id="sidebar-publish-format-json"
+        >
           <FormatAlignLeft style={{ fontSize: '20px' }} />
         </Fab>
       </Tooltip>
     )
-  }
+  }, [formatJson, props.editorMode, props.publish])
 
-  private editorMode() {
-    return (
+  return useMemo(
+    () => (
       <div style={{ marginTop: '16px' }}>
-        <div style={{ width: '100%', lineHeight: '64px' }}>
-          {this.renderEditorModeSelection()}
-          {this.renderFormatJson()}
-          <div style={{ float: 'right', marginRight: '16px' }}>
-            {this.publishButton()}
+        <div style={{ width: '100%', lineHeight: '64px', textAlign: 'center' }}>
+          <EditorModeSelect value={props.editorMode} onChange={updateMode} />
+          {renderFormatJson()}
+          <div style={{ float: 'right' }}>
+            <PublishButton publish={props.publish} />
           </div>
         </div>
       </div>
-    )
-  }
+    ),
+    [props.editorMode, renderFormatJson]
+  )
+}
 
-  private renderEditorModeSelection() {
-    const labelStyle = { margin: '0 8px 0 8px' }
-    return (
-      <RadioGroup
-        style={{ display: 'inline-block', float: 'left' }}
-        value={this.props.editorMode}
-        onChange={this.updateMode}
-        row={true}
-      >
-        <FormControlLabel
-          value="text"
-          style={labelStyle}
-          control={<Radio color="primary" />}
-          label="raw"
-          labelPlacement="top"
-        />
-        <FormControlLabel
-          value="xml"
-          style={labelStyle}
-          control={<Radio color="primary" />}
-          label="xml"
-          labelPlacement="top"
-        />
-        <FormControlLabel
-          value="json"
-          style={labelStyle}
-          control={<Radio color="primary" />}
-          label="json"
-          labelPlacement="top"
-        />
-      </RadioGroup>
-    )
-  }
+const PublishButton = (props: { publish: () => void }) => {
+  const handleClickPublish = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation()
+      props.publish()
+    },
+    [props.publish]
+  )
 
-  private onChangeQoS = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = parseInt(event.target.value, 10)
-    if (value !== 0 && value !== 1 && value !== 2) {
-      return
-    }
-
-    this.props.actions.setQoS(value)
-  }
-
-  private publishMode() {
-    const labelStyle = { margin: '0 8px 0 8px' }
-    const itemStyle = { padding: '0' }
-    const tooltipStyle = { textAlign: 'center' as 'center', width: '100%' }
-    const qosSelect = (
-      <TextField
-        select={true}
-        value={this.props.qos}
-        margin="normal"
-        style={{ margin: '8px 0 8px 8px' }}
-        onChange={this.onChangeQoS}
-      >
-        <MenuItem key={0} value={0} style={itemStyle}>
-          <Tooltip title="At most once"><div style={tooltipStyle}>0</div></Tooltip>
-        </MenuItem>
-        <MenuItem key={1} value={1} style={itemStyle}>
-          <Tooltip title="At least once"><div style={tooltipStyle}>1</div></Tooltip>
-        </MenuItem>
-        <MenuItem key={2} value={2} style={itemStyle}>
-          <Tooltip title="Exactly once"><div style={tooltipStyle}>2</div></Tooltip>
-        </MenuItem>
-      </TextField>
-    )
-    return (
-      <div style={{ marginTop: '8px', clear: 'both' }}>
-        <div style={{ width: '100%', textAlign: 'right' }}>
-          <FormControlLabel
-            style={labelStyle}
-            control={qosSelect}
-            label="QoS"
-            labelPlacement="start"
-          />
-          <Tooltip title="Retained messages only appear to be retained, when client subscribes after the initial publish." placement="top">
-            <FormControlLabel
-              value="retain"
-              style={labelStyle}
-              control={<Checkbox color="primary" checked={this.props.retain} onChange={this.props.actions.toggleRetain} />}
-              label="retain"
-              labelPlacement="end"
-            />
-          </Tooltip>
-        </div>
-      </div>
-    )
-  }
-
-  private history() {
-    const items = this.state.history.reverse().map(message => ({
-      title: message.topic,
-      value: message.payload || '',
-    }))
-
-    return <History items={items} onClick={this.didSelectHistoryEntry} />
-  }
-
-  private didSelectHistoryEntry = (index: number) => {
-    const message = this.state.history[index]
-    this.props.actions.setTopic(message.topic)
-    this.props.actions.setPayload(message.payload)
-  }
-
-  private editor() {
-    return (
-      <div style={{ width: '100%', display: 'block' }}>
-        {this.editorMode()}
-        {this.renderEditor()}
-        {this.publishMode()}
-      </div>
-    )
-  }
-
-  private renderEditor() {
-    return (
-      <AceEditor
-        mode={this.props.editorMode}
-        theme={this.props.theme.palette.type === 'dark' ? 'monokai' : 'dawn'}
-        name="UNIQUE_ID_OF_DIV"
-        width="100%"
-        height="200px"
-        showGutter={true}
-        value={this.props.payload}
-        onChange={this.updatePayload}
-        setOptions={this.editorOptions}
-        editorProps={{ $blockScrolling: true }}
-      />
-    )
-  }
-
-  public render() {
-    return (
-      <div style={{ flexGrow: 1, marginLeft: '8px' }}>
-        {this.topic()}
-        {this.editor()}
-        {this.history()}
-      </div>
-    )
-  }
+  return useMemo(
+    () => (
+      <Button variant="contained" size="small" color="primary" onClick={handleClickPublish} id="publish-button">
+        <Navigation style={{ marginRight: '8px' }} /> Publish
+      </Button>
+    ),
+    [handleClickPublish]
+  )
 }
 
 const mapDispatchToProps = (dispatch: any) => {
@@ -341,8 +180,10 @@ const mapStateToProps = (state: AppState) => {
     payload: state.publish.payload,
     editorMode: state.publish.editorMode,
     retain: state.publish.retain,
-    qos: state.publish.qos,
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withTheme(Publish))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withTheme(Publish))

app/src/components/Sidebar/Publish/PublishHistory.tsx

@@ -0,0 +1,40 @@
+import History from '../HistoryDrawer'
+import Message from './Model/Message'
+import React, { useCallback, useMemo } from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { publishActions } from '../../../actions'
+const sha1 = require('sha1')
+
+function PublishHistory(props: { history: Array<Message>; actions: typeof publishActions }) {
+  const didSelectHistoryEntry = useCallback(
+    (index: number) => {
+      const items = [...props.history].reverse()
+      const message = items[index]
+      props.actions.setTopic(message.topic)
+      props.actions.setPayload(message.payload)
+    },
+    [props.history]
+  )
+
+  return useMemo(() => {
+    const items = [...props.history].reverse().map(message => ({
+      key: sha1(message.topic + message.payload),
+      title: message.topic,
+      value: message.payload || '',
+    }))
+
+    return <History autoOpen={true} items={items} onClick={didSelectHistoryEntry} />
+  }, [props.history])
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(publishActions, dispatch),
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(PublishHistory)

app/src/components/Sidebar/Publish/QosSelect.tsx

@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { TextField, MenuItem, Tooltip } from '@material-ui/core'
+import { connect } from 'react-redux'
+import { AppState } from '../../../reducers'
+import { bindActionCreators } from 'redux'
+import { publishActions } from '../../../actions'
+
+interface Props {
+  qos: 0 | 1 | 2
+  actions: {
+    publish: typeof publishActions
+  }
+}
+
+function QosSelect(props: Props) {
+  const tooltipStyle = { textAlign: 'center' as 'center', width: '100%' }
+  const itemStyle = { padding: '0' }
+
+  const onChangeQos = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      const value = parseInt(event.target.value, 10)
+      if (value !== 0 && value !== 1 && value !== 2) {
+        return
+      }
+
+      props.actions.publish.setQoS(value)
+    },
+    [props.actions.publish]
+  )
+
+  return (
+    <TextField
+      select={true}
+      value={props.qos}
+      margin="normal"
+      style={{ margin: '8px 0 8px 8px' }}
+      onChange={onChangeQos}
+    >
+      <MenuItem key={0} value={0} style={itemStyle}>
+        <Tooltip title="At most once">
+          <div style={tooltipStyle}>0</div>
+        </Tooltip>
+      </MenuItem>
+      <MenuItem key={1} value={1} style={itemStyle}>
+        <Tooltip title="At least once">
+          <div style={tooltipStyle}>1</div>
+        </Tooltip>
+      </MenuItem>
+      <MenuItem key={2} value={2} style={itemStyle}>
+        <Tooltip title="Exactly once">
+          <div style={tooltipStyle}>2</div>
+        </Tooltip>
+      </MenuItem>
+    </TextField>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      publish: bindActionCreators(publishActions, dispatch),
+    },
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    qos: state.publish.qos,
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(QosSelect)

app/src/components/Sidebar/Publish/RetainSwitch.tsx

@@ -0,0 +1,47 @@
+import QosSelect from './QosSelect'
+import React from 'react'
+import { Checkbox, FormControlLabel, Tooltip } from '@material-ui/core'
+import { publishActions } from '../../../actions'
+import { bindActionCreators } from 'redux'
+import { AppState } from '../../../reducers'
+import { connect } from 'react-redux'
+
+export function RetainSwitch(props: { retain: boolean; actions: typeof publishActions }) {
+  const labelStyle = { margin: '0 8px 0 8px' }
+  return (
+    <div style={{ marginTop: '8px', clear: 'both' }}>
+      <div style={{ width: '100%', textAlign: 'right' }}>
+        <FormControlLabel style={labelStyle} control={<QosSelect />} label="QoS" labelPlacement="start" />
+        <Tooltip
+          title="Retained messages only appear to be retained, when client subscribes after the initial publish."
+          placement="top"
+        >
+          <FormControlLabel
+            value="retain"
+            style={labelStyle}
+            control={<Checkbox color="primary" checked={props.retain} onChange={props.actions.toggleRetain} />}
+            label="retain"
+            labelPlacement="end"
+          />
+        </Tooltip>
+      </div>
+    </div>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(publishActions, dispatch),
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    retain: state.publish.retain,
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(RetainSwitch)

app/src/components/Sidebar/Publish/TopicInput.tsx

@@ -0,0 +1,63 @@
+import ClearAdornment from '../../helper/ClearAdornment'
+import React, { useCallback, useMemo } from 'react'
+import { FormControl, Input, InputLabel } from '@material-ui/core'
+import { publishActions } from '../../../actions'
+import { bindActionCreators } from 'redux'
+import { AppState } from '../../../reducers'
+import { connect } from 'react-redux'
+
+function TopicInput(props: { actions: typeof publishActions; topic?: string }) {
+  const updateTopic = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    props.actions.setTopic(e.target.value)
+  }, [])
+
+  const clearTopic = useCallback(() => {
+    props.actions.setTopic('')
+  }, [])
+
+  const onTopicBlur = useCallback((e: React.FocusEvent<HTMLInputElement>) => {
+    if (!e.target.value) {
+      props.actions.setTopic(undefined)
+    }
+  }, [])
+
+  const topicStr = props.topic || ''
+
+  return useMemo(
+    () => (
+      <div>
+        <FormControl style={{ width: '100%' }}>
+          <InputLabel htmlFor="publish-topic">Topic</InputLabel>
+          <Input
+            id="publish-topic"
+            value={topicStr}
+            startAdornment={<span />}
+            endAdornment={<ClearAdornment action={clearTopic} value={topicStr} />}
+            onBlur={onTopicBlur}
+            onChange={updateTopic}
+            multiline={false}
+            placeholder="example/topic"
+          />
+        </FormControl>
+      </div>
+    ),
+    [topicStr]
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(publishActions, dispatch),
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    topic: state.publish.topic,
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TopicInput)

app/src/components/Sidebar/Sidebar.tsx

@@ -1,189 +1,84 @@
 import * as q from '../../../../backend/src/Model'
-import * as React from 'react'
-import Copy from '../helper/Copy'
-import CustomIconButton from '../helper/CustomIconButton'
-import Delete from '@material-ui/icons/Delete'
+import React, { useState, useEffect, useCallback } from 'react'
 import ExpandMore from '@material-ui/icons/ExpandMore'
 import NodeStats from './NodeStats'
-import Topic from './Topic'
 import ValuePanel from './ValueRenderer/ValuePanel'
 import { AppState } from '../../reducers'
+import { Badge, ExpansionPanel, ExpansionPanelDetails, ExpansionPanelSummary, Typography } from '@material-ui/core'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { settingsActions, sidebarActions } from '../../actions'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { TopicViewModel } from '../../model/TopicViewModel'
-
-import {
-  ExpansionPanel,
-  ExpansionPanelDetails,
-  ExpansionPanelSummary,
-  Typography,
-  Tooltip,
-  Badge,
-} from '@material-ui/core'
+import TopicPanel from './TopicPanel/TopicPanel'
+import Panel from './Panel'
+import { usePollingToFetchTreeNode } from '../helper/usePollingToFetchTreeNode'
 
 const throttle = require('lodash.throttle')
 
 const Publish = React.lazy(() => import('./Publish/Publish'))
 
 interface Props {
-  node?: q.TreeNode<TopicViewModel>
+  nodePath?: string
+  tree?: q.Tree<TopicViewModel>
   actions: typeof sidebarActions
   settingsActions: typeof settingsActions
   classes: any
   connectionId?: string
 }
 
-interface State {
-  node: q.TreeNode<TopicViewModel>
-  compareMessage?: q.Message
-  valueRenderWidth: number
+function useUpdateNodeWhenNodeReceivesUpdates(node?: q.TreeNode<any>) {
+  const [lastUpdate, setLastUpdate] = useState(0)
+  const updateNode = useCallback(
+    throttle(() => {
+      setLastUpdate(node ? node.lastUpdate : 0)
+    }, 300),
+    [node]
+  )
+
+  useEffect(() => {
+    const updateCallback = updateNode
+    node && node.onMerge.subscribe(updateCallback)
+    node && node.onMessage.subscribe(updateCallback)
+
+    return function cleanup() {
+      node && node.onMerge.unsubscribe(updateCallback)
+      node && node.onMessage.unsubscribe(updateCallback)
+    }
+  }, [node])
 }
 
-class Sidebar extends React.Component<Props, State> {
-  private updateNode = throttle(() => {
-    this.setState(this.state)
-  }, 300)
+function Sidebar(props: Props) {
+  const { classes, tree, nodePath } = props
+  const node = usePollingToFetchTreeNode(tree, nodePath || '')
+  useUpdateNodeWhenNodeReceivesUpdates(node)
+  // console.log(node && node.path(), tree, nodePath)
 
-  private detailsStyle = { padding: '0px 16px 8px 8px', display: 'block' }
-
-  constructor(props: any) {
-    super(props)
-    console.error('Find and fix me #state')
-    this.state = { node: new q.Tree(), valueRenderWidth: 300 }
-  }
-
-  private registerUpdateListener(node: q.TreeNode<TopicViewModel>) {
-    node.onMerge.subscribe(this.updateNode)
-    node.onMessage.subscribe(this.updateNode)
-  }
-
-  private removeUpdateListener(node: q.TreeNode<TopicViewModel>) {
-    node.onMerge.unsubscribe(this.updateNode)
-    node.onMessage.unsubscribe(this.updateNode)
-  }
-
-  private renderTopicDeleteButton() {
-    if (!this.props.node || (!this.props.node.message || !this.props.node.message.value)) {
-      return null
-    }
-
-    return (
-      <CustomIconButton onClick={() => this.deleteTopic(this.props.node)}>
-        <Tooltip title="Clear this topic">
-          <Delete />
-        </Tooltip>
-      </CustomIconButton>
-    )
-  }
-
-  private renderRecursiveTopicDeleteButton() {
-    const deleteLimit = 50
-    const topicCount = this.props.node ? this.props.node.childTopicCount() : 0
-    if ((!this.props.node || topicCount === 0) || (this.props.node.message && topicCount === 1)) {
-      return null
-    }
-
-    return (
-      <CustomIconButton onClick={() => this.deleteTopic(this.props.node, true, deleteLimit)}>
-        <Tooltip title={`Deletes up to ${deleteLimit} sub-topics with a single click`}>
-          <Badge
-            classes={{ badge: this.props.classes.badge }}
-            badgeContent={<span style={{ whiteSpace: 'nowrap' }}>{topicCount >= deleteLimit ? '50+' : topicCount}</span>}
-            color="secondary"
-          >
-            <Delete color="action" />
-          </Badge>
-        </Tooltip>
-      </CustomIconButton>
-    )
-  }
-
-  private deleteTopic = (topic?: q.TreeNode<TopicViewModel>, recursive: boolean = false, maxCount = 50) => {
-    if (!topic) {
-      return
-    }
-
-    this.props.actions.clearTopic(topic, recursive, maxCount)
-  }
-
-  private renderNode() {
-    const { classes, node } = this.props
-
-    const copyTopic = node ? <Copy value={node.path()} /> : null
-    const deleteTopic = this.renderTopicDeleteButton()
-    const deleteRecursiveTopic = this.renderRecursiveTopicDeleteButton()
-    const summaryStyle = { minHeight: '0' }
-    return (
+  return (
+    <div id="Sidebar" className={classes.drawer}>
       <div>
-        <ExpansionPanel key="topic" defaultExpanded={true} disabled={!Boolean(this.props.node)}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
-            <Typography className={classes.heading}>Topic {copyTopic} {deleteTopic} {deleteRecursiveTopic}</Typography>
-          </ExpansionPanelSummary>
-          <ExpansionPanelDetails style={this.detailsStyle}>
-            <Topic node={this.props.node} didSelectNode={this.updateNode} />
+        <TopicPanel node={node} />
+        <ValuePanel lastUpdate={node ? node.lastUpdate : 0} />
+        <Panel>
+          <span>Publish</span>
+          <Publish connectionId={props.connectionId} />
+        </Panel>
+        <Panel detailsHidden={!node}>
+          <span>Stats</span>
+          <ExpansionPanelDetails className={classes.details}>
+            <NodeStats node={node} />
           </ExpansionPanelDetails>
-        </ExpansionPanel>
-        {<ValuePanel />}
-        <ExpansionPanel defaultExpanded={true}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
-            <Typography className={classes.heading}>Publish</Typography>
-          </ExpansionPanelSummary>
-          <ExpansionPanelDetails style={this.detailsStyle}>
-            <React.Suspense fallback={<div>Loading...</div>}>
-              <Publish node={this.props.node} connectionId={this.props.connectionId} />
-            </React.Suspense>
-          </ExpansionPanelDetails>
-        </ExpansionPanel>
-        <ExpansionPanel defaultExpanded={Boolean(this.props.node)}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
-            <Typography className={classes.heading}>Stats</Typography>
-          </ExpansionPanelSummary>
-          {this.renderNodeStats()}
-        </ExpansionPanel>
+        </Panel>
       </div>
-    )
-  }
-
-  private renderNodeStats() {
-    if (!this.props.node) {
-      return null
-    }
-
-    return (
-      <ExpansionPanelDetails style={this.detailsStyle}>
-        <NodeStats node={this.props.node} />
-      </ExpansionPanelDetails>
-    )
-  }
-
-  public componentWillReceiveProps(nextProps: Props) {
-    this.props.node && this.removeUpdateListener(this.props.node)
-    nextProps.node && this.registerUpdateListener(nextProps.node)
-    this.props.node && this.setState({ node: this.props.node })
-
-    if (this.props.node !== nextProps.node) {
-      this.setState({ compareMessage: undefined })
-    }
-  }
-
-  public componentWillUnmount() {
-    this.props.node && this.removeUpdateListener(this.props.node)
-  }
-
-  public render() {
-    return (
-      <div id="Sidebar" className={this.props.classes.drawer}>
-        {this.renderNode()}
-      </div>
-    )
-  }
+    </div>
+  )
 }
 
 const mapStateToProps = (state: AppState) => {
+  const node = state.tree.get('selectedTopic')
   return {
-    node: state.tree.selectedTopic,
+    tree: state.connection.tree,
+    nodePath: node && node.path(),
   }
 }
 
@@ -194,20 +89,19 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-const styles: StyleRulesCallback<string> = (theme: Theme) => {
-  return {
-    drawer: {
-      display: 'block',
-      height: '100%',
-    },
-    valuePaper: {
-      margin: theme.spacing(1),
-    },
-    heading: {
-      fontSize: theme.typography.pxToRem(15),
-      fontWeight: theme.typography.fontWeightRegular,
-    },
-  }
-}
+const styles = (theme: Theme) => ({
+  drawer: {
+    display: 'block' as 'block',
+  },
+  details: {
+    padding: '0px 16px 8px 8px',
+    display: 'block',
+  },
+})
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Sidebar))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(Sidebar)
+)

app/src/components/Sidebar/Topic.tsx

@@ -1,70 +0,0 @@
-import * as React from 'react'
-import * as q from '../../../../backend/src/Model'
-import Button from '@material-ui/core/Button'
-import { withStyles, Theme, StyleRulesCallback } from '@material-ui/core/styles'
-import { treeActions } from '../../actions'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { TopicViewModel } from '../../model/TopicViewModel'
-
-interface Props {
-  classes: any
-  theme: Theme
-  node?: q.TreeNode<TopicViewModel>
-  selected?: q.TreeNode<TopicViewModel>
-  actions: typeof treeActions
-  didSelectNode: (node: q.TreeNode<TopicViewModel>) => void
-}
-
-const styles: StyleRulesCallback<string> = (theme: Theme) => ({
-  button: {
-    textTransform: 'none',
-    padding: '3px 5px 3px 5px',
-    minWidth: '30px',
-  },
-})
-
-class Topic extends React.Component<Props, {}> {
-  public render() {
-    const { node } = this.props
-    if (!node) {
-      return null
-    }
-
-    let key = 0
-    const breadCrumps = node.branch()
-      .map(node => node.sourceEdge)
-      .filter(edge => Boolean(edge))
-      .map(edge =>
-        [(
-          <Button
-            onClick={() => this.props.actions.selectTopic(edge!.target)}
-            size="small"
-            color="secondary"
-            className={this.props.classes.button}
-            key={edge!.hash()}
-          >
-            {edge!.name}
-          </Button>
-        )]
-      )
-
-    if (breadCrumps.length === 0) {
-      return null
-    }
-
-    const joinedBreadCrumps = breadCrumps.reduce((prev, current) =>
-      prev.concat([<span key={key += 1}>/</span>]).concat(current)
-    )
-
-    return <span style={{ lineHeight: '2.2em' }}>{joinedBreadCrumps}</span>
-  }
-}
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(treeActions, dispatch),
-  }
-}
-
-export default connect(null, mapDispatchToProps)(withStyles(styles, { withTheme: true })(Topic))

app/src/components/Sidebar/TopicPanel/RecursiveTopicDeleteButton.tsx

@@ -0,0 +1,37 @@
+import * as q from '../../../../../backend/src/Model'
+import CustomIconButton from '../../helper/CustomIconButton'
+import Delete from '@material-ui/icons/Delete'
+import React, { useCallback } from 'react'
+import { Badge } from '@material-ui/core'
+
+export const RecursiveTopicDeleteButton = (props: {
+  node?: q.TreeNode<any>
+  deleteTopicAction: (node: q.TreeNode<any>, a: boolean, limit: number) => void
+}) => {
+  const onClick = useCallback(
+    (event: React.MouseEvent) => {
+      if (props.node) {
+        event.stopPropagation()
+        event.preventDefault()
+        props.deleteTopicAction(props.node, true, Infinity)
+      }
+    },
+    [props.node]
+  )
+
+  if (!props.node) {
+    return null
+  }
+
+  const topicCount = props.node ? props.node.childTopicCount() : 0
+  if (topicCount === 0 || (props.node.message && topicCount === 1)) {
+    return null
+  }
+  return (
+    <Badge badgeContent={<span style={{ whiteSpace: 'nowrap' }}>{topicCount}</span>} color="secondary">
+      <CustomIconButton onClick={onClick} tooltip={`Deletes ${topicCount} sub-topics with a single click`}>
+        <Delete color="action" />
+      </CustomIconButton>
+    </Badge>
+  )
+}

app/src/components/Sidebar/TopicPanel/Topic.tsx

@@ -0,0 +1,72 @@
+import React from 'react'
+import * as q from '../../../../../backend/src/Model'
+import Button from '@material-ui/core/Button'
+import { withStyles, Theme } from '@material-ui/core/styles'
+import { treeActions } from '../../../actions'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { TopicViewModel } from '../../../model/TopicViewModel'
+
+interface Props {
+  classes: any
+  theme: Theme
+  node?: q.TreeNode<TopicViewModel>
+  selected?: q.TreeNode<TopicViewModel>
+  actions: typeof treeActions
+}
+
+const styles = (theme: Theme) => ({
+  button: {
+    textTransform: 'none' as 'none',
+    padding: '3px 5px 3px 5px',
+    minWidth: '30px',
+  },
+})
+
+class Topic extends React.PureComponent<Props, {}> {
+  public render() {
+    const { node, theme } = this.props
+    if (!node) {
+      return null
+    }
+
+    let key = 0
+    const breadCrumps = node
+      .branch()
+      .map(node => node.sourceEdge)
+      .filter(edge => Boolean(edge))
+      .map(edge => [
+        <Button
+          onClick={() => this.props.actions.selectTopic(edge!.target)}
+          size="small"
+          variant={theme.palette.type === 'light' ? 'contained' : undefined}
+          color={theme.palette.type === 'light' ? 'primary' : 'secondary'}
+          className={this.props.classes.button}
+          key={edge!.hash()}
+        >
+          {edge!.name || <span dangerouslySetInnerHTML={{ __html: '&nbsp;' }} />}
+        </Button>,
+      ])
+
+    if (breadCrumps.length === 0) {
+      return null
+    }
+
+    const joinedBreadCrumps = breadCrumps.reduce((prev, current) =>
+      prev.concat([<span key={(key += 1)}> / </span>]).concat(current)
+    )
+
+    return <span style={{ lineHeight: '2.2em' }}>{joinedBreadCrumps}</span>
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(treeActions, dispatch),
+  }
+}
+
+export default connect(
+  null,
+  mapDispatchToProps
+)(withStyles(styles, { withTheme: true })(Topic))

app/src/components/Sidebar/TopicPanel/TopicDeleteButton.tsx

@@ -0,0 +1,19 @@
+import * as q from '../../../../../backend/src/Model'
+import CustomIconButton from '../../helper/CustomIconButton'
+import Delete from '@material-ui/icons/Delete'
+import React from 'react'
+
+export const TopicDeleteButton = (props: {
+  node?: q.TreeNode<any>
+  deleteTopicAction: (node: q.TreeNode<any>) => void
+}) => {
+  const { node } = props
+  if (!node || !node.message || !node.message.value) {
+    return null
+  }
+  return (
+    <CustomIconButton onClick={() => props.deleteTopicAction(node)} tooltip="Clear this topic">
+      <Delete />
+    </CustomIconButton>
+  )
+}

app/src/components/Sidebar/TopicPanel/TopicPanel.tsx

@@ -0,0 +1,49 @@
+import * as q from '../../../../../backend/src/Model'
+import Copy from '../../helper/Copy'
+import Panel from '../Panel'
+import React, { useMemo, useCallback } from 'react'
+import Topic from './Topic'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { RecursiveTopicDeleteButton } from './RecursiveTopicDeleteButton'
+import { sidebarActions } from '../../../actions'
+import { TopicDeleteButton } from './TopicDeleteButton'
+
+const TopicPanel = (props: { node?: q.TreeNode<any>; actions: typeof sidebarActions }) => {
+  const { node } = props
+  console.log(node && node.path())
+  const copyTopic = node ? <Copy value={node.path()} /> : null
+
+  const deleteTopic = useCallback((topic?: q.TreeNode<any>, recursive: boolean = false) => {
+    if (!topic) {
+      return
+    }
+
+    props.actions.clearTopic(topic, recursive)
+  }, [])
+
+  return useMemo(
+    () => (
+      <Panel disabled={!Boolean(node)}>
+        <span>
+          Topic {copyTopic}
+          <TopicDeleteButton node={node} deleteTopicAction={deleteTopic} />
+          <RecursiveTopicDeleteButton node={node} deleteTopicAction={deleteTopic} />
+        </span>
+        <Topic node={node} />
+      </Panel>
+    ),
+    [node, node && node.childTopicCount()]
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(sidebarActions, dispatch),
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(TopicPanel)

app/src/components/Sidebar/ValueRenderer/ActionButtons.tsx

@@ -0,0 +1,79 @@
+import React, { useCallback } from 'react'
+import Code from '@material-ui/icons/Code'
+import Reorder from '@material-ui/icons/Reorder'
+import ToggleButton from '@material-ui/lab/ToggleButton'
+import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'
+import { settingsActions } from '../../../actions'
+import { Tooltip, withStyles, Theme } from '@material-ui/core'
+import { bindActionCreators } from 'redux'
+import { AppState } from '../../../reducers'
+import { connect } from 'react-redux'
+import { ValueRendererDisplayMode } from '../../../reducers/Settings'
+
+function ActionButtons(props: {
+  actions: { settings: typeof settingsActions }
+  valueRendererDisplayMode: ValueRendererDisplayMode
+  classes: any
+}) {
+  const handleValue = useCallback(
+    (mouseEvent: React.MouseEvent, value: any) => {
+      if (value === null) {
+        return
+      }
+      props.actions.settings.setValueDisplayMode(value)
+    },
+    [props.actions.settings.setValueDisplayMode]
+  )
+
+  return (
+    <ToggleButtonGroup
+      id="valueRendererDisplayMode"
+      value={props.valueRendererDisplayMode}
+      exclusive={true}
+      onChange={handleValue}
+    >
+      <ToggleButton className={props.classes.toggleButton} value="diff" id="valueRendererDisplayMode-diff">
+        <Tooltip title="Show difference between the current and the last message">
+          <span>
+            <Code className={props.classes.toggleButtonIcon} />
+          </span>
+        </Tooltip>
+      </ToggleButton>
+      <ToggleButton className={props.classes.toggleButton} value="raw" id="valueRendererDisplayMode-raw">
+        <Tooltip title="Raw / formatted JSON">
+          <span>
+            <Reorder className={props.classes.toggleButtonIcon} />
+          </span>
+        </Tooltip>
+      </ToggleButton>
+    </ToggleButtonGroup>
+  )
+}
+
+const styles = (theme: Theme) => ({
+  toggleButton: {
+    height: '36px',
+  },
+  toggleButtonIcon: {
+    verticalAlign: 'middle',
+  },
+})
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+    },
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    valueRendererDisplayMode: state.settings.get('valueRendererDisplayMode'),
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ActionButtons))

app/src/components/Sidebar/ValueRenderer/DeleteSelectedTopicButton.tsx

@@ -0,0 +1,39 @@
+import Clear from '@material-ui/icons/Clear'
+import React, { useMemo } from 'react'
+import { bindActionCreators } from 'redux'
+import { Button, Tooltip } from '@material-ui/core'
+import { connect } from 'react-redux'
+import { sidebarActions } from '../../../actions'
+
+const DeleteSelectedTopicButton = (props: {
+  actions: {
+    sidebar: typeof sidebarActions
+  }
+}) =>
+  useMemo(
+    () => (
+      <Tooltip title="Delete retained topic" placement="top">
+        <Button
+          size="small"
+          color="secondary"
+          variant="contained"
+          style={{ marginTop: '11px', padding: '0px 4px', minHeight: '24px' }}
+          onClick={props.actions.sidebar.clearRetainedTopic}
+        >
+          retained <Clear style={{ fontSize: '16px', marginLeft: '2px' }} />
+        </Button>
+      </Tooltip>
+    ),
+    [props.actions.sidebar.clearRetainedTopic]
+  )
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: { sidebar: bindActionCreators(sidebarActions, dispatch) },
+  }
+}
+
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(DeleteSelectedTopicButton)

app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx

@@ -1,12 +1,17 @@
 import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
-import BarChart from '@material-ui/icons/BarChart'
+import ShowChart from '@material-ui/icons/ShowChart'
+import Copy from '../../helper/Copy'
 import DateFormatter from '../../helper/DateFormatter'
-import History from '../History'
-import { TopicViewModel } from '../../../model/TopicViewModel'
+import History from '../HistoryDrawer'
+import TopicPlot from '../../TopicPlot'
 import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
-
-const PlotHistory = React.lazy(() => import('./PlotHistory'))
+import { isPlottable } from '../CodeDiff/util'
+import { TopicViewModel } from '../../../model/TopicViewModel'
+import { bindActionCreators } from 'redux'
+import { chartActions } from '../../../actions'
+import { connect } from 'react-redux'
+import CustomIconButton from '../../helper/CustomIconButton'
 
 const throttle = require('lodash.throttle')
 
@@ -14,21 +19,37 @@ interface Props {
   node?: q.TreeNode<TopicViewModel>
   selected?: q.Message
   onSelect: (message: q.Message) => void
+  actions: {
+    charts: typeof chartActions
+  }
 }
 
 interface State {
-  displayMessage?: q.Message,
+  displayMessage?: q.Message
   anchorEl?: HTMLElement
+  lastUpdate: number
 }
 
-class MessageHistory extends React.Component<Props, State> {
-
+class MessageHistory extends React.PureComponent<Props, State> {
   private updateNode = throttle(() => {
-    this.setState(this.state)
+    this.setState({ lastUpdate: Date.now() })
   }, 300)
+
   constructor(props: any) {
     super(props)
-    this.state = { }
+    this.state = { lastUpdate: 0 }
+  }
+
+  private addNodeToCharts = (event: React.MouseEvent) => {
+    event.preventDefault()
+    event.stopPropagation()
+
+    const { node } = this.props
+    if (!node) {
+      return null
+    }
+
+    this.props.actions.charts.addChart({ topic: node.path() })
   }
 
   private displayMessage = (index: number, eventTarget: EventTarget) => {
@@ -59,43 +80,66 @@ class MessageHistory extends React.Component<Props, State> {
 
     const history = node.messageHistory.toArray()
     let previousMessage: q.Message | undefined = node.message
-    const historyElements = history.reverse().map((message) => {
+    const historyElements = [...history].reverse().map((message, idx) => {
+      const value = message.value ? Base64Message.toUnicodeString(message.value) : ''
       const element = {
-        title: <span><DateFormatter date={message.received} /> {previousMessage ? <i>(-<DateFormatter date={message.received} intervalSince={previousMessage.received} />)</i> : null}</span>,
-        value: message.value ? Base64Message.toUnicodeString(message.value) : '',
+        value,
+        key: `${message.messageNumber}-${message.received}`,
+        title: (
+          <span>
+            <DateFormatter date={message.received} />
+            {previousMessage && previousMessage !== message ? (
+              <i>
+                (-
+                <DateFormatter date={message.received} intervalSince={previousMessage.received} />)
+              </i>
+            ) : null}
+            <div style={{ float: 'right' }}>
+              <Copy value={value} />
+            </div>
+          </span>
+        ),
         selected: message && message === this.props.selected,
       }
       previousMessage = message
       return element
     })
 
-    const numericMessages = history
-      .map((message: q.Message) => {
-        const value = message.value ? parseFloat(Base64Message.toUnicodeString(message.value)) : NaN
-        return { x: message.received.getTime(), y: value  }
-      }).filter(data => !isNaN(data.y))
-    const showPlot = numericMessages.length >= 2
-
+    const isMessagePlottable =
+      node.message && node.message.value && isPlottable(Base64Message.toUnicodeString(node.message.value))
     return (
       <div>
         <History
           items={historyElements}
-          contentTypeIndicator={showPlot ? <BarChart /> : undefined}
+          contentTypeIndicator={
+            isMessagePlottable ? (
+              <CustomIconButton
+                style={{ height: '22px', width: '22px' }}
+                onClick={this.addNodeToCharts}
+                tooltip="Add to chart panel"
+              >
+                <ShowChart style={{ marginTop: '-5px' }} />
+              </CustomIconButton>
+            ) : (
+              undefined
+            )
+          }
           onClick={this.displayMessage}
         >
-          {showPlot ? this.renderPlot(numericMessages) : null}
+          {isMessagePlottable ? <TopicPlot history={node.messageHistory} /> : null}
         </History>
       </div>
     )
   }
+}
 
-  public renderPlot(data: Array<{x: number, y: number}>) {
-    return (
-      <React.Suspense fallback={<div>Loading...</div>}>
-        <PlotHistory data={data} />
-      </React.Suspense>
-    )
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: { charts: bindActionCreators(chartActions, dispatch) },
   }
 }
 
-export default MessageHistory
+export default connect(
+  null,
+  mapDispatchToProps
+)(MessageHistory)

app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx

@@ -1,72 +0,0 @@
-import * as q from '../../../../../backend/src/Model'
-import * as React from 'react'
-import DateFormatter from '../../helper/DateFormatter'
-import { default as ReactResizeDetector } from 'react-resize-detector'
-import 'react-vis/dist/style.css'
-import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
-const { XYPlot, LineMarkSeries, Hint, YAxis, HorizontalGridLines } = require('react-vis')
-const abbreviate = require('number-abbreviate')
-
-interface Props {
-  data: Array<{x: number, y: number}>
-}
-
-interface Stats {
-  width: number
-  value?: any
-}
-
-class PlotHistory extends React.Component<Props, Stats> {
-  constructor(props: Props) {
-    super(props)
-    this.state = { width: 300 }
-  }
-
-  private resize = (width: number, height: number) => {
-    this.setState({ width: width - 12 })
-  }
-
-  private hintFormatter = (point: any) => {
-    return [
-      { title: <b>Time</b>, value: <DateFormatter date={new Date(point.x)} /> },
-      { title: <b>Value</b>, value: point.y },
-    ]
-  }
-
-  private _forgetValue = () => {
-    this.setState({
-      value: undefined,
-    })
-  }
-
-  private _rememberValue = (value: any) => {
-    this.setState({ value })
-  }
-
-  public render() {
-    const data = this.props.data
-
-    return (
-      <div>
-        <XYPlot width={this.state.width} height={150}>
-          <HorizontalGridLines />
-          <YAxis
-            width={45}
-            tickFormat={(num: number) => abbreviate(num)}
-          />
-          <LineMarkSeries
-            onValueMouseOver={this._rememberValue}
-            onValueMouseOut={this._forgetValue}
-            size={3}
-            data={data}
-            curve={data.length < 50 ? 'curveCardinal' : undefined}
-          />
-          {this.state.value ? <Hint format={this.hintFormatter} value={this.state.value} /> : null}
-        </XYPlot>
-        <ReactResizeDetector handleWidth={true} onResize={this.resize} />
-      </div>
-    )
-  }
-}
-
-export default PlotHistory