Extended info for separate devices in bridge (#225)

* Fixing pipeline * Show hint, if user want to add more than 15 devices to unconnected bridge: #197 * MAX_UN_COMISSIONED_DEVICES * Add hint about Alexa Bridge: #219 * Added help button: #215 * Show long IPv6 on big screens: #216 * Added text to QR code scan dialog: #220 * Adde welcome dialog: #208 * Fixed linter
ioBroker · Dec 13, 2024 · 58ed18c · 58ed18c
1 parent 0280ad5
commit 58ed18c
Show file tree

Hide file tree

Showing 24 changed files with 1,051 additions and 301 deletions.
diff --git a/io-package.json b/io-package.json
diff --git a/src-admin/package.json b/src-admin/package.json
@@ -23,7 +23,7 @@
     "scripts": {
         "start": "vite",
         "build": "vite build",
-        "lint": "eslint --fix --ext .js,.jsx,.tsx src",
+        "lint": "eslint -c eslint.config.mjs",
         "check-ts": "tsc --noEmit --checkJS false",
         "tsc": "tsc --project tsconfig.json"
     },

diff --git a/src-admin/src/App.tsx b/src-admin/src/App.tsx
@@ -8,13 +8,14 @@ import {
     DialogContent,
     DialogContentText,
     DialogTitle,
+    Fab,
     LinearProgress,
     Tab,
     Tabs,
     Tooltip,
 } from '@mui/material';
 
-import { SignalCellularOff as IconNotAlive } from '@mui/icons-material';
+import { Help as IconHelp, SignalCellularOff as IconNotAlive } from '@mui/icons-material';
 
 import {
     AdminConnection,
@@ -32,6 +33,7 @@ import BridgesTab from './Tabs/Bridges';
 import ControllerTab from './Tabs/Controller';
 import DevicesTab from './Tabs/Devices';
 import OptionsTab from './Tabs/Options';
+import WelcomeDialog from './components/WelcomeDialog';
 
 import type {
     CommissioningInfo,
@@ -93,12 +95,14 @@ interface AppState extends GenericAppState {
     /** Undefined if no detection ran yet */
     detectedDevices?: DetectedRoom[];
     ready: boolean;
+    showWelcomeDialog: boolean;
     progress: {
         title?: ioBroker.StringOrTranslated;
         text?: ioBroker.StringOrTranslated;
         indeterminate?: boolean;
         value?: number;
     } | null;
+    welcomeDialogShowed: boolean;
 }
 
 class App extends GenericApp<GenericAppProps, AppState> {
@@ -155,6 +159,8 @@ class App extends GenericApp<GenericAppProps, AppState> {
             },
             ready: false,
             progress: null,
+            showWelcomeDialog: false,
+            welcomeDialogShowed: false,
         });
 
         this.alert = window.alert;
@@ -253,6 +259,8 @@ class App extends GenericApp<GenericAppProps, AppState> {
 
         const alive = await this.socket.getState(`system.adapter.matter.${this.instance}.alive`);
 
+        const welcomeDialog = await this.socket.getState(`matter.${this.instance}.welcomeDialog`);
+
         if (alive?.val) {
             this.refreshBackendSubscription(true);
         }
@@ -262,6 +270,8 @@ class App extends GenericApp<GenericAppProps, AppState> {
             commissioning,
             ready: true,
             alive: !!alive?.val,
+            showWelcomeDialog: !welcomeDialog?.val,
+            welcomeDialogShowed: !!welcomeDialog?.val,
         });
     }
 
@@ -278,6 +288,28 @@ class App extends GenericApp<GenericAppProps, AppState> {
         }
     };
 
+    renderWelcomeDialog(): React.JSX.Element | null {
+        if (!this.state.showWelcomeDialog) {
+            return null;
+        }
+
+        return (
+            <WelcomeDialog
+                common={this.common}
+                instance={this.instance}
+                socket={this.socket}
+                onClose={async () => {
+                    if (!this.state.welcomeDialogShowed) {
+                        await this.socket.setState(`matter.${this.instance}.welcomeDialog`, true, true);
+                    }
+                    this.setState({ showWelcomeDialog: false, welcomeDialogShowed: true });
+                }}
+                login={this.state.native.login}
+                pass={this.state.native.pass}
+            />
+        );
+    }
+
     onBackendUpdates = (update: GUIMessage | null): void => {
         if (!update) {
             return;
@@ -440,6 +472,7 @@ class App extends GenericApp<GenericAppProps, AppState> {
                         this.updateNativeValue(id, value, resolve);
                     });
                 }}
+                onShowWelcomeDialog={() => this.setState({ showWelcomeDialog: true })}
                 onLoad={(native: Record<string, any>) => this.onLoadConfig(native)}
                 socket={this.socket}
                 common={this.common}
@@ -625,6 +658,7 @@ class App extends GenericApp<GenericAppProps, AppState> {
                 <ThemeProvider theme={this.state.theme}>
                     {this.renderToast()}
                     {this.renderProgressDialog()}
+                    {this.renderWelcomeDialog()}
                     <div
                         className="App"
                         style={{
@@ -697,6 +731,28 @@ class App extends GenericApp<GenericAppProps, AppState> {
                                         </div>
                                     </Tooltip>
                                 )}
+                                {this.common && this.state.selectedTab !== 'options' ? (
+                                    <Tooltip
+                                        title={I18n.t('Show readme page')}
+                                        slotProps={{ popper: { sx: { pointerEvents: 'none' } } }}
+                                    >
+                                        <Fab
+                                            size="small"
+                                            color="primary"
+                                            style={{
+                                                marginRight: 5,
+                                                marginTop: 5,
+                                                float: 'right',
+                                            }}
+                                            onClick={() => {
+                                                const win = window.open(this.common?.readme, '_blank');
+                                                win?.focus();
+                                            }}
+                                        >
+                                            <IconHelp />
+                                        </Fab>
+                                    </Tooltip>
+                                ) : null}
                             </Tabs>
                         </AppBar>