Correcting close&save button: ioBroker/ioBroker.matter#310

ioBroker · Jan 15, 2025 · 92060dc · 92060dc
1 parent c3a1add
commit 92060dc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -90,6 +90,7 @@ The icons may not be reused in other projects without the proper flaticon licens
 ### **WORK IN PROGRESS**
 
 -   (@GermanBluefox) Extended DM with device type
+-   (@GermanBluefox) Corrected Save&Close button for the instance configs
 
 ### 7.4.12 (2025-01-11)
 

diff --git a/packages/adapter-react-v5/src/GenericApp.tsx b/packages/adapter-react-v5/src/GenericApp.tsx
@@ -803,8 +803,9 @@ export class GenericApp<
                     // ignore
                 }
 
-                this.setState({ changed: false });
-                isClose && GenericApp.onClose();
+                this.setState({ changed: false }, () => {
+                    isClose && GenericApp.onClose();
+                });
             })
             .catch(e => console.error(`Cannot save configuration: ${e}`));
     }

diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
@@ -434,7 +434,6 @@ interface AppState {
     drawerState: 0 | 1 | 2;
     editMenuList: boolean;
     tab: any;
-    allStored: boolean;
     dataNotStoredDialog: boolean;
     dataNotStoredTab: {
         tab: string;
@@ -488,6 +487,8 @@ interface AppState {
 class App extends Router<AppProps, AppState> {
     private readonly translations: Record<ioBroker.Languages, Record<string, string>>;
 
+    private _tempAllStored = true;
+
     /** Seconds before logout to show warning */
     private readonly EXPIRE_WARNING_THRESHOLD: number = 120;
 
@@ -610,8 +611,9 @@ class App extends Router<AppProps, AppState> {
                 get: () => this.state.configNotSaved,
                 set: configNotSaved => {
                     const allStored = !configNotSaved;
-                    if (allStored !== this.state.allStored) {
-                        this.setState({ allStored });
+                    if (allStored !== this._tempAllStored) {
+                        this._tempAllStored = allStored;
+                        this.forceUpdate();
                     }
                 },
                 configurable: true,
@@ -655,7 +657,6 @@ class App extends Router<AppProps, AppState> {
                 editMenuList: false,
 
                 tab: null,
-                allStored: true,
                 dataNotStoredDialog: false,
                 dataNotStoredTab: null,
 
@@ -2202,7 +2203,7 @@ class App extends Router<AppProps, AppState> {
 
     handleNavigation = (tab: string, subTab?: string, param?: string): void => {
         if (tab) {
-            if (this.state.allStored) {
+            if (this._tempAllStored) {
                 Router.doNavigate(tab, subTab, param);
 
                 this.setState({ currentTab: Router.getLocation() });
@@ -2224,20 +2225,21 @@ class App extends Router<AppProps, AppState> {
     };
 
     allStored(value: boolean): void {
-        this.setState({
-            allStored: value,
-        });
+        if (this._tempAllStored !== value) {
+            this._tempAllStored = value;
+            this.forceUpdate();
+        }
     }
 
     closeDataNotStoredDialog(): void {
         this.setState({ dataNotStoredDialog: false });
     }
 
     confirmDataNotStored(): void {
+        this._tempAllStored = true;
         this.setState(
             {
                 dataNotStoredDialog: false,
-                allStored: true,
             },
             () =>
                 this.handleNavigation(
@@ -2475,6 +2477,9 @@ class App extends Router<AppProps, AppState> {
     }
 
     renderDialogConfirm(): JSX.Element | null {
+        if (!this.state.dataNotStoredDialog) {
+            return null;
+        }
         /* return <DialogConfirm
             onClose={() => this.closeDataNotStoredDialog()}
             open={this.state.dataNotStoredDialog}
@@ -2484,15 +2489,15 @@ class App extends Router<AppProps, AppState> {
         >
             {I18n.t('Some data are not stored. Discard?')}
         </DialogConfirm>; */
-        return this.state.dataNotStoredDialog ? (
+        return (
             <DialogConfirm
-                title={I18n.t('Please confirm')}
-                text={I18n.t('Some data are not stored. Discard?')}
-                ok={I18n.t('Ok')}
-                cancel={I18n.t('Cancel')}
+                title={I18n.t('ra_Please confirm')}
+                text={I18n.t('ra_Some data are not stored. Discard?')}
+                ok={I18n.t('ra_Discard')}
+                cancel={I18n.t('ra_Cancel')}
                 onClose={(isYes: boolean) => (isYes ? this.confirmDataNotStored() : this.closeDataNotStoredDialog())}
             />
-        ) : null;
+        );
     }
 
     renderExpertDialog(): JSX.Element | null {

diff --git a/packages/admin/src-admin/src/tabs/Intro.tsx b/packages/admin/src-admin/src/tabs/Intro.tsx
@@ -1500,7 +1500,7 @@ class Intro extends React.Component<IntroProps, IntroState> {
                 hostData && typeof hostData === 'object'
                     ? Object.keys(hostData).reduce(
                           (acom: string, item: string) =>
-                              `${acom}${this.t(item)}:${formatInfo[item] ? formatInfo[item](hostData[item] as number, this.t) : (typeof hostData[item] === 'object' ? JSON.stringify(hostData[item]) : hostData[item] as string) || '--'}\n`,
+                              `${acom}${this.t(item)}:${formatInfo[item] ? formatInfo[item](hostData[item] as number, this.t) : (typeof hostData[item] === 'object' ? JSON.stringify(hostData[item]) : (hostData[item] as string)) || '--'}\n`,
                       )
                     : '',
         };