Add bad examples

.cspell.json

@@ -1,27 +1,19 @@
 {
-  "import": [
-    "@cspell/dict-typescript/cspell-ext.json"
-  ],
-  "ignoreRegExpList": [
-    "import(?:(?:(?:[ \\n\\t]+([^ *\\n\\t\\{\\},]+)[ \\n\\t]*(?:,|[ \\n\\t]+))?([ \\n\\t]*\\{(?:[ \\n\\t]*[^ \\n\\t\"'\\{\\}]+[ \\n\\t]*,?)+\\})?[ \\n\\t]*)|[ \n\\n\\t]*\\*[ \\n\\t]*as[ \\n\\t]+([^ \\n\\t\\{\\}]+)[ \\n\\t]+)from[ \\n\\t]*(?:['\"])([^'\"\\n]+)(['\"])\n",
-    "^import\\s+(['\"]).*\\1$"
-  ],
   "language": "en",
   "words": [
-    "Bbreak",
-    "nodered",
-    "goog",
     "thomasnordquist",
     "nowrap",
     "subheader",
     "basepath",
+    "webdriverio",
     "repo",
     "hexagonalize",
     "pixelize",
     "Transistions",
+    "squashfs",
+    "squashfs",
     "provisionprofile",
     "Nsis",
-    "webdriverio",
     "Appx",
     "Hashable",
     "clickaway",
@@ -31,6 +23,8 @@
     "Monokai",
     "plottable",
     "snackbar",
+    "webdriverio",
+    "prismjs",
     "Nordquist",
     "debounced",
     "mosquitto",
@@ -49,10 +43,6 @@
     "DEVTOOLS",
     "mixins",
     "Explorerdmg",
-    "heapsnapshot",
-    "noconflict",
-    "sparkplugb",
-    "protojson",
-    "typesafe"
+    "heapsnapshot"
   ]
-}
+}

.devcontainer/devcontainer.json

@@ -1,46 +0,0 @@
-{
-  "name": "MQTT Explorer Development",
-  "dockerComposeFile": "docker-compose.yml",
-  "service": "app",
-  "workspaceFolder": "/workspace",
-
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode",
-        "ms-vscode.vscode-typescript-next",
-        "ms-azuretools.vscode-docker",
-        "eamodio.gitlens"
-      ],
-      "settings": {
-        "editor.formatOnSave": true,
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "typescript.tsdk": "node_modules/typescript/lib",
-        "editor.codeActionsOnSave": {
-          "source.fixAll.eslint": "explicit"
-        }
-      }
-    }
-  },
-
-  "forwardPorts": [3000, 8080, 1883],
-  "portsAttributes": {
-    "3000": {
-      "label": "MQTT Explorer Server",
-      "onAutoForward": "notify"
-    },
-    "8080": {
-      "label": "Webpack Dev Server",
-      "onAutoForward": "notify"
-    },
-    "1883": {
-      "label": "MQTT Broker",
-      "onAutoForward": "ignore"
-    }
-  },
-
-  "postCreateCommand": "yarn install",
-
-  "remoteUser": "node"
-}

.devcontainer/docker-compose.yml

@@ -1,21 +0,0 @@
-version: '3.8'
-
-services:
-  app:
-    image: mcr.microsoft.com/devcontainers/javascript-node:20
-    volumes:
-      - ../..:/workspace:cached
-    command: sleep infinity
-    network_mode: service:mosquitto
-    environment:
-      - MQTT_EXPLORER_USERNAME=dev
-      - MQTT_EXPLORER_PASSWORD=dev123
-
-  mosquitto:
-    image: eclipse-mosquitto:2
-    ports:
-      - "1883:1883"
-      - "3000:3000"
-      - "8080:8080"
-    volumes:
-      - ./mosquitto.conf:/mosquitto/config/mosquitto.conf:ro

.devcontainer/mosquitto.conf

@@ -1,4 +0,0 @@
-# Mosquitto configuration for development
-listener 1883
-allow_anonymous true
-persistence false

.github/CODEOWNERS

@@ -1,3 +0,0 @@
-package.ts @thomasnordquist
-.github @thomasnordquist
-scripts @thomasnordquist

.github/copilot-instructions.md

