Update 14.01 (#309)

* dep update * Optimize Discovery dialog handling * Streamline device classes * Optimize DM icons and connection status * Optimize icons and connection status * add todo * fix discovery response * display connection type and connection status * Readme * optimize icons * fix typo * address review feedback * finalize * hide factory reset when bridge has no devices * adjust icons for connection type
ioBroker · Jan 15, 2025 · 60c58b4 · 60c58b4
1 parent 230a706
commit 60c58b4
Show file tree

Hide file tree

Showing 51 changed files with 415 additions and 255 deletions.
diff --git a/README.md b/README.md
@@ -239,7 +239,12 @@ TBD
 
 ## Changelog
 ### **WORK IN PROGRESS**
-* (@GermanBluefox) Showed the device name in paring dialog  
+* (@GermanBluefox) Showed the device name in paring dialog
+* (@GermanBluefox/Apollon77) Adjusts connection type icons
+* (@Apollon77) Optimized the discovery dialog handling
+* (@Apollon77) Fixed Thermostat for Controller to update temperatures
+* (@Apollon77) Gives Energy sensors a dedicated icon
+* (@Apollon77) Optimized an fixed multiple things
 
 ### 0.3.6 (2025-01-13)
 * (@GermanBluefox) Fixed GUI errors

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,16 +23,16 @@
     "url": "https://github.com/ioBroker/ioBroker.matter"
   },
   "optionalDependencies": {
-    "@matter/nodejs-ble": "0.12.0-alpha.0-20250113-e619723a5"
+    "@matter/nodejs-ble": "0.12.0-alpha.0-20250113-1c80c6d58"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
     "@iobroker/i18n": "^0.3.1",
     "@iobroker/dm-utils": "^1.0.6",
     "@iobroker/type-detector": "^4.1.1",
-    "@matter/main": "0.12.0-alpha.0-20250113-e619723a5",
-    "@matter/nodejs": "0.12.0-alpha.0-20250113-e619723a5",
-    "@project-chip/matter.js": "0.12.0-alpha.0-20250113-e619723a5",
+    "@matter/main": "0.12.0-alpha.0-20250113-1c80c6d58",
+    "@matter/nodejs": "0.12.0-alpha.0-20250113-1c80c6d58",
+    "@project-chip/matter.js": "0.12.0-alpha.0-20250113-1c80c6d58",
     "axios": "^1.7.9",
     "jsonwebtoken": "^9.0.2"
   },

diff --git a/src-admin/package-lock.json b/src-admin/package-lock.json
diff --git a/src-admin/package.json b/src-admin/package.json
@@ -7,8 +7,8 @@
     },
     "dependencies": {
         "@foxriver76/iob-component-lib": "^0.2.0",
-        "@iobroker/adapter-react-v5": "^7.4.12",
-        "@iobroker/dm-gui-components": "^7.4.12",
+        "@iobroker/adapter-react-v5": "^7.4.14",
+        "@iobroker/dm-gui-components": "^7.4.14",
         "@iobroker/type-detector": "^4.1.1",
         "@types/react-dom": "^18.3.5",
         "@types/uuid": "^10.0.0",
@@ -51,4 +51,4 @@
             }
         ]
     ]
-}
+}
diff --git a/src-admin/src/Tabs/Bridges.tsx b/src-admin/src/Tabs/Bridges.tsx
@@ -1554,7 +1554,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                                 }}
                                 sx={styles.devicesHeader}
                             >
-                                {this.props.alive && bridge.enabled ? (
+                                {this.props.alive && bridge.enabled && bridge.list.length ? (
                                     <Tooltip
                                         title={I18n.t('Reset to factory defaults')}
                                         slotProps={{ popper: { sx: { pointerEvents: 'none' } } }}

diff --git a/src-admin/src/Tabs/Controller.tsx b/src-admin/src/Tabs/Controller.tsx
@@ -114,7 +114,9 @@ interface ComponentState {
     /** If we are currently waiting for backend processing */
     backendProcessingActive: boolean;
     discovered: CommissionableDevice[];
+    /** Discovery process is active in the backend */
     discoveryRunning: boolean;
+    /** Was a discovery result received which means that the dialog should stay open also after discovery ended */
     discoveryDone: boolean;
     nodes: Record<string, ioBroker.Object>;
     states: Record<string, ioBroker.State>;
@@ -230,7 +232,10 @@ class Controller extends Component<ComponentProps, ComponentState> {
             if (state?.val) {
                 this.setState({ discoveryRunning: true });
             } else {
-                this.setState({ discoveryRunning: false });
+                this.setState({
+                    discoveryRunning: false,
+                    discoveryDone: !!this.state.discovered.length, // Leave dialog open if we found devices
+                });
             }
             return;
         }
@@ -616,6 +621,8 @@ class Controller extends Component<ComponentProps, ComponentState> {
                                             onClick={async () => {
                                                 await this.stopDiscovery();
                                                 this.setState({
+                                                    discoveryDone: false,
+                                                    discovered: [],
                                                     showQrCodeDialog: device,
                                                 });
                                             }}
@@ -657,11 +664,13 @@ class Controller extends Component<ComponentProps, ComponentState> {
      * Stop discovering devices
      */
     async stopDiscovery(): Promise<void> {
+        if (!this.state.discoveryRunning) {
+            // Nothing to stop if no Discovery is running
+            return;
+        }
         console.log('Stop discovery');
 
         await this.props.socket.sendTo(`matter.${this.props.instance}`, 'controllerDiscoveryStop', {});
-
-        this.setState({ discoveryDone: !!this.state.discovered.length });
     }
 
     /**
@@ -765,8 +774,8 @@ class Controller extends Component<ComponentProps, ComponentState> {
                                         window.alert(`Error on discovery: ${result.error}`);
                                     } else if (result.result) {
                                         this.setState({
+                                            discoveryDone: !!result.result.length,
                                             discovered: result.result,
-                                            discoveryDone: true,
                                         });
                                     }
                                 });