Merge pull request #201 from Luligu/dev

Release 1.7.1

CHANGELOG.md

@@ -17,28 +17,51 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
 
 Matterbridge edge is now released. The default mode is still the normal mode to allow the storage conversion. See https://github.com/Luligu/matterbridge/blob/dev/README-EDGE.md to manually switch to edge mode after the conversion is done.
 
-The frontend has a new dark and light mode. The dark mode is now the default mode. 
+The frontend has a new dark and light mode. The dark mode is now the default mode.
 It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbridge settings.
 
-## [1.7.0] - 2025-01-03
+## [1.7.1] - 2025-01-07
+
+### Added
+
+- [platform]: Added selectDevice to get the device names from a list in the config editor.
+- [websocket]: Added api /api/select.
+- [frontend]: Added configUrl to Devices page.
+- [frontend]: Added config button to Devices page.
+- [frontend]: Added id and deviceTypes to Devices page.
+
+### Changed
+
+- [websocket]: Added params to /api/clusters.
+- [frontend]: Frontend v.2.3.3
+
+### Fixed
+
+- [frontend]: Fixed WebSocketProvider online.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
+## [1.7.0] - 2025-01-04
 
 ### Added
 
 - [edge]: Added guide https://github.com/Luligu/matterbridge/blob/dev/README-EDGE.md.
-- [storage]: Added conversion from old matter storage to the new api format with fabrics, resumptionRecords, network, commissioning, operationalCredentials, acl and parts number. The conversion is triggered every time you shutdown or restart matterbridge till the new storage has been used with matterbridge edge. 
-- [storage]: Added conversion for child endpoint numbers. 
-- [storage]: Added conversion for childbridge mode. 
+- [storage]: Added conversion from old matter storage to the new api format with fabrics, resumptionRecords, network, commissioning, operationalCredentials, acl and parts number. The conversion is triggered every time you shutdown or restart matterbridge till the new storage has been used with matterbridge edge.
+- [storage]: Added conversion for child endpoint numbers.
+- [storage]: Added conversion for childbridge mode.
 - [package]: Update README.md and README-SERVICE.md to include instructions for using SSL on port 443.
 - [platform]: Added checkEndpointNumbers() to detect endpoint numbers changes.
 - [frontend]: Frontend v.2.3.0
 - [frontend]: Added dark and light mode to the frontend. Dark mode is now the default mode. It is possible to change the mode in Settings, Matterbridge settings.
 - [frontend]: Custom rfjsreact-jsonschema-form for the config editor.
 - [frontend]: Added columns configuration to Devices.
 - [frontend]: Added clear logs button in Logs.
-- [unregister]: Added unregister for Matterbridge edge. 
-- [reset]: Added reset for Matterbridge edge. 
-- [factoryreset]: Added factoryreset for Matterbridge edge. 
-- [websocket]: Added /api/clusters and removed all fetch calls from frontend. 
+- [unregister]: Added unregister for Matterbridge edge.
+- [reset]: Added reset for Matterbridge edge.
+- [factoryreset]: Added factoryreset for Matterbridge edge.
+- [websocket]: Added /api/clusters and removed all fetch calls from frontend.
 
 ### Changed
 

README-EDGE.md

@@ -1,10 +1,8 @@
-# <img src="https://github.com/Luligu/matterbridge/blob/main/frontend/public/matterbridge%2064x64.png" alt="Matterbridge Logo" width="64px" height="64px">&nbsp;&nbsp;&nbsp;Matterbridge
-
-# Matterbridge edge
+# <img src="https://github.com/Luligu/matterbridge/blob/main/frontend/public/matterbridge%2064x64.png" alt="Matterbridge Logo" width="64px" height="64px">&nbsp;&nbsp;&nbsp;Matterbridge edge
 
 Matterbridge Edge is the version of Matterbridge running with the new Matter.js API.
 
-After months of work, the migration of Matterbridge from the old API to the new API is now complete. This includes the conversion of the entire old storage format to the new API storage format, encompassing fabrics, resumption records, network, commissioning, operational credentials, ACL, and part numbers.
+After months of work, the migration of Matterbridge from the old API to the new API is now complete. This includes the conversion of the entire old storage format to the new API storage format, encompassing fabrics, resumption records, network, commissioning, operational credentials, ACL, and part numbers. The conversion doesn't convert the persisted attributes, so at restart for a while it is possible to see wrong states on the controllers.
 
 A special thanks goes to Apollon for answering my countless questions and helping to resolve the many small issues that arose during this process.
 
@@ -25,7 +23,7 @@ There is no conversion back to the old storage.
 
 Matterbridge Edge will be officially released as version 2.0.0, as it represents a major update.
 
-## How to run matterbridge in edge mode 
+## How to run matterbridge in edge mode
 
 To start Matterbridge in Edge mode before its official release, you need to add the -edge parameter to the command line or Docker command.
 