@@ -1,383 +0,0 @@
-# GitHub Copilot Agent Instructions for MQTT Explorer
-
-## Overview
-
-MQTT Explorer is an Electron-based desktop application for exploring MQTT brokers. It provides a comprehensive UI for connecting to MQTT brokers, browsing topics, and analyzing message flows.
-
-## Technology Stack
-
-- **Frontend**: React 16.x with Material-UI
-- **Backend**: Node.js with TypeScript
-- **Desktop Framework**: Electron 29.x
-- **MQTT Client**: [mqttjs](https://github.com/mqttjs/MQTT.js) v4.x
-- **State Management**: Redux with redux-thunk
-- **Build Tools**: webpack, TypeScript compiler
-- **Testing**: Mocha + Chai for unit tests, Playwright for MCP introspection tests
-
-## Project Setup
-
-### Building and Running
-
-```bash
-# Install dependencies
-yarn install
-
-# Build the project
-yarn build
-
-# Set password for browser testing
-export MQTT_EXPLORER_USERNAME=admin
-export MQTT_EXPLORER_PASSWORD=secretpassword
-
-# Start the application
-yarn start
-
-# Start in development mode
-yarn dev
-```
-
-### Running with MCP Introspection (for testing)
-
-```bash
-# Build first
-yarn build
-
-# Start with MCP introspection enabled
-electron . --enable-mcp-introspection
-
-# Or with custom port
-electron . --enable-mcp-introspection --remote-debugging-port=9223
-```
-
-## Writing Tests
-
-### Requirements for All Tests
-
-1. **Tests MUST be deterministic** - They should produce the same results every time they run
-2. **Tests MUST be independent** - Each test should be able to run in isolation without depending on other tests
-3. **Include screenshots** - Visual verification is required for UI changes
-4. **Handle asynchronous operations properly** - This is an MQTT message queue tool
-
-### Best Practices for UI Tests
-
-#### 1. Use Given-When-Then Pattern
-Structure tests with clear Given-When-Then comments to make them readable:
-
-```typescript
-it('Given a JSON message sent to topic foo/bar/baz, the tree should display nested topics', async function () {
-  // Given: Mock MQTT publishes JSON to foo/bar/baz
-  // When: We wait for the topic to appear in the tree
-  // Then: Topic hierarchy should be visible (foo -> bar -> baz)
-})
-```
-
-#### 2. Wait for Elements, Don't Use Fixed Delays
-Prefer `waitFor` over `sleep` whenever possible:
-
-```typescript
-// ✓ Good: Wait for specific element
-const topic = await page.locator('span[data-test-topic="kitchen"]')
-await topic.waitFor({ state: 'visible', timeout: 5000 })
-
-// ✗ Bad: Fixed delay without verification
-await sleep(5000)
-```
-
-#### 3. Use Meaningful Assertions
-Every test should have explicit assertions that verify the expected state:
-
-```typescript
-// ✓ Good: Explicit assertion with meaningful message
-const treeNodes = await page.locator('[class*="TreeNode"]')
-const count = await treeNodes.count()
-expect(count).to.be.greaterThan(0, 'Topic tree should contain nodes')
-
-// ✗ Bad: No assertion, only screenshot
-await page.screenshot({ path: 'test.png' })
-```
-
-#### 4. Test Data-Driven Scenarios
-Write tests that describe the data flow:
-
-```typescript
-it('Given messages sent to livingroom/lamp/state and livingroom/lamp/brightness, both should appear under livingroom/lamp', async function () {
-  // Test implementation verifies the specific data flow
-})
-```
-
-#### 5. Use Data Test Attributes
-Leverage `data-test-*` attributes for reliable selectors:
-
-```typescript
-// ✓ Good: Use data-test attributes
-const topic = await page.locator('span[data-test-topic="kitchen"]')
-
-// ⚠ Acceptable: Use role/text when data attributes aren't available
-const button = await page.locator('//button/span[contains(text(),"Connect")]')
-
-// ✗ Bad: Rely on CSS classes that may change
-const topic = await page.locator('.MuiTreeItem-label')
-```
-
-#### 6. Verify Multiple Aspects
-Test should verify both state and UI:
-
-```typescript
-// Verify the action completed
-const isVisible = await disconnectButton.isVisible()
-expect(isVisible).to.be.true
-
-// Capture screenshot for visual verification
-await page.screenshot({ path: 'test-screenshot-connection.png' })
-```
-
-#### 7. Handle MQTT Asynchronous Nature
-Account for message propagation time:
-
-```typescript
-// Publish message
-await mockClient.publish('topic/name', 'value')
-
-// Wait for UI to update
-await page.locator(`text="value"`).waitFor({ timeout: 5000 })
-
-// Verify state
-const value = await page.textContent('.message-value')
-expect(value).toBe('value')
-```
-
-### Handling MQTT Asynchronous Operations
-
-MQTT is inherently asynchronous. When writing tests:
-
-- **Wait for message propagation**: Use proper wait strategies (e.g., `await page.waitForSelector()`, `await sleep()`)
-- **Don't assume immediate updates**: Messages take time to send, receive, and update the UI
-- **Use event-based waiting**: Wait for specific UI elements or state changes rather than fixed timeouts when possible
-- **Account for network latency**: MQTT broker communication involves network round trips
-
-### Example Test Pattern
-
-```typescript
-// 1. Perform action (e.g., publish message)
-await publishMessage(topic, payload)
-
-// 2. Wait for UI to update (not just arbitrary sleep)
-await page.waitForSelector(`text="${expectedValue}"`, { timeout: 5000 })
-
-// 3. Verify state
-const value = await page.textContent('.message-value')
-expect(value).toBe(expectedValue)
-
-// 4. Take screenshot for verification
-await page.screenshot({ path: 'test-result.png' })
-```
-
-### Running Tests
-
-```bash
-# Run all tests
-yarn test
-
-# Run specific test suites
-yarn test:app
-yarn test:backend
-yarn test:mcp
-
-# Run linters
-yarn lint
-yarn lint:fix
-```
-
-### Running UI Tests (yarn test:ui)
-
-The UI tests require specific setup in the test environment:
-
-**Prerequisites:**
-1. **Xvfb (X Virtual Framebuffer)** - Required for headless Electron testing
-   ```bash
-   # Start Xvfb on display :99
-   Xvfb :99 -screen 0 1024x720x24 -ac &
-   export DISPLAY=:99
-   ```
-
-2. **Mosquitto MQTT Broker** - Required for MQTT message testing
-   ```bash
-   # Install mosquitto
-   sudo apt-get install -y mosquitto mosquitto-clients
-   
-   # Start mosquitto service
-   sudo systemctl start mosquitto
-   
-   # Verify it's running on port 1883
-   sudo systemctl status mosquitto
-   ```
-
-3. **@types/node** - Required for TypeScript compilation
-   ```bash
-   yarn add -D @types/node
-   ```
-
-**Running UI Tests:**
-```bash
-# Build the application first
-yarn build
-
-# Run UI tests with proper display
-DISPLAY=:99 yarn test:ui
-```
-
-**Common Issues:**
-- **"Timeout exceeded" in before hook**: Mosquitto is not running or not accessible on port 1883
-- **"Cannot find type definition file for 'node'"**: Run `yarn add -D @types/node`
-- **Electron fails to launch**: Xvfb is not running or DISPLAY variable not set
-- **Tests hang**: Check if old Electron/mosquitto processes are still running and kill them
-
-**Environment Cleanup:**
-```bash
-# Kill old Electron processes
-ps aux | grep electron | grep -v grep | awk '{print $2}' | xargs kill -9 2>/dev/null
-
-# Kill old mosquitto processes (if running custom instance)
-ps aux | grep mosquitto | grep -v grep | awk '{print $2}' | xargs kill -9 2>/dev/null
-```
-
-## MCP Introspection Testing
-
-The project supports MCP (Model Context Protocol) for automated testing with Playwright:
-
-- Use `yarn test:mcp` to run automated UI tests
-- Tests launch the app with remote debugging enabled on port 9222
-- Connect to `http://localhost:9222` via Chrome DevTools Protocol
-
-## Project Structure
-
-- `app/` - Frontend React application
-- `backend/` - Backend models, tests, and connection management
-- `src/` - Electron main process and bindings
-- `src/spec/` - Test specifications including MCP introspection tests
-
-## Code Style and Formatting
-
-### Linting
-
-The project uses TSLint with Airbnb config and Prettier for code formatting:
-
-```bash
-# Run all linters
-yarn lint
-
-# Run linters individually
-yarn lint:prettier    # Check Prettier formatting
-yarn lint:tslint      # Check TSLint rules
-yarn lint:spellcheck  # Check spelling in code
-
-# Auto-fix issues
-yarn lint:fix         # Fix TSLint and Prettier issues
-yarn lint:tslint:fix  # Fix TSLint issues only
-yarn lint:prettier:fix # Fix Prettier issues only
-```
-
-### Code Style Rules
-
-- **Semicolons**: Never use semicolons (enforced by TSLint and Prettier)
-- **Quotes**: Single quotes for strings
-- **Indentation**: 2 spaces
-- **Line length**: Maximum 120 characters (Prettier) / 200 characters (TSLint)
-- **Arrow functions**: No parentheses for single parameters (`x => x + 1`)
-- **Trailing commas**: Required for multiline objects and arrays (ES5 compatible)
-
-### TypeScript Guidelines
-
-- Enable strict null checks and no implicit any
-- Use TypeScript interfaces for data structures
-- Prefer `const` over `let`, avoid `var`
-- Use type inference when possible, explicit types when clarity is needed
-
-## Dependency Management
-
-### Adding Dependencies
-
-```bash
-# Add to root project
-yarn add <package-name>
-
-# Add to app (frontend)
-cd app && yarn add <package-name>
-
-# Add to backend
-cd backend && yarn add <package-name>
-
-# Add dev dependencies
-yarn add -D <package-name>
-```
-
-### Important Dependency Notes
-
-- Main dependencies are in the root `package.json`
-- Frontend React app has its own dependencies in `app/package.json`
-- Backend models and logic have dependencies in `backend/package.json`
-- Always use `--frozen-lockfile` in CI to ensure reproducible builds
-- Run `yarn install` after pulling changes that modify `yarn.lock`
-
-## Debugging
-
-### Development Mode
-
-```bash
-# Start with hot reload for frontend
-yarn dev
-
-# This runs two processes in parallel:
-# 1. webpack-dev-server for the React app (port varies)
-# 2. Electron in development mode with the --development flag
-```
-
-### Debugging TypeScript
-
-- Source maps are enabled in `tsconfig.json`
-- Use `ts-node` for running TypeScript files directly
-- Backend tests can be debugged with: `cd backend && yarn test-inspect`
-
-### Common Issues
-
-- **Build fails**: Clear `dist/` and `app/build/` directories, then rebuild
-- **Electron won't start**: Ensure `yarn build` completed successfully
-- **Tests fail**: Check if MQTT broker (mosquitto) is running for integration tests
-- **UI not updating**: In dev mode, ensure webpack-dev-server is running
-
-## Deployment and Packaging
-
-### Creating Releases
-
-```bash
-# Prepare release (updates version, changelog)
-yarn prepare-release
-
-# Package the application for distribution
-yarn package
-
-# Package with Docker (for consistent builds)
-yarn package-with-docker
-```
-
-### Release Workflow
-
-- **Beta releases**: Create PR to `beta` branch with "feat:" or "fix:" commits
-- **Production releases**: Create PR to `release` branch with "feat:" or "fix:" commits
-- Semantic release automatically handles versioning and changelog
-- Builds are created for Windows, macOS, and Linux
-
-### Build Artifacts
-
-- Output directory: `build/`
-- Supported formats: DMG (macOS), EXE/NSIS (Windows), AppImage/Snap (Linux), AppX (Windows Store)
-- Code signing is configured via `res/` directory certificates and provisioning profiles
-
-## Important Notes
-
-- Always run `yarn build` before starting the application
-- The app uses Electron (see `package.json` for version)
-- MQTT communication is handled via [mqttjs](https://github.com/mqttjs/MQTT.js)
-- All code changes should pass linting (`yarn lint`)
-- Node.js version requirement: >= 20
-- The project uses workspace-like structure with separate package.json files for app and backend

.github/workflows/build-dockerfile.yml

@@ -1,29 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-      - release
-      - beta
-    paths:
-      - Dockerfile
-      - .github
-
-jobs:
-  create-image:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest

.github/workflows/copilot-setup.yml

@@ -1,39 +0,0 @@
-name: Copilot Agent Setup
-
-on:
-  workflow_call:
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-      
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      
-      - name: Cache yarn dependencies
-        uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-            app/node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-      
-      - name: Build project
-        run: yarn build

.github/workflows/platform-builds.yml

@@ -1,53 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - release
-      - beta
-
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        build:
-          - os: ubuntu-latest
-            task: linux
-          - os: windows-latest
-            task: win
-          - os: macos-latest
-            task: mac
-    runs-on: ${{ matrix.build.os }}
-    steps:
-      - if: matrix.build.os == 'ubuntu-latest'
-        run: sudo snap install snapcraft --classic
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 24
-      - run: npm install -g yarn
-      - run: yarn
-      - id: create_token # get ReleaseBot access token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.RELEASE_BOT_APP_ID }}
-          private-key: ${{ secrets.RELEASE_BOT_PRIVATE_KEY }}
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v4
-        id: semantic   # Need an `id` for output variables
-        env:
-          GITHUB_TOKEN: ${{ steps.create_token.outputs.token }}
-      - run: yarn build
-        if: steps.semantic.outputs.new_release_published == 'true'
-      - run: yarn prepare-release
-        if: steps.semantic.outputs.new_release_published == 'true'
-      - run: yarn package ${{ matrix.build.task }}
-        if: steps.semantic.outputs.new_release_published == 'true'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
-  

.github/workflows/tests.yml

@@ -1,135 +0,0 @@
-on:
-  pull_request_target: # Use pull_request_target
-    branches: [master, beta, release]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
-      volumes:
-        - ./:/app
-      options: --user root
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Install Packages
-        run: yarn install --frozen-lockfile
-      - name: Build
-        run: yarn build
-      - name: Test
-        run: yarn test
-
-  ui-tests:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
-      volumes:
-        - ./:/app
-      options: --user root
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Install Packages
-        run: yarn install --frozen-lockfile
-      - name: Build
-        run: yarn build
-      - name: Run UI Tests
-        timeout-minutes: 10
-        run: ./scripts/runUiTests.sh
-      - name: Upload Test Screenshots
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-test-screenshots
-          path: |
-            test-screenshot-*.png
-          retention-days: 30
-
-  demo-video:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
-      volumes:
-        - ./:/app
-      options: --user root
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Install Packages
-        run: yarn install --frozen-lockfile
-      - name: Build
-        run: yarn build
-      - name: Generate Demo Video
-        run: yarn ui-test
-      - name: Post-processing
-        run: ./scripts/prepareVideo.sh
-      - uses: hkusu/s3-upload-action@v2
-        id: upload # specify some ID for use in subsequent steps
-        with:
-          aws-access-key-id: ${{ vars.AWS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: 'eu-central-1'
-          aws-bucket: ${{ vars.AWS_BUCKET }}
-          file-path: './ui-test.gif'
-          content-type: image/gif
-          output-file-url: 'true'
-      - name: Show URL
-        run: echo '${{ steps.upload.outputs.file-url }}'
-        id: artifact-upload-step
-      - run: echo '<picture><img src="${{ steps.upload.outputs.file-url }}"></picture>' >> $GITHUB_STEP_SUMMARY
-
-  test-browser:
-    runs-on: ubuntu-latest
-    services:
-      mosquitto:
-        image: eclipse-mosquitto:2
-        ports:
-          - 1883:1883
-        options: >-
-          --health-cmd "mosquitto_sub -t '$SYS/#' -C 1"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-      - name: Build Browser Mode
-        run: yarn build:server
-      - name: Test App
-        run: yarn test:app
-      - name: Test Backend
-        run: yarn test:backend
-      - name: Start Server in Background
-        run: |
-          yarn start:server &
-          echo $! > server.pid
-        env:
-          MQTT_EXPLORER_USERNAME: test
-          MQTT_EXPLORER_PASSWORD: test123
-          PORT: 3000
-      - name: Wait for Server
-        run: |
-          timeout 30 bash -c 'until curl -f http://localhost:3000; do sleep 1; done'
-      - name: Browser Smoke Test
-        run: |
-          # Test server is running
-          curl -f http://localhost:3000 || exit 1
-          echo "Browser mode server is running successfully"
-      - name: Stop Server
-        if: always()
-        run: |
-          if [ -f server.pid ]; then
-            kill $(cat server.pid) || true
-            rm server.pid
-          fi

.github/workflows/update-website.yml

@@ -1,17 +0,0 @@
-name: Update Website
-
-on: [release, workflow_dispatch]
-
-jobs:
-  update-website:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: gh-pages
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-      - run: npm install
-      - run: npm run readme
-      - uses: stefanzweifel/git-auto-commit-action@v5

.gitignore

@@ -9,12 +9,3 @@ test.png
 .awcache
 .scannerwork
 screen*.png
-
-# MCP introspection artifacts
-mqtt-explorer-mcp-screenshot.png
-screenshot-mcp-*.png
-test-mcp-introspection.js
-
-/data
-test-screenshot-*.png
-test-expand-*.png

.releaserc

@@ -1,30 +0,0 @@
-{
-  "branches": [
-    "release",
-    {
-      "name": "beta",
-      "prerelease": true
-    }
-  ],
-  repositoryUrl: "git@github.com:thomasnordquist/MQTT-Explorer.git",
-  "plugins": [
-    "@semantic-release/commit-analyzer",
-    "semantic-release-export-data",
-    "@semantic-release/changelog",
-    [
-      "@semantic-release/npm",
-      {
-        "npmPublish": false
-      }
-    ],
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "package.json",
-          "yarn.lock"
-        ]
-      }
-    ]
-  ]
-}

.travis.yml

@@ -0,0 +1,40 @@
+language: node_js
+
+services:
+  - xvfb
+
+cache:
+  directories:
+  - node_modules
+  - $HOME/.cache/electron
+  - $HOME/.cache/electron-builder
+  - $HOME/.npm/_prebuilds
+
+node_js:
+  - "10"
+
+os:
+  - linux
+  - osx
+
+osx_image: xcode10.2
+
+dist: xenial
+
+services:
+  - docker
+
+install:
+  - yarn install
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get -y install snap squashfs-tools && sudo snap install snapcraft --classic; fi;
+
+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 unset CSC_LINK; yarn run package -- win; fi

BROWSER_MODE.md

@@ -1,193 +0,0 @@
-# Browser Mode Documentation
-
-MQTT Explorer now supports running as a web application served by a Node.js server, in addition to the existing Electron desktop app.
-
-## Running in Browser Mode
-
-### Quick Start
-
-1. Build the application for browser mode:
-   ```bash
-   yarn build:server
-   ```
-
-2. Start the server:
-   ```bash
-   yarn start:server
-   ```
-
-3. Open your browser and navigate to `http://localhost:3000`
-
-4. You'll be prompted to log in with credentials that were generated on server startup.
-
-### Development Mode
-
-To run in development mode with hot reload:
-
-```bash
-yarn dev:server
-```
-
-This starts both the webpack dev server and the backend server.
-
-## Authentication
-
-### Environment Variables
-
-You can set custom authentication credentials using environment variables:
-
-```bash
-export MQTT_EXPLORER_USERNAME=admin
-export MQTT_EXPLORER_PASSWORD=secretpassword
-yarn start:server
-```
-
-### Generated Credentials
-
-If no environment variables are set, the server will generate credentials on first startup and save them to `data/credentials.json`. The generated credentials will be printed to the console:
-
-```
-============================================================
-Generated new credentials:
-Username: user-abc123
-Password: 123e4567-e89b-12d3-a456-426614174000
-============================================================
-Please save these credentials. They will be persisted to:
-/path/to/data/credentials.json
-============================================================
-```
-
-## Features
-
-### Certificate Upload
-
-In browser mode, certificate files are uploaded directly through the browser using the HTML5 File API. The certificates are:
-- Read client-side as base64
-- Stored in the connection configuration
-- Used when establishing MQTT connections
-
-### Data Storage
-
-In browser mode, all data is stored on the server:
-- Credentials: `data/credentials.json`
-- Uploaded certificates: `data/certificates/`
-- File uploads: `data/uploads/`
-
-### Port Configuration
-
-The default port is 3000. You can change it using the `PORT` environment variable:
-
-```bash
-PORT=8080 yarn start:server
-```
-
-## Architecture
-
-### Client-Server Communication
-
-- **Electron Mode**: Uses Electron IPC for communication between renderer and main process
-- **Browser Mode**: Uses Socket.io WebSockets for real-time communication between browser and server
-
-The application automatically detects the environment and uses the appropriate transport layer.
-
-### Event Bus Abstraction
-
-Both Electron IPC and Socket.io implement the same `EventBusInterface`, allowing the application code to work seamlessly in both modes without modification.
-
-## Differences from Electron Mode
-
-### Browser Mode Limitations
-
-1. **File System Access**: Limited to server-side operations
-2. **Native Dialogs**: File selection uses browser file input instead of native dialogs
-3. **Auto-Updates**: Not available in browser mode
-4. **Tray Icon**: Not available in browser mode
-
-### Browser Mode Advantages
-
-1. **No Installation**: Access from any browser
-2. **Cross-Platform**: Works on any device with a modern browser
-3. **Remote Access**: Can be deployed on a server for remote access
-4. **Multi-User**: Can support authentication for multiple users
-
-## Security Considerations
-
-1. **HTTPS**: For production, always use HTTPS to encrypt credentials and MQTT data
-2. **Authentication**: Keep credentials secure and rotate them regularly
-3. **Network**: Ensure the server is on a trusted network or behind a firewall
-4. **Environment Variables**: Use environment variables for production credentials, not the generated ones
-
-## Deployment
-
-For production deployment:
-
-1. Build the application:
-   ```bash
-   yarn build:server
-   ```
-
-2. Set environment variables:
-   ```bash
-   export MQTT_EXPLORER_USERNAME=your_username
-   export MQTT_EXPLORER_PASSWORD=your_secure_password
-   export PORT=3000
-   ```
-
-3. Start the server:
-   ```bash
-   yarn start:server
-   ```
-
-4. Use a reverse proxy (nginx, Apache) to add HTTPS and additional security features
-
-## Troubleshooting
-
-### Debugging
-
-Enable detailed Socket.IO connection and lifecycle debugging:
-
-```bash
-DEBUG=mqtt-explorer:socketio* yarn start:server
-```
-
-Available debug namespaces:
-- `mqtt-explorer:socketio` - General Socket.IO events and metrics
-- `mqtt-explorer:socketio:connect` - Client connection events
-- `mqtt-explorer:socketio:disconnect` - Client disconnection and cleanup
-- `mqtt-explorer:socketio:subscriptions` - Subscription lifecycle tracking
-- `mqtt-explorer:socketio:connections` - MQTT connection ownership
-
-This will log:
-- Client connect/disconnect events
-- Subscription counts per socket
-- MQTT connection ownership tracking
-- Memory leak detection metrics (subscriptions, handlers, connections)
-
-Example output:
-```
-mqtt-explorer:socketio:connect Client connected: abc123de
-mqtt-explorer:socketio [connect] clients=1 subscriptions=8 mqttConns=0 | socket[abc123de]: subs=8 conns=0
-mqtt-explorer:socketio:connections Connection my-mqtt owned by socket abc123de (total: 1)
-mqtt-explorer:socketio:disconnect Client disconnected: abc123de
-mqtt-explorer:socketio:subscriptions Removed 8 subscriptions for socket abc123de
-mqtt-explorer:socketio [disconnect] clients=0 subscriptions=0 mqttConns=0 | socket[abc123de]: subs=0 conns=0
-```
-
-### Authentication Fails
-
-1. Check the console output for the generated credentials
-2. Clear browser session storage: `sessionStorage.clear()` in browser console
-3. Restart the server to regenerate credentials
-
-### Connection Issues
-
-1. Check that the server is running: `http://localhost:3000`
-2. Check browser console for Socket.io connection errors
-3. Verify firewall rules allow the port
-
-### Certificate Upload Issues
-
-In browser mode, certificates are handled differently:
-- Use the file upload button to select certificate files
-- Files are read and encoded client-side
-- Large certificate files (>16KB) will be rejected

CI_CD.md

@@ -1,149 +0,0 @@
-# CI/CD Pipeline Documentation
-
-## Overview
-
-MQTT Explorer uses GitHub Actions for continuous integration and testing. The pipeline tests both Electron (desktop) and browser modes.
-
-## Workflows
-
-### Test Workflow (`.github/workflows/tests.yml`)
-
-This workflow runs on pull requests to `master`, `beta`, and `release` branches.
-
-#### Jobs
-
-##### 1. `test` - Electron Mode Tests
-
-Tests the traditional Electron desktop application:
-
-- **Environment**: Custom Docker container (`ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest`)
-- **Steps**:
-  1. Install dependencies with frozen lockfile
-  2. Build the Electron application
-  3. Run unit tests (app + backend)
-  4. Run UI tests with video recording
-  5. Upload test video to S3
-  6. Display test results in GitHub summary
-
-**Artifacts**: UI test video (GIF format) uploaded to S3
-
-##### 2. `test-browser` - Browser Mode Tests
-
-Tests the new browser/server mode:
-
-- **Environment**: Ubuntu latest with Node.js 20
-- **Services**:
-  - **Mosquitto MQTT Broker**: Eclipse Mosquitto v2 on port 1883
-    - Health checks enabled
-    - Anonymous connections allowed
-- **Steps**:
-  1. Setup Node.js 20
-  2. Install dependencies
-  3. Build browser mode (`yarn build:server`)
-  4. Run unit tests (app + backend)
-  5. Start server in background with test credentials
-  6. Wait for server to be ready
-  7. Run browser smoke tests
-  8. Clean up server process
-
-**Environment Variables**:
-- `MQTT_EXPLORER_USERNAME=test`
-- `MQTT_EXPLORER_PASSWORD=test123`
-- `PORT=3000`
-
-## Test Commands
-
-The following npm scripts are used in CI/CD:
-
-```bash
-# Unit tests
-yarn test              # Run all tests (app + backend)
-yarn test:app          # Frontend tests only
-yarn test:backend      # Backend tests only
-
-# Build
-yarn build             # Build Electron mode
-yarn build:server      # Build browser mode
-
-# UI Tests (Electron only)
-yarn ui-test           # Run UI tests with video recording
-```
-
-## Adding New Tests
-
-### For Electron Mode
-
-Add tests to the `test` job. UI tests should be added to the test suite that `yarn ui-test` runs.
-
-### For Browser Mode
-
-Browser-specific tests should:
-1. Use the pre-configured Mosquitto service
-2. Connect to `mqtt://mosquitto:1883`
-3. Test server endpoints at `http://localhost:3000`
-
-Example:
-```yaml
-- name: Browser Integration Test
-  run: |
-    # Test MQTT connection through server
-    curl -X POST http://localhost:3000/api/test
-```
-
-## Local Testing
-
-### Electron Mode
-
-```bash
-yarn build
-yarn test
-yarn ui-test
-```
-
-### Browser Mode
-
-```bash
-# Start Mosquitto in Docker
-docker run -d -p 1883:1883 eclipse-mosquitto:2
-
-# Build and test
-yarn build:server
-yarn test
-
-# Start server
-MQTT_EXPLORER_USERNAME=test MQTT_EXPLORER_PASSWORD=test123 yarn start:server
-
-# Run manual tests
-curl http://localhost:3000
-```
-
-## GitHub Codespaces / Devcontainer
-
-The repository includes a devcontainer configuration that automatically sets up:
-- Node.js 20
-- MQTT broker (Mosquitto)
-- All development dependencies
-- Port forwarding for development
-
-See [.devcontainer/README.md](.devcontainer/README.md) for details.
-
-## Troubleshooting
-
-### Browser Tests Failing
-
-1. **Server won't start**: Check if port 3000 is already in use
-2. **MQTT connection fails**: Ensure Mosquitto service is healthy
-3. **Timeout errors**: Increase timeout in "Wait for Server" step
-
-### Electron Tests Failing
-
-1. **UI tests timeout**: Check if the Docker container has display access
-2. **Build fails**: Verify all dependencies are in yarn.lock
-
-## Future Improvements
-
-- [ ] Add E2E browser tests with Playwright
-- [ ] Test WebSocket connections in browser mode
-- [ ] Add performance benchmarks
-- [ ] Test with different MQTT broker versions
-- [ ] Add security scanning for browser mode

LICENSE.md

@@ -1,10 +1,10 @@
-When redistributing, the attribution page may not be altered or made less accessible without explicit approval.
+## creative commons
 
-# Creative Commons Attribution-ShareAlike 4.0 International
+# 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**
+### 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.
 
@@ -12,37 +12,31 @@ Creative Commons public licenses provide a standard set of terms and conditions
 
 * __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-ShareAlike 4.0 International Public License
+## 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-ShareAlike 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.
+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. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+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. __BY-SA Compatible License__ means a license listed at [creativecommons.org/compatiblelicenses](http://creativecommons.org/compatiblelicenses), approved by Creative Commons as essentially the equivalent of this Public License.
+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. __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.
+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. __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.
+e. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
 
-f. __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.
+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. __License Elements__ means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+g. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
 
-h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied 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. __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.
+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. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
-
-k. __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.
-
-l. __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.
-
-m. __You__ means the individual or entity exercising the Licensed Rights under this Public License. __Your__ has a corresponding meaning.
+j. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
 
 ### Section 2 – Scope.
 
@@ -52,7 +46,7 @@ a. ___License grant.___
 
        A. reproduce and Share the Licensed Material, in whole or in part; and
 
-       B. produce, reproduce, and Share Adapted Material.
+       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.
 
@@ -64,9 +58,7 @@ a. ___License grant.___
 
        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. __Additional offer from the Licensor – Adapted Material.__ Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
-
-       C. __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.
+       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).
 
@@ -84,7 +76,7 @@ Your exercise of the Licensed Rights is expressly made subject to the following
 
 a. ___Attribution.___
 
-   1. If You Share the Licensed Material (including in modified form), You must:
+   1. If You Share the Licensed Material, You must:
 
        A. retain the following if it is supplied by the Licensor with the Licensed Material:
 
@@ -102,27 +94,19 @@ a. ___Attribution.___
 
        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.
 
-b. ___ShareAlike.___
-
-In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
-
-1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
-
-2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
-
-3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
-
 ### 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;
+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, including for purposes of Section 3(b); and
+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.
 
@@ -168,6 +152,7 @@ c. No term or condition of this Public License will be waived and no failure to
 
 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.” The text of the Creative Commons public licenses is dedicated to the public domain under the [CC0 Public Domain Dedication](https://creativecommons.org/publicdomain/zero/1.0/legalcode). 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 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.
+> Creative Commons may be contacted at creativecommons.org
+

Readme.md

@@ -6,146 +6,61 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/c35tkm29rm4m5364/branch/master?svg=true)](https://ci.appveyor.com/project/thomasnordquist/mqtt-explorer/branch/master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/47b26e03fce543ceac7914214482334a)](https://app.codacy.com/app/thomasnordquist/MQTT-Explorer?utm_source=github.com&utm_medium=referral&utm_content=thomasnordquist/MQTT-Explorer&utm_campaign=Badge_Grade_Dashboard)
 
-|                                                                                                                                     |                                                                                                                |                                                                                                                |
-| :---------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------: |
-| [![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) |
+|   |   |   |
+|:---:|:---:|:---:|
+|[![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.  
 Downloads can be found at the link above.
 
 This page is dedicated to its development.
 Pull-Requests and error reports are welcome.
 
-## Quick Start with GitHub Codespaces
-
-The fastest way to start developing is with GitHub Codespaces:
-
-1. Click the green "Code" button above
-2. Select "Codespaces" tab
-3. Click "Create codespace on [branch]"
-4. Wait for the environment to set up (includes Node.js and MQTT broker)
-5. Run `yarn dev:server` to start development
-
-The devcontainer includes a pre-configured MQTT broker and all development tools. See [.devcontainer/README.md](.devcontainer/README.md) for details.
-
 ## Run from sources
 
-### Desktop Application (Electron)
-
 ```bash
-npm install -g yarn
 yarn
 yarn build
 yarn start
 ```
 
-### Browser Mode (Web Application)
-
-MQTT Explorer can also run as a web application served by a Node.js server:
-
-```bash
-npm install -g yarn
-yarn
-yarn build:server
-yarn start:server
-```
-
-Then open your browser to `http://localhost:3000`. For more details, see [BROWSER_MODE.md](BROWSER_MODE.md).
-
 ## Develop
 
-### Desktop Application
-
 Launch Application
-
 ```bash
-npm install -g yarn
 yarn
 yarn dev
 ```
 
-### Browser Mode
-
-Launch in development mode with hot reload:
-
-```bash
-npm install -g yarn
-yarn
-yarn dev:server
-```
-
 The `app` directory contains all the rendering logic, the `backend` directory currently contains the models, tests, connection management, `src` contains all the electron bindings. [mqttjs](https://github.com/mqttjs/MQTT.js) is used to facilitate communication to MQTT brokers.
 
 ## Automated Tests
 
-To achieve a reliable product automated tests run regularly on CI.
+To achieve a reliable product automated tests run regularly on travis.
 
-- **Data model tests**: `yarn test:backend`
-- **App tests**: `yarn test:app`
-- **UI test suite**: `yarn test:ui` (independent, deterministic tests)
-- **Demo video**: `yarn ui-test` (UI test recording for documentation)
+  - Data model
+  - MQTT integration
+  - UI-Tests (The demo is a recorded ui test)
 
-### Run UI Test Suite
-
-The UI test suite validates core functionality through automated browser tests. Each test is independent and deterministic.
+## Run UI-tests
+A [mosquitto](https://mosquitto.org/) MQTT broker is required to run the ui-tests.
 
+Run tests with
 ```bash
-# Run with automated setup (recommended)
-./scripts/runUiTests.sh
-
-# Or run directly (requires manual MQTT broker setup)
-yarn build
-yarn test:ui
+# Run chromedriver in a separate terminal session
+./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515 --verbose
 ```
 
-See [docs/UI-TEST-SUITE.md](docs/UI-TEST-SUITE.md) for more details.
-
-### Run Demo Video Generation
-
-A [mosquitto](https://mosquitto.org/) MQTT broker is required to generate the demo video.
-
+Compile and execute tests
 ```bash
-yarn build
-yarn ui-test
+npm run build
+node dist/src/spec/webdriverio.js
 ```
 
-## Create a release
-
-Create a PR to `release` branch.
-There needs to be a "feat: some new feature" or "fix: some bugfix" commit for a new release to be created
-
-## Create a beta release
-
-Create a PR to `beta` branch. A "feat" or "fix" commit is necessary to create a new version.
-
-## Write docs
-
-```
-git clone --single-branch -b gh-pages https://github.com/thomasnordquist/MQTT-Explorer.git mqtt-explorer-pages
-cd mqtt-explorer-pages
-bundle install
-bundle exec jekyll serve --incremental
-```
-
-Readme file: `Readme.tpl.md`
-
-Preview is available at
-http://localhost:4000/Readme.tpl
-
-## Update docs
-
-```
-npm install
-./updateReadme.ts
-```
-
-The readme will be generated from the docs.
-
 ## License
 
-![CC-BY-Nc 4.0](https://img.shields.io/badge/License-CC%20BY--NC%204.0-blue.svg)  
-[CC-BY-Nc 4.0](https://creativecommons.org/licenses/by-nC/4.0/)
+![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 allows for anyone to adapt, share, and redistribute the material, as long as it is non-commercial.
+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,197 +1,180 @@
 <!DOCTYPE html>
 <html>
+  <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>
 
-<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;
-    }
-
-    [tabindex] {
-      outline: none;
-    }
-
-    @keyframes updateDark {
-      0% {
-        background-color: none;
+    <style>
+      body,
+      html {
+        margin: 0;
+        padding: 0;
       }
 
-      25% {
-        background-color: #595585;
+      [tabindex] {
+        outline: none;
       }
 
-      50% {
-        background-color: #595585;
+      @keyframes updateDark {
+        0% {
+          background-color: none;
+        }
+        25% {
+          background-color: #595585;
+        }
+        50% {
+          background-color: #595585;
+        }
+        100% {
+          background-color: none;
+        }
       }
 
-      100% {
-        background-color: none;
-      }
-    }
-
-    @keyframes updateLight {
-      0% {
-        background-color: none;
-        color: inherit;
+      @keyframes updateLight {
+        0% {
+          background-color: none;
+          color: inherit;
+        }
+        25% {
+          background-color: #c0c8c0;
+        }
+        50% {
+          background-color: #c0c8c0;
+        }
+        100% {
+          background-color: none;
+          color: inherit;
+        }
       }
 
-      25% {
-        background-color: #c0c8c0;
+      ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
       }
 
-      50% {
-        background-color: #c0c8c0;
+      ::-webkit-scrollbar-corner {
+        background-color: rgba(0, 0, 0, 0);
       }
 
-      100% {
-        background-color: none;
-        color: inherit;
+      ::-webkit-scrollbar-track {
+        -webkit-box-shadow: inset 0 0 6px rgba(60, 60, 60, 0.5);
+        background-color: rgba(140, 140, 140, 0.1);
       }
-    }
 
-    ::-webkit-scrollbar {
-      width: 8px;
-      height: 8px;
-    }
+      ::-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;
+      }
 
-    ::-webkit-scrollbar-corner {
-      background-color: rgba(0, 0, 0, 0);
-    }
+      .Resizer:hover {
+        -webkit-transition: all 0.3s ease-out;
+        transition: all 0.3s ease-out;
+      }
 
-    ::-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.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%;
+      }
 
-    ::-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::before {
+        content: '•••';
+        display: inline-block;
+        vertical-align: middle;
+        text-align: center;
+        width: 100%;
+        margin-top: -22px;
+        color: #aaa;
+        opacity: 1;
+      }
 
-    .Resizer:hover {
-      -webkit-transition: all 0.3s ease-out;
-      transition: all 0.3s ease-out;
-    }
+      .Resizer.horizontal:hover {
+        border-top: 5px solid rgba(120, 120, 120, 0.3);
+        border-bottom: 5px solid rgba(120, 120, 120, 0.3);
+      }
 
-    .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: 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.horizontal::before {
-      content: '•••';
-      display: inline-block;
-      vertical-align: middle;
-      text-align: center;
-      width: 100%;
-      margin-top: -22px;
-      color: #aaa;
-      opacity: 1;
-    }
+      .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.horizontal:hover {
-      border-top: 5px solid rgba(120, 120, 120, 0.3);
-      border-bottom: 5px solid rgba(120, 120, 120, 0.3);
-    }
+      .Resizer.vertical:hover {
+        border-left: 0px solid rgba(130, 130, 130, 0.3);
+        border-right: 8px solid rgba(140, 140, 140, 0.3);
+      }
 
-    .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.disabled {
+        cursor: not-allowed;
+      }
+      .Resizer.disabled:hover {
+        border-color: transparent;
+      }
 
-    .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;
-    }
+      .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)
+      }
 
-    .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>
-  <script>
-    global = globalThis //<- this should be enough
-  </script>
-</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>
+      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,97 +4,84 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "webpack --mode production",
+    "build": "yarn rebuild && webpack --mode production",
     "dev": "node_modules/.bin/webpack-dev-server --mode development --progress",
-    "test": "mocha --require tsx --require source-map-support/register --recursive src/*/**/*.spec.ts",
-    "mochatest": "mocha --require tsx --require source-map-support/register --recursive src/*/**/*.spec.ts"
-  },
-  "engines": {
-    "node": ">=20"
+    "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": "CC-BY-ND-4.0",
   "dependencies": {
-    "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
-    "@mui/icons-material": "^5.18.0",
-    "@mui/lab": "^5.0.0-alpha.177",
-    "@mui/material": "^5.18.0",
-    "@mui/styles": "^6.4.8",
-    "@types/react-transition-group": "^4.4.11",
-    "ace-builds": "^1.4.11",
-    "axios": "^1.13.2",
-    "compare-versions": "^6.1.1",
-    "copy-text-to-clipboard": "^3.2.0",
-    "d3": "^7.9.0",
-    "d3-shape": "^3.2.0",
-    "diff": "^7.0.0",
-    "dot-prop": "^5.3.0",
-    "events": "^3.3.0",
+    "@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": "^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.3.7",
+    "immutable": "^4.0.0-rc.12",
     "in-viewport": "^3.6.0",
-    "js-base64": "^3.7.8",
+    "js-base64": "^2.5.1",
     "json-to-ast": "^2.1.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
+    "moment": "^2.24.0",
     "moving-average": "^1.0.0",
     "number-abbreviate": "^2.0.0",
-    "os-browserify": "^0.3.0",
     "parse-duration": "^0.1.1",
-    "path-browserify": "^1.0.1",
-    "prismjs": "^1.29.0",
-    "react": "^18.3.1",
-    "react-ace": "^12.0.0",
-    "react-dom": "^18.3.1",
-    "react-redux": "^9.2.0",
-    "react-resize-detector": "^11.0.1",
-    "react-split-pane": "^0.1.92",
-    "react-transition-group": "^4.4.5",
-    "react-vis": "^1.12.1",
-    "redux": "^5.0.1",
-    "redux-batched-actions": "^0.5.0",
-    "redux-thunk": "^3.1.0",
+    "prismjs": "^1.15.0",
+    "react": "16.8",
+    "react-ace": "^7.0.1",
+    "react-dom": "^16.7.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",
+    "redux-thunk": "^2.3.0",
     "sha1": "^1.1.1",
-    "socket.io-client": "^4.8.1",
-    "url": "^0.11.4",
-    "uuid": "^11.0.0"
+    "socket.io-client": "^2.2.0",
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@babel/runtime": "^7.28.4",
-    "@types/d3": "^7.4.3",
-    "@types/diff": "^7.0.0",
-    "@types/get-value": "^3.0.5",
-    "@types/lodash.debounce": "^4.0.9",
-    "@types/node": "^25.0.3",
-    "@types/prismjs": "^1.26.5",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
-    "@types/react-redux": "^7.1.34",
-    "@types/react-resize-detector": "^4.0.3",
+    "@types/d3": "^5.7.2",
+    "@types/diff": "^4.0.1",
+    "@types/get-value": "^3.0.1",
+    "@types/node": "^12.0.4",
+    "@types/prismjs": "^1.9.1",
+    "@types/react": "^16.7.18",
+    "@types/react-dom": "^16.0.11",
+    "@types/react-redux": "^7.0.9",
+    "@types/react-resize-detector": "^4.0.1",
     "@types/sha1": "^1.1.1",
-    "@types/socket.io-client": "^3.0.0",
-    "@types/uuid": "^11.0.0",
-    "@types/vis": "^4.21.24",
-    "chai": "^4.5.0",
-    "cross-env": "^7.0.3",
-    "css-loader": "^7.1.2",
-    "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.6.3",
-    "lodash": "^4.17.21",
-    "mocha": "^10.8.2",
-    "moment": "^2.30.1",
-    "node-loader": "^2.0.0",
-    "source-map-loader": "^5.0.0",
-    "style-loader": "^4.0.0",
-    "ts-loader": "^9.5.1",
-    "typescript": "^5.9.3",
-    "webpack": "^5.98.0",
-    "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-cli": "^6.0.1",
-    "webpack-dev-server": "^5.2.0"
+    "@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": "^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",
+    "webpack": "^4.28.2",
+    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.14"
   },
   "peerDependencies": {
-    "electron": "^39"
+    "electron": "^5.0.5"
   }
 }

app/src/actions/Charts.ts

@@ -45,7 +45,9 @@ export const saveCharts = () => async (dispatch: Dispatch<any>, getState: () =>
     return
   }
 
-  const charts = getState().charts.get('charts').toArray()
+  const charts = getState()
+    .charts.get('charts')
+    .toArray()
 
   let viewStates: ConnectionViewStateDictionary | undefined
   try {
@@ -60,55 +62,63 @@ export const saveCharts = () => async (dispatch: Dispatch<any>, getState: () =>
   }
 }
 
-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 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
   }
 
-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())
-  }
+  dispatch({
+    type: ActionTypes.CHARTS_ADD,
+    chart: chartParameters,
+  })
+  dispatch(saveCharts())
+  dispatch(showNotification('Added to chart panel'))
+}
 
-export const removeChart =
-  (chartParameters: ChartParameters) => async (dispatch: Dispatch<any>, getState: () => AppState) => {
-    dispatch({
-      chart: chartParameters,
-      type: ActionTypes.CHARTS_REMOVE,
-    })
-    dispatch(saveCharts())
-  }
+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 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 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 {

app/src/actions/Connection.ts

@@ -11,29 +11,31 @@ import { showError } from './Global'
 import { TopicViewModel } from '../model/TopicViewModel'
 import { addMqttConnectionEvent, makeConnectionStateEvent, removeConnection, rendererEvents } from '../../../events'
 
-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
+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 => {
-      if (dataSourceState.connected) {
-        const didReconnect = Boolean(getState().connection.tree)
-        if (!didReconnect) {
-          const tree = new q.Tree<TopicViewModel>()
-          tree.updateWithConnection(rendererEvents, connectionId)
-          dispatch(showTree(tree))
-          dispatch(connected(tree, host!))
-        }
-      } else if (dataSourceState.error) {
-        dispatch(showError(dataSourceState.error))
-        dispatch(disconnect())
+  rendererEvents.subscribe(event, dataSourceState => {
+    if (dataSourceState.connected) {
+      const didReconnect = Boolean(getState().connection.tree)
+      if (!didReconnect) {
+        const tree = new q.Tree<TopicViewModel>()
+        tree.updateWithConnection(rendererEvents, connectionId)
+        dispatch(showTree(tree))
+        dispatch(connected(tree, host!))
       }
-      dispatch(updateHealth(dataSourceState))
-    })
-  }
+    } else if (dataSourceState.error) {
+      dispatch(showError(dataSourceState.error))
+      dispatch(disconnect())
+    }
+    dispatch(updateHealth(dataSourceState))
+  })
+}
 
 const updateHealth = (dataSourceState: DataSourceState) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   let state

app/src/actions/ConnectionManager.ts

@@ -9,14 +9,13 @@ import {
 import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
 import { Dispatch } from 'redux'
 import { showError } from './Global'
+import { remote } from 'electron'
+import * as fs from 'fs'
 import * as path from 'path'
-import { ActionTypes, Action } from '../reducers/ConnectionManager'
-import { Subscription } from '../../../backend/src/DataSource/MqttSource'
-import { connectionsMigrator } from './migrations/Connection'
-import { rendererRpc, readFromFile } from '../../../events'
-import { makeOpenDialogRpc } from '../../../events/OpenDialogRequest'
 
-export interface ConnectionDictionary {
+import { ActionTypes, Action } from '../reducers/ConnectionManager'
+
+interface ConnectionDictionary {
   [s: string]: ConnectionOptions
 }
 const storedConnectionsIdentifier: StorageIdentifier<ConnectionDictionary> = {
@@ -28,12 +27,6 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getS
   try {
     await ensureConnectionsHaveBeenInitialized()
     connections = await persistentStorage.load(storedConnectionsIdentifier)
-
-    // Apply migrations
-    if (connections && connectionsMigrator.isMigrationNecessary(connections)) {
-      connections = connectionsMigrator.applyMigrations(connections)
-      await persistentStorage.store(storedConnectionsIdentifier, connections)
-    }
   } catch (error) {
     dispatch(showError(error))
   }
@@ -50,19 +43,21 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getS
 }
 
 export type CertificateTypes = 'selfSignedCertificate' | 'clientCertificate' | 'clientKey'
-export const selectCertificate =
-  (type: CertificateTypes, connectionId: string) => async (dispatch: Dispatch<any>, getState: () => AppState) => {
-    try {
-      const certificate = await openCertificate()
-      dispatch(
-        updateConnection(connectionId, {
-          [type]: certificate,
-        })
-      )
-    } catch (error) {
-      dispatch(showError(error))
-    }
+export const selectCertificate = (type: CertificateTypes, connectionId: string) => async (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+) => {
+  try {
+    const certificate = await openCertificate()
+    dispatch(
+      updateConnection(connectionId, {
+        [type]: certificate,
+      })
+    )
+  } catch (error) {
+    dispatch(showError(error))
   }
+}
 
 async function openCertificate(): Promise<CertificateParameters> {
   const rejectReasons = {
@@ -70,25 +65,35 @@ async function openCertificate(): Promise<CertificateParameters> {
     certificateSizeDoesNotMatch: 'Certificate size larger/smaller then expected.',
   }
 
-  const openDialogReturnValue = await rendererRpc.call(makeOpenDialogRpc(), {
-    properties: ['openFile'],
-    securityScopedBookmarks: true,
+  return new Promise((resolve, reject) => {
+    remote.dialog.showOpenDialog(
+      { properties: ['openFile'], securityScopedBookmarks: true },
+      (filePaths?: Array<string>) => {
+        const selectedFile = filePaths && filePaths[0]
+        if (!selectedFile) {
+          reject(rejectReasons.noCertificateSelected)
+          return
+        }
+
+        fs.readFile(selectedFile, (error, data) => {
+          if (error) {
+            reject(error)
+            return
+          }
+
+          if (data.length > 16_384 || data.length < 128) {
+            reject(rejectReasons.certificateSizeDoesNotMatch)
+            return
+          }
+
+          resolve({
+            data: data.toString('base64'),
+            name: path.basename(selectedFile),
+          })
+        })
+      }
+    )
   })
-
-  const selectedFile = openDialogReturnValue.filePaths && openDialogReturnValue.filePaths[0]
-  if (!selectedFile) {
-    throw rejectReasons.noCertificateSelected
-  }
-
-  const data = await rendererRpc.call(readFromFile, { filePath: selectedFile })
-  if (data.length > 16_384 || data.length < 64) {
-    throw rejectReasons.certificateSizeDoesNotMatch
-  }
-
-  return {
-    data: data.toString('base64'),
-    name: path.basename(selectedFile),
-  }
 }
 
 export const saveConnectionSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
@@ -106,13 +111,13 @@ export const updateConnection = (connectionId: string, changeSet: Partial<Connec
   type: ActionTypes.CONNECTION_MANAGER_UPDATE_CONNECTION,
 })
 
-export const addSubscription = (subscription: Subscription, connectionId: string): Action => ({
+export const addSubscription = (subscription: string, connectionId: string): Action => ({
   connectionId,
   subscription,
   type: ActionTypes.CONNECTION_MANAGER_ADD_SUBSCRIPTION,
 })
 
-export const deleteSubscription = (subscription: Subscription, connectionId: string): Action => ({
+export const deleteSubscription = (subscription: string, connectionId: string): Action => ({
   connectionId,
   subscription,
   type: ActionTypes.CONNECTION_MANAGER_DELETE_SUBSCRIPTION,
@@ -179,4 +184,31 @@ async function ensureConnectionsHaveBeenInitialized() {
 
     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,7 +1,7 @@
 import { ActionTypes, ConfirmationRequest } from '../reducers/Global'
 import { Dispatch } from 'redux'
 
-export const showError = (error?: string | unknown) => ({
+export const showError = (error?: string) => ({
   error,
   type: ActionTypes.showError,
 })

app/src/actions/Publish.ts

@@ -2,10 +2,7 @@ import { Action, ActionTypes } from '../reducers/Publish'
 import { AppState } from '../reducers'
 import { Base64Message } from '../../../backend/src/Model/Base64Message'
 import { Dispatch } from 'redux'
-import { MqttMessage, makePublishEvent, rendererEvents, rendererRpc, readFromFile } from '../../../events'
-import { makeOpenDialogRpc } from '../../../events/OpenDialogRequest'
-import { showError } from './Global'
-import { Base64 } from 'js-base64'
+import { makePublishEvent, rendererEvents } from '../../../events'
 
 export const setTopic = (topic?: string): Action => {
   return {
@@ -14,50 +11,6 @@ export const setTopic = (topic?: string): Action => {
   }
 }
 
-export const openFile =
-  (encoding: BufferEncoding = 'utf8') =>
-  async (dispatch: Dispatch<any>, getState: () => AppState) => {
-    try {
-      const file = await getFileContent(encoding)
-      if (file) {
-        dispatch(setPayload(file.data))
-      }
-    } catch (error) {
-      dispatch(showError(error))
-    }
-  }
-
-type FileParameters = {
-  name: string
-  data: string
-}
-async function getFileContent(encoding: BufferEncoding): Promise<FileParameters | undefined> {
-  const rejectReasons = {
-    noFileSelected: 'No file selected',
-    errorReadingFile: 'Error reading file',
-  }
-
-  const { canceled, filePaths } = await rendererRpc.call(makeOpenDialogRpc(), {
-    properties: ['openFile'],
-    securityScopedBookmarks: true,
-  })
-
-  if (canceled) {
-    return
-  }
-
-  const selectedFile = filePaths[0]
-  if (!selectedFile) {
-    throw rejectReasons.noFileSelected
-  }
-  try {
-    const data = await rendererRpc.call(readFromFile, { filePath: selectedFile, encoding })
-    return { name: selectedFile, data: data.toString(encoding) }
-  } catch (error) {
-    throw rejectReasons.errorReadingFile
-  }
-}
-
 export const setPayload = (payload?: string): Action => {
   return {
     payload,
@@ -81,14 +34,14 @@ export const setEditorMode = (editorMode: string): Action => {
 
 export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, getState: () => AppState) => {
   const state = getState()
-  const topic = state.publish.manualTopic ?? state.tree.get('selectedTopic')?.path()
+  const topic = state.publish.topic
 
   if (!topic) {
     return
   }
 
   const publishEvent = makePublishEvent(connectionId)
-  const mqttMessage: Partial<MqttMessage> = {
+  const mqttMessage = {
     topic,
     payload: state.publish.payload ? Base64Message.fromString(state.publish.payload) : null,
     retain: state.publish.retain,

app/src/actions/Settings.ts

@@ -1,5 +1,5 @@
 import * as q from '../../../backend/src/Model'
-import { ActionTypes, SettingsStateModel, TopicOrder, ValueRendererDisplayMode } from '../reducers/Settings'
+import { ActionTypes, SettingsStateModel, TopicOrder } from '../reducers/Settings'
 import { AppState } from '../reducers'
 import { autoExpandLimitSet } from '../components/SettingsDrawer/Settings'
 import { Base64Message } from '../../../backend/src/Model/Base64Message'
@@ -10,12 +10,6 @@ import { globalActions } from './'
 import { showError } from './Global'
 import { showTree } from './Tree'
 import { TopicViewModel } from '../model/TopicViewModel'
-import { backendEvents } from '../../../events'
-import {
-  Events,
-  MAX_MESSAGE_SIZE_UNLIMITED,
-  MAX_MESSAGE_SIZE_DEFAULT,
-} from '../../../events/EventsV2'
 
 const settingsIdentifier: StorageIdentifier<Partial<SettingsStateModel>> = {
   id: 'Settings',
@@ -28,9 +22,6 @@ export const loadSettings = () => async (dispatch: Dispatch<any>, getState: () =
       settings: getState().settings.merge(settings),
       type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS,
     })
-    // Emit the maxMessageSize to backend after loading settings
-    const maxMessageSize = getState().settings.get('maxMessageSize')
-    backendEvents.emit(Events.setMaxMessageSize, maxMessageSize)
   } catch (error) {
     dispatch(showError(error))
   }
@@ -38,14 +29,11 @@ export const loadSettings = () => async (dispatch: Dispatch<any>, getState: () =
 }
 
 export const storeSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
-  const currentSettings = getState().settings.toJS()
   const settings = {
-    ...currentSettings,
+    ...getState().settings.toJS(),
     autoExpandLimit: undefined,
     topicFilter: undefined,
     visible: undefined,
-    // Don't persist unlimited - reset to default
-    maxMessageSize: currentSettings.maxMessageSize === MAX_MESSAGE_SIZE_UNLIMITED ? MAX_MESSAGE_SIZE_DEFAULT : currentSettings.maxMessageSize,
   }
 
   try {
@@ -55,14 +43,12 @@ export const storeSettings = () => async (dispatch: Dispatch<any>, getState: ()
   }
 }
 
-export const setAutoExpandLimit =
-  (autoExpandLimit: number = 0) =>
-  (dispatch: Dispatch<any>) => {
-    dispatch({
-      autoExpandLimit,
-      type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
-    })
-  }
+export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    autoExpandLimit,
+    type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
+  })
+}
 
 export const setTimeLocale = (timeLocale: string) => (dispatch: Dispatch<any>) => {
   dispatch({
@@ -80,14 +66,13 @@ export const selectTopicWithMouseOver = (doSelect: boolean) => (dispatch: Dispat
   dispatch(storeSettings())
 }
 
-export const setValueDisplayMode =
-  (valueRendererDisplayMode: ValueRendererDisplayMode) => (dispatch: Dispatch<any>) => {
-    dispatch({
-      valueRendererDisplayMode,
-      type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE,
-    })
-    dispatch(storeSettings())
-  }
+export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch<any>) => {
+  dispatch({
+    valueRendererDisplayMode,
+    type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE,
+  })
+  dispatch(storeSettings())
+}
 
 export const toggleHighlightTopicUpdates = () => (dispatch: Dispatch<any>) => {
   dispatch({
@@ -96,15 +81,13 @@ export const toggleHighlightTopicUpdates = () => (dispatch: Dispatch<any>) => {
   dispatch(storeSettings())
 }
 
-export const setTopicOrder =
-  (topicOrder: TopicOrder = TopicOrder.none) =>
-  (dispatch: Dispatch<any>) => {
-    dispatch({
-      topicOrder,
-      type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
-    })
-    dispatch(storeSettings())
-  }
+export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    topicOrder,
+    type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
+  })
+  dispatch(storeSettings())
+}
 
 export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   const { tree } = getState().connection
@@ -122,15 +105,21 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, get
   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.payload &&
-      node.message.payload.toUnicodeString().toLowerCase().indexOf(filterStr) !== -1
+      node.message.value &&
+      Base64Message.toUnicodeString(node.message.value)
+        .toLowerCase()
+        .indexOf(filterStr) !== -1
 
     return Boolean(messageMatches)
   }
@@ -181,12 +170,3 @@ export const toggleTheme = () => (dispatch: Dispatch<any>, getState: () => AppSt
   })
   dispatch(storeSettings())
 }
-
-export const setMaxMessageSize = (maxMessageSize: number) => (dispatch: Dispatch<any>) => {
-  dispatch({
-    maxMessageSize,
-    type: ActionTypes.SETTINGS_SET_MAX_MESSAGE_SIZE,
-  })
-  dispatch(storeSettings())
-  backendEvents.emit(Events.setMaxMessageSize, maxMessageSize)
-}

app/src/actions/Tree.ts

@@ -7,15 +7,17 @@ import { batchActions } from 'redux-batched-actions'
 import { globalActions } from './'
 import { setTopic } from './Publish'
 import { TopicViewModel } from '../model/TopicViewModel'
-import debounce from 'lodash.debounce'
+const debounce = require('lodash.debounce')
 export { clearTopic } from './clearTopic'
 
 export { moveSelectionUpOrDownwards, moveInward, moveOutward } from './visibleTreeTraversal'
 
-export const selectTopic =
-  (topic: q.TreeNode<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState) => {
-    debouncedSelectTopic(topic, dispatch, getState)
-  }
+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) => {
@@ -27,14 +29,19 @@ const debouncedSelectTopic = debounce(
 
     // Update publish topic
     let setTopicDispatch: any | undefined
-    if (!getState().publish.manualTopic) {
+    if (!getState().publish.topic) {
       setTopicDispatch = setTopic(topic.path())
-    } else if (previouslySelectedTopic && previouslySelectedTopic.path() === getState().publish.manualTopic) {
+    } else if (previouslySelectedTopic && previouslySelectedTopic.path() === getState().publish.topic) {
       setTopicDispatch = setTopic(topic.path())
     }
 
-    previouslySelectedTopic?.viewModel?.setSelected(false)
-    topic.viewModel?.setSelected(true)
+    if (previouslySelectedTopic && previouslySelectedTopic.viewModel) {
+      previouslySelectedTopic.viewModel.setSelected(false)
+    }
+
+    if (topic.viewModel) {
+      topic.viewModel.setSelected(true)
+    }
 
     const selectTreeTopicDispatch = {
       selectedTopic: topic,
@@ -67,26 +74,25 @@ function destroyUnreferencedTree(state: AppState) {
   }
 }
 
-export const resetStore =
-  () =>
-  (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
-    destroyUnreferencedTree(getState())
+export const resetStore = () => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
+  destroyUnreferencedTree(getState())
 
-    return dispatch({
-      type: ActionTypes.TREE_RESET_STORE,
-    })
-  }
+  return dispatch({
+    type: ActionTypes.TREE_RESET_STORE,
+  })
+}
 
-export const showTree =
-  (tree: q.Tree<TopicViewModel> | undefined) =>
-  (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
-    destroyUnreferencedTree(getState())
+export const showTree = (tree: q.Tree<TopicViewModel> | undefined) => (
+  dispatch: Dispatch<any>,
+  getState: () => AppState
+): AnyAction => {
+  destroyUnreferencedTree(getState())
 
-    return dispatch({
-      tree,
-      type: ActionTypes.TREE_SHOW_TREE,
-    })
-  }
+  return dispatch({
+    tree,
+    type: ActionTypes.TREE_SHOW_TREE,
+  })
+}
 
 export const togglePause = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   const paused = getState().tree.get('paused')

app/src/actions/clearTopic.ts

@@ -5,50 +5,51 @@ 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]
+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()
+  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 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.`
-        )
+    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) {
+    )
+    if (!confirmed) {
       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,
-          messageId: undefined,
-        }
-        // Rate limit deletion
-        setTimeout(() => rendererEvents.emit(publishEvent, mqttMessage), 20 * idx)
-      })
   }
+
+  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/migrations/Connection.ts

@@ -1,94 +0,0 @@
-import { ConfigMigrator, Migration } from '../../utils/ConfigMigrator'
-import { ConnectionDictionary } from '../ConnectionManager'
-import { ConnectionOptions } from '../../model/ConnectionOptions'
-
-export interface ConnectionOptionsV0 {
-  type: 'mqtt'
-  id: string
-  host: string
-  protocol: 'mqtt' | 'ws'
-  basePath?: string
-  port: number
-  name: string
-  username?: string
-  password?: string
-  encryption: boolean
-  certValidation: boolean
-  // selfSignedCertificate?: CertificateParameters
-  // clientCertificate?: CertificateParameters
-  // clientKey?: CertificateParameters
-  clientId?: string
-  subscriptions: Array<string>
-}
-
-let migrations: Migration[] = [
-  // iot.eclipse.org ha moved to mqtt.eclipse.org
-  {
-    from: undefined,
-    apply: (connection: ConnectionOptionsV0): ConnectionOptionsV0 => {
-      if (connection.id == 'iot.eclipse.org' && connection.host == 'iot.eclipse.org' && connection.port == 1883) {
-        return {
-          ...connection,
-          id: 'mqtt.eclipse.org',
-          host: 'mqtt.eclipse.org',
-          name: 'mqtt.eclipse.org',
-        }
-      }
-
-      return {
-        ...connection,
-      }
-    },
-  },
-  // Remove stored clientId if it is the default generated client id. This allows to connect multiple instances of mqtt explorer to the same broker.
-  // A randomly generated clientId will be used if no clientId is set.
-  {
-    from: undefined,
-    apply: (connection: ConnectionOptionsV0): ConnectionOptionsV0 => {
-      if (connection.clientId && /mqtt-explorer-[0-9a-f]{8}/.test(connection.clientId)) {
-        return {
-          ...connection,
-          clientId: undefined,
-        }
-      }
-
-      return {
-        ...connection,
-      }
-    },
-  },
-  // Added QoS level to subscription options
-  {
-    from: undefined,
-    apply: (connection: ConnectionOptionsV0): ConnectionOptions => {
-      return {
-        ...connection,
-        configVersion: 1,
-        subscriptions: connection.subscriptions.map(topic => ({ topic, qos: 0 })),
-      }
-    },
-  },
-]
-
-const connectionMigrator = new ConfigMigrator(migrations)
-
-function isMigrationNecessary(connections: ConnectionDictionary): boolean {
-  return Object.values(connections)
-    .map(connection => connectionMigrator.isMigrationNecessary(connection))
-    .reduce((a, b) => a || b, false)
-}
-
-function applyMigrations(connections: ConnectionDictionary): ConnectionDictionary {
-  let newConnectionDictionary: ConnectionDictionary = {}
-  Object.keys(connections).forEach(key => {
-    let newConnection = connectionMigrator.applyMigrations(connections[key]) as any
-    newConnectionDictionary[newConnection.id] = newConnection
-  })
-
-  return newConnectionDictionary
-}
-
-export const connectionsMigrator = {
-  isMigrationNecessary,
-  applyMigrations,
-}

app/src/actions/visibleTreeTraversal.ts

@@ -6,56 +6,53 @@ 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')
+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))
+  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
   }
 
-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'))
+  }
+}
 
-    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
   }
 
-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'))
-    }
+  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)

app/src/components/App.tsx

@@ -1,6 +1,6 @@
 import ConfirmationDialog from './ConfirmationDialog'
 import ConnectionSetup from './ConnectionSetup/ConnectionSetup'
-import CssBaseline from '@mui/material/CssBaseline'
+import CssBaseline from '@material-ui/core/CssBaseline'
 import ErrorBoundary from './ErrorBoundary'
 import Notification from './Layout/Notification'
 import React from 'react'
@@ -11,9 +11,7 @@ import { bindActionCreators } from 'redux'
 import { ConfirmationRequest } from '../reducers/Global'
 import { connect } from 'react-redux'
 import { globalActions, settingsActions } from '../actions'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
-;(window as any).global = window
+import { Theme, withStyles } from '@material-ui/core/styles'
 
 const Settings = React.lazy(() => import('./SettingsDrawer/Settings'))
 const ContentView = React.lazy(() => import('./Layout/ContentView'))
@@ -68,8 +66,6 @@ class App extends React.PureComponent<Props, {}> {
       return null
     }
 
-    const anyProps: any = {}
-
     return (
       <div className={centerContent}>
         <CssBaseline />
@@ -77,7 +73,7 @@ class App extends React.PureComponent<Props, {}> {
           <ConfirmationDialog confirmationRequests={this.props.confirmationRequests} />
           {this.renderNotification()}
           <React.Suspense fallback={<div></div>}>
-            <Settings {...anyProps} />
+            <Settings />
           </React.Suspense>
           <div className={centerContent}>
             <div className={`${settingsVisible ? contentShift : content}`}>
@@ -161,4 +157,9 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(App))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(App)
+)

app/src/components/BrowserAuthWrapper.tsx

@@ -1,64 +0,0 @@
-import * as React from 'react'
-import { LoginDialog } from './LoginDialog'
-
-interface BrowserAuthWrapperProps {
-  children: React.ReactNode
-}
-
-const isBrowserMode =
-  typeof window !== 'undefined' && (typeof process === 'undefined' || process.env?.BROWSER_MODE === 'true')
-
-export function BrowserAuthWrapper(props: BrowserAuthWrapperProps) {
-  const [isAuthenticated, setIsAuthenticated] = React.useState(false)
-  const [loginError, setLoginError] = React.useState<string | undefined>()
-  const [showLogin, setShowLogin] = React.useState(false)
-
-  React.useEffect(() => {
-    if (!isBrowserMode) {
-      // Not in browser mode, skip authentication
-      setIsAuthenticated(true)
-      return
-    }
-
-    // Check if already authenticated
-    const username = sessionStorage.getItem('mqtt-explorer-username')
-    const password = sessionStorage.getItem('mqtt-explorer-password')
-
-    if (username && password) {
-      // Try to use stored credentials
-      setIsAuthenticated(true)
-    } else {
-      // Show login dialog
-      setShowLogin(true)
-    }
-  }, [])
-
-  const handleLogin = async (username: string, password: string) => {
-    try {
-      // Store credentials in session storage
-      sessionStorage.setItem('mqtt-explorer-username', username)
-      sessionStorage.setItem('mqtt-explorer-password', password)
-
-      // The socket will use these credentials on next connection
-      setIsAuthenticated(true)
-      setShowLogin(false)
-      setLoginError(undefined)
-
-      // Reload to reinitialize socket with new auth
-      window.location.reload()
-    } catch (error) {
-      setLoginError('Login failed. Please check your credentials.')
-    }
-  }
-
-  if (!isBrowserMode) {
-    // Not in browser mode, render children directly
-    return <>{props.children}</>
-  }
-
-  if (!isAuthenticated) {
-    return <LoginDialog open={showLogin} onLogin={handleLogin} error={loginError} />
-  }
-
-  return <>{props.children}</>
-}

app/src/components/Chart/Chart.tsx

@@ -1,13 +1,14 @@
 import DateFormatter from '../helper/DateFormatter'
 import NoData from './NoData'
 import NumberFormatter from '../helper/NumberFormatter'
-import React, { memo, useCallback, useRef, useEffect } from 'react'
+import React, { memo, useCallback } from 'react'
 import TooltipComponent from './TooltipComponent'
-import { useResizeDetector } from 'react-resize-detector'
-import { emphasize, useTheme } from '@mui/material/styles'
+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'
@@ -16,85 +17,89 @@ 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 memo((props: Props) => {
-  const theme = useTheme()
-  const [tooltip, setTooltip] = React.useState<Tooltip | undefined>()
-  const { width = 300, ref } = useResizeDetector()
+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 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 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 showTooltip = React.useCallback((point: Point, something: { event: MouseEvent }) => {
+      if (!something) {
+        return
+      }
+      setTooltip({ point, value: hintFormatter(point), element: something.event.target as any })
+    }, [])
 
-  const paletteColor =
-    theme.palette.mode === 'light' ? theme.palette.secondary.dark : theme.palette.primary.light
-  const color = props.color ? props.color : paletteColor
+    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 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 formatYAxis = useCallback((num: number) => abbreviate(num), [])
 
-  const xDomain = useCustomXDomain(props)
-  const yDomain = useCustomYDomain(props)
+    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 ref={ref} style={{ height: '150px', width: '100%', position: 'relative' }}>
-        {data.length === 0 ? <NoData /> : null}
-        <XYPlot
-          width={width || 300}
-          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} />
-          </Hint>
-        </XYPlot>
+    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>
-    </div>
-  )
-})
+    )
+  })
+)

app/src/components/Chart/NoData.tsx

@@ -1,5 +1,5 @@
 import React, { memo } from 'react'
-import { Typography } from '@mui/material'
+import { Typography } from '@material-ui/core'
 
 function NoData() {
   return (

app/src/components/Chart/TooltipComponent.tsx

@@ -1,10 +1,9 @@
 import React, { memo } from 'react'
-import { alpha as fade } from '@mui/material/styles'
-import { Fade, Grow, Paper, Popper, Typography, useTheme } from '@mui/material'
+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 }) {
-  const theme = useTheme()
+function TooltipComponent(props: { tooltip?: Tooltip; theme: Theme }) {
   const { tooltip } = props
   return (
     <Popper
@@ -27,9 +26,9 @@ function TooltipComponent(props: { tooltip?: Tooltip }) {
                 padding: '4px',
                 marginTop: '-12px',
                 backgroundColor: fade(
-                  theme.palette.mode === 'light'
-                    ? theme.palette.background.paper
-                    : theme.palette.background.default,
+                  props.theme.palette.type === 'light'
+                    ? props.theme.palette.background.paper
+                    : props.theme.palette.background.default,
                   0.7
                 ),
               }}
@@ -57,4 +56,4 @@ function TooltipComponent(props: { tooltip?: Tooltip }) {
   )
 }
 
-export default memo(TooltipComponent)
+export default withTheme(memo(TooltipComponent))

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

@@ -2,20 +2,16 @@ import { Props } from '../Chart'
 import { useMemo } from 'react'
 import { Point } from '../Model'
 
-function defaultFor(a: number | undefined, b: number) {
-  return a === undefined ? b : a
-}
-
 export function useCustomYDomain(props: Props) {
   return useMemo(() => {
     const data = props.data
     const calculatedDomain = domainForData(data)
     const yDomain: [number, number] = props.range
-      ? [defaultFor(props.range[0], calculatedDomain[0]), defaultFor(props.range[1], calculatedDomain[1])]
+      ? [props.range[0] || calculatedDomain[0], props.range[1] || calculatedDomain[1]]
       : calculatedDomain
 
     return yDomain
-  }, [props.data, props.range])
+  }, [props.data])
 }
 
 function domainForData(data: Array<Point>): [number, number] {
@@ -23,10 +19,8 @@ function domainForData(data: Array<Point>): [number, number] {
     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

app/src/components/ChartPanel/ChartActions.tsx

@@ -1,7 +1,7 @@
 import React, { useRef } from 'react'
-import Play from '@mui/icons-material/PlayArrow'
-import Pause from '@mui/icons-material/PauseCircleFilled'
-import Clear from '@mui/icons-material/Clear'
+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'

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

@@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'
 import { ChartParameters } from '../../../reducers/Charts'
 import { connect } from 'react-redux'
-import { Menu, MenuItem } from '@mui/material'
+import { Menu, MenuItem } from '@material-ui/core'
 import { colors as createColors } from './colors'
 
 function chartParametersForColor(chart: ChartParameters, color?: string) {
@@ -65,4 +65,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(memo(ColorSettings))
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(memo(ColorSettings))

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

@@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'
 import { ChartParameters, PlotCurveTypes } from '../../../reducers/Charts'
 import { connect } from 'react-redux'
-import { Menu, MenuItem, Typography } from '@mui/material'
+import { Menu, MenuItem, Typography } from '@material-ui/core'
 
 function chartParametersForAction(chart: ChartParameters, action: string) {
   return {
@@ -60,4 +60,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(InterpolationSettings)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(InterpolationSettings)

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

@@ -1,10 +1,10 @@
 import * as React from 'react'
-import ArrowUpward from '@mui/icons-material/ArrowUpward'
+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 '@mui/material'
+import { MenuItem, Typography, ListItemIcon } from '@material-ui/core'
 
 function MoveUp(props: { actions: { chart: typeof chartActions }; chart: ChartParameters; close: () => void }) {
   const moveUp = React.useCallback(() => {
@@ -33,4 +33,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(MoveUp)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(MoveUp)

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

@@ -1,6 +1,6 @@
 import React, { useCallback, useState, ChangeEvent, MouseEvent, useRef, useEffect, useMemo } from 'react'
 import { ChartParameters } from '../../../reducers/Charts'
-import { Menu, TextField, Typography } from '@mui/material'
+import { Menu, TextField, Typography } from '@material-ui/core'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'
@@ -95,7 +95,10 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(RangeSettings)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(RangeSettings)
 
 function useRangeStateToFireUpdateAction(
   rangeFrom: string | number | undefined,

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

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import ChartSettings from '.'
 import CustomIconButton from '../../helper/CustomIconButton'
-import MoreVertIcon from '@mui/icons-material/Settings'
+import MoreVertIcon from '@material-ui/icons/Settings'
 import { ChartParameters } from '../../../reducers/Charts'
 
 export function SettingsButton(props: {

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

@@ -1,6 +1,6 @@
 import React, { memo } from 'react'
 import { ChartParameters } from '../../../reducers/Charts'
-import { Menu, MenuItem, TextField, Typography } from '@mui/material'
+import { Menu, MenuItem, TextField, Typography } from '@material-ui/core'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'
@@ -47,4 +47,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(memo(Size))
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(memo(Size))

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

@@ -1,6 +1,6 @@
 import React, { ChangeEvent, MouseEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { bindActionCreators } from 'redux'
-import { Button, Menu, TextField, Typography } from '@mui/material'
+import { Button, Menu, TextField, Typography } from '@material-ui/core'
 import { chartActions } from '../../../actions'
 import { ChartParameters } from '../../../reducers/Charts'
 import { connect } from 'react-redux'
@@ -96,4 +96,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(TimeRangeSettings)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(TimeRangeSettings)

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

@@ -12,7 +12,7 @@ import {
   yellow,
   brown,
   blueGrey,
-} from '@mui/material/colors'
+} from '@material-ui/core/colors'
 
 export function colors() {
   function colorToInt(color: string): [number, number, number] {

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

@@ -1,17 +1,17 @@
-import BarChart from '@mui/icons-material/BarChart'
-import Clear from '@mui/icons-material/Refresh'
-import ColorLens from '@mui/icons-material/ColorLens'
+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 '@mui/icons-material/MultilineChart'
+import MultilineChart from '@material-ui/icons/MultilineChart'
 import RangeSettings from './RangeSettings'
 import React, { memo } from 'react'
 import Size from './Size'
-import Sort from '@mui/icons-material/Sort'
+import Sort from '@material-ui/icons/Sort'
 import TimeRangeSettings from './TimeRangeSettings'
 import { ChartParameters } from '../../../reducers/Charts'
-import { Menu, MenuItem, ListItemIcon, Typography } from '@mui/material'
+import { Menu, MenuItem, ListItemIcon, Typography } from '@material-ui/core'
 
 function ChartSettings(props: {
   open: boolean
@@ -25,7 +25,6 @@ function ChartSettings(props: {
   const [interpolationVisible, setInterpolationVisible] = React.useState(false)
   const [sizeVisible, setSizeVisible] = React.useState(false)
   const [colorVisible, setColorVisible] = React.useState(false)
-  const open = props.open
 
   const toggleRange = React.useCallback(() => {
     if (open) {

app/src/components/ChartPanel/ChartTitle.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react'
 import { ChartParameters } from '../../reducers/Charts'
-import { Typography } from '@mui/material'
-import { withStyles } from '@mui/styles'
-import { Theme } from '@mui/material/styles'
+import { Typography, Theme, withStyles } from '@material-ui/core'
 
 function ChartTitle(props: { parameters: ChartParameters; classes: any }) {
   const { classes, parameters } = props

app/src/components/ChartPanel/TopicChart.tsx

@@ -7,7 +7,7 @@ import { ChartActions } from './ChartActions'
 import { chartActions } from '../../actions'
 import { ChartParameters } from '../../reducers/Charts'
 import { connect } from 'react-redux'
-import { Paper } from '@mui/material'
+import { Paper } from '@material-ui/core'
 const throttle = require('lodash.throttle')
 
 class ClearableMessageBuffer extends q.RingBuffer<q.Message> {
@@ -114,7 +114,6 @@ function TopicChart(props: Props) {
         </div>
       </div>
       <TopicPlot
-        node={props.treeNode ? props.treeNode : undefined}
         color={props.parameters.color}
         interpolation={props.parameters.interpolation}
         timeInterval={props.parameters.timeRange ? props.parameters.timeRange.until : undefined}
@@ -134,4 +133,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(memo(TopicChart))
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(memo(TopicChart))

app/src/components/ChartPanel/index.tsx

@@ -1,15 +1,13 @@
 import * as q from '../../../../backend/src/Model'
 import * as React from 'react'
-import ShowChart from '@mui/icons-material/ShowChart'
+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, Typography } from '@mui/material'
-import { withStyles } from '@mui/styles'
-import { Theme } from '@mui/material/styles'
+import { Grid, Theme, Typography, withStyles } from '@material-ui/core'
 import { List } from 'immutable'
 const { TransitionGroup, CSSTransition } = require('react-transition-group/esm')
 
@@ -128,4 +126,7 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ChartPanel) as any)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ChartPanel))

app/src/components/ConfirmationDialog.tsx

@@ -1,6 +1,6 @@
 import React, { useRef, useCallback, memo } from 'react'
 import { ConfirmationRequest } from '../reducers/Global'
-import { Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions, Button } from '@mui/material'
+import { Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions, Button } from '@material-ui/core'
 import { KeyCodes } from '../utils/KeyCodes'
 
 function ConfirmationDialog(props: { confirmationRequests: Array<ConfirmationRequest> }) {

app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx

@@ -1,19 +1,16 @@
 import * as React from 'react'
-import { useState, useCallback, memo } from 'react'
-import Add from '@mui/icons-material/Add'
-import Lock from '@mui/icons-material/Lock'
-import Undo from '@mui/icons-material/Undo'
+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 Undo from '@material-ui/icons/Undo'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
-import { Button, Grid, TextField, Tooltip } from '@mui/material'
-import { QosSelect } from '../QosSelect'
-import { QoS } from '../../../../backend/src/DataSource/MqttSource'
-import Subscriptions from './Subscriptions'
-const SubscriptionsAny = Subscriptions as any
+import { Theme, withStyles } from '@material-ui/core/styles'
+
+import { Button, Grid, IconButton, TextField, List, ListItem, ListItemText, Tooltip } from '@material-ui/core'
 
 interface Props {
   connection: ConnectionOptions
@@ -21,93 +18,116 @@ interface Props {
   managerActions: typeof connectionManagerActions
 }
 
-const ConnectionSettings = memo(function ConnectionSettings(props: Props) {
-  const [qos, setQos] = useState<QoS>(0)
-  const [topic, setTopic] = useState('')
-  const { classes } = props
+interface State {
+  subscription: string
+}
 
-  const updateSubscription = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => setTopic(event.target.value),
-    []
-  )
+class ConnectionSettings extends React.Component<Props, State> {
+  constructor(props: any) {
+    super(props)
+    this.state = { subscription: '' }
+  }
 
-  const handleChange = useCallback(
-    (name: string) => (event: any) => {
-      props.managerActions.updateConnection(props.connection.id, {
-        [name]: event.target.value,
-      })
-    },
-    []
-  )
+  private handleChange = (name: string) => (event: any) => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      [name]: event.target.value,
+    })
+  }
 
+  private renderSubscriptions() {
+    const connection = this.props.connection
+    return connection.subscriptions.map(subscription => (
+      <Subscription
+        deleteAction={() => this.props.managerActions.deleteSubscription(subscription, connection.id)}
+        subscription={subscription}
+        key={subscription}
+      />
+    ))
+  }
+
+  public render() {
+    const { classes } = this.props
+    return (
+      <div>
+        <form className={classes.container} noValidate={true} autoComplete="off">
+          <Grid container={true} spacing={3}>
+            <Grid item={true} xs={10} className={classes.gridPadding}>
+              <TextField
+                className={classes.fullWidth}
+                label="Subscription"
+                margin="normal"
+                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)
+                }
+                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>
+            </Grid>
+            <Grid item={true} xs={7} className={classes.gridPadding}>
+              <TextField
+                className={classes.fullWidth}
+                label="MQTT Client ID"
+                margin="normal"
+                value={this.props.connection.clientId}
+                onChange={this.handleChange('clientId')}
+              />
+            </Grid>
+            <Grid item={true} xs={3} className={classes.gridPadding}>
+              <div>
+                <Tooltip title="Manage tls connection certificates" placement="top">
+                  <Button
+                    variant="contained"
+                    className={classes.button}
+                    onClick={() => this.props.managerActions.toggleCertificateSettings()}
+                  >
+                    <Lock /> Certificates
+                  </Button>
+                </Tooltip>
+              </div>
+            </Grid>
+            <Grid item={true} xs={2} className={classes.gridPadding}>
+              <Button
+                variant="contained"
+                className={classes.button}
+                onClick={this.props.managerActions.toggleAdvancedSettings}
+              >
+                <Undo /> Back
+              </Button>
+            </Grid>
+          </Grid>
+        </form>
+      </div>
+    )
+  }
+}
+
+const Subscription = (props: { subscription: string; deleteAction: any }) => {
   return (
-    <div>
-      <form className={classes.container} noValidate={true} autoComplete="off">
-        <Grid container={true} spacing={3}>
-          <Grid item={true} xs={8} className={classes.gridPadding}>
-            <TextField
-              className={`${classes.fullWidth} advanced-connection-settings-topic-input`}
-              label="Topic"
-              placeholder="example/topic"
-              margin="normal"
-              value={topic}
-              onChange={updateSubscription}
-            />
-          </Grid>
-          <Grid item={true} xs={2} className={classes.gridPadding}>
-            <div className={classes.qos}>
-              <QosSelect label="QoS" selected={qos} onChange={setQos} />
-            </div>
-          </Grid>
-          <Grid item={true} xs={2} className={classes.gridPadding}>
-            <Button
-              className={classes.button}
-              color="secondary"
-              onClick={() => props.managerActions.addSubscription({ topic, qos }, props.connection.id)}
-              variant="contained"
-            >
-              <Add /> Add
-            </Button>
-          </Grid>
-          <Grid item={true} xs={12} style={{ padding: 0 }}>
-            <SubscriptionsAny connection={props.connection} />
-          </Grid>
-          <Grid item={true} xs={7} className={classes.gridPadding}>
-            <TextField
-              className={classes.fullWidth}
-              label="MQTT Client ID"
-              margin="normal"
-              value={props.connection.clientId}
-              onChange={handleChange('clientId')}
-            />
-          </Grid>
-          <Grid item={true} xs={3} className={classes.gridPadding}>
-            <div>
-              <Tooltip title="Manage tls connection certificates" placement="top">
-                <Button
-                  variant="contained"
-                  className={classes.button}
-                  onClick={() => props.managerActions.toggleCertificateSettings()}
-                >
-                  <Lock /> Certificates
-                </Button>
-              </Tooltip>
-            </div>
-          </Grid>
-          <Grid item={true} xs={2} className={classes.gridPadding}>
-            <Button
-              variant="contained"
-              className={classes.button}
-              onClick={props.managerActions.toggleAdvancedSettings}
-            >
-              <Undo /> Back
-            </Button>
-          </Grid>
-        </Grid>
-      </form>
-    </div>
+    <ListItem style={{ padding: '0 0 0 8px' }}>
+      <ListItemText>
+        <IconButton onClick={props.deleteAction} style={{ padding: '6px' }}>
+          <Delete />
+        </IconButton>
+        {props.subscription}
+      </ListItemText>
+    </ListItem>
   )
-})
+}
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
@@ -122,13 +142,19 @@ const styles = (theme: Theme) => ({
   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',
   },
-  qos: {
-    marginTop: theme.spacing(1),
-  },
 })
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings) as any)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/BrowserCertificateFileSelection.tsx

@@ -1,140 +0,0 @@
-import * as React from 'react'
-import ClearAdornment from '../helper/ClearAdornment'
-import Lock from '@mui/icons-material/Lock'
-import { bindActionCreators } from 'redux'
-import { Button, Theme, Tooltip, Typography } from '@mui/material'
-import { CertificateParameters, ConnectionOptions } from '../../model/ConnectionOptions'
-import { CertificateTypes } from '../../actions/ConnectionManager'
-import { connect } from 'react-redux'
-import { connectionManagerActions } from '../../actions'
-import { withStyles } from '@mui/styles'
-import { rendererRpc } from '../../../../events'
-import { RpcEvents } from '../../../../events/EventsV2'
-
-function BrowserCertificateFileSelection(props: {
-  certificateType: CertificateTypes
-  title: string
-  certificate?: CertificateParameters
-  classes: any
-  actions: {
-    connectionManager: typeof connectionManagerActions
-  }
-  connection: ConnectionOptions
-}) {
-  const fileInputRef = React.useRef<HTMLInputElement>(null)
-
-  const clearCertificate = React.useCallback(() => {
-    props.actions.connectionManager.updateConnection(props.connection.id, {
-      [props.certificateType]: undefined,
-    })
-  }, [props.connection, props.certificateType])
-
-  const handleFileSelect = React.useCallback(
-    async (event: React.ChangeEvent<HTMLInputElement>) => {
-      const file = event.target.files?.[0]
-      if (!file) {
-        return
-      }
-
-      try {
-        // Read file content
-        const reader = new FileReader()
-        reader.onload = async e => {
-          const content = e.target?.result
-          if (typeof content === 'string') {
-            // Convert to base64
-            const base64Data = content.split(',')[1] || content
-
-            // Upload via IPC instead of HTTP POST
-            const result = await rendererRpc.call(RpcEvents.uploadCertificate, {
-              filename: file.name,
-              data: base64Data,
-            })
-
-            // Create certificate parameters
-            const certificate: CertificateParameters = {
-              name: result.name,
-              data: result.data,
-            }
-
-            // Update connection
-            props.actions.connectionManager.updateConnection(props.connection.id, {
-              [props.certificateType]: certificate,
-            })
-          }
-        }
-        reader.readAsDataURL(file)
-      } catch (error) {
-        console.error('Error uploading certificate:', error)
-      }
-
-      // Reset input
-      if (fileInputRef.current) {
-        fileInputRef.current.value = ''
-      }
-    },
-    [props.connection.id, props.certificateType, props.actions.connectionManager]
-  )
-
-  const handleButtonClick = () => {
-    fileInputRef.current?.click()
-  }
-
-  return (
-    <span>
-      <input
-        ref={fileInputRef}
-        type="file"
-        accept=".pem,.crt,.cer,.key"
-        style={{ display: 'none' }}
-        onChange={handleFileSelect}
-      />
-      <Tooltip title="Select certificate" placement="top">
-        <Button variant="contained" className={props.classes.button} onClick={handleButtonClick}>
-          <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.secondary,
-  },
-  button: {
-    marginTop: theme.spacing(3),
-    marginRight: theme.spacing(2),
-  },
-})
-
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(BrowserCertificateFileSelection) as any)

app/src/components/ConnectionSetup/CertificateFileSelection.tsx

@@ -1,13 +1,15 @@
 import * as React from 'react'
+import Add from '@material-ui/icons/Add'
 import ClearAdornment from '../helper/ClearAdornment'
-import Lock from '@mui/icons-material/Lock'
+import Delete from '@material-ui/icons/Delete'
+import Lock from '@material-ui/icons/Lock'
 import { bindActionCreators } from 'redux'
-import { Button, Theme, Tooltip, Typography } from '@mui/material'
+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 '@mui/styles'
+import { withStyles } from '@material-ui/styles'
 
 function CertificateFileSelection(props: {
   certificateType: CertificateTypes
@@ -71,7 +73,7 @@ const styles = (theme: Theme) => ({
     overflow: 'hidden' as 'hidden',
     whiteSpace: 'nowrap' as 'nowrap',
     textOverflow: 'ellipsis' as 'ellipsis',
-    color: theme.palette.text.secondary,
+    color: theme.palette.text.hint,
   },
   button: {
     marginTop: theme.spacing(3),
@@ -79,4 +81,7 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(CertificateFileSelection) as any)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(CertificateFileSelection))

app/src/components/ConnectionSetup/Certificates.tsx

@@ -1,19 +1,12 @@
 import * as React from 'react'
 import CertificateFileSelection from './CertificateFileSelection'
-import BrowserCertificateFileSelection from './BrowserCertificateFileSelection'
-import Undo from '@mui/icons-material/Undo'
+import Undo from '@material-ui/icons/Undo'
 import { bindActionCreators } from 'redux'
-import { Button, Grid } from '@mui/material'
+import { Button, Grid } from '@material-ui/core'
 import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
-
-// Check if we're in browser mode
-const isBrowserMode =
-  typeof window !== 'undefined' && (typeof process === 'undefined' || process.env?.BROWSER_MODE === 'true')
-const CertSelector: any = isBrowserMode ? BrowserCertificateFileSelection : CertificateFileSelection
+import { Theme, withStyles } from '@material-ui/core/styles'
 
 interface Props {
   connection: ConnectionOptions
@@ -52,7 +45,7 @@ class Certificates extends React.PureComponent<Props, State> {
         <form noValidate={true} autoComplete="off">
           <Grid container={true} spacing={3}>
             <Grid item={true} xs={12} className={classes.gridPadding}>
-              <CertSelector
+              <CertificateFileSelection
                 connection={this.props.connection}
                 certificate={this.props.connection.selfSignedCertificate}
                 title="Server Certificate (CA)"
@@ -60,7 +53,7 @@ class Certificates extends React.PureComponent<Props, State> {
               />
             </Grid>
             <Grid item={true} xs={12} className={classes.gridPadding}>
-              <CertSelector
+              <CertificateFileSelection
                 connection={this.props.connection}
                 certificate={this.props.connection.clientCertificate}
                 title="Client Certificate"
@@ -68,7 +61,7 @@ class Certificates extends React.PureComponent<Props, State> {
               />
             </Grid>
             <Grid item={true} xs={12} className={classes.gridPadding}>
-              <CertSelector
+              <CertificateFileSelection
                 connection={this.props.connection}
                 certificate={this.props.connection.clientKey}
                 title="Client Key"
@@ -111,4 +104,7 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(Certificates) as any)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(Certificates))

app/src/components/ConnectionSetup/ConnectButton.tsx

@@ -1,7 +1,7 @@
 import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
-import PowerSettingsNew from '@mui/icons-material/PowerSettingsNew'
+import PowerSettingsNew from '@material-ui/icons/PowerSettingsNew'
 import React from 'react'
-import { Button } from '@mui/material'
+import { Button } from '@material-ui/core'
 
 function ConnectButton(props: { connecting: boolean; classes: any; toggle: () => void }) {
   const { classes, toggle, connecting } = props

app/src/components/ConnectionSetup/ConnectionSettings.tsx

@@ -1,18 +1,17 @@
 import ConnectButton from './ConnectButton'
+import Delete from '@material-ui/icons/Delete'
 import React, { useCallback, useState } from 'react'
-import Save from '@mui/icons-material/Save'
-import Delete from '@mui/icons-material/Delete'
-import Settings from '@mui/icons-material/Settings'
-import Visibility from '@mui/icons-material/Visibility'
-import VisibilityOff from '@mui/icons-material/VisibilityOff'
+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'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { connectionActions, connectionManagerActions } from '../../actions'
 import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
 import { KeyCodes } from '../../utils/KeyCodes'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { ToggleSwitch } from './ToggleSwitch'
 import { useGlobalKeyEventHandler } from '../../effects/useGlobalKeyEventHandler'
 import {
@@ -25,7 +24,7 @@ import {
   InputLabel,
   MenuItem,
   TextField,
-} from '@mui/material'
+} from '@material-ui/core'
 
 interface Props {
   connection: ConnectionOptions
@@ -286,4 +285,7 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings) as any)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/ConnectionSetup.tsx

@@ -1,19 +1,15 @@
 import * as React from 'react'
 import ConnectionSettings from './ConnectionSettings'
-const ConnectionSettingsAny = ConnectionSettings as any
 import ProfileList from './ProfileList'
 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 } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
-import { Modal, Paper, Toolbar, Typography, Collapse } from '@mui/material'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { Modal, Paper, Toolbar, Typography, Collapse } from '@material-ui/core'
 import AdvancedConnectionSettings from './AdvancedConnectionSettings'
-const AdvancedConnectionSettingsAny = AdvancedConnectionSettings as any
 import Certificates from './Certificates'
-const CertificatesAny = Certificates as any
 
 interface Props {
   actions: any
@@ -38,13 +34,13 @@ class ConnectionSetup extends React.PureComponent<Props, {}> {
     return (
       <div>
         <Collapse in={!showAdvancedSettings && !showCertificateSettings}>
-          <ConnectionSettingsAny connection={connection} />
+          <ConnectionSettings connection={connection} />
         </Collapse>
         <Collapse in={showAdvancedSettings && !showCertificateSettings}>
-          <AdvancedConnectionSettingsAny connection={connection} />
+          <AdvancedConnectionSettings connection={connection} />
         </Collapse>
         <Collapse in={showCertificateSettings}>
-          <CertificatesAny connection={connection} />
+          <Certificates connection={connection} />
         </Collapse>
       </div>
     )
@@ -115,7 +111,7 @@ const styles = (theme: Theme) => ({
     textOverflow: 'ellipsis' as 'ellipsis',
     whiteSpace: 'nowrap' as 'nowrap',
     overflow: 'hidden' as 'hidden',
-    color: theme.palette.text.secondary,
+    color: theme.palette.text.hint,
     fontSize: '0.9em',
     marginLeft: theme.spacing(4),
   },
@@ -138,4 +134,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSetup) as any)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSetup))

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

@@ -1,8 +1,7 @@
 import * as React from 'react'
-import Add from '@mui/icons-material/Add'
-import { Fab } from '@mui/material'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import Add from '@material-ui/icons/Add'
+import { Fab } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
 const styles = (theme: Theme) => ({
   addButton: {

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

@@ -1,41 +1,26 @@
-import React, { useCallback } from 'react'
+import React from 'react'
 import { connect } from 'react-redux'
-import { ListItem, Typography } from '@mui/material'
+import { ListItem, Typography } from '@material-ui/core'
 import { toMqttConnection, ConnectionOptions } from '../../../model/ConnectionOptions'
-import { withStyles } from '@mui/styles'
-import { Theme } from '@mui/material/styles'
+import { withStyles, Theme } from '@material-ui/core/styles'
 import { bindActionCreators } from 'redux'
-import { connectionActions, connectionManagerActions } from '../../../actions'
+import { connectionManagerActions } from '../../../actions'
 
 export interface Props {
   connection: ConnectionOptions
-  actions: {
-    connection: any
-    connectionManager: any
-  }
+  actions: any
   selected: boolean
   classes: any
 }
 
 const ConnectionItem = (props: Props) => {
-  const connect = useCallback(() => {
-    const mqttOptions = toMqttConnection(props.connection)
-    if (mqttOptions) {
-      props.actions.connection.connect(mqttOptions, props.connection.id)
-    }
-  }, [props.connection, props])
-
   const connection = props.connection.host && toMqttConnection(props.connection)
   return (
     <ListItem
       button={true}
       selected={props.selected}
       style={{ display: 'block' }}
-      onClick={() => props.actions.connectionManager.selectConnection(props.connection.id)}
-      onDoubleClick={() => {
-        props.actions.connectionManager.selectConnection(props.connection.id)
-        connect()
-      }}
+      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>
@@ -45,12 +30,10 @@ const ConnectionItem = (props: Props) => {
 
 export const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: {
-      connection: bindActionCreators(connectionActions, dispatch),
-      connectionManager: bindActionCreators(connectionManagerActions, dispatch),
-    },
+    actions: bindActionCreators(connectionManagerActions, dispatch),
   }
 }
+
 export const connectionItemStyle = (theme: Theme) => ({
   name: {
     width: '100%',
@@ -63,9 +46,12 @@ export const connectionItemStyle = (theme: Theme) => ({
     textOverflow: 'ellipsis' as 'ellipsis',
     whiteSpace: 'nowrap' as 'nowrap',
     overflow: 'hidden' as 'hidden',
-    color: theme.palette.text.secondary,
+    color: theme.palette.text.hint,
     fontSize: '0.7em',
   },
 })
 
-export default connect(null, mapDispatchToProps)(withStyles(connectionItemStyle)(ConnectionItem) as any)
+export default connect(
+  null,
+  mapDispatchToProps
+)(withStyles(connectionItemStyle)(ConnectionItem))

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

@@ -1,5 +1,4 @@
 import ConnectionItem from './ConnectionItem'
-const ConnectionItemAny = ConnectionItem as any
 import React from 'react'
 import { AddButton } from './AddButton'
 import { AppState } from '../../../reducers'
@@ -8,9 +7,8 @@ import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../../actions'
 import { ConnectionOptions } from '../../../model/ConnectionOptions'
 import { KeyCodes } from '../../../utils/KeyCodes'
-import { List } from '@mui/material'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { List, ListSubheader } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { useGlobalKeyEventHandler } from '../../../effects/useGlobalKeyEventHandler'
 
 interface Props {
@@ -51,7 +49,7 @@ function ProfileList(props: Props) {
     <List style={{ height: '100%' }} component="nav" subheader={createConnectionButton}>
       <div className={classes.list}>
         {Object.values(connections).map(connection => (
-          <ConnectionItemAny connection={connection} key={connection.id} selected={selected === connection.id} />
+          <ConnectionItem connection={connection} key={connection.id} selected={selected === connection.id} />
         ))}
       </div>
     </List>
@@ -79,4 +77,7 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ProfileList) as any)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ProfileList))

app/src/components/ConnectionSetup/Subscriptions.tsx

@@ -1,90 +0,0 @@
-import React, { useCallback, useState } from 'react'
-import Delete from '@mui/icons-material/Delete'
-import { connectionManagerActions } from '../../actions'
-import { ConnectionOptions } from '../../model/ConnectionOptions'
-import {
-  IconButton,
-  TableContainer,
-  Table,
-  TableHead,
-  TableRow,
-  TableCell,
-  TableBody,
-  Paper,
-  Theme,
-} from '@mui/material'
-import { bindActionCreators } from 'redux'
-import { withStyles } from '@mui/styles'
-import { connect } from 'react-redux'
-
-function Subscriptions(props: {
-  classes: any
-  connection: ConnectionOptions
-  managerActions: typeof connectionManagerActions
-}) {
-  const { classes, connection, managerActions } = props
-
-  return (
-    <TableContainer component={Paper} className={`${classes.topicList} advanced-connection-settings-topic-list`}>
-      <Table size="small">
-        <TableHead>
-          <TableRow>
-            <TableCell align="left" padding="checkbox" className={classes.tableTitleCell}></TableCell>
-            <TableCell className={classes.tableTitleCell}>Topic</TableCell>
-            <TableCell align="right" className={classes.tableTitleCell}>
-              QoS
-            </TableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {connection.subscriptions.map(subscription => (
-            <TableRow key={subscription.topic + '_qos_' + subscription.qos}>
-              <TableCell align="right" className={classes.tableCell}>
-                <IconButton
-                  onClick={() => managerActions.deleteSubscription(subscription, connection.id)}
-                  style={{ padding: '6px' }}
-                >
-                  <Delete />
-                </IconButton>
-              </TableCell>
-
-              <TableCell component="th" scope="row" className={classes.tableCell}>
-                {subscription.topic}
-              </TableCell>
-              <TableCell align="right" className={classes.tableCell}>
-                {subscription.qos}
-              </TableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-      </Table>
-    </TableContainer>
-  )
-}
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    managerActions: bindActionCreators(connectionManagerActions, dispatch),
-  }
-}
-
-const styles = (theme: Theme) => ({
-  tableCell: {
-    paddingTop: 0,
-    paddingBottom: 0,
-    wordBbreak: 'break-word',
-  },
-  tableTitleCell: {
-    paddingTop: `${theme.spacing(0.5)}px`,
-    paddingBottom: `${theme.spacing(0.5)}px`,
-  },
-  topicList: {
-    height: '196px',
-    overflowY: 'scroll' as 'scroll',
-    margin: `${theme.spacing(1)}px ${theme.spacing(1)}px 0 ${theme.spacing(1)}px`,
-    backgroundColor: theme.palette.background.default,
-    width: 'auto',
-  },
-})
-
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(Subscriptions) as any)

app/src/components/ConnectionSetup/ToggleSwitch.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { FormControlLabel, Switch } from '@mui/material'
+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

app/src/components/Demo/Key.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core'
 
 interface Props {
   keyboardKey: string

app/src/components/Demo/Mouse.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core'
 const cursor = require('./cursor.png')
 
 interface State {
@@ -75,7 +74,7 @@ const style = (theme: Theme) => ({
     height: '32px',
     position: 'fixed' as 'fixed',
     zIndex: 1000000,
-    filter: theme.palette.mode === 'light' ? undefined : 'invert(100%)',
+    filter: theme.palette.type === 'light' ? undefined : 'invert(100%)',
     pointerEvents: 'none' as 'none',
   },
 })

app/src/components/Demo/ShowText.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core'
 import Key from './Key'
 
 interface State {

app/src/components/Demo/index.tsx

@@ -5,7 +5,7 @@ let heapdump: any
 
 function writeHeapdump(path?: string) {
   if (!heapdump) {
-    //<heapdump = require('heapdump')
+    heapdump = require('heapdump')
   }
 
   heapdump.writeSnapshot(path || `${Date.now()}.heapsnapshot`)

app/src/components/ErrorBoundary.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react'
 import PersistentStorage from '../utils/PersistentStorage'
-import SentimentDissatisfied from '@mui/icons-material/SentimentDissatisfied'
-import Warning from '@mui/icons-material/Warning'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
-import { Button, Modal, Paper, Toolbar, Typography } from '@mui/material'
+import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
+import Warning from '@material-ui/icons/Warning'
+import { electronRendererTelemetry } from 'electron-telemetry'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { Button, Modal, Paper, Toolbar, Typography } from '@material-ui/core'
 
 interface State {
   error?: Error
@@ -12,7 +12,6 @@ interface State {
 
 interface Props {
   classes: any
-  children?: React.ReactNode
 }
 
 class ErrorBoundary extends React.PureComponent<Props, State> {
@@ -25,16 +24,16 @@ class ErrorBoundary extends React.PureComponent<Props, State> {
   }
 
   private restart = () => {
-    window.location.reload()
+    window.location = window.location
   }
 
   private clearStorage = () => {
     PersistentStorage.clear()
-    window.location.reload()
+    window.location = window.location
   }
 
   public componentDidCatch(error: Error, errorInfo: any) {
-    // electronRendererTelemetry.trackError(error)
+    electronRendererTelemetry.trackError(error)
     console.log('did catch', error)
   }
 

app/src/components/Layout/ContentView.tsx

@@ -7,7 +7,7 @@ import { ChartParameters } from '../../reducers/Charts'
 import { connect } from 'react-redux'
 import { List } from 'immutable'
 import { Sidebar } from '../Sidebar'
-import { useResizeDetector } from 'react-resize-detector'
+import ReactResizeDetector from 'react-resize-detector'
 
 interface Props {
   heightProperty: any
@@ -21,23 +21,11 @@ function ContentView(props: Props) {
   const [sidebarWidth, setSidebarWidth] = React.useState<string | number>('40%')
   const [detectedHeight, setDetectedHeight] = React.useState(0)
   const [detectedSidebarWidth, setDetectedSidebarWidth] = React.useState(0)
-  
-  const { height: resizeHeight, ref: heightRef } = useResizeDetector()
-  const { width: resizeWidth, ref: widthRef } = useResizeDetector()
-  
-  React.useEffect(() => {
-    if (resizeHeight) setDetectedHeight(resizeHeight)
-  }, [resizeHeight])
-  
-  React.useEffect(() => {
-    if (resizeWidth) setDetectedSidebarWidth(resizeWidth)
-  }, [resizeWidth])
-  
-  const detectSize = React.useCallback((width: any, newHeight: any) => {
+  const detectSize = React.useCallback((width, newHeight) => {
     setDetectedHeight(newHeight)
   }, [])
 
-  const detectSidebarSize = React.useCallback((width: any) => {
+  const detectSidebarSize = React.useCallback(width => {
     setDetectedSidebarWidth(width)
   }, [])
 
@@ -97,13 +85,15 @@ function ContentView(props: Props) {
             >
               <Tree />
               {/** Passing height constraints via flex options down */}
-              <div ref={heightRef} style={{ flex: 1, display: 'flex', height: '100%', width: '100%' }}>
+              <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 ref={widthRef} style={{ height: '100%' }}>
+          <div style={{ height: '100%' }}>
+            <ReactResizeDetector handleWidth={true} onResize={detectSidebarSize} />
             <div
               className={props.paneDefaults}
               style={{ minWidth: '250px', height: '100%', overflowY: 'auto', overflowX: 'hidden' }}

app/src/components/Layout/Notification.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react'
 
-import { Snackbar, SnackbarContent } from '@mui/material'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
-import { green, red } from '@mui/material/colors'
+import { Snackbar, SnackbarContent } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { green, red } from '@material-ui/core/colors'
 
 interface Props {
   message?: string

app/src/components/Layout/PauseButton.tsx

@@ -1,14 +1,13 @@
 import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
 import CustomIconButton from '../helper/CustomIconButton'
-import Pause from '@mui/icons-material/PauseCircleFilled'
-import Resume from '@mui/icons-material/PlayArrow'
+import Pause from '@material-ui/icons/PauseCircleFilled'
+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 { withStyles } from '@mui/styles'
-import { Theme } from '@mui/material/styles'
+import { withStyles, Theme } from '@material-ui/core/styles'
 
 const styles = (theme: Theme) => ({
   icon: {
@@ -103,4 +102,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(PauseButton) as any)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(PauseButton))

app/src/components/Layout/SearchBar.tsx

@@ -1,13 +1,12 @@
 import React, { useCallback, useState, useRef } from 'react'
 import ClearAdornment from '../helper/ClearAdornment'
-import Search from '@mui/icons-material/Search'
+import Search from '@material-ui/icons/Search'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { InputBase } from '@mui/material'
+import { InputBase } from '@material-ui/core'
 import { settingsActions } from '../../actions'
-import { alpha as fade, Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { fade, Theme, withStyles } from '@material-ui/core/styles'
 import { useGlobalKeyEventHandler } from '../../effects/useGlobalKeyEventHandler'
 import { KeyCodes } from '../../utils/KeyCodes'
 
@@ -36,7 +35,6 @@ function SearchBar(props: {
 
   useGlobalKeyEventHandler(undefined, event => {
     const isCharacter = event.key.length === 1
-    const isModifierKey = event.metaKey || event.ctrlKey
     const isAllowedControlCharacter = event.keyCode === KeyCodes.backspace || event.keyCode === KeyCodes.delete
     const tagNameBlacklist = ['INPUT', 'TEXTAREA', 'RADIO', 'CHECKBOX', 'OPTION', 'FORM']
 
@@ -45,7 +43,6 @@ function SearchBar(props: {
 
     if (
       (isCharacter || isAllowedControlCharacter) &&
-      !isModifierKey &&
       !event.defaultPrevented &&
       !hasFocus &&
       tagElementIsNotBlacklisted &&
@@ -143,4 +140,7 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(SearchBar) as any)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(SearchBar))

app/src/components/Layout/TitleBar.tsx

@@ -1,17 +1,15 @@
 import * as React from 'react'
-import CloudOff from '@mui/icons-material/CloudOff'
+import CloudOff from '@material-ui/icons/CloudOff'
 import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
-const ConnectionHealthIndicatorAny = ConnectionHealthIndicator as any
-import Menu from '@mui/icons-material/Menu'
+import Menu from '@material-ui/icons/Menu'
 import PauseButton from './PauseButton'
 import SearchBar from './SearchBar'
-import { AppBar, Button, IconButton, Toolbar, Typography } from '@mui/material'
+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, globalActions, settingsActions } from '../../actions'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
 const styles = (theme: Theme) => ({
   title: {
@@ -77,12 +75,12 @@ class TitleBar extends React.PureComponent<Props, {}> {
           <PauseButton />
           <Button
             className={classes.disconnect}
-            sx={{ color: 'primary.contrastText' }}
+            classes={{ label: classes.disconnectLabel }}
             onClick={actions.connection.disconnect}
           >
             Disconnect <CloudOff className={classes.disconnectIcon} />
           </Button>
-          <ConnectionHealthIndicatorAny withBackground={true} />
+          <ConnectionHealthIndicator withBackground={true} />
         </Toolbar>
       </AppBar>
     )
@@ -105,4 +103,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(TitleBar))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(TitleBar))

app/src/components/LoginDialog.tsx

@@ -1,57 +0,0 @@
-import * as React from 'react'
-import { Dialog, DialogTitle, DialogContent, DialogActions, TextField, Button, Typography } from '@mui/material'
-
-interface LoginDialogProps {
-  open: boolean
-  onLogin: (username: string, password: string) => void
-  error?: string
-}
-
-export function LoginDialog(props: LoginDialogProps) {
-  const [username, setUsername] = React.useState('')
-  const [password, setPassword] = React.useState('')
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault()
-    props.onLogin(username, password)
-  }
-
-  return (
-    <Dialog open={props.open} disableEscapeKeyDown onClose={(event, reason) => { if (reason !== 'backdropClick') { /* Allow closing only via escape if needed */ } }}>
-      <form onSubmit={handleSubmit}>
-        <DialogTitle>Login to MQTT Explorer</DialogTitle>
-        <DialogContent>
-          {props.error && (
-            <Typography color="error" style={{ marginBottom: 16 }}>
-              {props.error}
-            </Typography>
-          )}
-          <TextField
-            autoFocus
-            margin="dense"
-            label="Username"
-            type="text"
-            fullWidth
-            value={username}
-            onChange={e => setUsername(e.target.value)}
-            required
-          />
-          <TextField
-            margin="dense"
-            label="Password"
-            type="password"
-            fullWidth
-            value={password}
-            onChange={e => setPassword(e.target.value)}
-            required
-          />
-        </DialogContent>
-        <DialogActions>
-          <Button type="submit" color="primary" variant="contained">
-            Login
-          </Button>
-        </DialogActions>
-      </form>
-    </Dialog>
-  )
-}

app/src/components/SettingsDrawer/BooleanSwitch.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
-import { InputLabel, Switch, Theme, Tooltip } from '@mui/material'
-import { withStyles } from '@mui/styles'
+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 }) {

app/src/components/SettingsDrawer/BrokerStatistics.tsx

@@ -3,10 +3,9 @@ import React, { useMemo } from 'react'
 import { AppState } from '../../reducers'
 import { Base64Message } from '../../../../backend/src/Model/Base64Message'
 import { connect } from 'react-redux'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { TopicViewModel } from '../../model/TopicViewModel'
-import { Typography } from '@mui/material'
+import { Typography } from '@material-ui/core'
 import { usePollingToFetchTreeNode } from '../helper/usePollingToFetchTreeNode'
 import { useUpdateComponentWhenNodeUpdates } from '../helper/useUpdateComponentWhenNodeUpdates'
 const abbreviate = require('number-abbreviate')
@@ -20,7 +19,7 @@ const styles = (theme: Theme) => ({
   container: {
     width: '100%',
     height: '224px',
-    backgroundColor: theme.palette.mode === 'dark' ? 'rebeccapurple' : '#ebebeb',
+    backgroundColor: theme.palette.type === 'dark' ? 'rebeccapurple' : '#ebebeb',
     marginBottom: 0,
     padding: '8px',
   },
@@ -124,8 +123,8 @@ function renderStat(tree: q.Tree<TopicViewModel>, stat: Stats) {
     return null
   }
 
-  const str = node.message.payload ? node.message.payload.toUnicodeString() : ''
-  let value = node.message && node.message.payload ? parseFloat(str) : NaN
+  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 (

app/src/components/SettingsDrawer/Settings.tsx

@@ -1,23 +1,15 @@
 import * as React from 'react'
 import BooleanSwitch from './BooleanSwitch'
 import BrokerStatistics from './BrokerStatistics'
-import ChevronRight from '@mui/icons-material/ChevronRight'
+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 { globalActions, settingsActions } from '../../actions'
 import { shell } from 'electron'
-import { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { TopicOrder } from '../../reducers/Settings'
-import {
-  MAX_MESSAGE_SIZE_20KB,
-  MAX_MESSAGE_SIZE_100KB,
-  MAX_MESSAGE_SIZE_1MB,
-  MAX_MESSAGE_SIZE_5MB,
-  MAX_MESSAGE_SIZE_UNLIMITED,
-} from '../../../../events/EventsV2'
 
 import {
   Divider,
@@ -29,7 +21,7 @@ import {
   Select,
   Typography,
   Tooltip,
-} from '@mui/material'
+} from '@material-ui/core'
 
 export const autoExpandLimitSet = [
   {
@@ -78,7 +70,7 @@ const styles = (theme: Theme) => ({
   },
   author: {
     margin: 'auto 8px 8px auto',
-    color: theme.palette.text.secondary,
+    color: theme.palette.text.hint,
     cursor: 'pointer' as 'pointer',
   },
 })
@@ -96,7 +88,6 @@ interface Props {
   topicOrder: TopicOrder
   visible: boolean
   theme: 'light' | 'dark'
-  maxMessageSize: number
 }
 
 class Settings extends React.PureComponent<Props, {}> {
@@ -212,47 +203,6 @@ class Settings extends React.PureComponent<Props, {}> {
     this.props.actions.settings.setTopicOrder(e.target.value as TopicOrder)
   }
 
-  private renderMaxMessageSize() {
-    const { classes, maxMessageSize } = this.props
-
-    const formatSize = (size: number) => {
-      if (size === MAX_MESSAGE_SIZE_UNLIMITED) {
-        return 'Unlimited'
-      } else if (size >= 1000000) {
-        return `${size / 1000000} MB`
-      } else if (size >= 1000) {
-        return `${size / 1000} KB`
-      }
-      return `${size} bytes`
-    }
-
-    return (
-      <div style={{ padding: '8px', display: 'flex' }}>
-        <InputLabel htmlFor="max-message-size" style={{ flex: '1', marginTop: '8px' }}>
-          Max Message Size
-        </InputLabel>
-        <Select
-          value={maxMessageSize}
-          onChange={this.onChangeMaxMessageSize}
-          input={<Input name="max-message-size" id="max-message-size-label-placeholder" />}
-          name="max-message-size"
-          className={classes.input}
-          style={{ flex: '1' }}
-        >
-          <MenuItem value={MAX_MESSAGE_SIZE_20KB}>{formatSize(MAX_MESSAGE_SIZE_20KB)}</MenuItem>
-          <MenuItem value={MAX_MESSAGE_SIZE_100KB}>{formatSize(MAX_MESSAGE_SIZE_100KB)}</MenuItem>
-          <MenuItem value={MAX_MESSAGE_SIZE_1MB}>{formatSize(MAX_MESSAGE_SIZE_1MB)}</MenuItem>
-          <MenuItem value={MAX_MESSAGE_SIZE_5MB}>{formatSize(MAX_MESSAGE_SIZE_5MB)}</MenuItem>
-          <MenuItem value={MAX_MESSAGE_SIZE_UNLIMITED}>{formatSize(MAX_MESSAGE_SIZE_UNLIMITED)}</MenuItem>
-        </Select>
-      </div>
-    )
-  }
-
-  private onChangeMaxMessageSize = (e: React.ChangeEvent<{ value: unknown }>) => {
-    this.props.actions.settings.setMaxMessageSize(parseInt(String(e.target.value), 10))
-  }
-
   public render() {
     const { classes, actions, visible } = this.props
     return (
@@ -270,7 +220,6 @@ class Settings extends React.PureComponent<Props, {}> {
           {this.renderAutoExpand()}
           {this.renderNodeOrder()}
           <TimeLocale />
-          {this.renderMaxMessageSize()}
           {this.renderHighlightTopicUpdates()}
           {this.selectTopicsOnMouseOver()}
           {this.toggleTheme()}
@@ -294,7 +243,6 @@ const mapStateToProps = (state: AppState) => {
     highlightTopicUpdates: state.settings.get('highlightTopicUpdates'),
     selectTopicWithMouseOver: state.settings.get('selectTopicWithMouseOver'),
     theme: state.settings.get('theme'),
-    maxMessageSize: state.settings.get('maxMessageSize'),
   }
 }
 
@@ -307,4 +255,9 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Settings))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(Settings)
+)

app/src/components/SettingsDrawer/TimeLocale.tsx

@@ -3,17 +3,10 @@ import DateFormatter from '../helper/DateFormatter'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { Input, InputLabel, MenuItem, Select, Theme } from '@mui/material'
+import { Input, InputLabel, MenuItem, Select, StyleRulesCallback, Theme } from '@material-ui/core'
 import { settingsActions } from '../../actions'
-import { withStyles } from '@mui/styles'
-
-function importAll(r: any) {
-  r.keys().forEach(r)
-}
-// @ts-expect-error -- webpack require
-importAll(require.context('moment/locale', true, /\.js$/))
-
-const moment = require('moment')
+import { withStyles } from '@material-ui/styles'
+const moment = require('moment/min/moment-with-locales')
 
 interface Props {
   actions: {
@@ -38,7 +31,7 @@ function TimeLocaleSettings(props: Props) {
     </MenuItem>
   ))
 
-  function updateLocale(e: any) {
+  function updateLocale(e: React.ChangeEvent<{ value: unknown }>) {
     const locale = e.target.value ? String(e.target.value) : ''
     actions.settings.setTimeLocale(locale)
   }
@@ -89,4 +82,9 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(TimeLocaleSettings))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(TimeLocaleSettings)
+)

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

@@ -1,11 +1,11 @@
 import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
-import ShowChart from '@mui/icons-material/ShowChart'
+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 '@mui/material'
+import { Fade, Paper, Popper, Tooltip } from '@material-ui/core'
 import { JsonPropertyLocation } from '../../../../../backend/src/JsonAstParser'
 
 interface Props {
@@ -69,11 +69,7 @@ function ChartPreview(props: Props) {
       <Popper open={open} anchorEl={chartIconRef.current} placement="left-end">
         <Fade in={open} timeout={300}>
           <Paper style={{ width: '300px' }}>
-            {open ? (
-              <TopicPlot node={props.treeNode} history={props.treeNode.messageHistory} dotPath={props.literal.path} />
-            ) : (
-              <span />
-            )}
+            {open ? <TopicPlot history={props.treeNode.messageHistory} dotPath={props.literal.path} /> : <span />}
           </Paper>
         </Fade>
       </Popper>
@@ -89,4 +85,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(ChartPreview)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(ChartPreview)

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

@@ -1,6 +1,6 @@
 import * as React from 'react'
-import { Theme } from '@mui/material'
-import { withStyles } from '@mui/styles'
+import { Theme } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
 
 interface Props {
   changes: Array<Diff.Change>

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

@@ -1,13 +1,13 @@
 import * as diff from 'diff'
 import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
-import Add from '@mui/icons-material/Add'
+import Add from '@material-ui/icons/Add'
 import ChartPreview from './ChartPreview'
-import Remove from '@mui/icons-material/Remove'
+import Remove from '@material-ui/icons/Remove'
 import { JsonPropertyLocation } from '../../../../../backend/src/JsonAstParser'
 import { lineChangeStyle, trimNewlineRight } from './util'
-import { Theme } from '@mui/material'
-import { withStyles } from '@mui/styles'
+import { Theme } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
 
 interface Props {
   changes: Array<diff.Change>

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

@@ -8,8 +8,7 @@ import { isPlottable, lineChangeStyle, trimNewlineRight } from './util'
 import { JsonPropertyLocation, literalsMappedByLines } from '../../../../../backend/src/JsonAstParser'
 import { selectTextWithCtrlA } from '../../../utils/handleTextSelectWithCtrlA'
 import { style } from './style'
-import { Typography } from '@mui/material'
-import { withStyles } from '@mui/styles'
+import { withStyles, Typography } from '@material-ui/core'
 import 'prismjs/components/prism-json'
 
 interface Props {
@@ -44,9 +43,9 @@ class CodeDiff extends React.PureComponent<Props, State> {
   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>
+    return allLiterals.map((l: JsonPropertyLocation) => (isPlottable(l.value) ? l : undefined)) as Array<
+      JsonPropertyLocation
+    >
   }
 
   private renderStyledCodeLines(changes: Array<Diff.Change>) {

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

@@ -1,8 +1,8 @@
 import { CodeBlockColors, CodeBlockColorsBraceMonokai } from '../CodeBlockColors'
-import { Theme } from '@mui/material'
+import { Theme } from '@material-ui/core'
 
 export const style = (theme: Theme) => {
-  const codeBlockColors = theme.palette.mode === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai
+  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',

app/src/components/Sidebar/HistoryDrawer.tsx

@@ -1,8 +1,7 @@
 import React, { useCallback, useState, useEffect, memo } from 'react'
-import { Badge, Typography } from '@mui/material'
+import { Badge, Typography } from '@material-ui/core'
 import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA'
-import { Theme, emphasize } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles, emphasize } from '@material-ui/core/styles'
 
 interface HistoryItem {
   key: string

app/src/components/Sidebar/MessageId.tsx

@@ -1,20 +0,0 @@
-import React, { memo } from 'react'
-import { Message } from '../../../../backend/src/Model'
-import { Tooltip } from '@mui/material'
-
-export const MessageId = memo(function MessageId(props: { message: Message; addComma?: boolean }) {
-  const { message, addComma } = props
-
-  if (!message.messageId) {
-    return null
-  }
-
-  return (
-    <Tooltip title="MessageIds are used to signal a successful transmission of a message.">
-      <span>
-        #msg: {message.messageId}
-        {addComma ? ', ' : ''}
-      </span>
-    </Tooltip>
-  )
-})

app/src/components/Sidebar/NodeStats.tsx

@@ -1,7 +1,7 @@
 import * as q from '../../../../backend/src/Model'
 import * as React from 'react'
 import { TopicViewModel } from '../../model/TopicViewModel'
-import { Typography } from '@mui/material'
+import { Typography } from '@material-ui/core'
 
 interface Props {
   node?: q.TreeNode<TopicViewModel>

app/src/components/Sidebar/Panel.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
-import ExpandMore from '@mui/icons-material/ExpandMore'
-import { Accordion, AccordionDetails, AccordionSummary, Typography, Theme } from '@mui/material'
-import { withStyles } from '@mui/styles'
+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' },
@@ -19,16 +19,15 @@ const Panel = (props: {
   detailsHidden?: boolean
 }) => {
   return (
-    <Accordion defaultExpanded={true} disabled={props.disabled}>
-      <AccordionSummary expandIcon={<ExpandMore />} className={props.classes.summary}>
+    <ExpansionPanel defaultExpanded={true} disabled={props.disabled}>
+      <ExpansionPanelSummary expandIcon={<ExpandMore />} className={props.classes.summary}>
         <Typography className={props.classes.heading}>{props.children[0]}</Typography>
-      </AccordionSummary>
+      </ExpansionPanelSummary>
       {props.detailsHidden ? null : (
-        <AccordionDetails className={props.classes.detail}>{props.children[1]}</AccordionDetails>
+        <ExpansionPanelDetails className={props.classes.detail}>{props.children[1]}</ExpansionPanelDetails>
       )}
-    </Accordion>
+    </ExpansionPanel>
   )
 }
 
-// @ts-ignore
 export default withStyles(styles)(Panel)

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

@@ -1,23 +1,19 @@
 import * as React from 'react'
 import { default as AceEditor } from 'react-ace'
-import { useTheme } from '@mui/material/styles'
-import 'ace-builds'
-import 'ace-builds/webpack-resolver'
-import 'ace-builds/src-noconflict/mode-json'
-import 'ace-builds/src-noconflict/mode-xml'
-import 'ace-builds/src-noconflict/snippets/json'
-import 'ace-builds/src-noconflict/snippets/xml'
-import 'ace-builds/src-noconflict/mode-text'
-import 'ace-builds/src-noconflict/theme-monokai'
+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
-  editorRef: React.Ref<AceEditor>
 }) {
-  const theme = useTheme()
   const editorOptions = {
     showLineNumbers: false,
     tabSize: 2,
@@ -25,17 +21,12 @@ function Editor(props: {
 
   return (
     <AceEditor
-      ref={props.editorRef}
       style={{}}
       mode={props.editorMode}
-      theme={theme.palette.mode === 'dark' ? 'monokai' : 'dawn'}
+      theme={props.theme.palette.type === 'dark' ? 'monokai' : 'dawn'}
       name="UNIQUE_ID_OF_DIV"
       width="100%"
       height="200px"
-      enableSnippets={true}
-      enableBasicAutocompletion={true}
-      enableLiveAutocompletion={true}
-      showPrintMargin={false}
       showGutter={true}
       value={props.value}
       onChange={props.onChange}
@@ -45,4 +36,4 @@ function Editor(props: {
   )
 }
 
-export default Editor
+export default withTheme(Editor)

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

@@ -1,10 +1,9 @@
 import * as React from 'react'
-import { FormControlLabel, Radio, RadioGroup } from '@mui/material'
+import { FormControlLabel, Radio, RadioGroup } from '@material-ui/core'
 
 interface Props {
   value: string
   onChange: (event: React.ChangeEvent<{}>, value: string) => void
-  focusEditor: () => void
 }
 export function EditorModeSelect(props: Props) {
   const labelStyle = { margin: '0 8px 0 8px' }
@@ -12,7 +11,6 @@ export function EditorModeSelect(props: Props) {
     <RadioGroup
       style={{ display: 'inline-block', float: 'left' }}
       value={props.value}
-      onFocus={props.focusEditor}
       onChange={props.onChange}
       row={true}
     >

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

@@ -1,19 +1,18 @@
 import Editor from './Editor'
-import { AttachFileOutlined, FormatAlignLeft } from '@mui/icons-material'
+import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
 import Message from './Model/Message'
-import Navigation from '@mui/icons-material/Navigation'
+import Navigation from '@material-ui/icons/Navigation'
 import PublishHistory from './PublishHistory'
-import React, { useCallback, useMemo, useState, useRef, memo } from 'react'
+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, Tooltip, useTheme } from '@mui/material'
+import { Button, Fab, Theme, Tooltip, withTheme } from '@material-ui/core'
 import { connect } from 'react-redux'
 import { EditorModeSelect } from './EditorModeSelect'
 import { globalActions, publishActions } from '../../../actions'
 import { KeyCodes } from '../../../utils/KeyCodes'
-import { default as AceEditor } from 'react-ace'
 
 interface Props {
   connectionId?: string
@@ -23,6 +22,7 @@ interface Props {
   globalActions: typeof globalActions
   retain: boolean
   editorMode: string
+  theme: Theme
 }
 
 function useHistory(): [Array<Message>, (topic: string, payload?: string) => void] {
@@ -41,14 +41,8 @@ function useHistory(): [Array<Message>, (topic: string, payload?: string) => voi
 }
 
 function Publish(props: Props) {
-  const theme = useTheme()
-  const editorRef = useRef<AceEditor>()
   const [history, amendToHistory] = useHistory()
 
-  const focusEditor = useCallback(() => {
-    editorRef.current?.editor.focus()
-  }, [editorRef])
-
   const publish = useCallback(() => {
     if (!props.connectionId) {
       return
@@ -76,23 +70,17 @@ function Publish(props: Props) {
 
   return useMemo(
     () => (
-      <div style={{ flexGrow: 1, width: '100%' }} onKeyDown={handleSubmit}>
+      <div style={{ flexGrow: 1 }} onKeyDown={handleSubmit}>
         <TopicInput />
         <div style={{ width: '100%', display: 'block' }}>
           <EditorMode
-            focusEditor={focusEditor}
             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}
-            editorRef={editorRef as any}
-          />
+          <Editor value={props.payload} editorMode={props.editorMode} onChange={props.actions.setPayload} />
           <RetainSwitch />
         </div>
         <PublishHistory history={history} />
@@ -102,10 +90,9 @@ function Publish(props: Props) {
   )
 }
 
-const EditorMode = memo(function EditorMode(props: {
+function EditorMode(props: {
   payload?: string
   editorMode: string
-  focusEditor: () => void
   actions: typeof publishActions
   globalActions: typeof globalActions
   publish: () => void
@@ -116,73 +103,52 @@ const EditorMode = memo(function EditorMode(props: {
     props.actions.setEditorMode(value)
   }, [])
 
-  const openFile = useCallback(() => {
-    props.actions.openFile()
-  }, [])
-
   const formatJson = useCallback(() => {
     if (props.payload) {
       try {
         const str = JSON.stringify(JSON.parse(props.payload), undefined, '  ')
         updatePayload(str)
       } catch (error) {
-        props.globalActions.showError(`Format error: ${(error as Error)?.message}`)
+        props.globalActions.showError(`Format error: ${error.message}`)
       }
     }
   }, [props.payload])
 
-  return (
-    <div style={{ marginTop: '16px' }}>
-      <div style={{ width: '100%', lineHeight: '64px', textAlign: 'center' }}>
-        <EditorModeSelect value={props.editorMode} onChange={updateMode} focusEditor={props.focusEditor} />
-        <FormatJsonButton editorMode={props.editorMode} focusEditor={props.focusEditor} formatJson={formatJson} />
-        <OpenFileButton editorMode={props.editorMode} openFile={openFile} />
-        <div style={{ float: 'right' }}>
-          <PublishButton publish={props.publish} focusEditor={props.focusEditor} />
+  const renderFormatJson = useCallback(() => {
+    if (props.editorMode !== 'json') {
+      return null
+    }
+
+    return (
+      <Tooltip title="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])
+
+  return useMemo(
+    () => (
+      <div style={{ marginTop: '16px' }}>
+        <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>
-    </div>
+    ),
+    [props.editorMode, renderFormatJson]
   )
-})
+}
 
-const FormatJsonButton = React.memo(function FormatJsonButton(props: {
-  editorMode: string
-  focusEditor: () => void
-  formatJson: () => void
-}) {
-  if (props.editorMode !== 'json') {
-    return null
-  }
-
-  return (
-    <Tooltip title="Format JSON">
-      <Fab
-        style={{ width: '36px', height: '36px', margin: '0 8px' }}
-        onClick={props.formatJson}
-        onFocus={props.focusEditor}
-        id="sidebar-publish-format-json"
-      >
-        <FormatAlignLeft style={{ fontSize: '20px' }} />
-      </Fab>
-    </Tooltip>
-  )
-})
-
-const OpenFileButton = React.memo(function OpenFileButton(props: { editorMode: string; openFile: () => void }) {
-  return (
-    <Tooltip title="Open file">
-      <Fab
-        style={{ width: '36px', height: '36px', margin: '0 8px' }}
-        onClick={props.openFile}
-        id="sidebar-publish-open-file"
-      >
-        <AttachFileOutlined style={{ fontSize: '20px' }} />
-      </Fab>
-    </Tooltip>
-  )
-})
-
-const PublishButton = memo(function PublishButton(props: { publish: () => void; focusEditor: () => void }) {
+const PublishButton = (props: { publish: () => void }) => {
   const handleClickPublish = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
@@ -191,19 +157,15 @@ const PublishButton = memo(function PublishButton(props: { publish: () => void;
     [props.publish]
   )
 
-  return (
-    <Button
-      variant="contained"
-      size="small"
-      color="primary"
-      onClick={handleClickPublish}
-      onFocus={props.focusEditor}
-      id="publish-button"
-    >
-      <Navigation style={{ marginRight: '8px' }} /> Publish
-    </Button>
+  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) => {
   return {
@@ -214,11 +176,14 @@ const mapDispatchToProps = (dispatch: any) => {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    topic: state.publish.manualTopic,
+    topic: state.publish.topic,
     payload: state.publish.payload,
     editorMode: state.publish.editorMode,
     retain: state.publish.retain,
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Publish)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withTheme(Publish))

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

@@ -34,4 +34,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(PublishHistory)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(PublishHistory)

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

@@ -1,34 +0,0 @@
-import * as React from 'react'
-import { connect } from 'react-redux'
-import { AppState } from '../../../reducers'
-import { bindActionCreators } from 'redux'
-import { publishActions } from '../../../actions'
-import { QosSelect } from '../../QosSelect'
-import { QoS } from '../../../../../backend/src/DataSource/MqttSource'
-
-interface Props {
-  qos: QoS
-  actions: {
-    publish: typeof publishActions
-  }
-}
-
-function QosPublishOption(props: Props) {
-  return <QosSelect onChange={props.actions.publish.setQoS} selected={props.qos} />
-}
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: {
-      publish: bindActionCreators(publishActions, dispatch),
-    },
-  }
-}
-
-const mapStateToProps = (state: AppState) => {
-  return {
-    qos: state.publish.qos,
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(QosPublishOption)

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

@@ -1,8 +1,18 @@
 import * as React from 'react'
-import { TextField, MenuItem, Tooltip } from '@mui/material'
-import { QoS } from '../../../backend/src/DataSource/MqttSource'
+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'
 
-export function QosSelect(props: { selected: QoS; onChange: (value: QoS) => void; label?: string }) {
+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' }
 
@@ -12,16 +22,16 @@ export function QosSelect(props: { selected: QoS; onChange: (value: QoS) => void
       if (value !== 0 && value !== 1 && value !== 2) {
         return
       }
-      props.onChange(value)
+
+      props.actions.publish.setQoS(value)
     },
-    [props.onChange]
+    [props.actions.publish]
   )
 
   return (
     <TextField
       select={true}
-      label={props.label}
-      value={props.selected}
+      value={props.qos}
       margin="normal"
       style={{ margin: '8px 0 8px 8px' }}
       onChange={onChangeQos}
@@ -45,4 +55,21 @@ export function QosSelect(props: { selected: QoS; onChange: (value: QoS) => void
   )
 }
 
-export default React.memo(QosSelect)
+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

@@ -1,6 +1,6 @@
-import QosSelect from './QosPublishOption'
+import QosSelect from './QosSelect'
 import React from 'react'
-import { Checkbox, FormControlLabel, Tooltip } from '@mui/material'
+import { Checkbox, FormControlLabel, Tooltip } from '@material-ui/core'
 import { publishActions } from '../../../actions'
 import { bindActionCreators } from 'redux'
 import { AppState } from '../../../reducers'
@@ -41,4 +41,7 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(RetainSwitch)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(RetainSwitch)

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

@@ -1,21 +1,18 @@
 import ClearAdornment from '../../helper/ClearAdornment'
-import React, { useCallback, useMemo, useRef } from 'react'
-import { FormControl, Input, InputLabel } from '@mui/material'
+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; manualTopic?: string; selectedTopic?: string }) {
-  const inputElement = useRef<HTMLInputElement>(null)
-
+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('')
-    inputElement.current?.focus()
   }, [])
 
   const onTopicBlur = useCallback((e: React.FocusEvent<HTMLInputElement>) => {
@@ -24,7 +21,7 @@ function TopicInput(props: { actions: typeof publishActions; manualTopic?: strin
     }
   }, [])
 
-  const topicStr = props.manualTopic || ''
+  const topicStr = props.topic || ''
 
   return useMemo(
     () => (
@@ -32,7 +29,6 @@ function TopicInput(props: { actions: typeof publishActions; manualTopic?: strin
         <FormControl style={{ width: '100%' }}>
           <InputLabel htmlFor="publish-topic">Topic</InputLabel>
           <Input
-            inputRef={inputElement}
             id="publish-topic"
             value={topicStr}
             startAdornment={<span />}
@@ -40,7 +36,7 @@ function TopicInput(props: { actions: typeof publishActions; manualTopic?: strin
             onBlur={onTopicBlur}
             onChange={updateTopic}
             multiline={false}
-            placeholder={props.selectedTopic ?? 'example/topic'}
+            placeholder="example/topic"
           />
         </FormControl>
       </div>
@@ -57,9 +53,11 @@ const mapDispatchToProps = (dispatch: any) => {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    manualTopic: state.publish.manualTopic,
-    selectedTopic: state.tree.get('selectedTopic')?.path(),
+    topic: state.publish.topic,
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(TopicInput)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TopicInput)

app/src/components/Sidebar/Sidebar.tsx

@@ -1,15 +1,14 @@
 import * as q from '../../../../backend/src/Model'
 import React, { useState, useEffect, useCallback } from 'react'
+import ExpandMore from '@material-ui/icons/ExpandMore'
 import NodeStats from './NodeStats'
 import ValuePanel from './ValueRenderer/ValuePanel'
-const ValuePanelAny = ValuePanel as any
 import { AppState } from '../../reducers'
-import { AccordionDetails } from '@mui/material'
+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 { Theme } from '@mui/material/styles'
-import { withStyles } from '@mui/styles'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import { TopicViewModel } from '../../model/TopicViewModel'
 import TopicPanel from './TopicPanel/TopicPanel'
 import Panel from './Panel'
@@ -29,7 +28,7 @@ interface Props {
 }
 
 function useUpdateNodeWhenNodeReceivesUpdates(node?: q.TreeNode<any>) {
-  const [, setLastUpdate] = useState(0)
+  const [lastUpdate, setLastUpdate] = useState(0)
   const updateNode = useCallback(
     throttle(() => {
       setLastUpdate(node ? node.lastUpdate : 0)
@@ -53,21 +52,22 @@ function Sidebar(props: Props) {
   const { classes, tree, nodePath } = props
   const node = usePollingToFetchTreeNode(tree, nodePath || '')
   useUpdateNodeWhenNodeReceivesUpdates(node)
+  // console.log(node && node.path(), tree, nodePath)
 
   return (
     <div id="Sidebar" className={classes.drawer}>
       <div>
         <TopicPanel node={node} />
-        <ValuePanelAny lastUpdate={node ? node.lastUpdate : 0} />
+        <ValuePanel lastUpdate={node ? node.lastUpdate : 0} />
         <Panel>
           <span>Publish</span>
           <Publish connectionId={props.connectionId} />
         </Panel>
         <Panel detailsHidden={!node}>
           <span>Stats</span>
-          <AccordionDetails className={classes.details}>
+          <ExpansionPanelDetails className={classes.details}>
             <NodeStats node={node} />
-          </AccordionDetails>
+          </ExpansionPanelDetails>
         </Panel>
       </div>
     </div>
@@ -99,4 +99,9 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Sidebar))
+export default withStyles(styles)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(Sidebar)
+)

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

@@ -1,8 +1,8 @@
 import * as q from '../../../../../backend/src/Model'
 import CustomIconButton from '../../helper/CustomIconButton'
-import Delete from '@mui/icons-material/Delete'
+import Delete from '@material-ui/icons/Delete'
 import React, { useCallback } from 'react'
-import { Badge } from '@mui/material'
+import { Badge } from '@material-ui/core'
 
 export const RecursiveTopicDeleteButton = (props: {
   node?: q.TreeNode<any>

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

@@ -1,8 +1,7 @@
 import React from 'react'
 import * as q from '../../../../../backend/src/Model'
-import Button from '@mui/material/Button'
-import { withStyles } from '@mui/styles'
-import { Theme } from '@mui/material/styles'
+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'
@@ -40,8 +39,8 @@ class Topic extends React.PureComponent<Props, {}> {
         <Button
           onClick={() => this.props.actions.selectTopic(edge!.target)}
           size="small"
-          variant={theme.palette.mode === 'light' ? 'contained' : undefined}
-          color={theme.palette.mode === 'light' ? 'primary' : 'secondary'}
+          variant={theme.palette.type === 'light' ? 'contained' : undefined}
+          color={theme.palette.type === 'light' ? 'primary' : 'secondary'}
           className={this.props.classes.button}
           key={edge!.hash()}
         >
@@ -67,4 +66,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(null, mapDispatchToProps)(withStyles(styles, { withTheme: true })(Topic) as any)
+export default connect(
+  null,
+  mapDispatchToProps
+)(withStyles(styles, { withTheme: true })(Topic))

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

@@ -1,6 +1,6 @@
 import * as q from '../../../../../backend/src/Model'
 import CustomIconButton from '../../helper/CustomIconButton'
-import Delete from '@mui/icons-material/Delete'
+import Delete from '@material-ui/icons/Delete'
 import React from 'react'
 
 export const TopicDeleteButton = (props: {
@@ -8,7 +8,7 @@ export const TopicDeleteButton = (props: {
   deleteTopicAction: (node: q.TreeNode<any>) => void
 }) => {
   const { node } = props
-  if (!node || !node.message || !node.message.payload) {
+  if (!node || !node.message || !node.message.value) {
     return null
   }
   return (

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

@@ -3,23 +3,22 @@ import Copy from '../../helper/Copy'
 import Panel from '../Panel'
 import React, { useMemo, useCallback } from 'react'
 import Topic from './Topic'
-const TopicAny = Topic as any
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { RecursiveTopicDeleteButton } from './RecursiveTopicDeleteButton'
-import { TopicDeleteButton } from './TopicDeleteButton'
-import { TopicTypeButton } from './TopicTypeButton'
 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)
   }, [])
 
@@ -30,12 +29,11 @@ const TopicPanel = (props: { node?: q.TreeNode<any>; actions: typeof sidebarActi
           Topic {copyTopic}
           <TopicDeleteButton node={node} deleteTopicAction={deleteTopic} />
           <RecursiveTopicDeleteButton node={node} deleteTopicAction={deleteTopic} />
-          <TopicTypeButton node={node} />
         </span>
-        <TopicAny node={node} />
+        <Topic node={node} />
       </Panel>
     ),
-    [node, node?.childTopicCount()]
+    [node, node && node.childTopicCount()]
   )
 }
 
@@ -45,4 +43,7 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(TopicPanel)
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(TopicPanel)

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

@@ -1,103 +0,0 @@
-import React, { useCallback, useMemo } from 'react'
-import * as q from '../../../../../backend/src/Model'
-import ClickAwayListener from '@mui/material/ClickAwayListener'
-import Grow from '@mui/material/Grow'
-import Button from '@mui/material/Button'
-import Paper from '@mui/material/Paper'
-import Popper from '@mui/material/Popper'
-import MenuItem from '@mui/material/MenuItem'
-import MenuList from '@mui/material/MenuList'
-import WarningRounded from '@mui/icons-material/WarningRounded'
-import { MessageDecoder, decoders } from '../../../decoders'
-import { Tooltip } from '@mui/material'
-
-export const TopicTypeButton = (props: { node?: q.TreeNode<any> }) => {
-  const { node } = props
-  if (!node || !node.message || !node.message.payload) {
-    return null
-  }
-
-  const options = decoders.flatMap(decoder => decoder.formats.map(format => [decoder, format] as const))
-
-  const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null)
-  const [open, setOpen] = React.useState(false)
-
-  const selectOption = useCallback(
-    (decoder: MessageDecoder, format: string) => {
-      if (!node) {
-        return
-      }
-
-      node.viewModel.decoder = { decoder, format }
-      setOpen(false)
-    },
-    [node]
-  )
-
-  const handleToggle = useCallback(
-    (event: React.MouseEvent<HTMLElement>) => {
-      event.stopPropagation()
-      if (open === true) {
-        return
-      }
-      setAnchorEl(event.currentTarget)
-      setOpen(prevOpen => !prevOpen)
-    },
-    [open]
-  )
-
-  const handleClose = useCallback((event: any) => {
-    if (anchorEl && anchorEl.contains(event.target as HTMLElement)) {
-      return
-    }
-    setOpen(false)
-  }, [])
-
-  return (
-    <Button onClick={handleToggle}>
-      {props.node?.viewModel.decoder?.format ?? props.node?.type}
-      <Popper open={open} anchorEl={anchorEl} role={undefined} transition>
-        {({ TransitionProps, placement }) => (
-          <Grow
-            {...TransitionProps}
-            style={{
-              transformOrigin: placement === 'bottom' ? 'center top' : 'center bottom',
-            }}
-          >
-            <Paper>
-              <ClickAwayListener onClickAway={handleClose}>
-                <MenuList id="topicTypeMode">
-                  {options.map(([decoder, format], index) => (
-                    <MenuItem
-                      key={format}
-                      selected={node && format === node.type}
-                      onClick={() => selectOption(decoder, format)}
-                    >
-                      <DecoderStatus decoder={decoder} format={format} node={node} />
-                    </MenuItem>
-                  ))}
-                </MenuList>
-              </ClickAwayListener>
-            </Paper>
-          </Grow>
-        )}
-      </Popper>
-    </Button>
-  )
-}
-
-function DecoderStatus({ node, decoder, format }: { node: q.TreeNode<any>; decoder: MessageDecoder; format: string }) {
-  const decoded = useMemo(() => {
-    return node.message?.payload && decoder.decode(node.message?.payload, format)
-  }, [node.message, decoder, format])
-
-  return decoded?.error ? (
-    <Tooltip title={decoded.error}>
-      <div>
-        {format} <WarningRounded />
-      </div>
-    </Tooltip>
-  ) : (
-    <>{format}</>
-  )
-}