Replace arrow buttons with drag-and-drop reordering using drag handles

Co-authored-by: thomasnordquist <7721625+thomasnordquist@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -0,0 +1,64 @@
+{
+  "name": "MQTT Explorer Development",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspace/MQTT-Explorer",
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "ms-vscode.vscode-typescript-next",
+        "ms-azuretools.vscode-docker",
+        "eamodio.gitlens"
+      ],
+      "settings": {
+        "editor.formatOnSave": true,
+        "typescript.tsdk": "node_modules/typescript/lib",
+        "editor.codeActionsOnSave": {
+          "source.fixAll.eslint": "explicit"
+        }
+      }
+    }
+  },
+
+  "forwardPorts": [3000, 8080, 1883, 5900, 6080],
+  "portsAttributes": {
+    "3000": {
+      "label": "MQTT Explorer Server",
+      "onAutoForward": "notify"
+    },
+    "8080": {
+      "label": "Webpack Dev Server",
+      "onAutoForward": "notify"
+    },
+    "1883": {
+      "label": "MQTT Broker",
+      "onAutoForward": "ignore"
+    },
+    "5900": {
+      "label": "VNC Server",
+      "onAutoForward": "ignore"
+    },
+    "6080": {
+      "label": "noVNC Web Client",
+      "onAutoForward": "notify"
+    }
+  },
+
+  "postCreateCommand": "yarn install",
+
+  "postStartCommand": "sudo apt-get update && sudo apt-get install -y mosquitto xvfb x11vnc ffmpeg tmux python3 python3-pip && sudo pip3 install --break-system-packages websockify",
+
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": true,
+      "installOhMyZsh": true,
+      "upgradePackages": true
+    }
+  },
+
+  "remoteUser": "node"
+}
+

.devcontainer/docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3.8'
+
+services:
+  app:
+    image: mcr.microsoft.com/devcontainers/javascript-node:24
+    volumes:
+      - ..:/workspaces/MQTT-Explorer: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'
+      - '5900:5900'
+      - '6080:6080'
+    volumes:
+      - ./mosquitto.conf:/mosquitto/config/mosquitto.conf:ro

.devcontainer/mosquitto.conf

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

.github/copilot-instructions.md