@@ -73,4 +71,4 @@ services:
       - "${HOME}/Matterbridge:/root/Matterbridge"       # Mounts the Matterbridge plugin directory
       - "${HOME}/.matterbridge:/root/.matterbridge"     # Mounts the Matterbridge storage directory
     command: [ "matterbridge", "-docker", "-edge" ]     # Override the image command adding -edge
-```
+```

README-SERVICE.md

@@ -49,13 +49,13 @@ After=network-online.target
 [Service]
 Type=simple
 ExecStart=matterbridge -service
-WorkingDirectory=/home/<USER>/Matterbridge  
+WorkingDirectory=/home/<USER>/Matterbridge
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
 RestartSec=10s
 TimeoutStopSec=30s
-User=<USER>                                 
+User=<USER>
 Group=<USER>
 
 [Install]

frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "./static/css/main.f1fce054.css",
-    "main.js": "./static/js/main.5caad8c7.js",
+    "main.css": "./static/css/main.b1a621ee.css",
+    "main.js": "./static/js/main.ecd94d17.js",
     "static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
@@ -60,12 +60,12 @@
     "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.b590dbe5c639944366d1.woff",
     "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
-    "main.f1fce054.css.map": "./static/css/main.f1fce054.css.map",
-    "main.5caad8c7.js.map": "./static/js/main.5caad8c7.js.map",
+    "main.b1a621ee.css.map": "./static/css/main.b1a621ee.css.map",
+    "main.ecd94d17.js.map": "./static/js/main.ecd94d17.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.f1fce054.css",
-    "static/js/main.5caad8c7.js"
+    "static/css/main.b1a621ee.css",
+    "static/js/main.ecd94d17.js"
   ]
 }

frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.5caad8c7.js"></script><link href="./static/css/main.f1fce054.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.ecd94d17.js"></script><link href="./static/css/main.b1a621ee.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.3.0",
+  "version": "2.3.3",
   "private": true,
   "homepage": "./",
   "scripts": {

frontend/src/App.css

@@ -170,7 +170,7 @@ html {
   scrollbar-width: thin;
 }
 
-/* Tooltip style */
+/* Tooltip styles */
 .tooltip-container {
   position: relative;
   display: inline-block;
@@ -204,7 +204,7 @@ html {
   opacity: 1;
 }
 
-/* StatusIndicator style */
+/* StatusIndicator styles */
 .status-enabled {
   background-color: green;
   color: white;
@@ -280,19 +280,7 @@ html {
   box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
 }
 
-/* Home page style */
-
-.PluginsIconButton {
-  color: #000000;
-  padding: 0;
-  gap: 0;
-}
-
-.main-background {
-  background-color: var(--main-bg-color);
-}
-
-/* Header style */
+/* Header styles */
 .header {
   display: flex;
   /*flex-wrap: 'wrap';*/
@@ -335,17 +323,18 @@ nav {
   color: var(--primary-color);
 }
 
-/* Table style */
+/* Table styles */
 table {
   border-collapse: collapse;
   width: 100%;
+  table-layout: auto;
 }
 
 thead {
   position: sticky;
   top: 0;
   border: 1px solid var(--table-border-color);
-  z-index: auto;
+  z-index: 10;
 }
 
 thead th {
@@ -474,7 +463,7 @@ h3 {
   padding-top: 0px;
 }
 
-/* Define the style for the header text element */
+/* Define the style for the footer text element */
 .MbfWindowFooterText {
   color: var(--footer-text-color);
   background-color: var(--footer-bg-color);
@@ -502,9 +491,8 @@ h3 {
   flex-direction: row;
   flex: 1 1 auto;
   height: 100%;
-  padding: 0px 10px 0px 10px;
   margin: 0px;
-  padding: 0px;
+  padding: 0px 10px 0px 10px;
   gap: 0px;
   overflow: auto;
 }

frontend/src/App.js

@@ -19,6 +19,8 @@ import Logs from './components/Logs';
 import { WebSocketProvider } from './components/WebSocketProvider';
 import { createMuiTheme, getCssVariable } from './components/muiTheme';
 
+export const debug = false;
+
 // Create a context for the authentication state
 const AuthContext = createContext();
 

frontend/src/components/Connecting.js

@@ -3,16 +3,17 @@ import { CircularProgress, Box } from '@mui/material';
 
 export function Connecting() {
   return (
-    <div className="main-background" style={{
+    <div style={{
       display: 'flex',
       justifyContent: 'center',
       alignItems: 'center',
-      height: '100vh',
-      color: '#333',
       fontSize: '20px',
-      flexDirection: 'column'
+      flexDirection: 'column',
+      color: 'var(--main-text-color)',
+      height: '100vh',
+      backgroundColor: 'var(--main-bg-color)',
     }}>
-     <Box sx={{ display: 'flex', alignItems: 'center', flexDirection: 'column' }}>
+      <Box sx={{ display: 'flex', alignItems: 'center', flexDirection: 'column' }}>
         <CircularProgress style={{ color: 'var(--primary-color)' }}/>
         <div style={{ marginTop: '20px', color: 'var(--primary-color)' }}>Connecting to Matterbridge...</div>
       </Box>