@etsoo/react 1.3.34 → 1.3.38

package/lib/app/ReactApp.js

@@ -142,7 +142,7 @@ export class ReactApp extends CoreApp {
                 await callback();
             else
                 await this.tryLogin();
-        }, {
+        }, undefined, {
             okLabel: labels.cancel,
             primaryButton: { fullWidth: true, autoFocus: false },
             inputs: progress

package/lib/app/ServiceApp.d.ts

@@ -25,6 +25,10 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * Go to the login page
+     */
+    toLoginPage(): void;
     /**
      * User login extended
      * @param user New user

package/lib/app/ServiceApp.js

@@ -1,4 +1,5 @@
 import { createClient } from '@etsoo/appscript';
+import { DomUtils } from '@etsoo/shared';
 import { ReactApp } from './ReactApp';
 /**
  * Core Service App
@@ -24,6 +25,20 @@ export class ServiceApp extends ReactApp {
         this.setApi(api);
         this.coreApi = api;
     }
+    /**
+     * Go to the login page
+     */
+    toLoginPage() {
+        const coreUrl = this.settings.coreApi;
+        window.location.href =
+            coreUrl +
+                '?serviceId=' +
+                this.settings.serviceId +
+                '&' +
+                DomUtils.Culture +
+                '=' +
+                this.culture;
+    }
     /**
      * User login extended
      * @param user New user
@@ -36,6 +51,6 @@ export class ServiceApp extends ReactApp {
         // Core system user
         this.coreUser = coreUser;
         // Core system API token
-        this.api.authorize(this.settings.authScheme, coreUser.token);
+        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
     }
 }

package/lib/mu/NotifierMU.js

@@ -350,7 +350,7 @@ export class NotifierMU extends NotifierReact {
      */
     addRaw(data, modal) {
         // Destruct
-        const { type, content, title, align, timespan, ...rest } = data;
+        const { type, content, title, align, timespan = modal ? 0 : undefined, ...rest } = data;
         // Setup
         const n = new NotificationMU(type, content, title, align, timespan);
         // Assign other properties

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.34",
+    "version": "1.3.38",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,8 +50,8 @@
         "@emotion/react": "^11.7.0",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.50",
-        "@etsoo/notificationbase": "^1.0.93",
+        "@etsoo/appscript": "^1.1.53",
+        "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.75",
         "@mui/icons-material": "^5.2.0",
         "@mui/material": "^5.2.2",
@@ -87,7 +87,7 @@
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
         "eslint-plugin-react": "^7.27.1",
-        "jest": "^27.4.2",
+        "jest": "^27.4.3",
         "react-test-renderer": "^17.0.2",
         "ts-jest": "^27.0.7",
         "typescript": "^4.5.2"

package/src/app/ReactApp.ts

@@ -266,6 +266,7 @@ export class ReactApp<
                 if (callback) await callback();
                 else await this.tryLogin();
             },
+            undefined,
             {
                 okLabel: labels.cancel,
                 primaryButton: { fullWidth: true, autoFocus: false },

package/src/app/ServiceApp.ts

@@ -1,4 +1,5 @@
 import { createClient, IApi } from '@etsoo/appscript';
+import { DomUtils } from '@etsoo/shared';
 import { ISmartERPUser } from '..';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
@@ -47,6 +48,21 @@ export class ServiceApp<
         this.coreApi = api;
     }
 
+    /**
+     * Go to the login page
+     */
+    override toLoginPage() {
+        const coreUrl = this.settings.coreApi;
+        window.location.href =
+            coreUrl +
+            '?serviceId=' +
+            this.settings.serviceId +
+            '&' +
+            DomUtils.Culture +
+            '=' +
+            this.culture;
+    }
+
     /**
      * User login extended
      * @param user New user
@@ -65,6 +81,6 @@ export class ServiceApp<
         this.coreUser = coreUser;
 
         // Core system API token
-        this.api.authorize(this.settings.authScheme, coreUser.token);
+        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
     }
 }

package/src/mu/NotifierMU.tsx

@@ -581,7 +581,14 @@ export class NotifierMU extends NotifierReact {
         modal?: boolean
     ): INotificationReact {
         // Destruct
-        const { type, content, title, align, timespan, ...rest } = data;
+        const {
+            type,
+            content,
+            title,
+            align,
+            timespan = modal ? 0 : undefined,
+            ...rest
+        } = data;
 
         // Setup
         const n = new NotificationMU(type, content, title, align, timespan);