Merge pull request #205 from Luligu/dev

Release 1.7.3
Luligu · Jan 11, 2025 · 97d9629 · 97d9629
2 parents 363a85d + 4bc2f2d
commit 97d9629
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 87 deletions.
diff --git a/.github/workflows/build-with-docker.yml b/.github/workflows/build-with-docker.yml
diff --git a/.github/workflows/docker-buildx-dev.yml b/.github/workflows/docker-buildx-dev.yml
@@ -1,4 +1,4 @@
-name: Build Docker image dev with buildx
+name: Build Docker Image dev with buildx
 
 on:
   push:
@@ -15,7 +15,7 @@ jobs:
 
     - uses: actions/setup-node@v4
       with:
-        node-version: '20.x'
+        node-version: '22.x'
 
     - name: Log in to Docker Hub
       uses: docker/login-action@v3

diff --git a/.github/workflows/docker-buildx-main.yml b/.github/workflows/docker-buildx-main.yml
@@ -1,4 +1,4 @@
-name: Build main and Push Docker image to Docker Hub with buildx
+name: Build Docker Image latest with buildx
 
 on:
   push:
@@ -15,7 +15,7 @@ jobs:
 
     - uses: actions/setup-node@v4
       with:
-        node-version: '20.x'
+        node-version: '22.x'
 
     - name: Log in to Docker Hub
       uses: docker/login-action@v3

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
+          node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Clean cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,21 @@ Matterbridge edge is now released. The default mode is still the normal mode to
 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.3] - 2025-01-11
+
+### Added
+
+- [platform]: Added selectDevice list to deviceFeatureBlackList to get the device names from a list in the config editor.
+
+### Changed
+
+- [frontend]: Frontend v.2.3.11
+- [package]: Workflows use node 22.x.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.7.2] - 2025-01-11
 
 ### Added

diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.cf25d33e.css",
-    "main.js": "./static/js/main.08241820.js",
+    "main.js": "./static/js/main.6bbd1772.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",
@@ -61,11 +61,11 @@
     "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
     "main.cf25d33e.css.map": "./static/css/main.cf25d33e.css.map",
-    "main.08241820.js.map": "./static/js/main.08241820.js.map",
+    "main.6bbd1772.js.map": "./static/js/main.6bbd1772.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.cf25d33e.css",
-    "static/js/main.08241820.js"
+    "static/js/main.6bbd1772.js"
   ]
 }
