Merge pull request #203 from Luligu/dev

Release 1.7.2
Luligu · Jan 11, 2025 · 363a85d · 363a85d
2 parents db225a5 + 8015e02
commit 363a85d
Show file tree

Hide file tree

Showing 29 changed files with 1,260 additions and 430 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,33 @@ 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.2] - 2025-01-11
+
+### Added
+
+- [platform]: Added selectEntity to get the entity names from a list in the config editor.
+- [websocket]: Added api /api/select/entities.
+- [frontend]: Added the possibility to reorder the items in the config editor lists.
+- [frontend]: Added custom error messages for ErrorListTemplate and FieldErrorTemplate in react-jsonschema-form for validation in the config editor.
+- [frontend]: Added filter by device name and serial number to Devices page.
+- [frontend]: Added Icon view to the Devices page (beta).
+- [frontend]: Added the possibility to select the entities/components from a list in the config editor.
+- [matterbridge]: Added /health endpoint for watchdog.
+
+### Changed
+
+- [frontend]: Frontend v.2.3.10
+- [package]: Update dependencies.
+
+### Fixed
+
+- [edge]: Fixed ValveConfigurationAndControlServer behavior.
+- [frontend]: Fixed restart that was not working correctly in Ingress.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.7.1] - 2025-01-07
 
 ### 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.b1a621ee.css",
-    "main.js": "./static/js/main.ecd94d17.js",
+    "main.css": "./static/css/main.cf25d33e.css",
+    "main.js": "./static/js/main.08241820.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.b1a621ee.css.map": "./static/css/main.b1a621ee.css.map",
-    "main.ecd94d17.js.map": "./static/js/main.ecd94d17.js.map",
+    "main.cf25d33e.css.map": "./static/css/main.cf25d33e.css.map",
+    "main.08241820.js.map": "./static/js/main.08241820.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.b1a621ee.css",
-    "static/js/main.ecd94d17.js"
+    "static/css/main.cf25d33e.css",
+    "static/js/main.08241820.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.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>
+<!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>
diff --git a/frontend/build/static/css/main.b1a621ee.css.map b/frontend/build/static/css/main.b1a621ee.css.map
diff --git a/frontend/build/static/css/main.b1a621ee.css → frontend/build/static/css/main.cf25d33e.css b/frontend/build/static/css/main.b1a621ee.css → frontend/build/static/css/main.cf25d33e.css
diff --git a/frontend/build/static/css/main.cf25d33e.css.map b/frontend/build/static/css/main.cf25d33e.css.map
diff --git a/frontend/build/static/js/main.ecd94d17.js → frontend/build/static/js/main.08241820.js b/frontend/build/static/js/main.ecd94d17.js → frontend/build/static/js/main.08241820.js
diff --git a/...ld/static/js/main.ecd94d17.js.LICENSE.txt → ...ld/static/js/main.08241820.js.LICENSE.txt b/...ld/static/js/main.ecd94d17.js.LICENSE.txt → ...ld/static/js/main.08241820.js.LICENSE.txt
diff --git a/frontend/build/static/js/main.08241820.js.map b/frontend/build/static/js/main.08241820.js.map
diff --git a/frontend/build/static/js/main.ecd94d17.js.map b/frontend/build/static/js/main.ecd94d17.js.map
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.3.3",
+  "version": "2.3.10",
   "private": true,
   "homepage": "./",
   "scripts": {

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -18,7 +18,7 @@
   --main-label-color: var(--main-grey-color);
 
   --primary-color: #009a00;
-  --secondary-color: #a58827;
+  --secondary-color: #316dc7;
 
   --header-bg-color: var(--primary-color);
   --header-text-color: white;
@@ -174,6 +174,7 @@ html {
 .tooltip-container {
   position: relative;
   display: inline-block;
+  z-index: 10;
 }
 
 .tooltip-text {
@@ -345,6 +346,7 @@ thead th {
   color: var(--header-text-color);
   background: var(--header-bg-color);
   text-align: left;
+  z-index: 10;
 }
 
 tbody td {
@@ -455,7 +457,6 @@ h3 {
   display: 'flex';
   align-items: center;
   justify-content: center;
-  height: 40px;
   color: var(--footer-text-color);
   background-color: var(--footer-bg-color);
   margin: 0px;

diff --git a/frontend/src/components/ConfirmCancelForm.js b/frontend/src/components/ConfirmCancelForm.js
@@ -4,23 +4,26 @@ import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import Button from '@mui/material/Button';
 
+// Frontend
+import { debug } from '../App';
+
 // Create a component for confirming or canceling an action
 export function ConfirmCancelForm({ open, title, message, onConfirm, onCancel }) {
 
   const handleConfirm = event => {
-    // console.log('Confirmed');
+    if(debug) console.log('Confirmed');
     event.preventDefault();
     onConfirm();
   };
 
   const handleCancel = event => {
-    // console.log('Canceled');
+    if(debug) console.log('Canceled');
     event.preventDefault();
     onCancel();
   };
 
   return (
-    <Dialog open={open} PaperProps={{style: { border: "2px solid #ddd", backgroundColor: '#c4c2c2', boxShadow: '5px 5px 10px #888'}}}>
+    <Dialog open={open}>
       <DialogTitle gap={'20px'}>
         <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', gap: '20px' }}>
           <img src="matterbridge 32x32.png" alt="Matterbridge Logo" style={{ height: '32px', width: '32px' }} />
@@ -29,11 +32,11 @@ export function ConfirmCancelForm({ open, title, message, onConfirm, onCancel })
       </DialogTitle>
       <DialogContent>
         <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'center', margin: '0', marginBottom: '20px', maxHeight: '350px', maxWidth: '350px' }}>
-          <p style={{ flex: 1, color: 'black', margin: '0' }}>{message}</p>
+          <p style={{ flex: 1, margin: '0' }}>{message}</p>
         </div>
         <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-around'}}>
-          <Button onClick={handleConfirm} variant="contained" color="primary" size="small" style={{ color: '#ffffff' }}>Confirm</Button>
-          <Button onClick={handleCancel} variant="contained" color="primary" size="small" style={{ color: '#ffffff' }}>Cancel</Button>
+          <Button onClick={handleConfirm} variant="contained" color="primary" size="small" >Confirm</Button>
+          <Button onClick={handleCancel} variant="contained" color="primary" size="small" >Cancel</Button>
         </div>
       </DialogContent>
     </Dialog>
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.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>
		<!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>