fix issue that no devices have been detected (#39)

* fix issue that no devices have been detected * fix devices too * use clone on device dialog * add dummy for qr code action
ioBroker · Jul 17, 2024 · 6782131 · 6782131
1 parent c9fb631
commit 6782131
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 30 deletions.
diff --git a/src-admin/src/App.tsx b/src-admin/src/App.tsx
@@ -73,7 +73,8 @@ interface AppState extends GenericAppState {
     matter: MatterConfig;
     commissioning: CommissioningInfo | null;
     nodeStates: { [uuid: string]: NodeStateResponse };
-    detectedDevices: DetectedRoom[] | null;
+    /** Undefined if no detection ran yet */
+    detectedDevices?: DetectedRoom[];
     ready: boolean;
 }
 
@@ -130,7 +131,6 @@ class App extends GenericApp<GenericAppProps, AppState> {
                 devices: {},
             },
             ready: false,
-            detectedDevices: null,
         });
 
         this.alert = window.alert;
@@ -349,8 +349,8 @@ class App extends GenericApp<GenericAppProps, AppState> {
             nodeStates={this.state.nodeStates}
             themeType={this.state.themeType}
             theme={this.state.theme}
-            detectedDevices={this.state.detectedDevices || []}
-            setDetectedDevices={(detectedDevices: DetectedRoom[]) =>
+            detectedDevices={this.state.detectedDevices}
+            setDetectedDevices={detectedDevices =>
                 this.setState({ detectedDevices })}
             productIDs={productIDs}
             matter={this.state.matter}
@@ -381,8 +381,8 @@ class App extends GenericApp<GenericAppProps, AppState> {
             socket={this.socket}
             themeType={this.state.themeType}
             theme={this.state.theme}
-            detectedDevices={this.state.detectedDevices || []}
-            setDetectedDevices={(detectedDevices: DetectedRoom[]) =>
+            detectedDevices={this.state.detectedDevices}
+            setDetectedDevices={detectedDevices =>
                 this.setState({ detectedDevices })}
             productIDs={productIDs}
             instance={this.instance}

diff --git a/src-admin/src/Tabs/BridgesAndDevices.tsx b/src-admin/src/Tabs/BridgesAndDevices.tsx
@@ -62,7 +62,8 @@ export const STYLES: Record<string, React.CSSProperties> = {
 export interface BridgesAndDevicesProps {
     alive: boolean;
     commissioning: Record<string, boolean>;
-    detectedDevices: DetectedRoom[];
+    /** Undefined if no detection ran yet */
+    detectedDevices?: DetectedRoom[];
     instance: number;
     matter: MatterConfig;
     nodeStates: { [uuid: string]: NodeStateResponse };

diff --git a/src-admin/src/Tabs/Devices.tsx b/src-admin/src/Tabs/Devices.tsx
@@ -720,7 +720,7 @@ class Devices extends BridgesAndDevices<DevicesProps, DevicesState> {
                 matter={this.props.matter}
                 socket={this.props.socket}
                 detectedDevices={this.props.detectedDevices}
-                setDetectedDevices={(detectedDevices: DetectedRoom[]) =>
+                setDetectedDevices={detectedDevices =>
                     this.props.setDetectedDevices(detectedDevices)}
                 type="device"
             />

diff --git a/src-admin/src/Utils.tsx b/src-admin/src/Utils.tsx
@@ -135,7 +135,7 @@ export async function detectDevices(
             }
             const members: string[] = devicesObject[id].common.members;
 
-            if (members && members.length) {
+            if (members?.length) {
                 members.forEach(member => {
                     // if an object really exists
                     if (devicesObject[member]) {

diff --git a/src-admin/src/components/DeviceDialog.tsx b/src-admin/src/components/DeviceDialog.tsx
@@ -48,7 +48,7 @@ import {
 } from '@iobroker/adapter-react-v5';
 import { Types } from '@iobroker/type-detector';
 
-import { detectDevices, getText } from '../Utils';
+import { clone, detectDevices, getText } from '../Utils';
 import type { DetectedRoom, DetectedDevice, MatterConfig } from '../types';
 
 export const DEVICE_ICONS: Record<Types, React.JSX.Element> = {
@@ -172,7 +172,8 @@ const styles: Record<string, any> = {
 };
 
 interface DeviceDialogProps {
-    detectedDevices: DetectedRoom[];
+    /** Undefined if no detection ran yet */
+    detectedDevices?: DetectedRoom[];
     matter: MatterConfig;
     socket: AdminConnection;
     setDetectedDevices: (detectedDevices: DetectedRoom[]) => void;
@@ -225,11 +226,12 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
 
     async componentDidMount() {
         const detectedDevices = this.props.detectedDevices || (await detectDevices(this.props.socket));
+
         if (!this.props.detectedDevices) {
             setTimeout(() => this.props.setDetectedDevices(detectedDevices), 100);
         }
 
-        let rooms: DetectedRoom[] = JSON.parse(JSON.stringify(detectedDevices));
+        let rooms = clone(detectedDevices);
 
         // ignore buttons
         rooms.forEach(
@@ -341,9 +343,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                     checked={!!this.state.devicesChecked[device._id]}
                     disabled={!supported}
                     onChange={e => {
-                        const devicesChecked = JSON.parse(
-                            JSON.stringify(this.state.devicesChecked),
-                        );
+                        const devicesChecked = clone(this.state.devicesChecked);
                         devicesChecked[device._id] = e.target.checked;
                         this.setState({ devicesChecked });
                     }}
@@ -364,7 +364,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                     }
                     value={device.common.name}
                     onChange={e => {
-                        const rooms = JSON.parse(JSON.stringify(this.state.rooms));
+                        const rooms = clone(this.state.rooms);
                         rooms[roomIndex].devices[deviceIndex].common.name =
             e.target.value;
                         this.setState({ rooms });
@@ -376,7 +376,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                     style={{ minWidth: 'initial' }}
                     value={device.vendorID}
                     onChange={e => {
-                        const rooms = JSON.parse(JSON.stringify(this.state.rooms));
+                        const rooms = clone(this.state.rooms);
                         rooms[roomIndex].devices[deviceIndex].vendorID = e.target.value;
                         this.setState({ rooms });
                     }}
@@ -394,7 +394,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                     style={{ minWidth: 'initial' }}
                     value={device.productID}
                     onChange={e => {
-                        const rooms = JSON.parse(JSON.stringify(this.state.rooms));
+                        const rooms = clone(this.state.rooms);
                         rooms[roomIndex].devices[deviceIndex].productID = e.target.value;
                         this.setState({ rooms });
                     }}
@@ -446,9 +446,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                             <Switch
                                 checked={this.state.ignoreUsedDevices || false}
                                 onChange={e => {
-                                    const devicesChecked = JSON.parse(
-                                        JSON.stringify(this.state.devicesChecked),
-                                    );
+                                    const devicesChecked = clone(this.state.devicesChecked);
                                     Object.keys(devicesChecked).forEach(deviceId => {
                                         if (e.target.checked && this.state.usedDevices[deviceId]) {
                                             devicesChecked[deviceId] = false;
@@ -480,9 +478,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                                         e.target.checked ? 'true' : 'false',
                                     );
 
-                                    const rooms: DetectedRoom[] = JSON.parse(
-                                        JSON.stringify(this.state.rooms),
-                                    );
+                                    const rooms = clone(this.state.rooms);
                                     if (e.target.checked) {
                                         rooms.forEach(room => {
                                             room.devices.forEach(device => {
@@ -551,9 +547,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                                 <Accordion
                                     expanded={this.state.expanded.includes(room._id)}
                                     onChange={() => {
-                                        const expanded: string[] = JSON.parse(
-                                            JSON.stringify(this.state.expanded),
-                                        );
+                                        const expanded = clone(this.state.expanded);
                                         const pos = expanded.indexOf(room._id);
                                         if (pos === -1) {
                                             expanded.push(room._id);
@@ -594,9 +588,7 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                                                 onClick={e => {
                                                     e.stopPropagation();
                                                     e.preventDefault();
-                                                    const devicesChecked = JSON.parse(
-                                                        JSON.stringify(this.state.devicesChecked),
-                                                    );
+                                                    const devicesChecked = clone(this.state.devicesChecked);
                                                     if (
                                                         counters[roomIndex] === room.devices.length
                                                     ) {

diff --git a/src-admin/src/i18n/de.json b/src-admin/src/i18n/de.json
@@ -51,6 +51,7 @@
   "Enable": "Aktivieren",
   "Enable/disable bridge": "Bridge aktivieren/deaktivieren",
   "Expand all": "Alle erweitern",
+  "Generate new pairing code": "Neuen Pairing-Code generieren",
   "Hide unsupported devices": "Nicht unterstützte Geräte ausblenden",
   "Interface": "Schnittstelle",
   "Manual pairing code": "Manueller Kopplungscode",

diff --git a/src-admin/src/i18n/en.json b/src-admin/src/i18n/en.json
@@ -51,6 +51,7 @@
   "Enable": "Enable",
   "Enable/disable bridge": "Enable/disable bridge",
   "Expand all": "Expand all",
+  "Generate new pairing code": "Generate new pairing code",
   "Hide unsupported devices": "Hide unsupported devices",
   "Interface": "Interface",
   "Manual pairing code": "Manual pairing code",

diff --git a/src-admin/src/i18n/es.json b/src-admin/src/i18n/es.json
@@ -51,6 +51,7 @@
   "Enable": "Permitir",
   "Enable/disable bridge": "Activar/desactivar puente",
   "Expand all": "Expandir todo",
+  "Generate new pairing code": "Generar nuevo código de emparejamiento",
   "Hide unsupported devices": "Ocultar dispositivos no compatibles",
   "Interface": "Interfaz",
   "Manual pairing code": "Código de emparejamiento manual",

diff --git a/src-admin/src/i18n/fr.json b/src-admin/src/i18n/fr.json
@@ -51,6 +51,7 @@
   "Enable": "Activer",
   "Enable/disable bridge": "Activer/désactiver le pont",
   "Expand all": "Développer tout",
+  "Generate new pairing code": "Générer un nouveau code d'appairage",
   "Hide unsupported devices": "Masquer les appareils non pris en charge",
   "Interface": "Interface",
   "Manual pairing code": "Code d'appairage manuel",

diff --git a/src-admin/src/i18n/it.json b/src-admin/src/i18n/it.json
@@ -51,6 +51,7 @@
   "Enable": "Abilitare",
   "Enable/disable bridge": "Abilita/disabilita il bridge",
   "Expand all": "Espandi tutto",
+  "Generate new pairing code": "Genera un nuovo codice di accoppiamento",
   "Hide unsupported devices": "Nascondi i dispositivi non supportati",
   "Interface": "Interfaccia",
   "Manual pairing code": "Codice di abbinamento manuale",

diff --git a/src-admin/src/i18n/nl.json b/src-admin/src/i18n/nl.json
@@ -51,6 +51,7 @@
   "Enable": "Inschakelen",
   "Enable/disable bridge": "Brug in-/uitschakelen",
   "Expand all": "Alles uitvouwen",
+  "Generate new pairing code": "Genereer een nieuwe koppelingscode",
   "Hide unsupported devices": "Verberg niet-ondersteunde apparaten",
   "Interface": "Koppel",
   "Manual pairing code": "Handmatige koppelingscode",

diff --git a/src-admin/src/i18n/pl.json b/src-admin/src/i18n/pl.json
@@ -51,6 +51,7 @@
   "Enable": "Włączać",
   "Enable/disable bridge": "Włącz/wyłącz most",
   "Expand all": "Rozwiń wszystkie",
+  "Generate new pairing code": "Wygeneruj nowy kod parowania",
   "Hide unsupported devices": "Ukryj nieobsługiwane urządzenia",
   "Interface": "Interfejs",
   "Manual pairing code": "Ręczny kod parowania",

diff --git a/src-admin/src/i18n/pt.json b/src-admin/src/i18n/pt.json
@@ -51,6 +51,7 @@
   "Enable": "Habilitar",
   "Enable/disable bridge": "Habilitar/desabilitar ponte",
   "Expand all": "Expandir todos",
+  "Generate new pairing code": "Gerar novo código de pareamento",
   "Hide unsupported devices": "Ocultar dispositivos não suportados",
   "Interface": "Interface",
   "Manual pairing code": "Código de emparelhamento manual",

diff --git a/src-admin/src/i18n/ru.json b/src-admin/src/i18n/ru.json
@@ -51,6 +51,7 @@
   "Enable": "Давать возможность",
   "Enable/disable bridge": "Включить/выключить мост",
   "Expand all": "Расширить все",
+  "Generate new pairing code": "Создать новый код сопряжения",
   "Hide unsupported devices": "Скрыть неподдерживаемые устройства",
   "Interface": "Интерфейс",
   "Manual pairing code": "Код сопряжения вручную",

diff --git a/src-admin/src/i18n/uk.json b/src-admin/src/i18n/uk.json
@@ -51,6 +51,7 @@
   "Enable": "Увімкнути",
   "Enable/disable bridge": "Увімкнути/вимкнути міст",
   "Expand all": "Розгорнути все",
+  "Generate new pairing code": "Створіть новий код сполучення",
   "Hide unsupported devices": "Приховати непідтримувані пристрої",
   "Interface": "Інтерфейс",
   "Manual pairing code": "Код підключення вручну",

diff --git a/src-admin/src/i18n/zh-cn.json b/src-admin/src/i18n/zh-cn.json
@@ -51,6 +51,7 @@
   "Enable": "使能够",
   "Enable/disable bridge": "启用/禁用桥接",
   "Expand all": "展开全部",
+  "Generate new pairing code": "生成新的配对码",
   "Hide unsupported devices": "隐藏不支持的设备",
   "Interface": "界面",
   "Manual pairing code": "手动配对码",

diff --git a/src/lib/DeviceManagement.ts b/src/lib/DeviceManagement.ts
@@ -61,6 +61,12 @@ class MatterAdapterDeviceManagement extends DeviceManagement<MatterAdapter> {
                         icon: 'fa-solid fa-pen',
                         description: t('Rename this device'),
                         handler: this.handleRenameDevice.bind(this)
+                    },
+                    {
+                        id: 'pairingCode',
+                        icon: 'fa-solid fa-qrcode',
+                        description: t('Generate new pairing code'),
+                        handler: this.handlePairingCode.bind(this)
                     }
                 ]
             };
@@ -136,6 +142,14 @@ class MatterAdapterDeviceManagement extends DeviceManagement<MatterAdapter> {
         return { error: { code: 404, message: 'State not found' } };
     }
 
+    /**
+     * Handle new pairing code request
+     */
+    handlePairingCode(): Promise<{ refresh: DeviceRefresh }> {
+        // TODO: return form as soon as QR code implemented
+        return Promise.resolve({ refresh: false });
+    }
+
     async handleRenameDevice(id: string, context: ActionContext): Promise<{ refresh: DeviceRefresh }> {
         this.adapter.log.info(`Rename device ${id}`);
         const devices = await this.adapter.getDevicesAsync();