diff --git a/frontend/build/index.html b/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.08241820.js"></script><link href="./static/css/main.cf25d33e.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.6bbd1772.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/frontend/build/static/js/main.08241820.js → frontend/build/static/js/main.6bbd1772.js b/frontend/build/static/js/main.08241820.js → frontend/build/static/js/main.6bbd1772.js
diff --git a/...ld/static/js/main.08241820.js.LICENSE.txt → ...ld/static/js/main.6bbd1772.js.LICENSE.txt b/...ld/static/js/main.08241820.js.LICENSE.txt → ...ld/static/js/main.6bbd1772.js.LICENSE.txt
diff --git a/...tend/build/static/js/main.08241820.js.map → ...tend/build/static/js/main.6bbd1772.js.map b/...tend/build/static/js/main.08241820.js.map → ...tend/build/static/js/main.6bbd1772.js.map
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.3.10",
+  "version": "2.3.11",
   "private": true,
   "homepage": "./",
   "scripts": {

diff --git a/frontend/src/components/configEditor.js b/frontend/src/components/configEditor.js
@@ -422,9 +422,10 @@ export function ArrayFieldTemplate(props) {
           <DialogTitle>Select an entity for {title}</DialogTitle>
           <DialogContent>
             <List dense>
-              {selectDevices.filter((d) => d.serial === title).map((value, index) => {
-                console.log('ArrayFieldTemplate: handleSelectDeviceEntityValue value:', value, value.entities);
-                return value.entities.map((entity, index) => (
+              {selectDevices.filter((d) => d.serial === title || d.name === title).map((value, index) => {
+                // console.log('ArrayFieldTemplate: handleSelectDeviceEntityValue value:', value, value.entities);
+                // console.log('ArrayFieldTemplate: handleSelectDeviceEntityValue schema:', schema);
+                return value.entities?.map((entity, index) => (
                   <ListItemButton onClick={() => handleSelectDeviceEntityValue(entity)} key={index}>
                     {entity.icon==='wifi' && <ListItemIcon><WifiIcon /></ListItemIcon>}
                     {entity.icon==='ble' && <ListItemIcon><BluetoothIcon /></ListItemIcon>}
@@ -466,53 +467,41 @@ export function ObjectFieldTemplate(props) {
   };
 
   const handleSelectDeviceValue = (value) => {
-    // console.log('ObjectFieldTemplate: handleSelectValue value:', value);
-    // console.log('ObjectFieldTemplate: handleSelectValue schema before:', schema);
     setDialogDeviceOpen(false);
     let newkey = '';
     if(schema.selectFrom === 'serial')
       newkey = value.serial;
     else if(schema.selectFrom === 'name')
       newkey = value.name;
     setNewkey(newkey);
-    // console.log('ObjectFieldTemplate: handleSelectValue newkey:', newkey);
-    // schema.properties[newkey] = { description: 'New device', type: 'array', uniqueItems: true, items: { type: 'string' }, selectEntityFrom: "name" };
+    console.log('ObjectFieldTemplate: handleSelectValue newkey:', newkey);
+
     // Trigger onAddClick returned function to add the selected new item
     const addProperty = onAddClick(schema);
     addProperty();
-    // console.log('ObjectFieldTemplate: handleSelectValue schema after:', schema);
-    // console.log('ObjectFieldTemplate: handleSelectValue schema after:', properties);
   };
 
   const handleAddItem = (event) => {
-    // console.log('ObjectFieldTemplate: handleAddItem schema before:', schema, formData, registry);
-    // console.log('ObjectFieldTemplate: handleSelectValue properties before:', properties);
     // Trigger onAddClick returned function to add the selected new item
     const addProperty = onAddClick(schema);
     addProperty();
-    // console.log('ObjectFieldTemplate: handleAddItem schema after:', schema, formData, registry);
-    // console.log('ObjectFieldTemplate: handleSelectValue properties after:', properties);
   };
 
   // Check if this is the entire schema or an individual object
   const isRoot = !schema.additionalProperties;
   if(debug) console.log('ObjectFieldTemplate: title', title, 'description', description, 'schema', schema, 'isRoot', isRoot);
   if(debug) console.log('ObjectFieldTemplate: props', props);
 
-  if(!isRoot) console.log('ObjectFieldTemplate: properties', properties);
-  /*
-  console.log('ObjectFieldTemplate: properties', properties);
-  properties.forEach((p) => {
-    console.log('ObjectFieldTemplate: ', p.name);
-    if(p.name==='newKey' && newkey!=='') {
-      console.log('ObjectFieldTemplate: changed', p.name, 'to', newkey);
-      p.name = newkey;
-      p.content.key = newkey;
-      p.content.props.name = newkey;
-      setNewkey('');
-    }
-  });
-  */
+  if(!isRoot && newkey !== '') {
+    console.log('ObjectFieldTemplate: newkey', newkey, 'properties', properties);
+    properties.forEach((p) => {
+      if(p.name==='newKey' && p.content.key==='newKey' && p.content.props.name==='newKey' && p.content.props.onKeyChange && newkey!=='') {
+        const newName = newkey;
+        setNewkey(''); // No enter again...
+        p.content.props.onKeyChange(newName);
+      }
+    });
+  }
 
   return (
     <Box sx={{ padding: '10px', margin: '0px', border: isRoot ? 'none' : '1px solid grey' }}>
@@ -529,7 +518,7 @@ export function ObjectFieldTemplate(props) {
           <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', padding: '0px', margin: '0px', marginBottom: '0px' }}>
             {schema.selectFrom && 
               <Tooltip title="Add a device from the list">
-                <IconButton disabled onClick={handleDialogDeviceToggle}>
+                <IconButton onClick={handleDialogDeviceToggle}>
                   <ListIcon />
                 </IconButton>
               </Tooltip>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
Original file line number	Diff line number	Diff line change
		@@ -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.08241820.js"></script><link href="./static/css/main.cf25d33e.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.6bbd1772.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>