@etsoo/react 1.3.24 → 1.3.28

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/IServicePage.d.ts

@@ -0,0 +1,6 @@
+import { IPageData } from '../states/PageState';
+/**
+ * Service page data interface
+ */
+export interface IServicePageData extends IPageData {
+}

package/lib/app/IServicePage.js

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

package/lib/app/IServiceUser.d.ts

@@ -1,6 +1,6 @@
 import { IUser } from '@etsoo/appscript';
 /**
- *
+ * Service user interface
  */
 export interface IServiceUser extends IUser {
 }

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/ServiceApp.d.ts

@@ -1,6 +1,7 @@
-import { IApi, IUser } from '@etsoo/appscript';
-import { IPageData } from '../states/PageState';
+import { IApi } from '@etsoo/appscript';
 import { IServiceAppSettings } from './IServiceAppSettings';
+import { IServicePageData } from './IServicePage';
+import { IServiceUser } from './IServiceUser';
 import { ReactApp } from './ReactApp';
 /**
  * Core Service App
@@ -8,7 +9,7 @@ import { ReactApp } from './ReactApp';
  * Use the acess token to the service api, get a service access token
  * Use the new acess token and refresh token to login
  */
-export declare class ServiceApp<P extends IPageData, U extends IUser, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, U, P> {
+export declare class ServiceApp<P extends IServicePageData = IServicePageData, U extends IServiceUser = IServiceUser, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, U, P> {
     /**
      * Core system API
      */

package/lib/index.d.ts

@@ -1,3 +1,7 @@
+export * from './app/InputDialogProps';
+export * from './app/IServiceAppSettings';
+export * from './app/IServicePage';
+export * from './app/IServiceUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
 export * from './app/ServiceApp';

package/lib/index.js

@@ -1,4 +1,8 @@
 // app
+export * from './app/InputDialogProps';
+export * from './app/IServiceAppSettings';
+export * from './app/IServicePage';
+export * from './app/IServiceUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
 export * from './app/ServiceApp';

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.24",
+    "version": "1.3.28",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.6.0",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.46",
+        "@etsoo/appscript": "^1.1.47",
         "@etsoo/notificationbase": "^1.0.93",
         "@etsoo/shared": "^1.0.74",
         "@mui/icons-material": "^5.1.1",
@@ -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-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/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/IServicePage.ts

@@ -0,0 +1,6 @@
+import { IPageData } from '../states/PageState';
+
+/**
+ * Service page data interface
+ */
+export interface IServicePageData extends IPageData {}

package/src/app/IServiceUser.ts

@@ -1,8 +1,6 @@
 import { IUser } from '@etsoo/appscript';
 
 /**
- * 
+ * Service user interface
  */
-export interface IServiceUser extends IUser {
-
-}
+export interface IServiceUser extends IUser {}

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;
     }
 

package/src/app/ServiceApp.ts

@@ -1,6 +1,7 @@
-import { createClient, IApi, IUser } from '@etsoo/appscript';
-import { IPageData } from '../states/PageState';
+import { createClient, IApi } from '@etsoo/appscript';
 import { IServiceAppSettings } from './IServiceAppSettings';
+import { IServicePageData } from './IServicePage';
+import { IServiceUser } from './IServiceUser';
 import { ReactApp } from './ReactApp';
 
 /**
@@ -10,8 +11,8 @@ import { ReactApp } from './ReactApp';
  * Use the new acess token and refresh token to login
  */
 export class ServiceApp<
-    P extends IPageData,
-    U extends IUser,
+    P extends IServicePageData = IServicePageData,
+    U extends IServiceUser = IServiceUser,
     S extends IServiceAppSettings = IServiceAppSettings
 > extends ReactApp<S, U, P> {
     /**

package/src/index.ts

@@ -1,4 +1,8 @@
 // app
+export * from './app/InputDialogProps';
+export * from './app/IServiceAppSettings';
+export * from './app/IServicePage';
+export * from './app/IServiceUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
 export * from './app/ServiceApp';

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);
         }
     };