@etsoo/react 1.3.44 → 1.3.48

package/lib/app/ServiceApp.d.ts

@@ -35,6 +35,7 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * @param props Props
      */
     refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    private loginFailed;
     /**
      * Try login
      */

package/lib/app/ServiceApp.js

@@ -124,7 +124,7 @@ export class ServiceApp extends ReactApp {
                         return;
                     }
                     // Set password for the action
-                    rq.pwd = pwd;
+                    rq.pwd = this.encrypt(pwd, this.settings.serviceId.toString());
                     // Submit again
                     const result = await this.api.put('Auth/RefreshToken', data, payload);
                     if (result == null)
@@ -150,6 +150,10 @@ export class ServiceApp extends ReactApp {
         }
         return await success(result, callback);
     }
+    loginFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
     /**
      * Try login
      */
@@ -163,14 +167,12 @@ export class ServiceApp extends ReactApp {
             callback: (result) => {
                 const message = this.formatRefreshTokenResult(result);
                 if (message == null) {
-                    this.toLoginPage();
+                    this.loginFailed();
                     return;
                 }
-                else {
-                    this.notifier.alert(message, () => {
-                        this.toLoginPage();
-                    });
-                }
+                this.notifier.alert(message, () => {
+                    this.loginFailed();
+                });
             },
             data,
             relogin: true

package/lib/index.d.ts

@@ -55,6 +55,7 @@ export * from './mu/OptionGroup';
 export * from './mu/PList';
 export * from './mu/ProgressCount';
 export * from './mu/PullToRefreshUI';
+export * from './mu/RLink';
 export * from './mu/ScrollerListEx';
 export * from './mu/ScrollTopFab';
 export * from './mu/SearchBar';

package/lib/index.js

@@ -58,6 +58,7 @@ export * from './mu/OptionGroup';
 export * from './mu/PList';
 export * from './mu/ProgressCount';
 export * from './mu/PullToRefreshUI';
+export * from './mu/RLink';
 export * from './mu/ScrollerListEx';
 export * from './mu/ScrollTopFab';
 export * from './mu/SearchBar';

package/lib/mu/RLink.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { LinkProps } from '@mui/material';
+import { LinkProps as RouterLinkProps } from '@reach/router';
+/**
+ * Router Link props
+ */
+export declare type RLinkProps = LinkProps & RouterLinkProps<{}>;
+/**
+ * Router Link
+ * @param props Props
+ * @returns Component
+ */
+export declare function RLink(props: RLinkProps): JSX.Element;

package/lib/mu/RLink.js

@@ -0,0 +1,11 @@
+import { Link } from '@mui/material';
+import { Link as RouterLink } from '@reach/router';
+import React from 'react';
+/**
+ * Router Link
+ * @param props Props
+ * @returns Component
+ */
+export function RLink(props) {
+    return React.createElement(Link, { component: RouterLink, ...props });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.44",
+    "version": "1.3.48",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -46,15 +46,15 @@
     },
     "homepage": "https://github.com/ETSOO/AppReact#readme",
     "dependencies": {
-        "@emotion/css": "^11.5.0",
-        "@emotion/react": "^11.7.0",
+        "@emotion/css": "^11.7.1",
+        "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.61",
+        "@etsoo/appscript": "^1.1.75",
         "@etsoo/notificationbase": "^1.0.94",
-        "@etsoo/shared": "^1.0.75",
-        "@mui/icons-material": "^5.2.0",
-        "@mui/material": "^5.2.2",
+        "@etsoo/shared": "^1.0.76",
+        "@mui/icons-material": "^5.2.1",
+        "@mui/material": "^5.2.3",
         "@reach/router": "^1.3.4",
         "@types/pica": "^5.1.3",
         "@types/pulltorefreshjs": "^0.1.5",
@@ -64,7 +64,7 @@
         "@types/react-dom": "^17.0.11",
         "@types/react-input-mask": "^3.0.1",
         "@types/react-window": "^1.8.5",
-        "pica": "^8.0.0",
+        "pica": "^9.0.0",
         "pulltorefreshjs": "^0.1.22",
         "react": "^17.0.2",
         "react-avatar-editor": "^12.0.0",
@@ -81,15 +81,15 @@
         "@babel/runtime-corejs3": "^7.16.3",
         "@types/jest": "^27.0.3",
         "@types/react-test-renderer": "^17.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "eslint": "^8.4.0",
+        "@typescript-eslint/eslint-plugin": "^5.6.0",
+        "@typescript-eslint/parser": "^5.6.0",
+        "eslint": "^8.4.1",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
         "eslint-plugin-react": "^7.27.1",
-        "jest": "^27.4.3",
+        "jest": "^27.4.4",
         "react-test-renderer": "^17.0.2",
-        "ts-jest": "^27.1.0",
-        "typescript": "^4.5.2"
+        "ts-jest": "^27.1.1",
+        "typescript": "^4.5.3"
     }
 }

package/src/app/ServiceApp.ts

@@ -183,7 +183,10 @@ export class ServiceApp<
                         }
 
                         // Set password for the action
-                        rq.pwd = pwd;
+                        rq.pwd = this.encrypt(
+                            pwd,
+                            this.settings.serviceId.toString()
+                        );
 
                         // Submit again
                         const result = await this.api.put<SmartERPLoginResult>(
@@ -227,6 +230,11 @@ export class ServiceApp<
         return await success(result, callback);
     }
 
+    private loginFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
+
     /**
      * Try login
      */
@@ -240,13 +248,13 @@ export class ServiceApp<
             callback: (result) => {
                 const message = this.formatRefreshTokenResult(result);
                 if (message == null) {
-                    this.toLoginPage();
+                    this.loginFailed();
                     return;
-                } else {
-                    this.notifier.alert(message, () => {
-                        this.toLoginPage();
-                    });
                 }
+
+                this.notifier.alert(message, () => {
+                    this.loginFailed();
+                });
             },
             data,
             relogin: true

package/src/index.ts

@@ -62,6 +62,7 @@ export * from './mu/OptionGroup';
 export * from './mu/PList';
 export * from './mu/ProgressCount';
 export * from './mu/PullToRefreshUI';
+export * from './mu/RLink';
 export * from './mu/ScrollerListEx';
 export * from './mu/ScrollTopFab';
 export * from './mu/SearchBar';

package/src/mu/RLink.tsx

@@ -0,0 +1,20 @@
+import { Link, LinkProps } from '@mui/material';
+import {
+    Link as RouterLink,
+    LinkProps as RouterLinkProps
+} from '@reach/router';
+import React from 'react';
+
+/**
+ * Router Link props
+ */
+export type RLinkProps = LinkProps & RouterLinkProps<{}>;
+
+/**
+ * Router Link
+ * @param props Props
+ * @returns Component
+ */
+export function RLink(props: RLinkProps) {
+    return <Link component={RouterLink} {...props} />;
+}