@etsoo/react 1.4.0 → 1.4.4

package/lib/app/IServiceUser.d.ts

@@ -11,4 +11,4 @@ export interface IServiceUser extends IUser {
 /**
  * Service user login result
  */
-export declare type ServiceLoginResult = IActionResult<IServiceUser>;
+export declare type ServiceLoginResult<U extends IServiceUser = IServiceUser> = IActionResult<U>;

package/lib/app/ServiceApp.d.ts

@@ -11,7 +11,7 @@ import { RefreshTokenRQ } from './RefreshTokenRQ';
  * 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<U extends IServiceUser = IServiceUser, P extends IServicePageData = IServicePageData, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, U, P> {
+export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends IServicePageData = IServicePageData, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, ISmartERPUser, P> {
     /**
      * Service API
      */
@@ -20,8 +20,8 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
     /**
      * Service user
      */
-    get serviceUser(): IServiceUser | undefined;
-    protected set serviceUser(value: IServiceUser | undefined);
+    get serviceUser(): U | undefined;
+    protected set serviceUser(value: U | undefined);
     /**
      * Service passphrase
      */
@@ -67,5 +67,5 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param refreshToken Refresh token
      * @param serviceUser Service user
      */
-    userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: IServiceUser): void;
+    userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: U): void;
 }

package/lib/mu/DnDList.d.ts

@@ -6,7 +6,7 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
     /**
      * Item renderer
      */
-    children: (item: D, index: number, deleteItem: (index: number) => void, editItem: (newItem: D, indexOrLabel: number | string) => void) => React.ReactNode;
+    children: (item: D, index: number, deleteItem: (index: number) => void, editItem: (newItem: D, index: number) => boolean) => React.ReactNode;
     /**
      * List container component
      * https://javascript.plainenglish.io/building-a-polymorphic-component-in-react-and-typescript-d9f236950af4
@@ -32,6 +32,10 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
      * Load data
      */
     loadData: (name: string) => PromiseLike<D[]>;
+    /**
+     * Data change handler
+     */
+    onChange?: (items: D[]) => void;
     /**
      * Top and bottom sides renderer
      */

package/lib/mu/DnDList.js