@@ -0,0 +1,207 @@
+# GitHub Copilot Agent Instructions for MQTT Explorer
+
+## Debugging Browser Mode
+
+### Prerequisites
+- Node.js 24 or higher
+- Yarn package manager
+- Running Mosquitto MQTT broker (for testing)
+
+### Development Mode (with Hot Reload)
+
+1. **Set credentials (required):**
+   ```bash
+   export MQTT_EXPLORER_USERNAME=admin
+   export MQTT_EXPLORER_PASSWORD=your_password
+   ```
+
+2. **Start development servers:**
+   ```bash
+   yarn dev:server
+   ```
+   This runs two servers in parallel:
+   - Backend server on http://localhost:3000 (serves API, WebSocket, authentication)
+   - Webpack dev server on http://localhost:8080 (serves frontend with hot reload)
+
+3. **Access the application:**
+   - Navigate to http://localhost:8080 (NOT :3000)
+   - Webpack dev server proxies API/WebSocket requests to backend on port 3000
+   - Hot reload enabled - changes to React components update automatically
+
+### Production Mode (Production Build)
+
+1. **Build the browser version:**
+   ```bash
+   yarn build:server
+   ```
+   This compiles TypeScript and builds the optimized webpack bundle
+
+2. **Start the server:**
+   ```bash
+   # Set credentials (required) - these are for the browser login page
+   export MQTT_EXPLORER_USERNAME=admin
+   export MQTT_EXPLORER_PASSWORD=your_password
+   
+   # Start server
+   yarn start:server
+   # OR: node dist/src/server.js
+   ```
+   Server will run on http://localhost:3000 (serves both frontend and backend)
+
+3. **Login to the application:**
+   - Navigate to http://localhost:3000
+   - Enter the username and password you set in the environment variables
+   - Click "LOGIN" button
+   - After successful login, the main application will load
+   - The MQTT Connection modal will appear where you can configure broker connections
+
+### Debugging with Browser DevTools
+
+1. **Open browser DevTools:**
+   - Navigate to http://localhost:3000
+   - Press F12 or right-click → Inspect
+   
+2. **Check Console tab:**
+   - Look for JavaScript errors
+   - CSP (Content Security Policy) errors indicate security header issues
+   - Network errors indicate API/WebSocket connection issues
+
+3. **Check Network tab:**
+   - Verify static assets load correctly (JS bundles, CSS)
+   - Check WebSocket connection status
+   - Monitor API calls for authentication issues
+
+4. **Common Issues:**
+
+   **Blank page / CSP errors:**
+   - Symptom: Console shows `EvalError: ... violates Content Security Policy`
+   - Cause: webpack runtime requires `unsafe-eval` for code splitting
+   - Fix: Add `'unsafe-eval'` to `scriptSrc` in `src/server.ts` helmet config
+   
+   **Authentication loop:**
+   - Symptom: Login dialog keeps reappearing
+   - Cause: WebSocket authentication failing
+   - Debug: Check browser Network tab → WS → Messages
+   - Check: Server logs for authentication errors
+   
+   **Theme errors:**
+   - Symptom: App loads but styling is broken
+   - Cause: Material-UI theme not loading correctly
+   - Check: Console for theme-related errors
+   - Verify: Both ThemeProvider and LegacyThemeProvider in `app/src/index.tsx`
+   
+   **Expected console warnings (non-fatal):**
+   - React 18 type warnings with Material-UI v5 components (dozens of "Failed prop type" warnings)
+   - `TypeError: Cannot read properties of undefined (reading 'on')` from IpcRendererEventBus - this is expected in browser mode as there's no Electron IPC
+   - MUI locale warnings for `en-US` - expected, app uses available locales
+   - `componentWillReceiveProps` deprecation warnings - from legacy TreeComponent
+   - ACE editor autocomplete warnings - expected, features not imported
+   - CSP worker violation for ACE editor - known issue, editor still functions
+   
+   These warnings don't prevent the application from functioning correctly.
+
+### Using Playwright for Automated Testing
+
+```bash
+# Start server in background
+export MQTT_EXPLORER_USERNAME=admin
+export MQTT_EXPLORER_PASSWORD=test123
+node dist/src/server.js &
+
+# Use Playwright browser tool (in Copilot agent context)
+playwright-browser_navigate http://localhost:3000
+playwright-browser_take_screenshot --filename debug.png
+playwright-browser_console_messages  # Check for errors
+```
+
+### Expected UI Flow
+
+1. **Login Page** (https://github.com/user-attachments/assets/383305e1-2169-433c-a668-5a05da0c343a)
+   - Enter username and password from environment variables
+   - Click "LOGIN" button
+   
+2. **Main Application After Login** (https://github.com/user-attachments/assets/cc4d665f-2665-4289-b2fc-dc4986f9ab5b)
+   - Application loads with sidebar, topic tree, value panel, and publish panel
+   - MQTT Connection modal appears automatically for first-time setup
+   - Configure broker connection (host, port, credentials, etc.)
+   - Click "CONNECT" to establish MQTT connection
+   
+3. **Application Features:**
+   - Topic tree on the left shows MQTT topic hierarchy
+   - Value panel shows selected topic's message content
+   - Publish panel allows sending MQTT messages
+   - Charts panel for numeric value visualization
+   - Settings drawer for app configuration
+
+### Debugging WebSocket Connection
+
+1. **Check server logs:**
+   ```bash
+   node dist/src/server.js 2>&1 | tee server.log
+   ```
+
+2. **Check browser WebSocket:**
+   - DevTools → Network → WS tab
+   - Look for socket.io connection
+   - Check Messages tab for authentication handshake
+
+3. **Common WebSocket issues:**
+   - CORS errors: Check `ALLOWED_ORIGINS` environment variable
+   - Authentication errors: Verify credentials in sessionStorage
+   - Connection refused: Server not running or port blocked
+
+### Development vs Production
+
+**Development mode:**
+```bash
+yarn dev:server
+# Runs webpack-dev-server with hot reload
+# More verbose error messages
+# Source maps enabled
+```
+
+**Production mode:**
+```bash
+NODE_ENV=production yarn build:server
+NODE_ENV=production node dist/src/server.js
+# Minified bundles
+# Generic error messages (security)
+# HSTS enabled
+```
+
+### Build Artifacts
+
+After `yarn build:server`, check:
+- `dist/src/server.js` - Compiled server code
+- `app/build/*.js` - Webpack bundles
+- `app/build/index.html` - Entry point HTML
+
+### Troubleshooting Checklist
+
+- [ ] Node.js version >=24
+- [ ] `yarn install` completed without errors  
+- [ ] TypeScript compilation successful (`npx tsc`)
+- [ ] Webpack build successful (check `app/build/` directory)
+- [ ] Server starts without errors
+- [ ] Can access http://localhost:3000
+- [ ] Login dialog appears
+- [ ] No CSP errors in console
+- [ ] WebSocket connects successfully
+- [ ] App renders after login
+
+### Security Considerations
+
+When debugging, be aware that:
+- `unsafe-eval` in CSP is required for webpack but reduces security
+- Credentials should never be hardcoded (use environment variables)
+- In production, use HTTPS with a reverse proxy (nginx/Apache)
+- Rate limiting is active (5 auth attempts per 15 min per IP)
+- File upload size limit is 16MB
+
+### Related Files
+
+- `src/server.ts` - Express server with security middleware
+- `app/webpack.browser.config.mjs` - Browser-specific webpack config  
+- `app/src/browserEventBus.ts` - Socket.io client for browser mode
+- `app/src/components/BrowserAuthWrapper.tsx` - Authentication dialog
+- `app/src/index.tsx` - React app entry point with theme providers

.github/workflows/build-dockerfile.yml

@@ -22,7 +22,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,49 @@
+name: 'Copilot Setup Steps'
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xvfb mosquitto
+
+      - 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

.github/workflows/platform-builds.yml

@@ -28,14 +28,14 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
       - run: npm install -g yarn
       - run: yarn
       - id: create_token # get ReleaseBot access token
-        uses: tibdex/github-app-token@v2
+        uses: actions/create-github-app-token@v1
         with:
-          app_id: ${{ secrets.RELEASE_BOT_APP_ID }}
-          private_key: ${{ secrets.RELEASE_BOT_PRIVATE_KEY }}
+          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
@@ -50,4 +50,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
   

.github/workflows/tests.yml

@@ -12,13 +12,58 @@ jobs:
       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
-      - name: UI-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
@@ -35,4 +80,56 @@ jobs:
       - name: Show URL
         run: echo '${{ steps.upload.outputs.file-url }}'
         id: artifact-upload-step
-      - run: echo '![test](${{ steps.upload.outputs.file-url }})' >> $GITHUB_STEP_SUMMARY
+      - 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

@@ -11,7 +11,7 @@ jobs:
           ref: gh-pages
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: '24'
       - run: npm install
       - run: npm run readme
       - uses: stefanzweifel/git-auto-commit-action@v5

.gitignore

@@ -9,3 +9,14 @@ 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
+
+app/.webpack-cache

BROWSER_MODE.md

@@ -0,0 +1,307 @@
+# 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
+
+### Production Deployment
+
+**CRITICAL**: The following security measures must be implemented for production deployments:
+
+#### 1. HTTPS/TLS Encryption
+Always use HTTPS in production to protect credentials and MQTT data in transit:
+
+```bash
+# Use a reverse proxy like nginx or Apache with TLS
+# Example nginx configuration:
+server {
+    listen 443 ssl http2;
+    server_name mqtt-explorer.example.com;
+    
+    ssl_certificate /path/to/cert.pem;
+    ssl_certificate_key /path/to/key.pem;
+    
+    location / {
+        proxy_pass http://localhost:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+    }
+}
+```
+
+#### 2. Environment Variables for Credentials
+**NEVER** use generated credentials in production. Always set secure credentials via environment variables:
+
+```bash
+export MQTT_EXPLORER_USERNAME=your_secure_username
+export MQTT_EXPLORER_PASSWORD=your_strong_password_min_12_chars
+export NODE_ENV=production
+yarn start:server
+```
+
+#### 3. CORS Configuration
+Configure allowed origins instead of using the wildcard (`*`):
+
+```bash
+# Single origin
+export ALLOWED_ORIGINS=https://mqtt-explorer.example.com
+
+# Multiple origins (comma-separated)
+export ALLOWED_ORIGINS=https://app1.example.com,https://app2.example.com
+
+yarn start:server
+```
+
+In production with `NODE_ENV=production`, wildcard CORS is automatically disabled for security.
+
+#### 4. Network Security
+- Deploy behind a firewall or VPN
+- Use IP whitelisting if possible
+- Implement network-level rate limiting
+- Monitor for suspicious connection patterns
+
+#### 5. File Upload Security
+The server implements several protections against malicious file uploads:
+- Maximum file size: 16MB (configurable via `MAX_FILE_SIZE` constant)
+- Path traversal protection via filename sanitization
+- Files stored in isolated directories
+- Real path validation to prevent directory escapes
+
+#### 6. Authentication Security
+The server implements multiple layers of authentication security:
+- **Password Hashing**: bcrypt with 10 rounds
+- **Timing Attack Protection**: Constant-time string comparison for usernames
+- **Rate Limiting**: Maximum 5 failed attempts per IP per 15 minutes
+- **Session Tracking**: Failed attempts are tracked per client IP
+- **No Credential Logging**: In production mode, credentials are not logged
+
+#### 7. HTTP Security Headers
+The server uses helmet.js to set security headers:
+- Content Security Policy (CSP)
+- HTTP Strict Transport Security (HSTS) in production
+- X-Content-Type-Options: nosniff
+- X-Frame-Options: DENY
+- X-XSS-Protection
+
+### Security Best Practices
+
+1. **Rotate Credentials Regularly**: Change authentication credentials periodically
+2. **Monitor Logs**: Watch for authentication failures and unusual patterns
+3. **Keep Dependencies Updated**: Run `yarn audit` regularly
+4. **Limit Network Exposure**: Don't expose the server directly to the internet
+5. **Use Strong Passwords**: Minimum 12 characters with mixed case, numbers, and symbols
+6. **Enable Logging**: Monitor access logs and error logs
+7. **Regular Backups**: Back up configuration and certificate data
+8. **Principle of Least Privilege**: Run the server with minimal required permissions
+
+### Vulnerability Reporting
+
+If you discover a security vulnerability, please report it via:
+- GitHub Security Advisories
+- Email to the maintainer
+- Do NOT create public issues for security vulnerabilities
+
+### Security Audit Log
+
+- **2024-12**: Initial security review and hardening
+  - Added helmet.js for HTTP security headers
+  - Implemented rate limiting for authentication
+  - Added path traversal protection
+  - Implemented constant-time comparison for credentials
+  - Added input validation and size limits
+  - Removed credential logging in production
+  - Added configurable CORS origins
+  - Created comprehensive security test suite
+
+## Security Considerations (Legacy)
+
+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

@@ -0,0 +1,149 @@
+# 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

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:24
 
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update \
   && apt-get install -y --no-install-recommends ca-certificates nano ffmpeg xvfb git-core tmux locales mosquitto x11vnc

LICENSE.md

@@ -1,10 +1,10 @@
-## creative commons
+When distributing, the attribution and donation page may not be altered or made less accessible without explicit approval.
 
-# Attribution-NoDerivatives 4.0 International
+# Creative Commons Attribution-ShareAlike 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,31 +12,37 @@ 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-NoDerivatives 4.0 International Public License
+## Creative Commons Attribution-ShareAlike 4.0 International Public License
 
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+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.
 
 ### Section 1 – Definitions.
 
 a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
 
-b. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+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.
 
-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.
+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.
 
-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.
+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.
 
-e. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+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.
 
-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.
+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.
 
-g. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public 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.
 
-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.
+h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public 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.
+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.
 
-j. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+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.
 
 ### Section 2 – Scope.
 
@@ -46,7 +52,7 @@ a. ___License grant.___
 
        A. reproduce and Share the Licensed Material, in whole or in part; and
 
-       B. produce and reproduce, but not Share, Adapted Material.
+       B. produce, reproduce, and 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.
 
@@ -58,7 +64,9 @@ 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. __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. __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.
 
    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).
 
@@ -76,7 +84,7 @@ Your exercise of the Licensed Rights is expressly made subject to the following
 
 a. ___Attribution.___
 
-   1. If You Share the Licensed Material, You must:
+   1. If You Share the Licensed Material (including in modified form), You must:
 
        A. retain the following if it is supplied by the Licensor with the Licensed Material:
 
@@ -94,19 +102,27 @@ 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, provided You do not Share Adapted 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;
 
-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
+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
 
 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.
 
@@ -152,7 +168,6 @@ 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.” 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.” 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 may be contacted at creativecommons.org
-
+> Creative Commons may be contacted at creativecommons.org.

NOTARIZATION.md

@@ -0,0 +1,143 @@
+# macOS Notarization Setup
+
+This document explains how to set up notarization for macOS builds of MQTT Explorer.
+
+## Overview
+
+macOS notarization is a security feature required by Apple for all software distributed outside the Mac App Store. Starting with macOS 10.15 (Catalina), all software must be notarized to run without warnings on macOS.
+
+## Prerequisites
+
+1. An active Apple Developer account
+2. Xcode command line tools installed on the build machine
+3. An app-specific password for notarization
+
+## Setup Steps
+
+### 1. Create an App-Specific Password
+
+1. Sign in to [appleid.apple.com](https://appleid.apple.com)
+2. Navigate to "Sign-In and Security" section
+3. Under "App-Specific Passwords", click "Generate an app-specific password"
+4. Enter a descriptive name (e.g., "MQTT Explorer Notarization")
+5. Copy the generated password (you won't be able to see it again)
+
+### 2. Find Your Team ID
+
+1. Sign in to [developer.apple.com](https://developer.apple.com/account)
+2. Navigate to "Membership Details"
+3. Copy your Team ID (a 10-character alphanumeric string)
+
+### 3. Configure GitHub Secrets
+
+Add the following secrets to your GitHub repository:
+
+- `APPLE_ID`: Your Apple ID email address (e.g., `your.email@example.com`)
+- `APPLE_APP_SPECIFIC_PASSWORD`: The app-specific password created in step 1
+- `APPLE_TEAM_ID`: Your Team ID from step 2
+
+To add secrets:
+1. Go to your repository on GitHub
+2. Navigate to Settings → Secrets and variables → Actions
+3. Click "New repository secret" for each of the above
+
+## How It Works
+
+### Build Configuration
+
+The notarization process is configured in `package.json`:
+
+```json
+{
+  "build": {
+    "mac": {
+      "hardenedRuntime": true,
+      "gatekeeperAssess": false,
+      "entitlements": "res/entitlements.mac.plist",
+      "entitlementsInherit": "res/entitlements.mac.inherit.plist"
+    },
+    "afterSign": "./dist/scripts/notarize.js"
+  }
+}
+```
+
+### Notarization Script
+
+The `scripts/notarize.ts` script handles the notarization process:
+
+1. Checks if the build is for macOS
+2. Verifies that required environment variables are set
+3. Submits the app to Apple's notarization service
+4. Waits for notarization to complete
+5. Staples the notarization ticket to the app
+
+### Entitlements
+
+Different entitlements are used for different build types:
+
+- **DMG builds** (regular distribution):
+  - `res/entitlements.mac.plist` - Main entitlements
+  - `res/entitlements.mac.inherit.plist` - Inherited entitlements for child processes
+
+- **MAS builds** (Mac App Store):
+  - `res/entitlements.mas.plist` - App Store specific entitlements
+
+### CI/CD Integration
+
+The GitHub Actions workflow (`platform-builds.yml`) automatically:
+
+1. Builds the macOS app when code is pushed to `release` or `beta` branches
+2. Signs the app with the developer certificate
+3. Notarizes the app using the configured secrets
+4. Publishes the notarized app to GitHub releases
+
+## Troubleshooting
+
+### Notarization Fails
+
+If notarization fails, check:
+
+1. **Credentials**: Ensure all three secrets are correctly set in GitHub
+2. **App-specific password**: Verify it hasn't expired or been revoked
+3. **Team ID**: Confirm it matches your developer account
+4. **Entitlements**: Ensure the entitlements files are valid and appropriate for your app
+
+### Checking Notarization Status
+
+You can check the notarization status of a built app:
+
+```bash
+# Check if an app is notarized
+spctl -a -vv /path/to/MQTT\ Explorer.app
+
+# Check notarization history
+xcrun notarytool history --apple-id your.email@example.com --team-id YOUR_TEAM_ID
+```
+
+### Local Testing
+
+To test notarization locally:
+
+```bash
+# Set environment variables
+export APPLE_ID="your.email@example.com"
+export APPLE_APP_SPECIFIC_PASSWORD="your-app-specific-password"
+export APPLE_TEAM_ID="YOUR_TEAM_ID"
+
+# Build and notarize
+yarn build
+yarn package mac
+```
+
+## Security Considerations
+
+- Never commit Apple credentials to the repository
+- Use app-specific passwords, not your main Apple ID password
+- Rotate app-specific passwords periodically
+- Limit access to GitHub secrets to trusted maintainers only
+
+## References
+
+- [Apple Notarization Documentation](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution)
+- [electron-builder Code Signing](https://www.electron.build/code-signing)
+- [@electron/notarize](https://github.com/electron/notarize)

Readme.md

@@ -18,8 +18,22 @@ 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
@@ -27,8 +41,23 @@ 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
@@ -37,32 +66,49 @@ 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 travis.
+To achieve a reliable product automated tests run regularly on CI.
 
-- Data model
-- MQTT integration
-- UI-Tests (The demo is a recorded ui test)
+- **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)
 
-## Run UI-tests
+### Run UI Test Suite
 
-A [mosquitto](https://mosquitto.org/) MQTT broker is required to run the ui-tests.
-
-Run tests with
+The UI test suite validates core functionality through automated browser tests. Each test is independent and deterministic.
 
 ```bash
-# Run chromedriver in a separate terminal session
-./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515 --verbose
+# Run with automated setup (recommended)
+./scripts/runUiTests.sh
+
+# Or run directly (requires manual MQTT broker setup)
+yarn build
+yarn test:ui
 ```
 
-Compile and execute tests
+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.
 
 ```bash
-npm run build
-node dist/src/spec/webdriverio.js
+yarn build
+yarn ui-test
 ```
 
 ## Create a release
@@ -70,6 +116,10 @@ node dist/src/spec/webdriverio.js
 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
 
+### macOS Notarization
+
+macOS builds are automatically notarized during the release process. To set up notarization credentials, see [NOTARIZATION.md](NOTARIZATION.md).
+
 ## Create a beta release
 
 Create a PR to `beta` branch. A "feat" or "fix" commit is necessary to create a new version.
@@ -99,7 +149,7 @@ The readme will be generated from the docs.
 
 ## License
 
-![CC-BY-ND 4.0](https://img.shields.io/badge/License-CC%20BY--ND%204.0-blue.svg)  
-[CC-BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0/)
+![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/)
 
-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.
+The license allows for anyone to adapt, share, and redistribute the material, as long as it is non-commercial.

SECURITY.md

@@ -0,0 +1,194 @@
+# Security Policy
+
+## Supported Versions
+
+Security updates are provided for the latest release of MQTT Explorer.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.4.x   | :white_check_mark: |
+| < 0.4   | :x:                |
+
+## Reporting a Vulnerability
+
+We take security vulnerabilities seriously. If you discover a security issue, please follow these steps:
+
+### How to Report
+
+1. **DO NOT** create a public GitHub issue for security vulnerabilities
+2. Report via one of these channels:
+   - GitHub Security Advisories (preferred): https://github.com/thomasnordquist/MQTT-Explorer/security/advisories/new
+   - Email the maintainer directly
+3. Include the following information:
+   - Description of the vulnerability
+   - Steps to reproduce
+   - Potential impact
+   - Any suggested fixes (optional)
+
+### What to Expect
+
+- **Acknowledgment**: We will acknowledge receipt of your report within 48 hours
+- **Updates**: We will provide updates on the status of your report within 7 days
+- **Fix Timeline**: We aim to release security fixes within 30 days for critical issues
+- **Credit**: With your permission, we will credit you in the security advisory and release notes
+
+## Security Features
+
+### Browser Mode Security
+
+MQTT Explorer's browser mode includes several security features:
+
+#### Authentication
+- **bcrypt Password Hashing**: All passwords are hashed with bcrypt (10 rounds)
+- **Constant-Time Comparison**: Username comparison uses crypto.timingSafeEqual() to prevent timing attacks
+- **Environment Variable Configuration**: Credentials can be set via environment variables for production
+- **Automatic Credential Generation**: Secure random credentials generated if not provided
+
+#### Rate Limiting
+- **Authentication Rate Limiting**: Maximum 5 failed authentication attempts per IP per 15 minutes
+- **Per-IP Tracking**: Failed attempts tracked separately for each client IP
+- **Automatic Reset**: Rate limit counters automatically reset after 15 minutes
+
+#### HTTP Security Headers (helmet.js)
+- **Content Security Policy (CSP)**: Restricts resource loading to prevent XSS attacks
+- **HTTP Strict Transport Security (HSTS)**: Enforces HTTPS in production
+- **X-Content-Type-Options**: Prevents MIME type sniffing
+- **X-Frame-Options**: Prevents clickjacking attacks
+- **X-XSS-Protection**: Enables browser XSS protection
+
+#### Input Validation
+- **File Size Limits**: Maximum 16MB for file uploads
+- **Path Traversal Protection**: All file paths validated and sanitized
+- **Filename Sanitization**: Removes path separators, null bytes, and validates against traversal patterns
+- **Real Path Validation**: Ensures resolved paths stay within allowed directories
+- **Base64 Validation**: All file data properly validated before processing
+
+#### CORS Configuration
+- **Configurable Origins**: CORS origins configurable via ALLOWED_ORIGINS environment variable
+- **Production Restrictions**: Wildcard CORS automatically disabled in production
+- **Credential Support**: CORS configured with credentials: true for authenticated requests
+
+#### Error Handling
+- **Generic Error Messages**: Detailed errors only shown in development mode
+- **No Information Leakage**: Error messages sanitized to prevent information disclosure
+- **Secure Logging**: Sensitive information not logged in production
+
+## Security Best Practices
+
+### For Server Deployment
+
+1. **Always Use HTTPS in Production**
+   - Use a reverse proxy (nginx, Apache) with TLS certificates
+   - Never expose the Node.js server directly to the internet
+   - Use Let's Encrypt for free TLS certificates
+
+2. **Set Strong Credentials**
+   ```bash
+   export MQTT_EXPLORER_USERNAME=your_secure_username
+   export MQTT_EXPLORER_PASSWORD=your_strong_password_min_12_chars
+   export NODE_ENV=production
+   ```
+
+3. **Configure CORS Properly**
+   ```bash
+   # Single origin
+   export ALLOWED_ORIGINS=https://mqtt-explorer.example.com
+   
+   # Multiple origins
+   export ALLOWED_ORIGINS=https://app1.example.com,https://app2.example.com
+   ```
+
+4. **Network Security**
+   - Deploy behind a firewall or VPN
+   - Use IP whitelisting when possible
+   - Implement network-level rate limiting
+   - Monitor access logs regularly
+
+5. **Keep Dependencies Updated**
+   ```bash
+   yarn audit
+   yarn upgrade-interactive
+   ```
+
+6. **Regular Security Audits**
+   - Run security tests: `yarn test:security`
+   - Review access logs for suspicious activity
+   - Monitor authentication failures
+   - Check for outdated dependencies
+
+### For MQTT Connections
+
+1. **Use TLS/SSL**: Always connect to MQTT brokers using TLS encryption
+2. **Strong Credentials**: Use unique, strong passwords for MQTT authentication
+3. **Certificate Validation**: Verify broker certificates in production
+4. **Least Privilege**: Connect with minimal required permissions
+
+## Security Testing
+
+The project includes comprehensive security tests:
+
+```bash
+# Run all tests including security tests
+yarn test
+
+# Run only security tests
+npx mocha --require source-map-support/register dist/src/spec/security-tests.spec.js
+```
+
+Security tests cover:
+- Path traversal attack prevention
+- Input validation and sanitization
+- Authentication security
+- CORS configuration
+- Rate limiting
+- Error handling
+- Data sanitization
+
+## Security Audit History
+
+### December 2024 - Initial Security Review
+- Added helmet.js for HTTP security headers
+- Implemented rate limiting for authentication
+- Added path traversal protection with sanitization
+- Implemented constant-time comparison for credentials
+- Added input validation and size limits
+- Removed credential logging in production
+- Added configurable CORS origins
+- Created comprehensive security test suite (19 tests)
+- Enhanced documentation with security best practices
+
+## Known Limitations
+
+### Browser Mode
+- File system access limited to server-side directories
+- No native OS dialogs (uses browser file input)
+- Session management is stateless (no persistent sessions)
+
+### Desktop Mode (Electron)
+- Inherits security model from Electron framework
+- IPC communication between renderer and main process
+- No network exposure by default
+
+## Recommended Security Tools
+
+- **Dependency Scanning**: Dependabot, Snyk, or npm audit
+- **SAST**: SonarQube, ESLint security plugins
+- **Container Scanning**: If using Docker deployment
+- **TLS Testing**: SSL Labs, testssl.sh
+- **Penetration Testing**: OWASP ZAP, Burp Suite
+
+## References
+
+- [OWASP Top 10](https://owasp.org/www-project-top-ten/)
+- [Node.js Security Best Practices](https://nodejs.org/en/docs/guides/security/)
+- [Express Security Best Practices](https://expressjs.com/en/advanced/best-practice-security.html)
+- [helmet.js Documentation](https://helmetjs.github.io/)
+- [MQTT Security](https://mqtt.org/mqtt-specification/)
+
+## Contact
+
+For security-related questions or concerns:
+- GitHub Security Advisories: https://github.com/thomasnordquist/MQTT-Explorer/security/advisories
+- Project Issues (for non-sensitive topics): https://github.com/thomasnordquist/MQTT-Explorer/issues
+
+Thank you for helping keep MQTT Explorer secure!

app/package.json

@@ -6,91 +6,95 @@
   "scripts": {
     "build": "webpack --mode production",
     "dev": "node_modules/.bin/webpack-dev-server --mode development --progress",
-    "test": "cross-env TS_NODE_PROJECT=test/tsconfig.json yarn mochatest",
-    "mochatest": "mocha --require ts-node/register --require source-map-support/register --recursive src/*/**/*.spec.ts"
+    "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": ">=18"
+    "node": ">=20"
   },
   "author": "",
   "license": "CC-BY-ND-4.0",
   "dependencies": {
-    "@material-ui/core": "4.12",
-    "@material-ui/icons": "^4",
-    "@material-ui/lab": "^4.0.0-alpha",
-    "@material-ui/styles": "4.11",
-    "@types/react-transition-group": "^4",
+    "@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": "^0.28.0",
-    "compare-versions": "^3.5.0",
-    "copy-text-to-clipboard": "^2.1.0",
-    "d3": "^5.9.7",
-    "d3-shape": "^1.3.5",
-    "diff": "^4.0.1",
-    "dot-prop": "^5.0.0",
+    "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",
     "get-value": "^3.0.1",
-    "immutable": "^4.0.0-rc.12",
+    "immutable": "^4.3.7",
     "in-viewport": "^3.6.0",
-    "js-base64": "^2.5.1",
+    "js-base64": "^3.7.8",
     "json-to-ast": "^2.1.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
     "moving-average": "^1.0.0",
     "number-abbreviate": "^2.0.0",
+    "os-browserify": "^0.3.0",
     "parse-duration": "^0.1.1",
-    "prismjs": "^1.15.0",
-    "react": "^16.11",
-    "react-ace": "^8",
-    "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",
-    "react-vis": "^1.11.6",
-    "react-window": "^1.8.10",
-    "redux": "^4.0.1",
-    "redux-batched-actions": "0.5",
-    "redux-thunk": "^2.3.0",
+    "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",
     "sha1": "^1.1.1",
-    "socket.io-client": "^2.2.0",
-    "uuid": "7"
+    "socket.io-client": "^4.8.1",
+    "url": "^0.11.4",
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
-    "@babel/runtime": "^7.17.2",
-    "@types/d3": "^5.7.2",
-    "@types/diff": "^4.0.1",
-    "@types/get-value": "^3.0.1",
-    "@types/node": "^12.7.8",
-    "@types/prismjs": "^1.9.1",
-    "@types/react": "^16.9.4",
-    "@types/react-dom": "^16.0.11",
-    "@types/react-redux": "^7.0.9",
-    "@types/react-resize-detector": "^4.0.1",
-    "@types/react-virtualized": "^9.21.30",
-    "@types/react-window": "^1.8.8",
+    "@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/sha1": "^1.1.1",
-    "@types/socket.io-client": "^1.4.32",
-    "@types/uuid": "^7.0.2",
-    "@types/vis": "^4.21.9",
-    "chai": "^4.2.0",
-    "cross-env": "^7.0.2",
-    "css-loader": "^3.0.0",
+    "@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.5.0",
+    "html-webpack-plugin": "^5.6.3",
     "lodash": "^4.17.21",
-    "mocha": "^10.4.0",
-    "moment": "^2.29.1",
-    "node-loader": "^0.6.0",
-    "source-map-loader": "^0.2.4",
-    "style-loader": "^1",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.5.5",
-    "webpack": "^5.91.0",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.0.4"
+    "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"
   },
   "peerDependencies": {
-    "electron": "^29"
+    "electron": "^39"
   }
 }

app/src/actions/ConnectionManager.ts

@@ -9,12 +9,11 @@ import {
 import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
 import { Dispatch } from 'redux'
 import { showError } from './Global'
-import { promises as fsPromise } 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 } from '../../../events'
+import { rendererRpc, readFromFile } from '../../../events'
 import { makeOpenDialogRpc } from '../../../events/OpenDialogRequest'
 
 export interface ConnectionDictionary {
@@ -81,7 +80,7 @@ async function openCertificate(): Promise<CertificateParameters> {
     throw rejectReasons.noCertificateSelected
   }
 
-  const data = await fsPromise.readFile(selectedFile)
+  const data = await rendererRpc.call(readFromFile, { filePath: selectedFile })
   if (data.length > 16_384 || data.length < 64) {
     throw rejectReasons.certificateSizeDoesNotMatch
   }
@@ -148,6 +147,12 @@ export const toggleCertificateSettings = (): Action => ({
   type: ActionTypes.CONNECTION_MANAGER_TOGGLE_CERTIFICATE_SETTINGS,
 })
 
+export const moveConnection = (connectionId: string, direction: 'up' | 'down'): Action => ({
+  connectionId,
+  direction,
+  type: ActionTypes.CONNECTION_MANAGER_MOVE_CONNECTION,
+})
+
 export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   const connectionIds = Object.keys(getState().connectionManager.connections)
   const connectionIdLocation = connectionIds.indexOf(connectionId)

app/src/actions/Publish.ts

@@ -2,7 +2,10 @@ 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 } from '../../../events'
+import { MqttMessage, makePublishEvent, rendererEvents, rendererRpc, readFromFile } from '../../../events'
+import { makeOpenDialogRpc } from '../../../events/OpenDialogRequest'
+import { showError } from './Global'
+import { Base64 } from 'js-base64'
 
 export const setTopic = (topic?: string): Action => {
   return {
@@ -11,6 +14,50 @@ 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,

app/src/actions/Tree.ts

@@ -7,7 +7,7 @@ import { batchActions } from 'redux-batched-actions'
 import { globalActions } from './'
 import { setTopic } from './Publish'
 import { TopicViewModel } from '../model/TopicViewModel'
-const debounce = require('lodash.debounce')
+import debounce from 'lodash.debounce'
 export { clearTopic } from './clearTopic'
 
 export { moveSelectionUpOrDownwards, moveInward, moveOutward } from './visibleTreeTraversal'

app/src/actions/migrations/Connection.ts

@@ -68,6 +68,17 @@ let migrations: Migration[] = [
       }
     },
   },
+  // Add order field for connection ordering
+  {
+    from: 1,
+    apply: (connection: ConnectionOptions): ConnectionOptions => {
+      if (connection.order !== undefined) {
+        return connection
+      }
+      // Order will be assigned during migration based on current position
+      return connection
+    },
+  },
 ]
 
 const connectionMigrator = new ConfigMigrator(migrations)
@@ -80,8 +91,14 @@ function isMigrationNecessary(connections: ConnectionDictionary): boolean {
 
 function applyMigrations(connections: ConnectionDictionary): ConnectionDictionary {
   let newConnectionDictionary: ConnectionDictionary = {}
-  Object.keys(connections).forEach(key => {
+  const connectionKeys = Object.keys(connections)
+  
+  connectionKeys.forEach((key, index) => {
     let newConnection = connectionMigrator.applyMigrations(connections[key]) as any
+    // If the migration didn't assign an order, assign one based on current position
+    if (newConnection.order === undefined) {
+      newConnection.order = index
+    }
     newConnectionDictionary[newConnection.id] = newConnection
   })
 

app/src/browserEventBus.ts

@@ -0,0 +1,115 @@
+// Browser-specific EventBus implementation using Socket.io
+// This file contains the socket.io-client dependency which belongs in the app layer
+import io, { Socket } from 'socket.io-client'
+import { SocketIOClientEventBus } from '../../events/EventSystem/SocketIOClientEventBus'
+import { Rpc } from '../../events/EventSystem/Rpc'
+
+// Get auth from sessionStorage or use empty (will show login dialog)
+let username = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('mqtt-explorer-username') || '' : ''
+let password = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('mqtt-explorer-password') || '' : ''
+
+// Connect to the server (same origin in browser mode)
+const socket: Socket = io({
+  auth: {
+    username,
+    password,
+  },
+  reconnection: true,
+  reconnectionDelay: 1000,
+  reconnectionDelayMax: 5000,
+  reconnectionAttempts: Infinity,
+  transports: ['websocket', 'polling'],
+  autoConnect: false, // Don't auto-connect, we'll connect manually after checking credentials
+})
+
+// Handle connection errors
+socket.on('connect_error', (error) => {
+  console.error('Socket connection error:', error.message)
+  
+  // Check if it's an authentication error
+  if (error.message.includes('Invalid credentials') || 
+      error.message.includes('Authentication required') ||
+      error.message.includes('Too many')) {
+    // Clear invalid credentials from sessionStorage
+    if (typeof sessionStorage !== 'undefined') {
+      sessionStorage.removeItem('mqtt-explorer-username')
+      sessionStorage.removeItem('mqtt-explorer-password')
+    }
+    
+    // Dispatch custom event that BrowserAuthWrapper can listen to
+    if (typeof window !== 'undefined') {
+      window.dispatchEvent(new CustomEvent('mqtt-auth-error', { 
+        detail: { message: error.message } 
+      }))
+    }
+  }
+})
+
+socket.on('disconnect', (reason) => {
+  console.log('Socket disconnected:', reason)
+})
+
+socket.on('connect', () => {
+  console.log('Socket connected successfully')
+  
+  // Dispatch custom event that BrowserAuthWrapper can listen to
+  if (typeof window !== 'undefined') {
+    window.dispatchEvent(new CustomEvent('mqtt-auth-success', { 
+      detail: { message: 'Authentication successful' } 
+    }))
+  }
+})
+
+/**
+ * Update socket authentication credentials and attempt to reconnect
+ * @param newUsername New username
+ * @param newPassword New password
+ */
+export function updateSocketAuth(newUsername: string, newPassword: string) {
+  username = newUsername
+  password = newPassword
+  
+  // Update socket auth
+  socket.auth = {
+    username: newUsername,
+    password: newPassword,
+  }
+  
+  // Store in sessionStorage
+  if (typeof sessionStorage !== 'undefined') {
+    sessionStorage.setItem('mqtt-explorer-username', newUsername)
+    sessionStorage.setItem('mqtt-explorer-password', newPassword)
+  }
+  
+  // Disconnect if connected, then reconnect with new credentials
+  if (socket.connected) {
+    socket.disconnect()
+  }
+  socket.connect()
+}
+
+/**
+ * Connect the socket (used on initial page load)
+ */
+export function connectSocket() {
+  if (!socket.connected) {
+    socket.connect()
+  }
+}
+
+export const rendererEvents = new SocketIOClientEventBus(socket)
+export const rendererRpc = new Rpc(rendererEvents)
+
+// Export socket instance for error monitoring
+export const browserSocket = socket
+
+// In browser mode, the backend is on the server
+// For compatibility, export same instances (renderer communicates with server backend via socket)
+export const backendEvents = rendererEvents
+export const backendRpc = rendererRpc
+
+// Re-export all events from the events module so imports work correctly
+export * from '../../events/Events'
+export * from '../../events/EventsV2'
+export * from '../../events/EventSystem/EventDispatcher'
+export * from '../../events/EventSystem/EventBusInterface'

app/src/components/App.tsx

@@ -1,6 +1,6 @@
 import ConfirmationDialog from './ConfirmationDialog'
 import ConnectionSetup from './ConnectionSetup/ConnectionSetup'
-import CssBaseline from '@material-ui/core/CssBaseline'
+import CssBaseline from '@mui/material/CssBaseline'
 import ErrorBoundary from './ErrorBoundary'
 import Notification from './Layout/Notification'
 import React from 'react'
@@ -11,7 +11,8 @@ import { bindActionCreators } from 'redux'
 import { ConfirmationRequest } from '../reducers/Global'
 import { connect } from 'react-redux'
 import { globalActions, settingsActions } from '../actions'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 ;(window as any).global = window
 
 const Settings = React.lazy(() => import('./SettingsDrawer/Settings'))

app/src/components/BrowserAuthWrapper.tsx

@@ -0,0 +1,117 @@
+import * as React from 'react'
+import { LoginDialog } from './LoginDialog'
+import { updateSocketAuth, connectSocket } from '../browserEventBus'
+import { isBrowserMode } from '../utils/browserMode'
+
+interface BrowserAuthWrapperProps {
+  children: React.ReactNode
+}
+
+export function BrowserAuthWrapper(props: BrowserAuthWrapperProps) {
+  const [isAuthenticated, setIsAuthenticated] = React.useState(false)
+  const [loginError, setLoginError] = React.useState<string | undefined>()
+  const [showLogin, setShowLogin] = React.useState(isBrowserMode) // Show login initially in browser mode
+  const [waitTimeSeconds, setWaitTimeSeconds] = React.useState<number | undefined>()
+  const [isConnecting, setIsConnecting] = React.useState(false)
+
+  React.useEffect(() => {
+    if (!isBrowserMode) {
+      // Not in browser mode, skip authentication
+      setIsAuthenticated(true)
+      return
+    }
+
+    // Listen for successful authentication from socket
+    const handleAuthSuccess = (event: CustomEvent) => {
+      console.log('Authentication successful')
+      setIsAuthenticated(true)
+      setShowLogin(false)
+      setLoginError(undefined)
+      setWaitTimeSeconds(undefined)
+      setIsConnecting(false)
+    }
+
+    // Listen for authentication errors from socket
+    const handleAuthError = (event: CustomEvent) => {
+      const errorMessage = event.detail?.message || 'Authentication failed'
+      console.error('Authentication error:', errorMessage)
+      
+      // Clear authentication state
+      setIsAuthenticated(false)
+      setShowLogin(true)
+      setIsConnecting(false)
+      
+      // Extract wait time from error message (e.g., "Please wait 30 seconds")
+      const waitTimeMatch = errorMessage.match(/(\d+)\s+seconds?/)
+      if (waitTimeMatch) {
+        const seconds = parseInt(waitTimeMatch[1], 10)
+        // Add a few seconds margin to the countdown
+        setWaitTimeSeconds(seconds + 3)
+      } else {
+        setWaitTimeSeconds(undefined)
+      }
+      
+      // Set user-friendly error message based on error type
+      // Error messages from server already include wait times
+      if (errorMessage.includes('Too many failed authentication attempts')) {
+        setLoginError(errorMessage)
+      } else if (errorMessage.includes('Invalid credentials')) {
+        setLoginError(errorMessage)
+      } else if (errorMessage.includes('Authentication required')) {
+        setLoginError('Please enter your username and password.')
+        setWaitTimeSeconds(undefined)
+      } else {
+        setLoginError('Authentication failed. Please try again.')
+        setWaitTimeSeconds(undefined)
+      }
+    }
+
+    window.addEventListener('mqtt-auth-success', handleAuthSuccess as EventListener)
+    window.addEventListener('mqtt-auth-error', handleAuthError as EventListener)
+
+    // Check if already authenticated
+    const username = sessionStorage.getItem('mqtt-explorer-username')
+    const password = sessionStorage.getItem('mqtt-explorer-password')
+
+    if (username && password) {
+      // Credentials exist, try to connect with them
+      setIsConnecting(true)
+      connectSocket()
+    } else {
+      // No credentials, show login dialog
+      setShowLogin(true)
+    }
+
+    return () => {
+      window.removeEventListener('mqtt-auth-success', handleAuthSuccess as EventListener)
+      window.removeEventListener('mqtt-auth-error', handleAuthError as EventListener)
+    }
+  }, [])
+
+  const handleLogin = (username: string, password: string) => {
+    try {
+      // Clear any previous error
+      setLoginError(undefined)
+      setWaitTimeSeconds(undefined)
+      setIsConnecting(true)
+      
+      // Update socket auth and reconnect (no page reload needed)
+      updateSocketAuth(username, password)
+    } catch (error) {
+      console.error('Failed to update socket auth:', error)
+      setLoginError('Failed to connect. Please try again.')
+      setIsConnecting(false)
+    }
+  }
+
+  if (!isBrowserMode) {
+    // Not in browser mode, render children directly
+    return <>{props.children}</>
+  }
+
+  if (!isAuthenticated) {
+    return <LoginDialog open={showLogin} onLogin={handleLogin} error={loginError} waitTimeSeconds={waitTimeSeconds} />
+  }
+
+  return <>{props.children}</>
+}

app/src/components/Chart/Chart.tsx

@@ -1,14 +1,13 @@
 import DateFormatter from '../helper/DateFormatter'
 import NoData from './NoData'
 import NumberFormatter from '../helper/NumberFormatter'
-import React, { memo, useCallback } from 'react'
+import React, { memo, useCallback, useRef, useEffect } from 'react'
 import TooltipComponent from './TooltipComponent'
-import { default as ReactResizeDetector } from 'react-resize-detector'
-import { emphasize } from '@material-ui/core/styles'
+import { useResizeDetector } from 'react-resize-detector'
+import { emphasize, useTheme } from '@mui/material/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'
@@ -17,89 +16,85 @@ const abbreviate = require('number-abbreviate')
 
 export interface Props {
   data: Array<{ x: number; y: number }>
-  theme: Theme
   interpolation?: PlotCurveTypes
   range?: [number?, number?]
   timeRangeStart?: number
   color?: string
 }
 
-export default withTheme(
-  memo((props: Props) => {
-    const [width, setWidth] = React.useState(300)
-    const [tooltip, setTooltip] = React.useState<Tooltip | undefined>()
-    const detectResize = React.useCallback(newWidth => setWidth(newWidth), [])
+export default memo((props: Props) => {
+  const theme = useTheme()
+  const [tooltip, setTooltip] = React.useState<Tooltip | undefined>()
+  const { width = 300, ref } = useResizeDetector()
 
-    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 =
-      props.theme.palette.type === 'light' ? props.theme.palette.secondary.dark : props.theme.palette.primary.light
-    const color = props.color ? props.color : paletteColor
+  const paletteColor =
+    theme.palette.mode === 'light' ? theme.palette.secondary.dark : 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 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>
+  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>
       </div>
-    )
-  })
-)
+    </div>
+  )
+})

app/src/components/Chart/NoData.tsx

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

app/src/components/Chart/TooltipComponent.tsx

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

app/src/components/ChartPanel/ChartActions.tsx

@@ -1,7 +1,7 @@
 import React, { useRef } from 'react'
-import Play from '@material-ui/icons/PlayArrow'
-import Pause from '@material-ui/icons/PauseCircleFilled'
-import Clear from '@material-ui/icons/Clear'
+import Play from '@mui/icons-material/PlayArrow'
+import Pause from '@mui/icons-material/PauseCircleFilled'
+import Clear from '@mui/icons-material/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 '@material-ui/core'
+import { Menu, MenuItem } from '@mui/material'
 import { colors as createColors } from './colors'
 
 function chartParametersForColor(chart: ChartParameters, color?: string) {

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 '@material-ui/core'
+import { Menu, MenuItem, Typography } from '@mui/material'
 
 function chartParametersForAction(chart: ChartParameters, action: string) {
   return {
@@ -39,7 +39,12 @@ function InterpolationSettings(props: {
 
   const menuItems = React.useMemo(() => {
     return curves.map(curve => (
-      <MenuItem key={curve} onClick={callbacks[curve]} selected={props.chart.interpolation === curve}>
+      <MenuItem 
+        key={curve} 
+        onClick={callbacks[curve]} 
+        selected={props.chart.interpolation === curve}
+        data-menu-item={curve.replace(/_/g, ' ')}
+      >
         <Typography variant="inherit">{curve.replace(/_/g, ' ')}</Typography>
       </MenuItem>
     ))

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

@@ -1,10 +1,10 @@
 import * as React from 'react'
-import ArrowUpward from '@material-ui/icons/ArrowUpward'
+import ArrowUpward from '@mui/icons-material/ArrowUpward'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'
 import { ChartParameters } from '../../../reducers/Charts'
 import { connect } from 'react-redux'
-import { MenuItem, Typography, ListItemIcon } from '@material-ui/core'
+import { MenuItem, Typography, ListItemIcon } from '@mui/material'
 
 function MoveUp(props: { actions: { chart: typeof chartActions }; chart: ChartParameters; close: () => void }) {
   const moveUp = React.useCallback(() => {

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 '@material-ui/core'
+import { Menu, TextField, Typography } from '@mui/material'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'

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 '@material-ui/icons/Settings'
+import MoreVertIcon from '@mui/icons-material/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 '@material-ui/core'
+import { Menu, MenuItem, TextField, Typography } from '@mui/material'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'

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 '@material-ui/core'
+import { Button, Menu, TextField, Typography } from '@mui/material'
 import { chartActions } from '../../../actions'
 import { ChartParameters } from '../../../reducers/Charts'
 import { connect } from 'react-redux'

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

@@ -12,7 +12,7 @@ import {
   yellow,
   brown,
   blueGrey,
-} from '@material-ui/core/colors'
+} from '@mui/material/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 '@material-ui/icons/BarChart'
-import Clear from '@material-ui/icons/Refresh'
-import ColorLens from '@material-ui/icons/ColorLens'
+import BarChart from '@mui/icons-material/BarChart'
+import Clear from '@mui/icons-material/Refresh'
+import ColorLens from '@mui/icons-material/ColorLens'
 import ColorSettings from './ColorSettings'
 import InterpolationSettings from './InterpolationSettings'
 import MoveUp from './MoveUp'
-import MultilineChart from '@material-ui/icons/MultilineChart'
+import MultilineChart from '@mui/icons-material/MultilineChart'
 import RangeSettings from './RangeSettings'
 import React, { memo } from 'react'
 import Size from './Size'
-import Sort from '@material-ui/icons/Sort'
+import Sort from '@mui/icons-material/Sort'
 import TimeRangeSettings from './TimeRangeSettings'
 import { ChartParameters } from '../../../reducers/Charts'
-import { Menu, MenuItem, ListItemIcon, Typography } from '@material-ui/core'
+import { Menu, MenuItem, ListItemIcon, Typography } from '@mui/material'
 
 function ChartSettings(props: {
   open: boolean
@@ -65,37 +65,37 @@ function ChartSettings(props: {
   return (
     <span>
       <Menu id="long-menu" anchorEl={props.anchorEl.current} open={props.open} onClose={props.close}>
-        <MenuItem key="range" onClick={toggleRange}>
+        <MenuItem key="range" onClick={toggleRange} data-menu-item="Y-Axis range (Values)">
           <ListItemIcon>
             <BarChart />
           </ListItemIcon>
           <Typography variant="inherit">Y-Axis range (Values)</Typography>
         </MenuItem>
-        <MenuItem key="timeRange" onClick={toggleTimeRange}>
+        <MenuItem key="timeRange" onClick={toggleTimeRange} data-menu-item="X-Axis range (Time)">
           <ListItemIcon>
             <BarChart />
           </ListItemIcon>
           <Typography variant="inherit">X-Axis range (Time)</Typography>
         </MenuItem>
-        <MenuItem key="interpolation" onClick={toggleInterpolation}>
+        <MenuItem key="interpolation" onClick={toggleInterpolation} data-menu-item="Curve interpolation">
           <ListItemIcon>
             <MultilineChart />
           </ListItemIcon>
           <Typography variant="inherit">Curve interpolation</Typography>
         </MenuItem>
-        <MenuItem key="size" onClick={toggleSize}>
+        <MenuItem key="size" onClick={toggleSize} data-menu-item="Size">
           <ListItemIcon>
             <Sort />
           </ListItemIcon>
           <Typography variant="inherit">Size</Typography>
         </MenuItem>
-        <MenuItem key="color" onClick={toggleColor}>
+        <MenuItem key="color" onClick={toggleColor} data-menu-item="Color">
           <ListItemIcon>
             <ColorLens />
           </ListItemIcon>
           <Typography variant="inherit">Color</Typography>
         </MenuItem>
-        <MenuItem key="clear" onClick={props.resetDataAction}>
+        <MenuItem key="clear" onClick={props.resetDataAction} data-menu-item="Clear data">
           <ListItemIcon>
             <Clear />
           </ListItemIcon>

app/src/components/ChartPanel/ChartTitle.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react'
 import { ChartParameters } from '../../reducers/Charts'
-import { Typography, Theme, withStyles } from '@material-ui/core'
+import { Typography } from '@mui/material'
+import { withStyles } from '@mui/styles'
+import { Theme } from '@mui/material/styles'
 
 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 '@material-ui/core'
+import { Paper } from '@mui/material'
 const throttle = require('lodash.throttle')
 
 class ClearableMessageBuffer extends q.RingBuffer<q.Message> {

app/src/components/ChartPanel/index.tsx

@@ -1,13 +1,15 @@
 import * as q from '../../../../backend/src/Model'
 import * as React from 'react'
-import ShowChart from '@material-ui/icons/ShowChart'
+import ShowChart from '@mui/icons-material/ShowChart'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../actions'
 import { ChartParameters } from '../../reducers/Charts'
 import { ChartWithTreeNode } from './ChartWithTreeNode'
 import { connect } from 'react-redux'
-import { Grid, Theme, Typography, withStyles } from '@material-ui/core'
+import { Grid, Typography } from '@mui/material'
+import { withStyles } from '@mui/styles'
+import { Theme } from '@mui/material/styles'
 import { List } from 'immutable'
 const { TransitionGroup, CSSTransition } = require('react-transition-group/esm')
 
@@ -126,4 +128,4 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ChartPanel))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ChartPanel) as any)

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 '@material-ui/core'
+import { Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions, Button } from '@mui/material'
 import { KeyCodes } from '../utils/KeyCodes'
 
 function ConfirmationDialog(props: { confirmationRequests: Array<ConfirmationRequest> }) {

app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx

@@ -1,17 +1,19 @@
 import * as React from 'react'
 import { useState, useCallback, memo } from 'react'
-import Add from '@material-ui/icons/Add'
-import Lock from '@material-ui/icons/Lock'
-import Undo from '@material-ui/icons/Undo'
+import Add from '@mui/icons-material/Add'
+import Lock from '@mui/icons-material/Lock'
+import Undo from '@mui/icons-material/Undo'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
-import { Theme, withStyles } from '@material-ui/core/styles'
-import { Button, Grid, TextField, Tooltip } from '@material-ui/core'
+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
 
 interface Props {
   connection: ConnectionOptions
@@ -63,12 +65,13 @@ const ConnectionSettings = memo(function ConnectionSettings(props: Props) {
               color="secondary"
               onClick={() => props.managerActions.addSubscription({ topic, qos }, props.connection.id)}
               variant="contained"
+              data-testid="add-subscription-button"
             >
               <Add /> Add
             </Button>
           </Grid>
           <Grid item={true} xs={12} style={{ padding: 0 }}>
-            <Subscriptions connection={props.connection} />
+            <SubscriptionsAny connection={props.connection} />
           </Grid>
           <Grid item={true} xs={7} className={classes.gridPadding}>
             <TextField
@@ -97,6 +100,7 @@ const ConnectionSettings = memo(function ConnectionSettings(props: Props) {
               variant="contained"
               className={classes.button}
               onClick={props.managerActions.toggleAdvancedSettings}
+              data-testid="back-button"
             >
               <Undo /> Back
             </Button>
@@ -129,4 +133,4 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
+export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings) as any)

app/src/components/ConnectionSetup/BrowserCertificateFileSelection.tsx

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

app/src/components/ConnectionSetup/Certificates.tsx

@@ -1,12 +1,18 @@
 import * as React from 'react'
 import CertificateFileSelection from './CertificateFileSelection'
-import Undo from '@material-ui/icons/Undo'
+import BrowserCertificateFileSelection from './BrowserCertificateFileSelection'
+import Undo from '@mui/icons-material/Undo'
 import { bindActionCreators } from 'redux'
-import { Button, Grid } from '@material-ui/core'
+import { Button, Grid } from '@mui/material'
 import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
+import { isBrowserMode } from '../../utils/browserMode'
+
+// Use browser or desktop file selection based on mode
+const CertSelector: any = isBrowserMode ? BrowserCertificateFileSelection : CertificateFileSelection
 
 interface Props {
   connection: ConnectionOptions
@@ -45,7 +51,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}>
-              <CertificateFileSelection
+              <CertSelector
                 connection={this.props.connection}
                 certificate={this.props.connection.selfSignedCertificate}
                 title="Server Certificate (CA)"
@@ -53,7 +59,7 @@ class Certificates extends React.PureComponent<Props, State> {
               />
             </Grid>
             <Grid item={true} xs={12} className={classes.gridPadding}>
-              <CertificateFileSelection
+              <CertSelector
                 connection={this.props.connection}
                 certificate={this.props.connection.clientCertificate}
                 title="Client Certificate"
@@ -61,7 +67,7 @@ class Certificates extends React.PureComponent<Props, State> {
               />
             </Grid>
             <Grid item={true} xs={12} className={classes.gridPadding}>
-              <CertificateFileSelection
+              <CertSelector
                 connection={this.props.connection}
                 certificate={this.props.connection.clientKey}
                 title="Client Key"
@@ -104,4 +110,4 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(Certificates))
+export default connect(undefined, mapDispatchToProps)(withStyles(styles)(Certificates) as any)

app/src/components/ConnectionSetup/ConnectButton.tsx

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

app/src/components/ConnectionSetup/ConnectionSettings.tsx

@@ -1,17 +1,18 @@
 import ConnectButton from './ConnectButton'
 import React, { useCallback, useState } from 'react'
-import Save from '@material-ui/icons/Save'
-import Delete from '@material-ui/icons/Delete'
-import Settings from '@material-ui/icons/Settings'
-import Visibility from '@material-ui/icons/Visibility'
-import VisibilityOff from '@material-ui/icons/VisibilityOff'
+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 { 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, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { ToggleSwitch } from './ToggleSwitch'
 import { useGlobalKeyEventHandler } from '../../effects/useGlobalKeyEventHandler'
 import {
@@ -24,7 +25,7 @@ import {
   InputLabel,
   MenuItem,
   TextField,
-} from '@material-ui/core'
+} from '@mui/material'
 
 interface Props {
   connection: ConnectionOptions
@@ -235,6 +236,7 @@ function ConnectionSettings(props: Props) {
               variant="contained"
               className={classes.button}
               onClick={props.managerActions.toggleAdvancedSettings}
+              data-testid="advanced-button"
             >
               <Settings /> Advanced
             </Button>
@@ -285,4 +287,4 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings) as any)

app/src/components/ConnectionSetup/ConnectionSetup.tsx

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

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

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

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

@@ -1,8 +1,10 @@
 import React, { useCallback } from 'react'
 import { connect } from 'react-redux'
-import { ListItem, Typography } from '@material-ui/core'
+import { ListItem, Typography, Box } from '@mui/material'
+import { DragIndicator } from '@mui/icons-material'
 import { toMqttConnection, ConnectionOptions } from '../../../model/ConnectionOptions'
-import { withStyles, Theme } from '@material-ui/core/styles'
+import { withStyles } from '@mui/styles'
+import { Theme } from '@mui/material/styles'
 import { bindActionCreators } from 'redux'
 import { connectionActions, connectionManagerActions } from '../../../actions'
 
@@ -14,6 +16,9 @@ export interface Props {
   }
   selected: boolean
   classes: any
+  onDragStart: (connectionId: string) => void
+  onDragOver: (e: React.DragEvent) => void
+  onDrop: (connectionId: string) => void
 }
 
 const ConnectionItem = (props: Props) => {
@@ -24,20 +29,48 @@ const ConnectionItem = (props: Props) => {
     }
   }, [props.connection, props])
 
+  const handleDragStart = (e: React.DragEvent) => {
+    e.stopPropagation()
+    props.onDragStart(props.connection.id)
+  }
+
+  const handleDragOver = (e: React.DragEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+    props.onDragOver(e)
+  }
+
+  const handleDrop = (e: React.DragEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+    props.onDrop(props.connection.id)
+  }
+
   const connection = props.connection.host && toMqttConnection(props.connection)
   return (
     <ListItem
       button={true}
       selected={props.selected}
-      style={{ display: 'block' }}
+      className={props.classes.itemContainer}
       onClick={() => props.actions.connectionManager.selectConnection(props.connection.id)}
       onDoubleClick={() => {
         props.actions.connectionManager.selectConnection(props.connection.id)
         connect()
       }}
+      onDragOver={handleDragOver}
+      onDrop={handleDrop}
     >
-      <Typography className={props.classes.name}>{props.connection.name || 'mqtt broker'}</Typography>
-      <Typography className={props.classes.details}>{connection && connection.url}</Typography>
+      <Box
+        className={props.classes.dragHandle}
+        draggable
+        onDragStart={handleDragStart}
+      >
+        <DragIndicator fontSize="small" />
+      </Box>
+      <Box className={props.classes.textContainer}>
+        <Typography className={props.classes.name}>{props.connection.name || 'mqtt broker'}</Typography>
+        <Typography className={props.classes.details}>{connection && connection.url}</Typography>
+      </Box>
     </ListItem>
   )
 }
@@ -62,9 +95,28 @@ export const connectionItemStyle = (theme: Theme) => ({
     textOverflow: 'ellipsis' as 'ellipsis',
     whiteSpace: 'nowrap' as 'nowrap',
     overflow: 'hidden' as 'hidden',
-    color: theme.palette.text.hint,
+    color: theme.palette.text.secondary,
     fontSize: '0.7em',
   },
+  itemContainer: {
+    display: 'flex' as 'flex',
+    alignItems: 'center' as 'center',
+    padding: '8px 8px 8px 8px',
+  },
+  textContainer: {
+    flex: 1,
+    overflow: 'hidden' as 'hidden',
+  },
+  dragHandle: {
+    display: 'flex' as 'flex',
+    alignItems: 'center' as 'center',
+    marginRight: '8px',
+    cursor: 'grab' as 'grab',
+    color: theme.palette.text.secondary,
+    '&:active': {
+      cursor: 'grabbing' as 'grabbing',
+    },
+  },
 })
 
-export default connect(null, mapDispatchToProps)(withStyles(connectionItemStyle)(ConnectionItem))
+export default connect(null, mapDispatchToProps)(withStyles(connectionItemStyle)(ConnectionItem) as any)

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

@@ -1,5 +1,6 @@
 import ConnectionItem from './ConnectionItem'
-import React from 'react'
+const ConnectionItemAny = ConnectionItem as any
+import React, { useState } from 'react'
 import { AddButton } from './AddButton'
 import { AppState } from '../../../reducers'
 import { bindActionCreators } from 'redux'
@@ -7,8 +8,9 @@ import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../../actions'
 import { ConnectionOptions } from '../../../model/ConnectionOptions'
 import { KeyCodes } from '../../../utils/KeyCodes'
-import { List } from '@material-ui/core'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { List } from '@mui/material'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { useGlobalKeyEventHandler } from '../../../effects/useGlobalKeyEventHandler'
 
 interface Props {
@@ -20,13 +22,14 @@ interface Props {
 
 function ProfileList(props: Props) {
   const { actions, classes, connections, selected } = props
+  const [draggedConnectionId, setDraggedConnectionId] = useState<string | null>(null)
 
   const selectConnection = (dir: 'next' | 'previous') => (event: KeyboardEvent) => {
     if (!selected) {
       return
     }
     const indexDirection = dir === 'next' ? 1 : -1
-    const connectionArray = Object.values(connections)
+    const connectionArray = Object.values(connections).sort((a, b) => (a.order || 0) - (b.order || 0))
     const selectedIndex = connectionArray.map(connection => connection.id).indexOf(selected)
     const nextConnection = connectionArray[selectedIndex + indexDirection]
     if (nextConnection) {
@@ -38,6 +41,39 @@ function ProfileList(props: Props) {
   useGlobalKeyEventHandler(KeyCodes.arrow_down, selectConnection('next'))
   useGlobalKeyEventHandler(KeyCodes.arrow_up, selectConnection('previous'))
 
+  const handleDragStart = (connectionId: string) => {
+    setDraggedConnectionId(connectionId)
+  }
+
+  const handleDragOver = (e: React.DragEvent) => {
+    e.preventDefault()
+  }
+
+  const handleDrop = (targetConnectionId: string) => {
+    if (!draggedConnectionId || draggedConnectionId === targetConnectionId) {
+      setDraggedConnectionId(null)
+      return
+    }
+
+    const sortedConnections = Object.values(connections).sort((a, b) => (a.order || 0) - (b.order || 0))
+    const draggedIndex = sortedConnections.findIndex(c => c.id === draggedConnectionId)
+    const targetIndex = sortedConnections.findIndex(c => c.id === targetConnectionId)
+
+    if (draggedIndex === -1 || targetIndex === -1) {
+      setDraggedConnectionId(null)
+      return
+    }
+
+    // Swap order values
+    const draggedConnection = sortedConnections[draggedIndex]
+    const targetConnection = sortedConnections[targetIndex]
+
+    actions.updateConnection(draggedConnection.id, { order: targetConnection.order })
+    actions.updateConnection(targetConnection.id, { order: draggedConnection.order })
+    
+    setDraggedConnectionId(null)
+  }
+
   const createConnectionButton = (
     <div style={{ padding: '8px 16px' }}>
       <AddButton action={actions.createConnection} />
@@ -48,9 +84,18 @@ function ProfileList(props: Props) {
   return (
     <List style={{ height: '100%' }} component="nav" subheader={createConnectionButton}>
       <div className={classes.list}>
-        {Object.values(connections).map(connection => (
-          <ConnectionItem connection={connection} key={connection.id} selected={selected === connection.id} />
-        ))}
+        {Object.values(connections)
+          .sort((a, b) => (a.order || 0) - (b.order || 0))
+          .map(connection => (
+            <ConnectionItemAny
+              connection={connection}
+              key={connection.id}
+              selected={selected === connection.id}
+              onDragStart={handleDragStart}
+              onDragOver={handleDragOver}
+              onDrop={handleDrop}
+            />
+          ))}
       </div>
     </List>
   )
@@ -77,4 +122,4 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ProfileList))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ProfileList) as any)

app/src/components/ConnectionSetup/Subscriptions.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react'
-import Delete from '@material-ui/icons/Delete'
+import Delete from '@mui/icons-material/Delete'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
 import {
@@ -12,9 +12,9 @@ import {
   TableBody,
   Paper,
   Theme,
-} from '@material-ui/core'
+} from '@mui/material'
 import { bindActionCreators } from 'redux'
-import { withStyles } from '@material-ui/styles'
+import { withStyles } from '@mui/styles'
 import { connect } from 'react-redux'
 
 function Subscriptions(props: {
@@ -87,4 +87,4 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(Subscriptions))
+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 '@material-ui/core'
+import { FormControlLabel, Switch } from '@mui/material'
 
 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,5 +1,6 @@
 import * as React from 'react'
-import { Theme, withStyles } from '@material-ui/core'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 
 interface Props {
   keyboardKey: string

app/src/components/Demo/Mouse.tsx

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

app/src/components/Demo/ShowText.tsx

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

app/src/components/ErrorBoundary.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react'
 import PersistentStorage from '../utils/PersistentStorage'
-import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
-import Warning from '@material-ui/icons/Warning'
-import { Theme, withStyles } from '@material-ui/core/styles'
-import { Button, Modal, Paper, Toolbar, Typography } from '@material-ui/core'
+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'
 
 interface State {
   error?: Error
@@ -11,6 +12,7 @@ interface State {
 
 interface Props {
   classes: any
+  children?: React.ReactNode
 }
 
 class ErrorBoundary extends React.PureComponent<Props, State> {
@@ -23,12 +25,12 @@ class ErrorBoundary extends React.PureComponent<Props, State> {
   }
 
   private restart = () => {
-    window.location = window.location
+    window.location.reload()
   }
 
   private clearStorage = () => {
     PersistentStorage.clear()
-    window.location = window.location
+    window.location.reload()
   }
 
   public componentDidCatch(error: Error, errorInfo: any) {

app/src/components/Layout/ContentView.tsx

@@ -1,13 +1,16 @@
 import * as React from 'react'
 import ChartPanel from '../ChartPanel'
-import ReactSplitPane from 'react-split-pane'
+import ReactSplitPaneImport from 'react-split-pane'
 import Tree from '../Tree'
 import { AppState } from '../../reducers'
 import { ChartParameters } from '../../reducers/Charts'
 import { connect } from 'react-redux'
 import { List } from 'immutable'
 import { Sidebar } from '../Sidebar'
-import ReactResizeDetector from 'react-resize-detector'
+import { useResizeDetector } from 'react-resize-detector'
+
+// Type cast to any to work around React 18 compatibility issues with react-split-pane 0.1.x
+const ReactSplitPane = ReactSplitPaneImport as any
 
 interface Props {
   heightProperty: any
@@ -21,11 +24,23 @@ 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 detectSize = React.useCallback((width, newHeight) => {
+  
+  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) => {
     setDetectedHeight(newHeight)
   }, [])
 
-  const detectSidebarSize = React.useCallback(width => {
+  const detectSidebarSize = React.useCallback((width: any) => {
     setDetectedSidebarWidth(width)
   }, [])
 
@@ -63,7 +78,7 @@ function ContentView(props: Props) {
           split="vertical"
           minSize={0}
           size={sidebarWidth}
-          onChange={setSidebarWidth}
+          onChange={(size: number) => setSidebarWidth(size)}
           onDragFinished={closeSidebarCompletelyIfItSitsOnTheEdge}
           allowResize={true}
           style={{ height: '100%' }}
@@ -80,20 +95,18 @@ function ContentView(props: Props) {
               style={{ height: 'calc(100vh - 64px)' }}
               pane1Style={{ maxHeight: '100%' }}
               pane2Style={{ borderTop: '1px solid #999', display: 'flex' }}
-              onChange={setHeight}
+              onChange={(size: number) => setHeight(size)}
               onDragFinished={closeDrawerCompletelyIfItSitsOnTheEdge}
             >
               <Tree />
               {/** Passing height constraints via flex options down */}
-              <div style={{ flex: 1, display: 'flex', height: '100%', width: '100%' }}>
+              <div ref={heightRef} style={{ flex: 1, display: 'flex', height: '100%', width: '100%' }}>
                 {/** Resize detector must not be in the scroll zone, it needs to detect actual available size */}
-                <ReactResizeDetector handleHeight={true} onResize={detectSize} />
                 <ChartPanel />
               </div>
             </ReactSplitPane>
           </span>
-          <div style={{ height: '100%' }}>
-            <ReactResizeDetector handleWidth={true} onResize={detectSidebarSize} />
+          <div ref={widthRef} style={{ height: '100%' }}>
             <div
               className={props.paneDefaults}
               style={{ minWidth: '250px', height: '100%', overflowY: 'auto', overflowX: 'hidden' }}

app/src/components/Layout/Notification.tsx

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

app/src/components/Layout/PauseButton.tsx

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

app/src/components/Layout/SearchBar.tsx

@@ -1,12 +1,13 @@
 import React, { useCallback, useState, useRef } from 'react'
 import ClearAdornment from '../helper/ClearAdornment'
-import Search from '@material-ui/icons/Search'
+import Search from '@mui/icons-material/Search'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { InputBase } from '@material-ui/core'
+import { InputBase } from '@mui/material'
 import { settingsActions } from '../../actions'
-import { fade, Theme, withStyles } from '@material-ui/core/styles'
+import { alpha as fade, Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { useGlobalKeyEventHandler } from '../../effects/useGlobalKeyEventHandler'
 import { KeyCodes } from '../../utils/KeyCodes'
 
@@ -142,4 +143,4 @@ const styles = (theme: Theme) => ({
   },
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(SearchBar))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(SearchBar) as any)

app/src/components/Layout/TitleBar.tsx

@@ -1,15 +1,19 @@
 import * as React from 'react'
-import CloudOff from '@material-ui/icons/CloudOff'
+import CloudOff from '@mui/icons-material/CloudOff'
+import Logout from '@mui/icons-material/Logout'
 import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
-import Menu from '@material-ui/icons/Menu'
+const ConnectionHealthIndicatorAny = ConnectionHealthIndicator as any
+import Menu from '@mui/icons-material/Menu'
 import PauseButton from './PauseButton'
 import SearchBar from './SearchBar'
-import { AppBar, Button, IconButton, Toolbar, Typography } from '@material-ui/core'
+import { AppBar, Button, IconButton, Toolbar, Typography } from '@mui/material'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { connectionActions, globalActions, settingsActions } from '../../actions'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
+import { isBrowserMode } from '../../utils/browserMode'
 
 const styles = (theme: Theme) => ({
   title: {
@@ -33,6 +37,9 @@ const styles = (theme: Theme) => ({
   disconnect: {
     margin: 'auto 8px auto auto',
   },
+  logout: {
+    margin: 'auto 0 auto 8px',
+  },
   disconnectLabel: {
     color: theme.palette.primary.contrastText,
   },
@@ -54,6 +61,22 @@ class TitleBar extends React.PureComponent<Props, {}> {
     this.state = {}
   }
 
+  private handleLogout = async () => {
+    // Disconnect first
+    this.props.actions.connection.disconnect()
+    
+    // Clear credentials from sessionStorage
+    if (typeof sessionStorage !== 'undefined') {
+      sessionStorage.removeItem('mqtt-explorer-username')
+      sessionStorage.removeItem('mqtt-explorer-password')
+    }
+    
+    // Reload page to reset all state and show login dialog
+    if (typeof window !== 'undefined') {
+      window.location.reload()
+    }
+  }
+
   public render() {
     const { actions, classes } = this.props
 
@@ -75,12 +98,22 @@ class TitleBar extends React.PureComponent<Props, {}> {
           <PauseButton />
           <Button
             className={classes.disconnect}
-            classes={{ label: classes.disconnectLabel }}
+            sx={{ color: 'primary.contrastText' }}
             onClick={actions.connection.disconnect}
+            data-testid="disconnect-button"
           >
             Disconnect <CloudOff className={classes.disconnectIcon} />
           </Button>
-          <ConnectionHealthIndicator withBackground={true} />
+          {isBrowserMode && (
+            <Button
+              className={classes.logout}
+              sx={{ color: 'primary.contrastText' }}
+              onClick={this.handleLogout}
+            >
+              Logout <Logout className={classes.disconnectIcon} />
+            </Button>
+          )}
+          <ConnectionHealthIndicatorAny withBackground={true} />
         </Toolbar>
       </AppBar>
     )

app/src/components/LoginDialog.tsx

@@ -0,0 +1,106 @@
+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
+  waitTimeSeconds?: number
+}
+
+export function LoginDialog(props: LoginDialogProps) {
+  const [username, setUsername] = React.useState('')
+  const [password, setPassword] = React.useState('')
+  const [countdown, setCountdown] = React.useState<number | undefined>(props.waitTimeSeconds)
+
+  // Update countdown when waitTimeSeconds prop changes
+  React.useEffect(() => {
+    setCountdown(props.waitTimeSeconds)
+  }, [props.waitTimeSeconds])
+
+  // Countdown timer
+  React.useEffect(() => {
+    if (countdown === undefined || countdown <= 0) {
+      return
+    }
+
+    const timer = setInterval(() => {
+      setCountdown(prev => {
+        if (prev === undefined || prev <= 1) {
+          return undefined
+        }
+        return prev - 1
+      })
+    }, 1000)
+
+    return () => clearInterval(timer)
+  }, [countdown])
+
+  const handleLogin = () => {
+    if (countdown !== undefined && countdown > 0) {
+      // Don't allow login during countdown
+      return
+    }
+    if (!username || !password) {
+      // Don't allow empty credentials
+      return
+    }
+    props.onLogin(username, password)
+  }
+
+  const handleKeyPress = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter') {
+      handleLogin()
+    }
+  }
+
+  const isDisabled = countdown !== undefined && countdown > 0
+
+  return (
+    <Dialog open={props.open} disableEscapeKeyDown onClose={(event, reason) => { if (reason !== 'backdropClick') { /* Allow closing only via escape if needed */ } }}>
+      <DialogTitle>Login to MQTT Explorer</DialogTitle>
+      <DialogContent>
+        {props.error && (
+          <Typography color="error" style={{ marginBottom: 16 }}>
+            {props.error}
+          </Typography>
+        )}
+        {countdown !== undefined && countdown > 0 && (
+          <Typography color="warning" style={{ marginBottom: 16, fontWeight: 'bold' }}>
+            Please wait {countdown} seconds before trying again...
+          </Typography>
+        )}
+        <TextField
+          autoFocus
+          margin="dense"
+          label="Username"
+          type="text"
+          fullWidth
+          value={username}
+          onChange={e => setUsername(e.target.value)}
+          onKeyPress={handleKeyPress}
+          disabled={isDisabled}
+          required
+          data-testid="username-input"
+        />
+        <TextField
+          margin="dense"
+          label="Password"
+          type="password"
+          fullWidth
+          value={password}
+          onChange={e => setPassword(e.target.value)}
+          onKeyPress={handleKeyPress}
+          disabled={isDisabled}
+          required
+          data-testid="password-input"
+        />
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={handleLogin} color="primary" variant="contained" disabled={isDisabled}>
+          {isDisabled ? `Wait ${countdown}s` : 'Login'}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  )
+}

app/src/components/QosSelect.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { TextField, MenuItem, Tooltip } from '@material-ui/core'
+import { TextField, MenuItem, Tooltip } from '@mui/material'
 import { QoS } from '../../../backend/src/DataSource/MqttSource'
 
 export function QosSelect(props: { selected: QoS; onChange: (value: QoS) => void; label?: string }) {

app/src/components/SettingsDrawer/BooleanSwitch.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react'
-import { InputLabel, Switch, Theme, Tooltip } from '@material-ui/core'
-import { withStyles } from '@material-ui/styles'
+import { InputLabel, Switch, Theme, Tooltip } from '@mui/material'
+import { withStyles } from '@mui/styles'
 const sha1 = require('sha1')
 
-function BooleanSwitch(props: { title: string; value: boolean; tooltip: string; action: () => void; classes: any }) {
+function BooleanSwitch(props: { title: string; value: boolean; tooltip: string; action: () => void; classes: any; 'data-testid'?: string }) {
   const { tooltip, value, action, title, classes } = props
 
   const clickHandler = (e: React.MouseEvent) => {
@@ -20,7 +20,13 @@ function BooleanSwitch(props: { title: string; value: boolean; tooltip: string;
         </InputLabel>
       </Tooltip>
       <Tooltip title={tooltip}>
-        <Switch name={`toggle-${sha1(title)}`} checked={value} onChange={action} color="primary" />
+        <Switch 
+          name={`toggle-${sha1(title)}`} 
+          checked={value} 
+          onChange={action} 
+          color="primary"
+          data-testid={props['data-testid']}
+        />
       </Tooltip>
     </div>
   )

app/src/components/SettingsDrawer/BrokerStatistics.tsx

@@ -3,9 +3,10 @@ import React, { useMemo } from 'react'
 import { AppState } from '../../reducers'
 import { Base64Message } from '../../../../backend/src/Model/Base64Message'
 import { connect } from 'react-redux'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { TopicViewModel } from '../../model/TopicViewModel'
-import { Typography } from '@material-ui/core'
+import { Typography } from '@mui/material'
 import { usePollingToFetchTreeNode } from '../helper/usePollingToFetchTreeNode'
 import { useUpdateComponentWhenNodeUpdates } from '../helper/useUpdateComponentWhenNodeUpdates'
 const abbreviate = require('number-abbreviate')
@@ -19,7 +20,7 @@ const styles = (theme: Theme) => ({
   container: {
     width: '100%',
     height: '224px',
-    backgroundColor: theme.palette.type === 'dark' ? 'rebeccapurple' : '#ebebeb',
+    backgroundColor: theme.palette.mode === 'dark' ? 'rebeccapurple' : '#ebebeb',
     marginBottom: 0,
     padding: '8px',
   },

app/src/components/SettingsDrawer/Settings.tsx

@@ -1,14 +1,15 @@
 import * as React from 'react'
 import BooleanSwitch from './BooleanSwitch'
 import BrokerStatistics from './BrokerStatistics'
-import ChevronRight from '@material-ui/icons/ChevronRight'
+import ChevronRight from '@mui/icons-material/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, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { TopicOrder } from '../../reducers/Settings'
 
 import {
@@ -19,9 +20,10 @@ import {
   InputLabel,
   MenuItem,
   Select,
+  SelectChangeEvent,
   Typography,
   Tooltip,
-} from '@material-ui/core'
+} from '@mui/material'
 
 export const autoExpandLimitSet = [
   {
@@ -70,7 +72,7 @@ const styles = (theme: Theme) => ({
   },
   author: {
     margin: 'auto 8px 8px auto',
-    color: theme.palette.text.hint,
+    color: theme.palette.text.secondary,
     cursor: 'pointer' as 'pointer',
   },
 })
@@ -136,6 +138,7 @@ class Settings extends React.PureComponent<Props, {}> {
         tooltip="Enable dark theme"
         value={theme === 'dark'}
         action={actions.settings.toggleTheme}
+        data-testid="dark-mode-toggle"
       />
     )
   }
@@ -167,7 +170,7 @@ class Settings extends React.PureComponent<Props, {}> {
     )
   }
 
-  private onChangeAutoExpand = (e: React.ChangeEvent<{ value: unknown }>) => {
+  private onChangeAutoExpand = (e: SelectChangeEvent<number>) => {
     this.props.actions.settings.setAutoExpandLimit(parseInt(String(e.target.value), 10))
   }
 
@@ -199,7 +202,7 @@ class Settings extends React.PureComponent<Props, {}> {
     )
   }
 
-  private onChangeSorting = (e: React.ChangeEvent<{ value: unknown }>) => {
+  private onChangeSorting = (e: SelectChangeEvent<TopicOrder>) => {
     this.props.actions.settings.setTopicOrder(e.target.value as TopicOrder)
   }
 

app/src/components/SettingsDrawer/TimeLocale.tsx

@@ -3,9 +3,9 @@ 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 '@material-ui/core'
+import { Input, InputLabel, MenuItem, Select, Theme } from '@mui/material'
 import { settingsActions } from '../../actions'
-import { withStyles } from '@material-ui/styles'
+import { withStyles } from '@mui/styles'
 
 function importAll(r: any) {
   r.keys().forEach(r)
@@ -38,7 +38,7 @@ function TimeLocaleSettings(props: Props) {
     </MenuItem>
   ))
 
-  function updateLocale(e: React.ChangeEvent<{ value: unknown }>) {
+  function updateLocale(e: any) {
     const locale = e.target.value ? String(e.target.value) : ''
     actions.settings.setTimeLocale(locale)
   }

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 '@material-ui/icons/ShowChart'
+import ShowChart from '@mui/icons-material/ShowChart'
 import TopicPlot from '../../TopicPlot'
 import { bindActionCreators } from 'redux'
 import { chartActions } from '../../../actions'
 import { connect } from 'react-redux'
-import { Fade, Paper, Popper, Tooltip } from '@material-ui/core'
+import { Fade, Paper, Popper, Tooltip } from '@mui/material'
 import { JsonPropertyLocation } from '../../../../../backend/src/JsonAstParser'
 
 interface Props {
@@ -52,16 +52,16 @@ function ChartPreview(props: Props) {
       />
     </Tooltip>
   ) : (
-      <Tooltip title="Add to chart panel, not enough data for preview">
-        <ShowChart
-          onClick={onClick}
-          className={props.classes.icon}
-          style={{ color: '#aaa' }}
-          data-test-type="ShowChart"
-          data-test={props.literal.path}
-        />
-      </Tooltip>
-    )
+    <Tooltip title="Add to chart panel, not enough data for preview">
+      <ShowChart
+        onClick={onClick}
+        className={props.classes.icon}
+        style={{ color: '#aaa' }}
+        data-test-type="ShowChart"
+        data-test={props.literal.path}
+      />
+    </Tooltip>
+  )
 
   return (
     <span>
@@ -69,7 +69,11 @@ 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 node={props.treeNode} history={props.treeNode.messageHistory} dotPath={props.literal.path} />
+            ) : (
+              <span />
+            )}
           </Paper>
         </Fade>
       </Popper>

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

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

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

@@ -8,7 +8,8 @@ import { isPlottable, lineChangeStyle, trimNewlineRight } from './util'
 import { JsonPropertyLocation, literalsMappedByLines } from '../../../../../backend/src/JsonAstParser'
 import { selectTextWithCtrlA } from '../../../utils/handleTextSelectWithCtrlA'
 import { style } from './style'
-import { withStyles, Typography } from '@material-ui/core'
+import { Typography } from '@mui/material'
+import { withStyles } from '@mui/styles'
 import 'prismjs/components/prism-json'
 
 interface Props {

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

@@ -1,8 +1,8 @@
 import { CodeBlockColors, CodeBlockColorsBraceMonokai } from '../CodeBlockColors'
-import { Theme } from '@material-ui/core'
+import { Theme } from '@mui/material'
 
 export const style = (theme: Theme) => {
-  const codeBlockColors = theme.palette.type === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai
+  const codeBlockColors = theme.palette.mode === '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,7 +1,8 @@
 import React, { useCallback, useState, useEffect, memo } from 'react'
-import { Badge, Typography } from '@material-ui/core'
+import { Badge, Typography } from '@mui/material'
 import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA'
-import { Theme, withStyles, emphasize } from '@material-ui/core/styles'
+import { Theme, emphasize } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 
 interface HistoryItem {
   key: string
@@ -87,6 +88,7 @@ function HistoryDrawer(props: Props) {
                 invisible={!visible}
                 badgeContent={props.items.length}
                 color="primary"
+                data-testid="message-history"
               >
                 {expanded ? '▼ History' : '▶ History'}
               </Badge>

app/src/components/Sidebar/MessageId.tsx

@@ -1,6 +1,6 @@
 import React, { memo } from 'react'
 import { Message } from '../../../../backend/src/Model'
-import { Tooltip } from '@material-ui/core'
+import { Tooltip } from '@mui/material'
 
 export const MessageId = memo(function MessageId(props: { message: Message; addComma?: boolean }) {
   const { message, addComma } = props

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 '@material-ui/core'
+import { Typography } from '@mui/material'
 
 interface Props {
   node?: q.TreeNode<TopicViewModel>

app/src/components/Sidebar/Panel.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
-import ExpandMore from '@material-ui/icons/ExpandMore'
-import { ExpansionPanel, ExpansionPanelDetails, ExpansionPanelSummary, Typography, Theme } from '@material-ui/core'
-import { withStyles } from '@material-ui/styles'
+import ExpandMore from '@mui/icons-material/ExpandMore'
+import { Accordion, AccordionDetails, AccordionSummary, Typography, Theme } from '@mui/material'
+import { withStyles } from '@mui/styles'
 
 const styles = (theme: Theme) => ({
   summary: { minHeight: '0' },
@@ -19,14 +19,14 @@ const Panel = (props: {
   detailsHidden?: boolean
 }) => {
   return (
-    <ExpansionPanel defaultExpanded={true} disabled={props.disabled}>
-      <ExpansionPanelSummary expandIcon={<ExpandMore />} className={props.classes.summary}>
+    <Accordion defaultExpanded={true} disabled={props.disabled}>
+      <AccordionSummary expandIcon={<ExpandMore />} className={props.classes.summary}>
         <Typography className={props.classes.heading}>{props.children[0]}</Typography>
-      </ExpansionPanelSummary>
+      </AccordionSummary>
       {props.detailsHidden ? null : (
-        <ExpansionPanelDetails className={props.classes.detail}>{props.children[1]}</ExpansionPanelDetails>
+        <AccordionDetails className={props.classes.detail}>{props.children[1]}</AccordionDetails>
       )}
-    </ExpansionPanel>
+    </Accordion>
   )
 }
 

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

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { default as AceEditor } from 'react-ace'
-import { Theme, withTheme } from '@material-ui/core'
+import { useTheme } from '@mui/material/styles'
 import 'ace-builds'
 import 'ace-builds/webpack-resolver'
 import 'ace-builds/src-noconflict/mode-json'
@@ -13,11 +13,11 @@ 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,
@@ -28,7 +28,7 @@ function Editor(props: {
       ref={props.editorRef}
       style={{}}
       mode={props.editorMode}
-      theme={props.theme.palette.type === 'dark' ? 'monokai' : 'dawn'}
+      theme={theme.palette.mode === 'dark' ? 'monokai' : 'dawn'}
       name="UNIQUE_ID_OF_DIV"
       width="100%"
       height="200px"
@@ -45,4 +45,4 @@ function Editor(props: {
   )
 }
 
-export default withTheme(Editor)
+export default Editor

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

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { FormControlLabel, Radio, RadioGroup } from '@material-ui/core'
+import { FormControlLabel, Radio, RadioGroup } from '@mui/material'
 
 interface Props {
   value: string

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

@@ -1,14 +1,14 @@
 import Editor from './Editor'
-import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
+import { AttachFileOutlined, FormatAlignLeft } from '@mui/icons-material'
 import Message from './Model/Message'
-import Navigation from '@material-ui/icons/Navigation'
+import Navigation from '@mui/icons-material/Navigation'
 import PublishHistory from './PublishHistory'
 import React, { useCallback, useMemo, useState, useRef, memo } from 'react'
 import RetainSwitch from './RetainSwitch'
 import TopicInput from './TopicInput'
 import { AppState } from '../../../reducers'
 import { bindActionCreators } from 'redux'
-import { Button, Fab, Theme, Tooltip, withTheme } from '@material-ui/core'
+import { Button, Fab, Tooltip } from '@mui/material'
 import { connect } from 'react-redux'
 import { EditorModeSelect } from './EditorModeSelect'
 import { globalActions, publishActions } from '../../../actions'
@@ -23,7 +23,6 @@ interface Props {
   globalActions: typeof globalActions
   retain: boolean
   editorMode: string
-  theme: Theme
 }
 
 function useHistory(): [Array<Message>, (topic: string, payload?: string) => void] {
@@ -116,6 +115,10 @@ const EditorMode = memo(function EditorMode(props: {
     props.actions.setEditorMode(value)
   }, [])
 
+  const openFile = useCallback(() => {
+    props.actions.openFile()
+  }, [])
+
   const formatJson = useCallback(() => {
     if (props.payload) {
       try {
@@ -132,6 +135,7 @@ const EditorMode = memo(function EditorMode(props: {
       <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} />
         </div>
@@ -163,6 +167,20 @@ const FormatJsonButton = React.memo(function FormatJsonButton(props: {
   )
 })
 
+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 handleClickPublish = useCallback(
     (e: React.MouseEvent) => {
@@ -202,4 +220,4 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withTheme(Publish))
+export default connect(mapStateToProps, mapDispatchToProps)(Publish)

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

@@ -1,6 +1,6 @@
 import QosSelect from './QosPublishOption'
 import React from 'react'
-import { Checkbox, FormControlLabel, Tooltip } from '@material-ui/core'
+import { Checkbox, FormControlLabel, Tooltip } from '@mui/material'
 import { publishActions } from '../../../actions'
 import { bindActionCreators } from 'redux'
 import { AppState } from '../../../reducers'

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

@@ -1,6 +1,6 @@
 import ClearAdornment from '../../helper/ClearAdornment'
 import React, { useCallback, useMemo, useRef } from 'react'
-import { FormControl, Input, InputLabel } from '@material-ui/core'
+import { FormControl, Input, InputLabel } from '@mui/material'
 import { publishActions } from '../../../actions'
 import { bindActionCreators } from 'redux'
 import { AppState } from '../../../reducers'

app/src/components/Sidebar/Sidebar.tsx

@@ -2,12 +2,14 @@ import * as q from '../../../../backend/src/Model'
 import React, { useState, useEffect, useCallback } from 'react'
 import NodeStats from './NodeStats'
 import ValuePanel from './ValueRenderer/ValuePanel'
+const ValuePanelAny = ValuePanel as any
 import { AppState } from '../../reducers'
-import { ExpansionPanelDetails } from '@material-ui/core'
+import { AccordionDetails } from '@mui/material'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { settingsActions, sidebarActions } from '../../actions'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { TopicViewModel } from '../../model/TopicViewModel'
 import TopicPanel from './TopicPanel/TopicPanel'
 import Panel from './Panel'
@@ -56,16 +58,16 @@ function Sidebar(props: Props) {
     <div id="Sidebar" className={classes.drawer}>
       <div>
         <TopicPanel node={node} />
-        <ValuePanel lastUpdate={node ? node.lastUpdate : 0} />
+        <ValuePanelAny lastUpdate={node ? node.lastUpdate : 0} />
         <Panel>
           <span>Publish</span>
           <Publish connectionId={props.connectionId} />
         </Panel>
         <Panel detailsHidden={!node}>
           <span>Stats</span>
-          <ExpansionPanelDetails className={classes.details}>
+          <AccordionDetails className={classes.details}>
             <NodeStats node={node} />
-          </ExpansionPanelDetails>
+          </AccordionDetails>
         </Panel>
       </div>
     </div>

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 '@material-ui/icons/Delete'
+import Delete from '@mui/icons-material/Delete'
 import React, { useCallback } from 'react'
-import { Badge } from '@material-ui/core'
+import { Badge } from '@mui/material'
 
 export const RecursiveTopicDeleteButton = (props: {
   node?: q.TreeNode<any>

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

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

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 '@material-ui/icons/Delete'
+import Delete from '@mui/icons-material/Delete'
 import React from 'react'
 
 export const TopicDeleteButton = (props: {

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

@@ -3,6 +3,7 @@ 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'
@@ -31,7 +32,7 @@ const TopicPanel = (props: { node?: q.TreeNode<any>; actions: typeof sidebarActi
           <RecursiveTopicDeleteButton node={node} deleteTopicAction={deleteTopic} />
           <TopicTypeButton node={node} />
         </span>
-        <Topic node={node} />
+        <TopicAny node={node} />
       </Panel>
     ),
     [node, node?.childTopicCount()]

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

@@ -1,15 +1,15 @@
 import React, { useCallback, useMemo } from 'react'
 import * as q from '../../../../../backend/src/Model'
-import ClickAwayListener from '@material-ui/core/ClickAwayListener'
-import Grow from '@material-ui/core/Grow'
-import Button from '@material-ui/core/Button'
-import Paper from '@material-ui/core/Paper'
-import Popper from '@material-ui/core/Popper'
-import MenuItem from '@material-ui/core/MenuItem'
-import MenuList from '@material-ui/core/MenuList'
-import WarningRounded from '@material-ui/icons/WarningRounded'
+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 '@material-ui/core'
+import { Tooltip } from '@mui/material'
 
 export const TopicTypeButton = (props: { node?: q.TreeNode<any> }) => {
   const { node } = props
@@ -46,7 +46,7 @@ export const TopicTypeButton = (props: { node?: q.TreeNode<any> }) => {
     [open]
   )
 
-  const handleClose = useCallback((event: React.MouseEvent<Document, MouseEvent>) => {
+  const handleClose = useCallback((event: any) => {
     if (anchorEl && anchorEl.contains(event.target as HTMLElement)) {
       return
     }

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

@@ -1,10 +1,12 @@
 import React, { useCallback } from 'react'
-import Code from '@material-ui/icons/Code'
-import Reorder from '@material-ui/icons/Reorder'
-import ToggleButton from '@material-ui/lab/ToggleButton'
-import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'
+import Code from '@mui/icons-material/Code'
+import Reorder from '@mui/icons-material/Reorder'
+import ToggleButton from '@mui/lab/ToggleButton'
+import ToggleButtonGroup from '@mui/lab/ToggleButtonGroup'
 import { settingsActions } from '../../../actions'
-import { Tooltip, withStyles, Theme } from '@material-ui/core'
+import { Tooltip } from '@mui/material'
+import { withStyles } from '@mui/styles'
+import { Theme } from '@mui/material/styles'
 import { bindActionCreators } from 'redux'
 import { AppState } from '../../../reducers'
 import { connect } from 'react-redux'
@@ -73,4 +75,4 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ActionButtons))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ActionButtons) as any)

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

@@ -1,7 +1,7 @@
-import Clear from '@material-ui/icons/Clear'
+import Clear from '@mui/icons-material/Clear'
 import React, { useMemo } from 'react'
 import { bindActionCreators } from 'redux'
-import { Button, Tooltip } from '@material-ui/core'
+import { Button, Tooltip } from '@mui/material'
 import { connect } from 'react-redux'
 import { sidebarActions } from '../../../actions'
 

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

@@ -1,6 +1,6 @@
 import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
-import ShowChart from '@material-ui/icons/ShowChart'
+import ShowChart from '@mui/icons-material/ShowChart'
 import Copy from '../../helper/Copy'
 import DateFormatter from '../../helper/DateFormatter'
 import History from '../HistoryDrawer'

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

@@ -1,6 +1,7 @@
 import * as q from '../../../../../backend/src/Model'
 import ActionButtons from './ActionButtons'
 import Copy from '../../helper/Copy'
+import Save from '../../helper/Save'
 import DateFormatter from '../../helper/DateFormatter'
 import MessageHistory from './MessageHistory'
 import Panel from '../Panel'
@@ -8,7 +9,9 @@ import React, { useCallback } from 'react'
 import ValueRenderer from './ValueRenderer'
 import { AppState } from '../../../reducers'
 import { bindActionCreators } from 'redux'
-import { Theme, Typography, withStyles } from '@material-ui/core'
+import { Typography } from '@mui/material'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { connect } from 'react-redux'
 import { sidebarActions } from '../../../actions'
 import DeleteSelectedTopicButton from './DeleteSelectedTopicButton'
@@ -59,6 +62,12 @@ function ValuePanel(props: Props) {
     return node?.message && decodeMessage(node.message)?.message?.toUnicodeString()
   }, [node, decodeMessage])
 
+  const getData = () => {
+    if (node?.message && node.message.payload) {
+      return node.message.payload.base64Message
+    }
+  }
+
   function messageMetaInfo() {
     if (!props.node || !props.node.message) {
       return null
@@ -93,10 +102,13 @@ function ValuePanel(props: Props) {
   const [value] =
     node && node.message && node.message.payload ? node.message.payload?.format(node.type) : [null, undefined]
   const copyValue = value ? <Copy getValue={getDecodedValue} /> : null
+  const saveValue = value ? <Save getData={getData} /> : null
 
   return (
     <Panel>
-      <span>Value {copyValue}</span>
+      <span>
+        Value {copyValue} {saveValue}
+      </span>
       <span style={{ width: '100%' }}>
         {renderViewOptions()}
         <div style={{ marginBottom: '-8px', marginTop: '8px' }}>
@@ -133,4 +145,4 @@ const styles = (theme: Theme) => ({
 })
 
 // @ts-ignore
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ValuePanel))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ValuePanel) as any)

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

@@ -4,7 +4,7 @@ import CodeDiff from '../CodeDiff'
 import { AppState } from '../../../reducers'
 import { connect } from 'react-redux'
 import { ValueRendererDisplayMode } from '../../../reducers/Settings'
-import { Fade } from '@material-ui/core'
+import { Fade } from '@mui/material'
 import { Decoder } from '../../../../../backend/src/Model/Decoder'
 import { useDecoder } from '../../hooks/useDecoder'
 import { TopicViewModel } from '../../../model/TopicViewModel'

app/src/components/Tree/Infinitree.tsx

@@ -1,117 +0,0 @@
-import * as q from '../../../../backend/src/Model'
-import React, { MutableRefObject, RefObject, useCallback, useMemo, useRef } from 'react'
-import { FixedSizeList as List, ListOnItemsRenderedProps, ListOnScrollProps } from 'react-window'
-import { AutoSizer } from 'react-virtualized'
-import TreeNode from './TreeNode'
-import { TopicViewModel } from '../../model/TopicViewModel'
-
-class TreeList {
-  tree: q.TreeNode<TopicViewModel>
-
-  constructor(tree: q.TreeNode<TopicViewModel>) {
-    this.tree = tree
-  }
-
-  getVisibleChildAt(index: number): [q.TreeNode<TopicViewModel>, number] | undefined {
-    return this.tree.viewModel?.visibleChildAt(index, 1)
-  }
-
-  get length(): number {
-    return this.tree.viewModel?.visibleChildren() ?? 0
-  }
-}
-
-const InfinitreeComponent: React.FC<{
-  tree: q.TreeNode<TopicViewModel>
-  actions: any
-  selectTopicAction: any
-  settings: any
-  listRef: RefObject<List>
-  lastUpdate: number
-  name: string
-  fixedOnTreeNodeRef: MutableRefObject<q.TreeNode<TopicViewModel> | null>
-}> = ({ tree, actions, settings, listRef, fixedOnTreeNodeRef, name }) => {
-  const list = useMemo(() => new TreeList(tree), [tree])
-  const lastIndex = useRef<number | undefined>(0)
-  const lastScroll = useRef<number>(Date.now())
-  const getKey = useCallback(
-    (index: number) => {
-      let [treeNode] = list.getVisibleChildAt(index) ?? []
-
-      return treeNode?.hash() ?? index.toString()
-    },
-    [list]
-  )
-
-  const afterRender = useCallback(
-    ({ visibleStartIndex }: ListOnItemsRenderedProps) => {
-      if (!visibleStartIndex) {
-        return
-      }
-
-      let [treeNode] = list.getVisibleChildAt(visibleStartIndex) ?? []
-
-      if (treeNode) {
-        fixedOnTreeNodeRef.current = treeNode
-      }
-    },
-    [list]
-  )
-
-  const indexOfItem = fixedOnTreeNodeRef.current?.viewModel?.getIndex()
-
-  if (indexOfItem && lastIndex.current !== indexOfItem && Date.now() - lastScroll.current > 300) {
-    // Kind of dangerous to mutate scroll state directly, useEffect causes glitches
-    indexOfItem && listRef.current?.scrollToItem(indexOfItem, 'start')
-  }
-  lastIndex.current = indexOfItem
-
-  const disableScroll = useCallback((args: ListOnScrollProps) => {
-    if (!args.scrollUpdateWasRequested) {
-      lastScroll.current = Date.now()
-    }
-  }, [])
-
-  return (
-    <AutoSizer>
-      {({ width, height }) => (
-        <List
-          ref={listRef}
-          width={width}
-          height={height}
-          itemSize={20}
-          itemCount={list.length}
-          itemKey={getKey}
-          onItemsRendered={afterRender}
-          onScroll={disableScroll}
-          overscanCount={3}
-        >
-          {({ index, style }) => {
-            let [treeNode, depth = 0] = list.getVisibleChildAt(index) ?? []
-            if (!treeNode) {
-              return null
-            }
-
-            return (
-              <div style={{ ...style, paddingLeft: 12 * (depth - 1) }}>
-                <TreeNode
-                  treeNode={treeNode}
-                  isRoot={index === 0}
-                  doNotRenderSubnodes={true}
-                  name={index === 0 ? name : undefined}
-                  collapsed={false}
-                  settings={settings}
-                  lastUpdate={treeNode.lastUpdate}
-                  actions={actions}
-                  selectTopicAction={actions.selectTopic}
-                />
-              </div>
-            )
-          }}
-        </List>
-      )}
-    </AutoSizer>
-  )
-}
-
-export const Infinitree = InfinitreeComponent

app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx

@@ -3,7 +3,8 @@ import React, { useEffect, useState, useMemo } from 'react'
 import TreeNode from '.'
 import { SettingsState } from '../../../reducers/Settings'
 import { sortedNodes } from '../../../sortedNodes'
-import { Theme, withStyles } from '@material-ui/core'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { TopicViewModel } from '../../../model/TopicViewModel'
 import { treeActions } from '../../../actions'
 

app/src/components/Tree/TreeNode/TreeNodeTitle.tsx

@@ -1,6 +1,7 @@
 import * as q from '../../../../../backend/src/Model'
 import React, { memo } from 'react'
-import { Theme, withStyles } from '@material-ui/core'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { TopicViewModel } from '../../../model/TopicViewModel'
 import { useDecoder } from '../../hooks/useDecoder'
 
@@ -94,7 +95,7 @@ const styles = (theme: Theme) => ({
     overflow: 'hidden' as 'hidden',
   },
   expander: {
-    color: theme.palette.type === 'light' ? '#222' : '#eee',
+    color: theme.palette.mode === 'light' ? '#222' : '#eee',
     cursor: 'pointer' as 'pointer',
     paddingRight: theme.spacing(0.25),
     userSelect: 'none' as 'none',

app/src/components/Tree/TreeNode/effects/useViewModel.tsx

@@ -4,9 +4,9 @@ import { TopicViewModel } from '../../../../model/TopicViewModel'
 
 export function useViewModel(treeNode: q.TreeNode<TopicViewModel> | undefined) {
   useEffect(() => {
-    // if (treeNode && !treeNode?.viewModel) {
-    //   treeNode.viewModel = new TopicViewModel(treeNode)
-    // }
+    if (treeNode && !treeNode?.viewModel) {
+      treeNode.viewModel = new TopicViewModel(treeNode)
+    }
     treeNode?.viewModel?.retain()
 
     return function cleanup() {

app/src/components/Tree/TreeNode/index.tsx

@@ -4,7 +4,8 @@ import TreeNodeSubnodes from './TreeNodeSubnodes'
 import TreeNodeTitle from './TreeNodeTitle'
 import { SettingsState } from '../../../reducers/Settings'
 import { styles } from './styles'
-import { Theme, withStyles } from '@material-ui/core/styles'
+import { Theme } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
 import { TopicViewModel } from '../../../model/TopicViewModel'
 import { treeActions } from '../../../actions'
 import { useAnimationToIndicateTopicUpdate } from './effects/useAnimationToIndicateTopicUpdate'
@@ -18,7 +19,6 @@ export interface Props {
   treeNode: q.TreeNode<TopicViewModel>
   name?: string | undefined
   collapsed?: boolean | undefined
-  doNotRenderSubnodes?: boolean
   classes: any
   lastUpdate: number
   actions: typeof treeActions
@@ -28,15 +28,15 @@ export interface Props {
 }
 
 function TreeNodeComponent(props: Props) {
-  const { actions, classes, settings, theme, treeNode, lastUpdate, name, doNotRenderSubnodes } = props
-  const [collapsedOverride, setCollapsedOverride] = useState<boolean | undefined>(!treeNode.viewModel?.isExpanded())
+  const { actions, classes, settings, theme, treeNode, lastUpdate, name } = props
+  const [collapsedOverride, setCollapsedOverride] = useState<boolean | undefined>(undefined)
   const [selected, selectionLastUpdate, setSelected] = useSelectionState(false)
   const nodeRef = useRef<HTMLDivElement>()
   const isAllowedToAutoExpand = useIsAllowedToAutoExpandState(props)
   const deleteTopicCallback = useDeleteKeyCallback(treeNode, actions)
   useViewModelSubscriptions(treeNode, nodeRef, setSelected, setCollapsedOverride)
   const animationClass =
-    props.theme.palette.type === 'light' ? props.classes.animationLight : props.classes.animationDark
+    props.theme.palette.mode === 'light' ? props.classes.animationLight : props.classes.animationDark
 
   useAnimationToIndicateTopicUpdate(
     nodeRef,
@@ -95,7 +95,7 @@ function TreeNodeComponent(props: Props) {
 
   return useMemo(() => {
     function renderNodes() {
-      if (isCollapsed || doNotRenderSubnodes) {
+      if (isCollapsed) {
         return null
       }
 
@@ -135,7 +135,7 @@ function TreeNodeComponent(props: Props) {
         {renderNodes()}
       </div>
     )
-  }, [treeNode.lastUpdate, treeNode, name, isCollapsed, selected, theme, mouseOver, settings, doNotRenderSubnodes])
+  }, [treeNode.lastUpdate, treeNode, name, isCollapsed, selected, theme, mouseOver, settings])
 }
 
 export default withStyles(styles, { withTheme: true })(React.memo(TreeNodeComponent))

app/src/components/Tree/TreeNode/styles.ts

@@ -1,5 +1,5 @@
-import { blueGrey } from '@material-ui/core/colors'
-import { Theme } from '@material-ui/core/styles'
+import { blueGrey } from '@mui/material/colors'
+import { Theme } from '@mui/material/styles'
 
 export const styles = (theme: Theme) => {
   return {
@@ -37,7 +37,7 @@ export const styles = (theme: Theme) => {
       marginLeft: theme.spacing(1.5),
     },
     selected: {
-      backgroundColor: (theme.palette.type === 'light' ? blueGrey[300] : theme.palette.primary.main) + ' !important',
+      backgroundColor: (theme.palette.mode === 'light' ? blueGrey[300] : theme.palette.primary.main) + ' !important',
     },
     hover: {},
     title: {
@@ -49,7 +49,7 @@ export const styles = (theme: Theme) => {
       padding: '1px 4px 0 4px',
       margin: '1px 0px',
       '&:hover': {
-        backgroundColor: theme.palette.type === 'light' ? blueGrey[100] : theme.palette.primary.light,
+        backgroundColor: theme.palette.mode === 'light' ? blueGrey[100] : theme.palette.primary.light,
       },
     },
   }