@etsoo/react 1.3.25 → 1.3.29

package/lib/app/Constants.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Constants
+ */
+export declare namespace Constants {
+    /**
+     * Rresh token cache field
+     */
+    const FieldRefreshToken = "RefreshToken";
+    /**
+     * Refresh token header field name
+     */
+    const TokenHeaderRefresh = "SmartERPRefreshToken";
+}

package/lib/app/Constants.js

@@ -0,0 +1,14 @@
+/**
+ * Constants
+ */
+export var Constants;
+(function (Constants) {
+    /**
+     * Rresh token cache field
+     */
+    Constants.FieldRefreshToken = 'RefreshToken';
+    /**
+     * Refresh token header field name
+     */
+    Constants.TokenHeaderRefresh = 'SmartERPRefreshToken';
+})(Constants || (Constants = {}));

package/lib/app/IServiceAppSettings.d.ts

@@ -1,10 +1,11 @@
 import { IAppSettings } from '@etsoo/appscript';
+import { DataTypes } from '@etsoo/shared';
 /**
  * Service app settings interface
  */
-export interface IServiceAppSettings extends IAppSettings {
+export interface IServiceAppSettings<S extends DataTypes.IdType = number> extends IAppSettings {
     /**
      * Service id
      */
-    readonly serviceId?: string;
+    readonly serviceId: S;
 }

package/lib/app/IServiceUser.d.ts

@@ -1,6 +1,10 @@
-import { IUser } from '@etsoo/appscript';
+import { IActionResult, IUser } from '@etsoo/appscript';
 /**
  * Service user interface
  */
 export interface IServiceUser extends IUser {
 }
+/**
+ * Service user login result
+ */
+export declare type ServiceLoginResult = IActionResult<IServiceUser>;

package/lib/app/ISmartERPUser.d.ts

@@ -0,0 +1,10 @@
+import { IActionResult, IUser } from '@etsoo/appscript';
+/**
+ * SmartERP user interface
+ */
+export interface ISmartERPUser extends IUser {
+}
+/**
+ * SmartERP user login result
+ */
+export declare type SmartERPLoginResult = IActionResult<ISmartERPUser>;

package/lib/app/ISmartERPUser.js

@@ -0,0 +1 @@
+export {};

package/lib/app/ReactApp.d.ts

@@ -144,7 +144,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/app/ReactApp.js

@@ -60,7 +60,7 @@ export class ReactApp extends CoreApp {
         // API
         // Support to replace {hostname} with current hostname
         const api = createClient();
-        api.baseUrl = settings.endpoint.replace('{hostname}', window.location.hostname);
+        api.baseUrl = settings.endpoint;
         return api;
     }
     static createNotifier() {

package/lib/app/RefreshTokenRQ.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Refresh token request data
+ */
+export declare type RefreshTokenRQ = {
+    /**
+     * Time zone
+     */
+    timezone?: string;
+};

package/lib/app/RefreshTokenRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/app/ServiceApp.d.ts

@@ -1,4 +1,5 @@
 import { IApi } from '@etsoo/appscript';
+import { ISmartERPUser } from '..';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
 import { IServiceUser } from './IServiceUser';
@@ -14,10 +15,21 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Core system API
      */
     readonly coreApi: IApi;
+    /**
+     * Core system user
+     */
+    coreUser?: ISmartERPUser;
     /**
      * Constructor
      * @param settings Settings
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * User login extended
+     * @param user New user
+     * @param refreshToken Refresh token
+     * @param coreUser Core system user
+     */
+    userLoginEx(user: IServiceUser, refreshToken: string, coreUser: ISmartERPUser): void;
 }

package/lib/app/ServiceApp.js

@@ -24,4 +24,14 @@ export class ServiceApp extends ReactApp {
         this.setApi(api);
         this.coreApi = api;
     }
+    /**
+     * User login extended
+     * @param user New user
+     * @param refreshToken Refresh token
+     * @param coreUser Core system user
+     */
+    userLoginEx(user, refreshToken, coreUser) {
+        super.userLogin(user, refreshToken, false);
+        this.coreUser = coreUser;
+    }
 }

package/lib/index.d.ts

