Fixing pipeline

ioBroker · Dec 12, 2024 · 8f7c5af · 8f7c5af
1 parent 0280ad5
commit 8f7c5af
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 9 deletions.
diff --git a/src-admin/src/Tabs/Bridges.tsx b/src-admin/src/Tabs/Bridges.tsx
@@ -11,12 +11,14 @@ import {
     DomainDisabled,
     Edit,
     FormatListBulleted,
+    Info,
     KeyboardArrowDown,
     KeyboardArrowUp,
     QuestionMark,
     Save,
     UnfoldLess,
     UnfoldMore,
+    Warning,
 } from '@mui/icons-material';
 import {
     Button,
@@ -1073,6 +1075,10 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
         devIndex: number,
     ): React.JSX.Element {
         const isLast = devIndex === bridge.list.length - 1;
+        const hasError = Array.isArray(this.props.nodeStates?.[bridge.uuid]?.error)
+            ? !!(this.props.nodeStates[bridge.uuid].error as string[])?.includes(device.uuid)
+            : false;
+
         return (
             <TableRow
                 key={devIndex}
@@ -1094,6 +1100,30 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                             </div>
                             <div style={styles.deviceType}>{`${I18n.t('Device type')}: ${I18n.t(device.type)}`}</div>
                         </div>
+                        <div style={{ flex: 1 }} />
+                        {this.props.nodeStates?.[bridge.uuid] ? (
+                            <Tooltip
+                                key="debug"
+                                title={hasError ? I18n.t('Show error') : I18n.t('Show additional information')}
+                                slotProps={{ popper: { sx: { pointerEvents: 'none' } } }}
+                            >
+                                <IconButton
+                                    style={{
+                                        height: 40,
+                                        color: hasError
+                                            ? '#FF0000'
+                                            : this.isDevice
+                                              ? this.props.themeType === 'dark'
+                                                  ? 'white'
+                                                  : '#00000080'
+                                              : 'white',
+                                    }}
+                                    onClick={e => this.requestAdditionalInformation(e, device.uuid)}
+                                >
+                                    {hasError ? <Warning /> : <Info />}
+                                </IconButton>
+                            </Tooltip>
+                        ) : null}
                     </div>
                 </TableCell>
                 <TableCell />

diff --git a/src-admin/src/Tabs/BridgesAndDevices.tsx b/src-admin/src/Tabs/BridgesAndDevices.tsx
@@ -245,12 +245,11 @@ class BridgesAndDevices<TProps extends BridgesAndDevicesProps, TState extends Br
         return <QuestionMark style={{ color }} />;
     }
 
-    requestAdditionalInformation(uuid: string): void {
+    requestAdditionalInformation(e: React.MouseEvent, uuid: string): void {
+        e.stopPropagation();
+
         this.props.socket
-            .sendTo(`matter.${this.props.instance}`, 'extendedInfo', {
-                uuid,
-                error: this.props.nodeStates[uuid]?.error,
-            })
+            .sendTo(`matter.${this.props.instance}`, 'extendedInfo', { uuid })
             .then((result: { schema: JsonFormSchema; options?: BackEndCommandJsonFormOptions }): void => {
                 this.setState({
                     jsonConfig: {
@@ -324,7 +323,7 @@ class BridgesAndDevices<TProps extends BridgesAndDevicesProps, TState extends Br
                                   : '#00000080'
                               : 'white',
                     }}
-                    onClick={() => this.requestAdditionalInformation(deviceOrBridge.uuid)}
+                    onClick={e => this.requestAdditionalInformation(e, deviceOrBridge.uuid)}
                 >
                     {this.props.nodeStates[deviceOrBridge.uuid].error ? <Warning /> : <Info />}
                 </IconButton>

diff --git a/src-admin/src/Tabs/Devices.tsx b/src-admin/src/Tabs/Devices.tsx
@@ -3,7 +3,16 @@ import React from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
 import { IconButton } from '@foxriver76/iob-component-lib';
-import { Add, AutoMode, Close, Delete, DeviceHub, FormatListBulleted, QuestionMark, Save } from '@mui/icons-material';
+import {
+    Add,
+    AutoMode,
+    Close,
+    Delete,
+    DeviceHub,
+    FormatListBulleted,
+    QuestionMark,
+    Save,
+} from '@mui/icons-material';
 import {
     Button,
     Checkbox,

diff --git a/src-admin/src/types.d.ts b/src-admin/src/types.d.ts
@@ -143,7 +143,7 @@ export interface ConnectionInfo {
 
 export interface NodeStateResponse {
     status: NodeStates;
-    error?: boolean;
+    error?: boolean | string[];
     qrPairingCode?: string;
     manualPairingCode?: string;
     connectionInfo?: ConnectionInfo[];

diff --git a/src/matter/BaseServerNode.ts b/src/matter/BaseServerNode.ts
@@ -70,7 +70,8 @@ export abstract class BaseServerNode implements GeneralNode {
         };
 
         // TODO: @Apollon77. Set this flag to true if error flag should be shown
-        // result.error = true;
+        // result.error = true; if the error is related to bridge
+        // or ['UUID1', 'UUID2'] if the error is related to a specific device
 
         // Device is not commissioned, so show QR code
         if (!this.serverNode.lifecycle.isCommissioned) {