@etsoo/materialui 1.4.10 → 1.4.12

package/lib/OptionGroup.js

@@ -65,10 +65,7 @@ export function OptionGroup(props) {
                     changedValues.push(typeValue);
                 }
                 else {
-                    const index = changedValues.findIndex((v) => v === typeValue);
-                    if (index === -1)
-                        return;
-                    changedValues.splice(index, 1);
+                    changedValues.remove(typeValue);
                 }
                 if (onValueChange)
                     onValueChange(changedValues);

package/lib/app/CommonApp.d.ts

@@ -1,4 +1,4 @@
-import { AppTryLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
+import { IAppSettings, IUser } from "@etsoo/appscript";
 import { IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
 /**
@@ -15,10 +15,4 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * @returns Fields
      */
     protected initCallEncryptedUpdateFields(): string[];
-    /**
-     * Try login
-     * @param showLoading Show loading bar or not
-     * @returns Result
-     */
-    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
 }

package/lib/app/CommonApp.js

@@ -20,32 +20,4 @@ export class CommonApp extends ReactApp {
         fields.push(CoreConstants.FieldUserIdSaved);
         return fields;
     }
-    /**
-     * Try login
-     * @param showLoading Show loading bar or not
-     * @returns Result
-     */
-    async tryLogin(params) {
-        // Check status
-        const result = await super.tryLogin(params);
-        if (!result) {
-            return false;
-        }
-        // Destruct
-        const { onFailure = () => {
-            this.toLoginPage(rest);
-        }, onSuccess, ...rest } = params ?? {};
-        // Refresh token
-        await this.refreshToken({
-            showLoading: params?.showLoading
-        }, (result) => {
-            if (result === true) {
-                onSuccess?.();
-            }
-            else if (result === false) {
-                onFailure();
-            }
-        });
-        return true;
-    }
 }

package/lib/app/ReactApp.d.ts

@@ -1,4 +1,4 @@
-import { CoreApp, FormatResultCustomCallback, IApp, IAppSettings, ICoreApp, IUser } from "@etsoo/appscript";
+import { AppTryLoginParams, CoreApp, FormatResultCustomCallback, IApp, IAppSettings, ICoreApp, IUser } from "@etsoo/appscript";
 import { INotifier, NotificationReturn } from "@etsoo/notificationbase";
 import { DataTypes, IActionResult } from "@etsoo/shared";
 import React from "react";
@@ -180,6 +180,18 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param callback Callback
      */
     freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
+    /**
+     * Try login
+     * @param showLoading Show loading bar or not
+     * @returns Result
+     */
+    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
+    /**
+     * Check if the action result should be ignored during try login
+     * @param result Action result
+     * @returns Result
+     */
+    protected tryLoginIgnoreResult(result: IActionResult): boolean;
     /**
      * Set page data
      * @param data Page data

package/lib/app/ReactApp.js

@@ -197,6 +197,49 @@ export class ReactApp extends CoreApp {
             inputs: progress
         });
     }
+    /**
+     * Try login
+     * @param showLoading Show loading bar or not
+     * @returns Result
+     */
+    async tryLogin(params) {
+        // Check status
+        const result = await super.tryLogin(params);
+        if (!result) {
+            return false;
+        }
+        // Destruct
+        const { onFailure = () => {
+            this.toLoginPage(rest);
+        }, onSuccess, ...rest } = params ?? {};
+        // Refresh token
+        await this.refreshToken({
+            showLoading: params?.showLoading
+        }, (result) => {
+            if (result === true) {
+                onSuccess?.();
+            }
+            else if (result === false) {
+                onFailure();
+            }
+            else if (result != null && this.tryLoginIgnoreResult(result)) {
+                return false;
+            }
+        });
+        return true;
+    }
+    /**
+     * Check if the action result should be ignored during try login
+     * @param result Action result
+     * @returns Result
+     */
+    tryLoginIgnoreResult(result) {
+        // Ignore no token warning
+        if (result.type === "noData" && result.field === "token")
+            return true;
+        else
+            return false;
+    }
     /**
      * Set page data
      * @param data Page data

package/lib/app/ServiceApp.js

@@ -125,14 +125,18 @@ export class ServiceApp extends ReactApp {
      * @param params Login parameters
      */
     async tryLogin(params) {
-        // Current callback
+        // Destruct
         params ?? (params = {});
-        const onSuccess = params.onSuccess;
-        const onFailure = params.onFailure;
+        let { onFailure, onSuccess, ...rest } = params;
+        if (onFailure == null) {
+            onFailure = params.onFailure = () => {
+                this.toLoginPage(rest);
+            };
+        }
         // Check core system token
         const coreToken = this.storage.getData(coreTokenKey);
         if (!coreToken) {
-            onFailure?.();
+            onFailure();
             return false;
         }
         params.onSuccess = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.10",
+  "version": "1.4.12",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,10 +50,10 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.52",
-    "@etsoo/notificationbase": "^1.1.50",
-    "@etsoo/react": "^1.7.85",
-    "@etsoo/shared": "^1.2.49",
+    "@etsoo/appscript": "^1.5.53",
+    "@etsoo/notificationbase": "^1.1.52",
+    "@etsoo/react": "^1.7.87",
+    "@etsoo/shared": "^1.2.51",
     "@mui/icons-material": "^6.1.4",
     "@mui/material": "^6.1.4",
     "@mui/x-data-grid": "^7.20.0",

package/src/OptionGroup.tsx

@@ -218,9 +218,7 @@ export function OptionGroup<
             if (changedValues.includes(typeValue)) return;
             changedValues.push(typeValue);
           } else {
-            const index = changedValues.findIndex((v) => v === typeValue);
-            if (index === -1) return;
-            changedValues.splice(index, 1);
+            changedValues.remove(typeValue);
           }
 
           if (onValueChange) onValueChange(changedValues);

