@etsoo/materialui 1.2.33 → 1.2.35

package/lib/app/IServiceApp.d.ts

@@ -23,7 +23,7 @@ export interface IServiceApp extends ReactAppType {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    serviceDecrypt(messageEncrypted: string, passphrase?: string): Promise<string | undefined>;
+    serviceDecrypt(messageEncrypted: string, passphrase?: string): string | undefined;
     /**
      * Service encrypt message
      * @param message Message
@@ -31,5 +31,5 @@ export interface IServiceApp extends ReactAppType {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    serviceEncrypt(message: string, passphrase?: string, iterations?: number): Promise<string | undefined>;
+    serviceEncrypt(message: string, passphrase?: string, iterations?: number): string | undefined;
 }

package/lib/app/ReactApp.d.ts

@@ -149,7 +149,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * Change culture
      * @param culture New culture definition
      */
-    changeCulture(culture: DataTypes.CultureDefinition): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Change culture extended
      * @param dispatch Dispatch method

package/lib/app/ReactApp.js

@@ -105,23 +105,22 @@ export class ReactApp extends CoreApp {
      * Change culture
      * @param culture New culture definition
      */
-    changeCulture(culture) {
+    async changeCulture(culture) {
         var _a, _b;
         // Super call to update cultrue
-        super.changeCulture(culture, (resources) => {
-            // Update component labels
-            Labels.setLabels(resources, {
-                notificationMU: {
-                    alertTitle: "warning",
-                    alertOK: "ok",
-                    confirmTitle: "confirm",
-                    confirmYes: "ok",
-                    confirmNo: "cancel",
-                    promptTitle: "prompt",
-                    promptCancel: "cancel",
-                    promptOK: "ok"
-                }
-            });
+        const resources = await super.changeCulture(culture);
+        // Update component labels
+        Labels.setLabels(resources, {
+            notificationMU: {
+                alertTitle: "warning",
+                alertOK: "ok",
+                confirmTitle: "confirm",
+                confirmYes: "ok",
+                confirmNo: "cancel",
+                promptTitle: "prompt",
+                promptCancel: "cancel",
+                promptOK: "ok"
+            }
         });
         // Document title
         // Default is servier name's label or appName label
@@ -135,6 +134,7 @@ export class ReactApp extends CoreApp {
         else {
             document.title = title;
         }
+        return resources;
     }
     /**
      * Change culture extended

package/lib/app/ServiceApp.d.ts

@@ -52,7 +52,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    serviceDecrypt(messageEncrypted: string, passphrase?: string): Promise<string | undefined>;
+    serviceDecrypt(messageEncrypted: string, passphrase?: string): string | undefined;
     /**
      * Service encrypt message
      * @param message Message
@@ -60,7 +60,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    serviceEncrypt(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    serviceEncrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Try login
      * @param data Additional data

package/lib/app/ServiceApp.js

@@ -230,8 +230,10 @@ export class ServiceApp extends ReactApp {
      * @param serviceUser Service user
      */
     userLoginEx(user, refreshToken, serviceUser) {
+        var _a;
         // Service user login
-        this.decrypt(serviceUser.servicePassphrase, this.settings.serviceId.toString()).then((result) => (this.servicePassphrase = result !== null && result !== void 0 ? result : ""));
+        this.servicePassphrase =
+            (_a = this.decrypt(serviceUser.servicePassphrase, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : "";
         // Service user
         this.serviceUser = serviceUser;
         // Service API token

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.33",
+  "version": "1.2.35",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,9 +50,9 @@
     "@emotion/css": "^11.11.0",
     "@emotion/react": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.4",
+    "@etsoo/appscript": "^1.4.6",
     "@etsoo/notificationbase": "^1.1.25",
-    "@etsoo/react": "^1.6.78",
+    "@etsoo/react": "^1.6.79",
     "@etsoo/shared": "^1.2.5",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.12.3",

package/src/app/IServiceApp.ts

@@ -30,7 +30,7 @@ export interface IServiceApp extends ReactAppType {
   serviceDecrypt(
     messageEncrypted: string,
     passphrase?: string
-  ): Promise<string | undefined>;
+  ): string | undefined;
 
   /**
    * Service encrypt message
@@ -43,5 +43,5 @@ export interface IServiceApp extends ReactAppType {
     message: string,
     passphrase?: string,
     iterations?: number
-  ): Promise<string | undefined>;
+  ): string | undefined;
 }

package/src/app/ReactApp.ts

@@ -310,22 +310,22 @@ export class ReactApp<
    * Change culture
    * @param culture New culture definition
    */
-  override changeCulture(culture: DataTypes.CultureDefinition) {
+  override async changeCulture(culture: DataTypes.CultureDefinition) {
     // Super call to update cultrue
-    super.changeCulture(culture, (resources) => {
-      // Update component labels
-      Labels.setLabels(resources, {
-        notificationMU: {
-          alertTitle: "warning",
-          alertOK: "ok",
-          confirmTitle: "confirm",
-          confirmYes: "ok",
-          confirmNo: "cancel",
-          promptTitle: "prompt",
-          promptCancel: "cancel",
-          promptOK: "ok"
-        }
-      });
+    const resources = await super.changeCulture(culture);
+
+    // Update component labels
+    Labels.setLabels(resources, {
+      notificationMU: {
+        alertTitle: "warning",
+        alertOK: "ok",
+        confirmTitle: "confirm",
+        confirmYes: "ok",
+        confirmNo: "cancel",
+        promptTitle: "prompt",
+        promptCancel: "cancel",
+        promptOK: "ok"
+      }
     });
 
     // Document title
@@ -339,6 +339,8 @@ export class ReactApp<
     } else {
       document.title = title;
     }
+
+    return resources;
   }
 
   /**

package/src/app/ServiceApp.ts

@@ -325,10 +325,11 @@ export class ServiceApp<
    */
   userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: U) {
     // Service user login
-    this.decrypt(
-      serviceUser.servicePassphrase,
-      this.settings.serviceId.toString()
-    ).then((result) => (this.servicePassphrase = result ?? ""));
+    this.servicePassphrase =
+      this.decrypt(
+        serviceUser.servicePassphrase,
+        this.settings.serviceId.toString()
+      ) ?? "";
 
     // Service user
     this.serviceUser = serviceUser;