@@ -9,9 +9,16 @@ import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
  */
 export function DnDList(props) {
     // Destruct
-    const { children, Component = 'div', componentProps, getItemStyle = (_isDragging) => ({}), getListStyle = () => undefined, labelField, loadData, name, sideRenderer } = props;
+    const { children, Component = 'div', componentProps, getItemStyle = (_isDragging) => ({}), getListStyle = () => undefined, labelField, loadData, name, onChange, sideRenderer } = props;
     // State
     const [items, setItems] = React.useState([]);
+    const changeItems = (items) => {
+        // Possible to alter items with the handler
+        if (onChange)
+            onChange(items);
+        // Update state
+        setItems(items);
+    };
     // Drag end handler
     const onDragEnd = (result) => {
         // Dropped outside the list
@@ -25,34 +32,33 @@ export function DnDList(props) {
         // Insert to the destination index
         newItems.splice(result.destination.index, 0, removed);
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
     };
     // Add item
     const addItem = (newItem) => {
         // Existence check
-        if (items.some((item) => item[labelField] == newItem[labelField])) {
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
             return false;
         }
         // Clone
         const newItems = [newItem, ...items];
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
         return true;
     };
     // Edit item
-    const editItem = (newItem, indexOrLabel) => {
-        const index = typeof indexOrLabel === 'number'
-            ? indexOrLabel
-            : items.findIndex((item) => DataTypes.convert(item[labelField], 'string') ==
-                indexOrLabel);
-        if (index === -1)
-            return;
+    const editItem = (newItem, index) => {
+        // Existence check
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
+            return false;
+        }
         // Clone
         const newItems = [...items];
         // Remove the item
         newItems.splice(index, 1, newItem);
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
+        return true;
     };
     // Add items
     const addItems = (inputItems) => {
@@ -67,7 +73,7 @@ export function DnDList(props) {
             newItems.push(newItem);
         });
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
         return newItems.length - items.length;
     };
     // Delete item
@@ -77,9 +83,10 @@ export function DnDList(props) {
         // Remove the item
         newItems.splice(index, 1);
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
     };
     React.useEffect(() => {
+        // Load data
         loadData(name).then((items) => setItems(items));
     }, [name]);
     // Layout

package/lib/mu/NotifierMU.js

@@ -1,5 +1,5 @@
 import { NotificationAlign, NotificationMessageType, NotificationType } from '@etsoo/notificationbase';
-import { Alert, AlertTitle, Backdrop, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Fade, Slider, Snackbar, styled, Switch, TextField } from '@mui/material';
+import { Alert, AlertTitle, Backdrop, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Fade, Slider, Snackbar, styled, Switch, TextField, Typography } from '@mui/material';
 import { Error, Info, Help, Warning, Done } from '@mui/icons-material';
 import React from 'react';
 import { Labels } from '../app/Labels';
@@ -120,14 +120,21 @@ export class NotificationMU extends NotificationReact {
         const labels = Labels.NotificationMU;
         const title = (_a = this.title) !== null && _a !== void 0 ? _a : labels.promptTitle;
         const { cancelLabel = labels.promptCancel, okLabel = labels.promptOK, inputs, type, fullScreen, fullWidth = true, maxWidth, primaryButton, ...rest } = (_b = this.inputProps) !== null && _b !== void 0 ? _b : {};
+        const inputRef = React.createRef();
+        const errorRef = React.createRef();
+        const setError = (error) => {
+            if (errorRef.current == null)
+                return;
+            errorRef.current.innerText = error !== null && error !== void 0 ? error : '';
+        };
         const handleSubmit = async (event) => {
             // Result
             let result = undefined;
+            const input = inputRef.current;
             if (this.onReturn) {
                 // Inputs case, no HTMLForm set to value, set the current form
                 if (inputs && value == null)
                     value = event.currentTarget.form;
-                const input = inputRef.current;
                 if (input) {
                     if (type === 'date') {
                         const dateValue = input.valueAsDate;
@@ -165,12 +172,18 @@ export class NotificationMU extends NotificationReact {
             // Get the value
             // returns false to prevent default dismiss
             const v = await result;
-            if (v === false)
+            if (v === false) {
+                input === null || input === void 0 ? void 0 : input.focus();
                 return;
+            }
+            if (typeof v === 'string') {
+                setError(v);
+                input === null || input === void 0 ? void 0 : input.focus();
+                return;
+            }
             this.dismiss();
         };
         let localInputs;
-        let inputRef = React.createRef();
         let value = undefined;
         if (inputs == null) {
             if (type === 'switch') {
@@ -180,7 +193,7 @@ export class NotificationMU extends NotificationReact {
                 localInputs = React.createElement(Slider, { onChange: (_e, v) => (value = v) });
             }
             else {
-                localInputs = (React.createElement(TextField, { inputRef: inputRef, autoFocus: true, margin: "dense", fullWidth: true, type: type, required: true, ...rest }));
+                localInputs = (React.createElement(TextField, { inputRef: inputRef, onChange: () => setError(undefined), autoFocus: true, margin: "dense", fullWidth: true, type: type, required: true, ...rest }));
             }
         }
         else {
@@ -193,7 +206,8 @@ export class NotificationMU extends NotificationReact {
                     React.createElement("span", { className: "dialogTitle" }, title)),
                 React.createElement(DialogContent, null,
                     React.createElement(DialogContentText, null, this.content),
-                    localInputs),
+                    localInputs,
+                    React.createElement(Typography, { variant: "caption", display: "block", ref: errorRef, color: (theme) => theme.palette.error.main })),
                 React.createElement(DialogActions, null,
                     React.createElement(Button, { color: "secondary", onClick: () => {
                             if (this.onReturn)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.0",
+    "version": "1.4.4",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,8 +50,8 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.11",
-        "@etsoo/notificationbase": "^1.0.95",
+        "@etsoo/appscript": "^1.2.15",
+        "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/shared": "^1.0.97",
         "@mui/icons-material": "^5.2.5",
         "@mui/material": "^5.2.6",
@@ -76,12 +76,12 @@
         "react-window": "^1.8.6"
     },
     "devDependencies": {
-        "@babel/cli": "^7.16.0",
-        "@babel/core": "^7.16.5",
-        "@babel/plugin-transform-runtime": "^7.16.5",
-        "@babel/preset-env": "^7.16.5",
-        "@babel/runtime-corejs3": "^7.16.5",
-        "@types/jest": "^27.0.3",
+        "@babel/cli": "^7.16.7",
+        "@babel/core": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.16.7",
+        "@babel/preset-env": "^7.16.7",
+        "@babel/runtime-corejs3": "^7.16.7",
+        "@types/jest": "^27.4.0",
         "@types/react-test-renderer": "^17.0.1",
         "@typescript-eslint/eslint-plugin": "^5.8.1",
         "@typescript-eslint/parser": "^5.8.1",

package/src/app/IServiceUser.ts

@@ -13,4 +13,5 @@ export interface IServiceUser extends IUser {
 /**
  * Service user login result
  */
-export type ServiceLoginResult = IActionResult<IServiceUser>;
+export type ServiceLoginResult<U extends IServiceUser = IServiceUser> =
+    IActionResult<U>;

package/src/app/ServiceApp.ts

@@ -24,20 +24,20 @@ export class ServiceApp<
     U extends IServiceUser = IServiceUser,
     P extends IServicePageData = IServicePageData,
     S extends IServiceAppSettings = IServiceAppSettings
-> extends ReactApp<S, U, P> {
+> extends ReactApp<S, ISmartERPUser, P> {
     /**
      * Service API
      */
     readonly serviceApi: IApi;
 
-    private _serviceUser?: IServiceUser;
+    private _serviceUser?: U;
     /**
      * Service user
      */
     get serviceUser() {
         return this._serviceUser;
     }
-    protected set serviceUser(value: IServiceUser | undefined) {
+    protected set serviceUser(value: U | undefined) {
         this._serviceUser = value;
     }
 
@@ -140,7 +140,9 @@ export class ServiceApp<
             const userData = result.data;
 
             // Use core system access token to service api to exchange service access token
-            const serviceResult = await this.serviceApi.put<ServiceLoginResult>(
+            const serviceResult = await this.serviceApi.put<
+                ServiceLoginResult<U>
+            >(
                 'Auth/ExchangeToken',
                 {
                     token: this.encryptEnhanced(
@@ -322,7 +324,7 @@ export class ServiceApp<
     userLoginEx(
         user: ISmartERPUser,
         refreshToken: string,
-        serviceUser: IServiceUser
+        serviceUser: U
     ): void {
         // Service user login
         this.servicePassphrase =

package/src/mu/DnDList.tsx

@@ -18,7 +18,7 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
         item: D,
         index: number,
         deleteItem: (index: number) => void,
-        editItem: (newItem: D, indexOrLabel: number | string) => void
+        editItem: (newItem: D, index: number) => boolean
     ) => React.ReactNode;
 
     /**
@@ -52,6 +52,11 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
      */
     loadData: (name: string) => PromiseLike<D[]>;
 
+    /**
+     * Data change handler
+     */
+    onChange?: (items: D[]) => void;
+
     /**
      * Top and bottom sides renderer
      */
@@ -87,12 +92,21 @@ export function DnDList<
         labelField,
         loadData,
         name,
+        onChange,
         sideRenderer
     } = props;
 
     // State
     const [items, setItems] = React.useState<D[]>([]);
 
+    const changeItems = (items: D[]) => {
+        // Possible to alter items with the handler
+        if (onChange) onChange(items);
+
+        // Update state
+        setItems(items);
+    };
+
     // Drag end handler
     const onDragEnd = (result: DropResult) => {
         // Dropped outside the list
@@ -110,13 +124,13 @@ export function DnDList<
         newItems.splice(result.destination.index, 0, removed);
 
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
     };
 
     // Add item
     const addItem = (newItem: D) => {
         // Existence check
-        if (items.some((item) => item[labelField] == newItem[labelField])) {
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
             return false;
         }
 
@@ -124,22 +138,17 @@ export function DnDList<
         const newItems = [newItem, ...items];
 
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
 
         return true;
     };
 
     // Edit item
-    const editItem = (newItem: D, indexOrLabel: number | string) => {
-        const index =
-            typeof indexOrLabel === 'number'
-                ? indexOrLabel
-                : items.findIndex(
-                      (item) =>
-                          DataTypes.convert(item[labelField], 'string') ==
-                          indexOrLabel
-                  );
-        if (index === -1) return;
+    const editItem = (newItem: D, index: number) => {
+        // Existence check
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
+            return false;
+        }
 
         // Clone
         const newItems = [...items];
@@ -148,7 +157,9 @@ export function DnDList<
         newItems.splice(index, 1, newItem);
 
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
+
+        return true;
     };
 
     // Add items
@@ -169,7 +180,7 @@ export function DnDList<
         });
 
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
 
         return newItems.length - items.length;
     };
@@ -183,10 +194,11 @@ export function DnDList<
         newItems.splice(index, 1);
 
         // Update the state
-        setItems(newItems);
+        changeItems(newItems);
     };
 
     React.useEffect(() => {
+        // Load data
         loadData(name).then((items) => setItems(items));
     }, [name]);
 

package/src/mu/NotifierMU.tsx

@@ -25,7 +25,8 @@ import {
     Snackbar,
     styled,
     Switch,
-    TextField
+    TextField,
+    Typography
 } from '@mui/material';
 import { Error, Info, Help, Warning, Done } from '@mui/icons-material';
 import React from 'react';
@@ -238,18 +239,30 @@ export class NotificationMU extends NotificationReact {
             ...rest
         } = this.inputProps ?? {};
 
+        const inputRef = React.createRef<HTMLInputElement>();
+        const errorRef = React.createRef<HTMLSpanElement>();
+
+        const setError = (error?: string) => {
+            if (errorRef.current == null) return;
+            errorRef.current.innerText = error ?? '';
+        };
+
         const handleSubmit = async (
             event: React.MouseEvent<HTMLButtonElement>
         ) => {
             // Result
-            let result: boolean | void | PromiseLike<boolean | void> =
-                undefined;
+            let result:
+                | boolean
+                | string
+                | void
+                | PromiseLike<boolean | string | void> = undefined;
+
+            const input = inputRef.current;
 
             if (this.onReturn) {
                 // Inputs case, no HTMLForm set to value, set the current form
                 if (inputs && value == null) value = event.currentTarget.form;
 
-                const input = inputRef.current;
                 if (input) {
                     if (type === 'date') {
                         const dateValue = input.valueAsDate;
@@ -284,13 +297,20 @@ export class NotificationMU extends NotificationReact {
             // Get the value
             // returns false to prevent default dismiss
             const v = await result;
-            if (v === false) return;
+            if (v === false) {
+                input?.focus();
+                return;
+            }
+            if (typeof v === 'string') {
+                setError(v);
+                input?.focus();
+                return;
+            }
 
             this.dismiss();
         };
 
         let localInputs: React.ReactNode;
-        let inputRef = React.createRef<HTMLInputElement>();
         let value: any = undefined;
 
         if (inputs == null) {
@@ -310,6 +330,7 @@ export class NotificationMU extends NotificationReact {
                 localInputs = (
                     <TextField
                         inputRef={inputRef}
+                        onChange={() => setError(undefined)}
                         autoFocus
                         margin="dense"
                         fullWidth
@@ -341,6 +362,12 @@ export class NotificationMU extends NotificationReact {
                     <DialogContent>
                         <DialogContentText>{this.content}</DialogContentText>
                         {localInputs}
+                        <Typography
+                            variant="caption"
+                            display="block"
+                            ref={errorRef}
+                            color={(theme) => theme.palette.error.main}
+                        />
                     </DialogContent>
                     <DialogActions>
                         <Button