package/src/app/CommonApp.ts

@@ -1,4 +1,4 @@
-import { AppTryLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
+import { IAppSettings, IUser } from "@etsoo/appscript";
 import { CoreConstants, IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
 
@@ -27,42 +27,4 @@ export abstract class CommonApp<
     fields.push(CoreConstants.FieldUserIdSaved);
     return fields;
   }
-
-  /**
-   * Try login
-   * @param showLoading Show loading bar or not
-   * @returns Result
-   */
-  override async tryLogin(params?: AppTryLoginParams) {
-    // Check status
-    const result = await super.tryLogin(params);
-    if (!result) {
-      return false;
-    }
-
-    // Destruct
-    const {
-      onFailure = () => {
-        this.toLoginPage(rest);
-      },
-      onSuccess,
-      ...rest
-    } = params ?? {};
-
-    // Refresh token
-    await this.refreshToken(
-      {
-        showLoading: params?.showLoading
-      },
-      (result) => {
-        if (result === true) {
-          onSuccess?.();
-        } else if (result === false) {
-          onFailure();
-        }
-      }
-    );
-
-    return true;
-  }
 }

package/src/app/ReactApp.ts

@@ -1,4 +1,5 @@
 import {
+  AppTryLoginParams,
   BridgeUtils,
   CoreApp,
   FormatResultCustomCallback,
@@ -418,6 +419,57 @@ export class ReactApp<
     );
   }
 
+  /**
+   * Try login
+   * @param showLoading Show loading bar or not
+   * @returns Result
+   */
+  override async tryLogin(params?: AppTryLoginParams) {
+    // Check status
+    const result = await super.tryLogin(params);
+    if (!result) {
+      return false;
+    }
+
+    // Destruct
+    const {
+      onFailure = () => {
+        this.toLoginPage(rest);
+      },
+      onSuccess,
+      ...rest
+    } = params ?? {};
+
+    // Refresh token
+    await this.refreshToken(
+      {
+        showLoading: params?.showLoading
+      },
+      (result) => {
+        if (result === true) {
+          onSuccess?.();
+        } else if (result === false) {
+          onFailure();
+        } else if (result != null && this.tryLoginIgnoreResult(result)) {
+          return false;
+        }
+      }
+    );
+
+    return true;
+  }
+
+  /**
+   * Check if the action result should be ignored during try login
+   * @param result Action result
+   * @returns Result
+   */
+  protected tryLoginIgnoreResult(result: IActionResult) {
+    // Ignore no token warning
+    if (result.type === "noData" && result.field === "token") return true;
+    else return false;
+  }
+
   /**
    * Set page data
    * @param data Page data

package/src/app/ServiceApp.ts

@@ -180,15 +180,20 @@ export class ServiceApp<
    * @param params Login parameters
    */
   override async tryLogin(params?: AppTryLoginParams) {
-    // Current callback
+    // Destruct
     params ??= {};
-    const onSuccess = params.onSuccess;
-    const onFailure = params.onFailure;
+    let { onFailure, onSuccess, ...rest } = params;
+
+    if (onFailure == null) {
+      onFailure = params.onFailure = () => {
+        this.toLoginPage(rest);
+      };
+    }
 
     // Check core system token
     const coreToken = this.storage.getData<string>(coreTokenKey);
     if (!coreToken) {
-      onFailure?.();
+      onFailure();
       return false;
     }
 
@@ -205,6 +210,7 @@ export class ServiceApp<
         onSuccess?.();
       });
     };
+
     return await super.tryLogin(params);
   }
 }