@etsoo/materialui 1.4.13 → 1.4.15

package/lib/app/ReactApp.d.ts

@@ -182,10 +182,10 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
     freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
      * Try login
-     * @param showLoading Show loading bar or not
+     * @param data Try login parameters
      * @returns Result
      */
-    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
+    tryLogin(data?: AppTryLoginParams): Promise<boolean>;
     /**
      * Check if the action result should be ignored during try login
      * @param result Action result

package/lib/app/ReactApp.js

@@ -199,22 +199,23 @@ export class ReactApp extends CoreApp {
     }
     /**
      * Try login
-     * @param showLoading Show loading bar or not
+     * @param data Try login parameters
      * @returns Result
      */
-    async tryLogin(params) {
+    async tryLogin(data) {
+        // Destruct
+        const { onFailure = () => {
+            this.toLoginPage(rest);
+        }, onSuccess, ...rest } = data ?? {};
         // Check status
-        const result = await super.tryLogin(params);
+        const result = await super.tryLogin(data);
         if (!result) {
+            onFailure();
             return false;
         }
-        // Destruct
-        const { onFailure = () => {
-            this.toLoginPage(rest);
-        }, onSuccess, ...rest } = params ?? {};
         // Refresh token
         await this.refreshToken({
-            showLoading: params?.showLoading
+            showLoading: data?.showLoading
         }, (result) => {
             if (result === true) {
                 onSuccess?.();

package/lib/app/ServiceApp.d.ts

@@ -36,9 +36,9 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
     loadCore(): void;
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams): void;
+    toLoginPage(data?: AppLoginParams): void;
     /**
      * User login extended
      * @param user New user

package/lib/app/ServiceApp.js

@@ -38,11 +38,11 @@ export class ServiceApp extends ReactApp {
     }
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params) {
+    toLoginPage(data) {
         // Destruct
-        const { removeUrl, showLoading, ...rest } = params ?? {};
+        const { removeUrl, showLoading, params } = data ?? {};
         // Cache current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
         //  Get the redirect URL
@@ -55,7 +55,9 @@ export class ServiceApp extends ReactApp {
             if (!url)
                 return;
             // Add try login flag
-            url = url.addUrlParams(rest);
+            if (params != null) {
+                url = url.addUrlParams(params);
+            }
             // Is it embeded?
             if (this.embedded) {
                 globalThis.parent.postMessage(["login", url], this.coreOrigin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,13 +50,13 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.53",
+    "@etsoo/appscript": "^1.5.56",
     "@etsoo/notificationbase": "^1.1.52",
-    "@etsoo/react": "^1.7.87",
+    "@etsoo/react": "^1.7.89",
     "@etsoo/shared": "^1.2.51",
     "@mui/icons-material": "^6.1.4",
     "@mui/material": "^6.1.4",
-    "@mui/x-data-grid": "^7.20.0",
+    "@mui/x-data-grid": "^7.21.0",
     "chart.js": "^4.4.5",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
@@ -77,7 +77,7 @@
     "@babel/preset-react": "^7.25.7",
     "@babel/preset-typescript": "^7.25.7",
     "@babel/runtime-corejs3": "^7.25.7",
-    "@testing-library/jest-dom": "^6.6.1",
+    "@testing-library/jest-dom": "^6.6.2",
     "@testing-library/react": "^16.0.1",
     "@types/jest": "^29.5.13",
     "@types/pica": "^9.0.4",
@@ -87,8 +87,8 @@
     "@types/react-dom": "^18.3.1",
     "@types/react-input-mask": "^3.0.5",
     "@types/react-window": "^1.8.8",
-    "@typescript-eslint/eslint-plugin": "^8.9.0",
-    "@typescript-eslint/parser": "^8.9.0",
+    "@typescript-eslint/eslint-plugin": "^8.10.0",
+    "@typescript-eslint/parser": "^8.10.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "typescript": "^5.6.3"

package/src/app/ReactApp.ts

@@ -421,16 +421,10 @@ export class ReactApp<
 
   /**
    * Try login
-   * @param showLoading Show loading bar or not
+   * @param data Try login parameters
    * @returns Result
    */
-  override async tryLogin(params?: AppTryLoginParams) {
-    // Check status
-    const result = await super.tryLogin(params);
-    if (!result) {
-      return false;
-    }
-
+  override async tryLogin(data?: AppTryLoginParams) {
     // Destruct
     const {
       onFailure = () => {
@@ -438,12 +432,19 @@ export class ReactApp<
       },
       onSuccess,
       ...rest
-    } = params ?? {};
+    } = data ?? {};
+
+    // Check status
+    const result = await super.tryLogin(data);
+    if (!result) {
+      onFailure();
+      return false;
+    }
 
     // Refresh token
     await this.refreshToken(
       {
-        showLoading: params?.showLoading
+        showLoading: data?.showLoading
       },
       (result) => {
         if (result === true) {

package/src/app/ServiceApp.ts

@@ -76,11 +76,11 @@ export class ServiceApp<
 
   /**
    * Go to the login page
-   * @params Login parameters
+   * @param data Login parameters
    */
-  override toLoginPage(params?: AppLoginParams) {
+  override toLoginPage(data?: AppLoginParams) {
     // Destruct
-    const { removeUrl, showLoading, ...rest } = params ?? {};
+    const { removeUrl, showLoading, params } = data ?? {};
 
     // Cache current URL
     this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
@@ -95,7 +95,9 @@ export class ServiceApp<
         if (!url) return;
 
         // Add try login flag
-        url = url.addUrlParams(rest);
+        if (params != null) {
+          url = url.addUrlParams(params);
+        }
 
         // Is it embeded?
         if (this.embedded) {