@@ -2,8 +2,10 @@ export * from './app/InputDialogProps';
 export * from './app/IServiceAppSettings';
 export * from './app/IServicePage';
 export * from './app/IServiceUser';
+export * from './app/ISmartERPUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
+export * from './app/RefreshTokenRQ';
 export * from './app/ServiceApp';
 export * from './app/Utils';
 export * from './components/GridColumn';

package/lib/index.js

@@ -3,8 +3,10 @@ export * from './app/InputDialogProps';
 export * from './app/IServiceAppSettings';
 export * from './app/IServicePage';
 export * from './app/IServiceUser';
+export * from './app/ISmartERPUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
+export * from './app/RefreshTokenRQ';
 export * from './app/ServiceApp';
 export * from './app/Utils';
 // components

package/lib/mu/ItemList.d.ts

@@ -32,7 +32,7 @@ export interface ItemListProps {
     /**
      * Close event
      */
-    onClose?(item?: any): void;
+    onClose?(item: any, changed: boolean): void;
     /**
      * Current selected language
      */

package/lib/mu/ItemList.js

@@ -38,11 +38,13 @@ export function ItemList(props) {
     };
     // Close handler
     const closeHandler = () => {
+        if (!open)
+            return;
         // Close the dialog
         setOpen(false);
         // Emit close event
         if (onClose) {
-            onClose(currentItem);
+            onClose(currentItem, false);
         }
     };
     // Close item handler
@@ -53,7 +55,7 @@ export function ItemList(props) {
         setOpen(false);
         // Emit close event
         if (onClose) {
-            onClose(item);
+            onClose(item, true);
         }
     };
     return (React.createElement(React.Fragment, null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.25",
+    "version": "1.3.29",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,21 +50,21 @@
         "@emotion/react": "^11.6.0",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.46",
+        "@etsoo/appscript": "^1.1.48",
         "@etsoo/notificationbase": "^1.0.93",
-        "@etsoo/shared": "^1.0.74",
+        "@etsoo/shared": "^1.0.75",
         "@mui/icons-material": "^5.1.1",
         "@mui/material": "^5.1.1",
         "@reach/router": "^1.3.4",
         "@types/pica": "^5.1.3",
         "@types/pulltorefreshjs": "^0.1.5",
         "@types/reach__router": "^1.3.9",
-        "@types/react": "^17.0.35",
+        "@types/react": "^17.0.36",
         "@types/react-avatar-editor": "^10.3.6",
         "@types/react-dom": "^17.0.11",
         "@types/react-input-mask": "^3.0.1",
         "@types/react-window": "^1.8.5",
-        "pica": "^7.1.0",
+        "pica": "^8.0.0",
         "pulltorefreshjs": "^0.1.22",
         "react": "^17.0.2",
         "react-avatar-editor": "^12.0.0",
@@ -79,14 +79,14 @@
         "@babel/plugin-transform-runtime": "^7.16.4",
         "@babel/preset-env": "^7.16.4",
         "@babel/runtime-corejs3": "^7.16.3",
-        "@types/jest": "^27.0.2",
+        "@types/jest": "^27.0.3",
         "@types/react-test-renderer": "^17.0.1",
         "@typescript-eslint/eslint-plugin": "^5.4.0",
         "@typescript-eslint/parser": "^5.4.0",
-        "eslint": "^8.2.0",
+        "eslint": "^8.3.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-react": "^7.27.0",
+        "eslint-plugin-react": "^7.27.1",
         "jest": "^27.3.1",
         "react-test-renderer": "^17.0.2",
         "ts-jest": "^27.0.7",

package/src/app/Constants.ts

@@ -0,0 +1,14 @@
+/**
+ * Constants
+ */
+export namespace Constants {
+    /**
+     * Rresh token cache field
+     */
+    export const FieldRefreshToken = 'RefreshToken';
+
+    /**
+     * Refresh token header field name
+     */
+    export const TokenHeaderRefresh = 'SmartERPRefreshToken';
+}

package/src/app/IServiceAppSettings.ts

@@ -1,11 +1,13 @@
 import { IAppSettings } from '@etsoo/appscript';
+import { DataTypes } from '@etsoo/shared';
 
 /**
  * Service app settings interface
  */
-export interface IServiceAppSettings extends IAppSettings {
+export interface IServiceAppSettings<S extends DataTypes.IdType = number>
+    extends IAppSettings {
     /**
      * Service id
      */
-    readonly serviceId?: string;
+    readonly serviceId: S;
 }

package/src/app/IServiceUser.ts

@@ -1,6 +1,11 @@
-import { IUser } from '@etsoo/appscript';
+import { IActionResult, IUser } from '@etsoo/appscript';
 
 /**
  * Service user interface
  */
 export interface IServiceUser extends IUser {}
+
+/**
+ * Service user login result
+ */
+export type ServiceLoginResult = IActionResult<IServiceUser>;

package/src/app/ISmartERPUser.ts

@@ -0,0 +1,11 @@
+import { IActionResult, IUser } from '@etsoo/appscript';
+
+/**
+ * SmartERP user interface
+ */
+export interface ISmartERPUser extends IUser {}
+
+/**
+ * SmartERP user login result
+ */
+export type SmartERPLoginResult = IActionResult<ISmartERPUser>;

package/src/app/ReactApp.ts

@@ -118,10 +118,7 @@ export class ReactApp<
         // API
         // Support to replace {hostname} with current hostname
         const api = createClient();
-        api.baseUrl = settings.endpoint.replace(
-            '{hostname}',
-            window.location.hostname
-        );
+        api.baseUrl = settings.endpoint;
         return api;
     }
 
@@ -342,7 +339,7 @@ export class ReactApp<
      */
     override userLogin(
         user: IUserData,
-        refreshToken?: string,
+        refreshToken: string,
         keep?: boolean
     ): void {
         // Changed

package/src/app/RefreshTokenRQ.ts

@@ -0,0 +1,9 @@
+/**
+ * Refresh token request data
+ */
+export type RefreshTokenRQ = {
+    /**
+     * Time zone
+     */
+    timezone?: string;
+};

package/src/app/ServiceApp.ts

@@ -1,4 +1,5 @@
 import { createClient, IApi } from '@etsoo/appscript';
+import { ISmartERPUser } from '..';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
 import { IServiceUser } from './IServiceUser';
@@ -20,6 +21,11 @@ export class ServiceApp<
      */
     readonly coreApi: IApi;
 
+    /**
+     * Core system user
+     */
+    coreUser?: ISmartERPUser;
+
     /**
      * Constructor
      * @param settings Settings
@@ -40,4 +46,19 @@ export class ServiceApp<
         this.setApi(api);
         this.coreApi = api;
     }
+
+    /**
+     * User login extended
+     * @param user New user
+     * @param refreshToken Refresh token
+     * @param coreUser Core system user
+     */
+    userLoginEx(
+        user: IServiceUser,
+        refreshToken: string,
+        coreUser: ISmartERPUser
+    ): void {
+        super.userLogin(user, refreshToken, false);
+        this.coreUser = coreUser;
+    }
 }

package/src/index.ts

@@ -3,8 +3,10 @@ export * from './app/InputDialogProps';
 export * from './app/IServiceAppSettings';
 export * from './app/IServicePage';
 export * from './app/IServiceUser';
+export * from './app/ISmartERPUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
+export * from './app/RefreshTokenRQ';
 export * from './app/ServiceApp';
 export * from './app/Utils';
 

package/src/mu/ItemList.tsx

@@ -48,7 +48,7 @@ export interface ItemListProps {
     /**
      * Close event
      */
-    onClose?(item?: any): void;
+    onClose?(item: any, changed: boolean): void;
 
     /**
      * Current selected language
@@ -133,12 +133,14 @@ export function ItemList(props: ItemListProps) {
 
     // Close handler
     const closeHandler = () => {
+        if (!open) return;
+
         // Close the dialog
         setOpen(false);
 
         // Emit close event
         if (onClose) {
-            onClose(currentItem);
+            onClose(currentItem, false);
         }
     };
 
@@ -152,7 +154,7 @@ export function ItemList(props: ItemListProps) {
 
         // Emit close event
         if (onClose) {
-            onClose(item);
+            onClose(item, true);
         }
     };