@etsoo/materialui 1.2.34 → 1.2.36

package/lib/UserAvatarEditor.js

@@ -27,7 +27,7 @@ export function UserAvatarEditor(props) {
     const labels = Labels.UserAvatarEditor;
     // Ref
     const ref = React.createRef();
-    const [AE, setAE] = React.useState();
+    const [AE, setAvatarEditor] = React.useState();
     // Button ref
     const buttonRef = React.createRef();
     // Preview image state
@@ -112,7 +112,7 @@ export function UserAvatarEditor(props) {
         }
     };
     React.useEffect(() => {
-        import("react-avatar-editor").then((result) => setAE(result.default));
+        import("react-avatar-editor").then((result) => setAvatarEditor(result.default));
     }, []);
     return (React.createElement(Stack, { direction: "column", spacing: 0.5, width: containerWidth },
         React.createElement(Button, { variant: "outlined", size: "medium", component: "label", startIcon: React.createElement(ComputerIcon, null), fullWidth: true },

package/lib/app/CommonApp.js

@@ -96,7 +96,7 @@ export class CommonApp extends ReactApp {
                         return;
                     }
                     // Set password for the action
-                    rq.pwd = await this.encrypt(await this.hash(pwd));
+                    rq.pwd = this.encrypt(this.hash(pwd));
                     // Submit again
                     const result = await this.api.put("Auth/RefreshToken", rq, payload);
                     if (result == null)

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.js

@@ -110,7 +110,7 @@ export class ServiceApp extends ReactApp {
             const userData = result.data;
             // Use core system access token to service api to exchange service access token
             const serviceResult = await this.serviceApi.put("Auth/ExchangeToken", {
-                token: await this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
+                token: this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
             }, {
                 showLoading,
                 onError: (error) => {
@@ -154,7 +154,7 @@ export class ServiceApp extends ReactApp {
                         return;
                     }
                     // Set password for the action
-                    rq.pwd = await this.encrypt(await this.hash(pwd));
+                    rq.pwd = this.encrypt(this.hash(pwd));
                     // Submit again
                     const result = await this.api.put("Auth/RefreshToken", rq, payload);
                     if (result == null)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.34",
+  "version": "1.2.36",
   "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.5",
+    "@etsoo/appscript": "^1.4.7",
     "@etsoo/notificationbase": "^1.1.25",
-    "@etsoo/react": "^1.6.79",
+    "@etsoo/react": "^1.6.80",
     "@etsoo/shared": "^1.2.5",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.12.3",

package/src/UserAvatarEditor.tsx

@@ -107,7 +107,7 @@ export function UserAvatarEditor(props: UserAvatarEditorProps) {
   // Ref
   const ref = React.createRef<AvatarEditor>();
 
-  const [AE, setAE] = React.useState<typeof AvatarEditor>();
+  const [AE, setAvatarEditor] = React.useState<typeof AvatarEditor>();
 
   // Button ref
   const buttonRef = React.createRef<HTMLButtonElement>();
@@ -215,7 +215,9 @@ export function UserAvatarEditor(props: UserAvatarEditorProps) {
   };
 
   React.useEffect(() => {
-    import("react-avatar-editor").then((result) => setAE(result.default));
+    import("react-avatar-editor").then((result) =>
+      setAvatarEditor(result.default)
+    );
   }, []);
 
   return (

package/src/app/CommonApp.ts

@@ -144,7 +144,7 @@ export abstract class CommonApp<
             }
 
             // Set password for the action
-            rq.pwd = await this.encrypt(await this.hash(pwd));
+            rq.pwd = this.encrypt(this.hash(pwd));
 
             // Submit again
             const result = await this.api.put<LoginResult>(

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

@@ -167,7 +167,7 @@ export class ServiceApp<
       const serviceResult = await this.serviceApi.put<ServiceLoginResult<U>>(
         "Auth/ExchangeToken",
         {
-          token: await this.encryptEnhanced(
+          token: this.encryptEnhanced(
             userData.token,
             this.settings.serviceId.toString()
           )
@@ -226,7 +226,7 @@ export class ServiceApp<
             }
 
             // Set password for the action
-            rq.pwd = await this.encrypt(await this.hash(pwd));
+            rq.pwd = this.encrypt(this.hash(pwd));
 
             // Submit again
             const result = await this.api.put<LoginResult>(