@etsoo/materialui 1.4.58 → 1.4.60

package/lib/app/CommonApp.d.ts

@@ -7,9 +7,12 @@ import { ReactApp } from "./ReactApp";
  */
 export declare abstract class CommonApp<U extends IUser = IUser, P extends IPageData = IPageData, S extends IAppSettings = IAppSettings> extends ReactApp<S, U, P> {
     /**
-     * Override persistedFields
+     * Constructor
+     * @param settings Settings
+     * @param name Application name
+     * @param debug Debug mode
      */
-    protected get persistedFields(): string[];
+    constructor(settings: S, name: string, debug?: boolean);
     /**
      * Init call update fields in local storage
      * @returns Fields

package/lib/app/CommonApp.js

@@ -6,10 +6,15 @@ import { ReactApp } from "./ReactApp";
  */
 export class CommonApp extends ReactApp {
     /**
-     * Override persistedFields
+     * Constructor
+     * @param settings Settings
+     * @param name Application name
+     * @param debug Debug mode
      */
-    get persistedFields() {
-        return [...super.persistedFields, CoreConstants.FieldUserIdSaved];
+    constructor(settings, name, debug = false) {
+        super(settings, name, debug);
+        // Add persisted fields
+        this.persistedFields.push(CoreConstants.FieldUserIdSaved);
     }
     /**
      * Init call update fields in local storage

package/lib/app/ReactApp.js

@@ -239,7 +239,7 @@ export class ReactApp extends CoreApp {
         // Check status
         const result = await super.tryLogin(data);
         if (!result) {
-            onFailure();
+            onFailure("ReactAppSuperTryLoginFailed");
             return false;
         }
         // Refresh token
@@ -250,10 +250,14 @@ export class ReactApp extends CoreApp {
                 onSuccess?.();
             }
             else if (result === false) {
-                onFailure();
+                onFailure("ReactAppRefreshTokenFailed");
             }
-            else if (result != null && this.tryLoginIgnoreResult(result)) {
-                // Ignore the result warning
+            else if (result != null && !this.tryLoginIgnoreResult(result)) {
+                onFailure("ReactAppRefreshTokenFailed: " + JSON.stringify(result));
+            }
+            else {
+                // Ignore other results
+                onFailure("ReactAppRefreshTokenIgnoredFailure: " + JSON.stringify(result));
                 return true;
             }
         });

package/lib/app/ServiceApp.js

@@ -38,6 +38,7 @@ export class ServiceApp extends ReactApp {
         this.coreEndpoint = coreEndpoint;
         this.coreOrigin = new URL(coreEndpoint.webUrl).origin;
         this.coreApi = this.createApi(coreName, coreEndpoint);
+        this.keepLogin = true;
     }
     /**
      * Load core system UI
@@ -188,19 +189,20 @@ export class ServiceApp extends ReactApp {
         params ??= {};
         let { onFailure, onSuccess, ...rest } = params;
         if (onFailure == null) {
-            onFailure = params.onFailure = () => {
+            onFailure = params.onFailure = (type) => {
+                console.log(`Try login failed: ${type}.`);
                 this.toLoginPage(rest);
             };
         }
         // Check core system token
         const coreToken = this.storage.getData(coreTokenKey);
         if (!coreToken) {
-            onFailure();
+            onFailure("ServiceAppCoreTokenNoData");
             return false;
         }
         const coreTokenDecrypted = this.decrypt(coreToken);
         if (!coreTokenDecrypted) {
-            onFailure();
+            onFailure("ServiceAppCoreTokenNoDecryptedData");
             return false;
         }
         params.onSuccess = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.58",
+  "version": "1.4.60",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",
@@ -35,9 +35,9 @@
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@etsoo/appscript": "^1.5.82",
+    "@etsoo/appscript": "^1.5.84",
     "@etsoo/notificationbase": "^1.1.54",
-    "@etsoo/react": "^1.8.16",
+    "@etsoo/react": "^1.8.17",
     "@etsoo/shared": "^1.2.55",
     "@mui/icons-material": "^6.3.1",
     "@mui/material": "^6.3.1",

package/src/app/CommonApp.ts

@@ -12,10 +12,16 @@ export abstract class CommonApp<
   S extends IAppSettings = IAppSettings
 > extends ReactApp<S, U, P> {
   /**
-   * Override persistedFields
+   * Constructor
+   * @param settings Settings
+   * @param name Application name
+   * @param debug Debug mode
    */
-  protected override get persistedFields() {
-    return [...super.persistedFields, CoreConstants.FieldUserIdSaved];
+  constructor(settings: S, name: string, debug: boolean = false) {
+    super(settings, name, debug);
+
+    // Add persisted fields
+    this.persistedFields.push(CoreConstants.FieldUserIdSaved);
   }
 
   /**

package/src/app/ReactApp.ts

@@ -437,7 +437,7 @@ export class ReactApp<
     // Check status
     const result = await super.tryLogin(data);
     if (!result) {
-      onFailure();
+      onFailure("ReactAppSuperTryLoginFailed");
       return false;
     }
 
@@ -450,9 +450,14 @@ export class ReactApp<
         if (result === true) {
           onSuccess?.();
         } else if (result === false) {
-          onFailure();
-        } else if (result != null && this.tryLoginIgnoreResult(result)) {
-          // Ignore the result warning
+          onFailure("ReactAppRefreshTokenFailed");
+        } else if (result != null && !this.tryLoginIgnoreResult(result)) {
+          onFailure("ReactAppRefreshTokenFailed: " + JSON.stringify(result));
+        } else {
+          // Ignore other results
+          onFailure(
+            "ReactAppRefreshTokenIgnoredFailure: " + JSON.stringify(result)
+          );
           return true;
         }
       }

package/src/app/ServiceApp.ts

@@ -66,6 +66,8 @@ export class ServiceApp<
     this.coreEndpoint = coreEndpoint;
     this.coreOrigin = new URL(coreEndpoint.webUrl).origin;
     this.coreApi = this.createApi(coreName, coreEndpoint);
+
+    this.keepLogin = true;
   }
 
   /**
@@ -252,7 +254,8 @@ export class ServiceApp<
     let { onFailure, onSuccess, ...rest } = params;
 
     if (onFailure == null) {
-      onFailure = params.onFailure = () => {
+      onFailure = params.onFailure = (type) => {
+        console.log(`Try login failed: ${type}.`);
         this.toLoginPage(rest);
       };
     }
@@ -260,13 +263,13 @@ export class ServiceApp<
     // Check core system token
     const coreToken = this.storage.getData<string>(coreTokenKey);
     if (!coreToken) {
-      onFailure();
+      onFailure("ServiceAppCoreTokenNoData");
       return false;
     }
 
     const coreTokenDecrypted = this.decrypt(coreToken);
     if (!coreTokenDecrypted) {
-      onFailure();
+      onFailure("ServiceAppCoreTokenNoDecryptedData");
       return false;
     }