awing-library 2.1.2-dev.586 → 2.1.2-dev.588

package/dist/AWING/AdvancedSearch/Container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../src/AWING/AdvancedSearch/Container.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAER,mBAAmB,EAOtB,MAAM,SAAS,CAAC;AAajB,iBAAS,cAAc,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,mBAAmB,CAAC,SAAS,CAAC,2CAgU/F;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../src/AWING/AdvancedSearch/Container.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAER,mBAAmB,EAOtB,MAAM,SAAS,CAAC;AAajB,iBAAS,cAAc,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,mBAAmB,CAAC,SAAS,CAAC,2CAiU/F;AAED,eAAe,cAAc,CAAC"}

package/dist/AWING/AdvancedSearch/Container.js

@@ -205,6 +205,7 @@ function AdvancedSearch(props) {
                                                             ],
                                                             onChangeDate: handleChange,
                                                             style: fieldDef.style,
+                                                            isShowCalendarInfo: currentField.isShowCalendarInfo,
                                                             children: fieldDef.label
                                                         }, fieldName);
                                                     }

package/dist/AWING/DataForm/container.test.js

@@ -9,7 +9,7 @@ var __webpack_modules__ = {
     "AWING/DataInput": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__DataInput_index_js_c7933a4f__;
     },
-    "../helper": function(module) {
+    "AWING/helper": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__helper_js_663c9e82__;
     }
 };
@@ -92,9 +92,9 @@ jest.mock('@mui/material', ()=>({
             })
     }));
 const mockInputFactory = __webpack_require__("AWING/DataInput")["default"];
-const mockCalculateValue = __webpack_require__("../helper").calculateValue;
-const mockConvertFormulaToBinaryTree = __webpack_require__("../helper").convertFormulaToBinaryTree;
-const mockReplaceFieldsValue = __webpack_require__("../helper").replaceFieldsValue;
+const mockCalculateValue = __webpack_require__("AWING/helper").calculateValue;
+const mockConvertFormulaToBinaryTree = __webpack_require__("AWING/helper").convertFormulaToBinaryTree;
+const mockReplaceFieldsValue = __webpack_require__("AWING/helper").replaceFieldsValue;
 describe('DataForm Component', ()=>{
     const mockFields = [
         {

package/dist/AWING/DirectoryTree/FilterTreeView/Container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../../src/AWING/DirectoryTree/FilterTreeView/Container.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAK9C,iBAAS,cAAc,CAAC,KAAK,EAAE,mBAAmB,2CAkEjD;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../../src/AWING/DirectoryTree/FilterTreeView/Container.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAK9C,iBAAS,cAAc,CAAC,KAAK,EAAE,mBAAmB,2CAqEjD;AAED,eAAe,cAAc,CAAC"}

package/dist/AWING/DirectoryTree/FilterTreeView/Container.js

@@ -6,14 +6,14 @@ import { Grid, Paper } from "@mui/material";
 import { CircularProgress } from "../../index.js";
 import ShowTreeItem from "../ShowTreeItem/index.js";
 import { useFilterTreeViewStyles } from "../components/Styled.js";
-import { getRootItem } from "../helper.js";
+import { getRootItems } from "../helper.js";
 function FilterTreeView(props) {
     const { t } = useTranslation();
     const { items, onDirectoryOpen, onTreeItemClick, isLoading, loadingFocusedId, rootDirectoryId, sx } = props;
     const classes = useFilterTreeViewStyles();
-    const [expanded, setExpanded] = useState([
+    const [expanded, setExpanded] = useState(rootDirectoryId ? [
         rootDirectoryId.toString()
-    ]);
+    ] : []);
     if (isLoading) return /*#__PURE__*/ jsx("div", {
         className: classes.CircularRoot,
         children: /*#__PURE__*/ jsx(CircularProgress, {})
@@ -37,7 +37,7 @@ function FilterTreeView(props) {
                 ...item,
                 isLoading: item.isLoading || void 0 !== loadingFocusedId && item.value === loadingFocusedId
             }));
-        const rootItem = getRootItem(itemsWithLoading);
+        const rootItems = getRootItems(itemsWithLoading);
         return /*#__PURE__*/ jsx(Grid, {
             container: true,
             spacing: 2,
@@ -53,17 +53,17 @@ function FilterTreeView(props) {
                 style: {
                     width: '100%'
                 },
-                children: rootItem ? /*#__PURE__*/ jsx(Fragment, {
+                children: rootItems.length > 0 ? /*#__PURE__*/ jsx(Fragment, {
                     children: /*#__PURE__*/ jsx(SimpleTreeView, {
                         className: `${classes.root} ${classes.treeviewStyle}`,
                         onExpandedItemsChange: handleChangeTreeView,
                         expandedItems: expanded,
                         sx: sx,
-                        children: /*#__PURE__*/ jsx(ShowTreeItem, {
-                            rootItem: rootItem,
-                            items: itemsWithLoading,
-                            onTreeItemClick: onTreeItemClick
-                        })
+                        children: rootItems.map((rootItem)=>/*#__PURE__*/ jsx(ShowTreeItem, {
+                                rootItem: rootItem,
+                                items: itemsWithLoading,
+                                onTreeItemClick: onTreeItemClick
+                            }, rootItem.value))
                     })
                 }) : null
             })

package/dist/AWING/DirectoryTree/FilterTreeView/types.d.ts

@@ -4,7 +4,7 @@ export type FilterTreeViewProps = {
     items: TreeItemOption[];
     onDirectoryOpen: (id: TreeItemOption['value'], treeItem?: TreeItemOption) => void;
     onTreeItemClick: (id: TreeItemOption['value'], treeItem?: TreeItemOption) => void;
-    rootDirectoryId: TreeItemOption['value'];
+    rootDirectoryId?: TreeItemOption['value'];
     isLoading?: boolean;
     loadingFocusedId?: TreeItemOption['value'];
     sx?: SxProps<Theme>;

package/dist/AWING/DirectoryTree/FilterTreeView/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/AWING/DirectoryTree/FilterTreeView/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,eAAe,EAAE,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClF,eAAe,EAAE,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClF,eAAe,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/AWING/DirectoryTree/FilterTreeView/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,eAAe,EAAE,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClF,eAAe,EAAE,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClF,eAAe,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}

package/dist/AWING/DirectoryTree/helper.d.ts

@@ -2,6 +2,8 @@ import { Directory } from '../../Features/SYSTEM/Directory';
 import { TreeItemOption } from './interface';
 /** Get root item for TreeView */
 export declare const getRootItem: (items: TreeItemOption[]) => TreeItemOption | undefined;
+/** Get all root items for TreeView — items whose parentObjectId is absent from the list */
+export declare const getRootItems: (items: TreeItemOption[]) => TreeItemOption[];
 /**
  * Phân tách path, path truyền vào phải đúng định dạng '.path.path.path.'
  * VD: '.12.22.1321.' => ['12', '22', '1321']

package/dist/AWING/DirectoryTree/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/AWING/DirectoryTree/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,iCAAiC;AACjC,eAAO,MAAM,WAAW,UAAW,cAAc,EAAE,+BAUlD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,SAAU,MAAM,6BAOxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAAW,cAAc,EAAE,cAAc,MAAM,oBAAoB,MAAM,qBAU5G,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,SAAS,EAAE,gBAwDpD,CAAC"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/AWING/DirectoryTree/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,iCAAiC;AACjC,eAAO,MAAM,WAAW,UAAW,cAAc,EAAE,+BAUlD,CAAC;AAEF,2FAA2F;AAC3F,eAAO,MAAM,YAAY,UAAW,cAAc,EAAE,qBAUnD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,SAAU,MAAM,6BAOxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAAW,cAAc,EAAE,cAAc,MAAM,oBAAoB,MAAM,qBAU5G,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,SAAS,EAAE,gBAwDpD,CAAC"}

package/dist/AWING/DirectoryTree/helper.js

@@ -5,6 +5,12 @@ const getRootItem = (items)=>{
         return res;
     }, items[0]);
 };
+const getRootItems = (items)=>{
+    if (!items.length) return [];
+    const levels = items.map((x)=>x.level).filter((x)=>void 0 !== x);
+    const minLevel = Math.min(...levels);
+    return items.filter((x)=>x.level === minLevel);
+};
 const getSplitPath = (path, space = '.')=>{
     const result = path.split(space);
     if (result.length < 3 || path.charAt(0) !== space || path.charAt(path.length - 1) !== space) return [];
@@ -46,4 +52,4 @@ const sortByDirectoryPath = (data)=>{
         return aParts.length - bParts.length;
     });
 };
-export { getChildrenByParentPath, getRootItem, getSplitPath, sortByDirectoryPath };
+export { getChildrenByParentPath, getRootItem, getRootItems, getSplitPath, sortByDirectoryPath };

package/dist/Features/SYSTEM/Group/SearchUser/component.d.ts

@@ -5,6 +5,9 @@ interface SearchUserGroupUserProps {
     users: User[];
     onSearch?: (searchString: string) => void;
     loading?: boolean;
+    loadingMore?: boolean;
+    hasMore?: boolean;
+    onLoadMore?: () => void;
 }
 declare function SearchUserGroupUser(props: SearchUserGroupUserProps): import("react/jsx-runtime").JSX.Element;
 export default SearchUserGroupUser;

package/dist/Features/SYSTEM/Group/SearchUser/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/component.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,UAAU,wBAAwB;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACnD,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,iBAAS,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CAwE3D;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/component.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,UAAU,wBAAwB;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACnD,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,iBAAS,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CA8F3D;AAED,eAAe,mBAAmB,CAAC"}

package/dist/Features/SYSTEM/Group/SearchUser/component.js

@@ -1,12 +1,27 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useEffect, useRef } from "react";
 import { filter, some } from "lodash";
-import { Checkbox, FormControlLabel, Paper } from "@mui/material";
+import { Box, Checkbox, FormControlLabel, Paper } from "@mui/material";
 import { CircularProgress, NoData, SearchBox } from "../../../../AWING/index.js";
 import Grid from "@mui/material/Grid";
 function SearchUserGroupUser(props) {
-    const { listUserId, onListUserIdChange, users, onSearch, loading } = props;
-    const [keyWordSearch, setKeyWordSearch] = useState('');
+    const { listUserId, onListUserIdChange, users, onSearch, loading, loadingMore = false, hasMore = false, onLoadMore } = props;
+    const scrollContainerRef = useRef(null);
+    useEffect(()=>{
+        const container = scrollContainerRef.current;
+        if (!container) return;
+        if (hasMore && !loadingMore && container.scrollHeight <= container.clientHeight) return void onLoadMore?.();
+        const handleScroll = ()=>{
+            const { scrollTop, scrollHeight, clientHeight } = container;
+            if (scrollHeight - scrollTop <= clientHeight + 50 && hasMore && !loadingMore) onLoadMore?.();
+        };
+        container.addEventListener('scroll', handleScroll);
+        return ()=>container.removeEventListener('scroll', handleScroll);
+    }, [
+        hasMore,
+        loadingMore,
+        onLoadMore
+    ]);
     const handleChangeUserList = (userId, e)=>{
         let newUserIds = listUserId.slice();
         if (e.target.checked) onListUserIdChange([
@@ -18,16 +33,13 @@ function SearchUserGroupUser(props) {
             onListUserIdChange(newUserIds);
         }
     };
-    const handleSearch = (searchString)=>{
-        setKeyWordSearch(searchString);
-        if (onSearch) onSearch(searchString);
-    };
     return /*#__PURE__*/ jsxs(Paper, {
         sx: (theme)=>({
-                padding: (theme)=>theme.spacing(3),
+                padding: theme.spacing(3),
                 border: theme.palette.background.paper,
                 minHeight: '200px',
-                position: 'relative'
+                position: 'relative',
+                height: '89vh'
             }),
         children: [
             /*#__PURE__*/ jsx(SearchBox, {
@@ -36,7 +48,7 @@ function SearchUserGroupUser(props) {
                     width: '100%'
                 },
                 onSearch: (_searchType, searchString)=>{
-                    handleSearch(searchString);
+                    onSearch?.(searchString);
                 }
             }),
             loading ? /*#__PURE__*/ jsx(Grid, {
@@ -46,31 +58,44 @@ function SearchUserGroupUser(props) {
                     mt: 3
                 },
                 children: /*#__PURE__*/ jsx(CircularProgress, {})
-            }) : users && users?.length > 0 ? /*#__PURE__*/ jsx(Grid, {
-                container: true,
+            }) : users && users.length > 0 ? /*#__PURE__*/ jsxs(Box, {
+                ref: scrollContainerRef,
                 sx: {
+                    maxHeight: '90%',
+                    overflowY: 'auto',
                     mt: 3
                 },
-                children: users?.map((user, key)=>/*#__PURE__*/ jsx(Grid, {
-                        size: {
-                            xs: 12,
-                            sm: 6,
-                            md: 4,
-                            lg: 3
+                children: [
+                    /*#__PURE__*/ jsx(Grid, {
+                        container: true,
+                        children: users.map((user, key)=>/*#__PURE__*/ jsx(Grid, {
+                                size: {
+                                    xs: 12,
+                                    sm: 6,
+                                    md: 4,
+                                    lg: 3
+                                },
+                                children: /*#__PURE__*/ jsx(FormControlLabel, {
+                                    control: /*#__PURE__*/ jsx(Checkbox, {
+                                        color: "primary",
+                                        checked: some(listUserId, (id)=>id === user.id),
+                                        onChange: (e)=>void 0 !== user.id && handleChangeUserList(user.id, e),
+                                        value: user.id
+                                    }),
+                                    label: user.username
+                                })
+                            }, key))
+                    }),
+                    loadingMore && /*#__PURE__*/ jsx(Grid, {
+                        container: true,
+                        justifyContent: "center",
+                        sx: {
+                            py: 1
                         },
-                        children: /*#__PURE__*/ jsx(FormControlLabel, {
-                            control: /*#__PURE__*/ jsx(Checkbox, {
-                                color: "primary",
-                                checked: some(listUserId, (id)=>id === user.id),
-                                onChange: (e)=>void 0 !== user.id && handleChangeUserList(user.id, e),
-                                value: user.id
-                            }),
-                            label: user.username
-                        })
-                    }, key))
-            }) : /*#__PURE__*/ jsx(Fragment, {
-                children: keyWordSearch ? /*#__PURE__*/ jsx(NoData, {}) : null
-            })
+                        children: /*#__PURE__*/ jsx(CircularProgress, {})
+                    })
+                ]
+            }) : /*#__PURE__*/ jsx(NoData, {})
         ]
     });
 }

package/dist/Features/SYSTEM/Group/SearchUser/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/container.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAQlD,UAAU,YAAY;IAClB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CAC7C;AAED,QAAA,MAAM,OAAO,UAAW,YAAY,4CA+GnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/container.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AASlD,UAAU,YAAY;IAClB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CAC7C;AAID,QAAA,MAAM,OAAO,UAAW,YAAY,4CA4InC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/dist/Features/SYSTEM/Group/SearchUser/container.js

@@ -6,13 +6,19 @@ import { useTranslation } from "react-i18next";
 import { ClassicDrawer } from "../../../../Commons/index.js";
 import { useContextGroup } from "../context.js";
 import component from "./component.js";
+import { convertArrayFiltersToCondition } from "../../../../index.js";
+const PAGE_SIZE = 50;
 const AddUser = (props)=>{
     const { t } = useTranslation();
     const { usersSelected, onChangeAddUser = ()=>null } = props;
     const [listUserId, setListUserId] = useState([]);
     const [usersData, setUsersData] = useState([]);
     const [loading, setLoading] = useState(false);
+    const [loadingMore, setLoadingMore] = useState(false);
+    const [hasMore, setHasMore] = useState(false);
     const usersCache = useRef({});
+    const searchStringRef = useRef('');
+    const skipRef = useRef(0);
     const { services } = useContextGroup();
     useEffect(()=>{
         setListUserId(usersSelected.length > 0 ? usersSelected.map((item)=>item.id).filter((id)=>void 0 !== id) : []);
@@ -27,45 +33,65 @@ const AddUser = (props)=>{
     };
     const handleSubmitUser = (userIds)=>{
         const newUserIds = lodash.differenceWith(userIds, usersSelected, (a, b)=>a === b.id);
-        const newUsers = [
-            ...newUserIds.map((userId)=>{
-                const user = usersCache.current[userId];
-                return {
-                    id: userId,
-                    username: user?.username ?? '',
-                    name: user?.name ?? ''
-                };
-            })
-        ];
+        const newUsers = newUserIds.map((userId)=>{
+            const user = usersCache.current[userId];
+            return {
+                id: userId,
+                username: user?.username ?? '',
+                name: user?.name ?? ''
+            };
+        });
         onChangeAddUser(newUsers);
     };
-    const fetchUsers = (searchString)=>{
-        if (services?.getUsers) {
-            setLoading(true);
-            services.getUsers({
+    const fetchUsers = (searchString, skip, isLoadMore)=>{
+        if (!services?.getUsers) return;
+        isLoadMore ? setLoadingMore(true) : setLoading(true);
+        services.getUsers({
+            input: {
                 where: {
-                    username: {
-                        eq: searchString
-                    }
-                }
-            }).then((data)=>{
-                setUsersData(data.users);
-                data.users.forEach((user)=>{
-                    if (void 0 !== user.id) usersCache.current[user.id] = user;
-                });
-            }).finally(()=>setLoading(false));
-        }
+                    ...convertArrayFiltersToCondition([
+                        {
+                            key: 'name',
+                            value: searchString.trim(),
+                            type: 'contains'
+                        }
+                    ])
+                },
+                skip,
+                take: PAGE_SIZE
+            }
+        }).then((data)=>{
+            data.users.forEach((user)=>{
+                if (void 0 !== user.id) usersCache.current[user.id] = user;
+            });
+            isLoadMore ? setUsersData((prev)=>[
+                    ...prev,
+                    ...data.users
+                ]) : setUsersData(data.users);
+            setHasMore(skip + data.users.length < data.total);
+        }).finally(()=>{
+            isLoadMore ? setLoadingMore(false) : setLoading(false);
+        });
     };
-    const debouncedFetchUsers = useRef(lodash.debounce((query)=>{
-        fetchUsers(query);
+    const debouncedFetch = useRef(lodash.debounce((searchString)=>{
+        skipRef.current = 0;
+        fetchUsers(searchString, 0, false);
     }, 500)).current;
     const handleSearch = (val)=>{
-        if ('' !== val) debouncedFetchUsers(val);
+        searchStringRef.current = val;
+        if ('' !== val) debouncedFetch(val);
         else {
-            debouncedFetchUsers.cancel();
+            debouncedFetch.cancel();
+            skipRef.current = 0;
             setUsersData([]);
+            setHasMore(false);
         }
     };
+    const handleLoadMore = ()=>{
+        const newSkip = skipRef.current + PAGE_SIZE;
+        skipRef.current = newSkip;
+        fetchUsers(searchStringRef.current, newSkip, true);
+    };
     return /*#__PURE__*/ jsx(ClassicDrawer, {
         title: t('UserGroup.TitleAdd'),
         onSubmit: ()=>new Promise((resolve, _reject)=>{
@@ -85,7 +111,10 @@ const AddUser = (props)=>{
                 listUserId: listUserId,
                 onListUserIdChange: handleListUserIdChange,
                 onSearch: handleSearch,
-                loading: loading
+                loading: loading,
+                loadingMore: loadingMore,
+                hasMore: hasMore,
+                onLoadMore: handleLoadMore
             })
         })
     });

package/dist/Features/SYSTEM/Group/Services.d.ts

@@ -1,5 +1,5 @@
 import type { Group, GroupInput } from './types';
-import type { CustomPagingRequestInput, PagingQueryInput } from '../../types';
+import type { CustomPagingRequestInput } from '../../types';
 import { User } from '../User/types';
 import { MenuOption, ValueBase } from '../../../AWING/interface';
 import { fetchOptionsType } from '../../../AWING/AsyncAutocomplete';
@@ -8,7 +8,9 @@ export type GroupServices = {
     /** Get Users
      * @param p - PagingQueryInput<Users> - Không truyền param sẽ lấy tất cả Users
      */
-    getUsers: (p?: PagingQueryInput<User>) => Promise<{
+    getUsers: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         users: User[];
         total: number;
     }>;

package/dist/Features/SYSTEM/Group/Services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Services.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Group/Services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,MAAM,aAAa,GAAG;IAExB,WAAW,EAAE,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEpF,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,wBAAwB,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEpG,yBAAyB;IACzB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAEzC,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpD,uBAAuB;IACvB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,yBAAyB;IACzB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzF,8BAA8B;IAC9B,SAAS,EAAE,OAAO,CAAC;IAEnB,iCAAiC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"Services.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Group/Services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,MAAM,aAAa,GAAG;IAExB,WAAW,EAAE,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,wBAAwB,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEjG,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,wBAAwB,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEpG,yBAAyB;IACzB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAEzC,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpD,uBAAuB;IACvB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,yBAAyB;IACzB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzF,8BAA8B;IAC9B,SAAS,EAAE,OAAO,CAAC;IAEnB,iCAAiC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC5B,CAAC"}

package/dist/Features/SYSTEM/User/Services.d.ts

@@ -48,5 +48,6 @@ export type UserServices = {
     isLoading: boolean;
     /** Loading khi submit dữ liệu */
     isSubmitLoading: boolean;
+    currentUserId?: string;
 };
 //# sourceMappingURL=Services.d.ts.map

package/dist/Features/SYSTEM/User/Services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Services.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/User/Services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB;;OAEG;IACH,WAAW,EAAE,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAErD;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,wBAAwB,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEjG,SAAS,EAAE,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnD,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,yBAAyB;IACzB,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAErF,wBAAwB;IACxB,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAExC,cAAc,EAAE,CAAC,CAAC,EAAE;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,CAAC,EAAE;YACd,WAAW,CAAC,EAAE;gBACV,KAAK,CAAC,EAAE;oBACJ,MAAM,CAAC,EAAE,MAAM,CAAC;iBACnB,CAAC;aACL,EAAE,CAAC;SACP,CAAC;QACF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAEnB,oBAAoB,EAAE,CAAC,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IAEhF,8BAA8B;IAC9B,SAAS,EAAE,OAAO,CAAC;IAEnB,iCAAiC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"Services.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/User/Services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB;;OAEG;IACH,WAAW,EAAE,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAErD;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;QAAE,KAAK,EAAE,wBAAwB,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEjG,SAAS,EAAE,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnD,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,yBAAyB;IACzB,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAErF,wBAAwB;IACxB,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAExC,cAAc,EAAE,CAAC,CAAC,EAAE;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,CAAC,EAAE;YACd,WAAW,CAAC,EAAE;gBACV,KAAK,CAAC,EAAE;oBACJ,MAAM,CAAC,EAAE,MAAM,CAAC;iBACnB,CAAC;aACL,EAAE,CAAC;SACP,CAAC;QACF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAEnB,oBAAoB,EAAE,CAAC,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IAEhF,8BAA8B;IAC9B,SAAS,EAAE,OAAO,CAAC;IAEnB,iCAAiC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}

package/dist/Features/SYSTEM/User/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/User/container.tsx"],"names":[],"mappings":"AAaA,iBAAS,aAAa,4CAyHrB;AACD,eAAe,aAAa,CAAC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/User/container.tsx"],"names":[],"mappings":"AAaA,iBAAS,aAAa,4CA0HrB;AACD,eAAe,aAAa,CAAC"}

package/dist/Features/SYSTEM/User/container.js

@@ -62,7 +62,7 @@ function UserContainer() {
             id
         });
     };
-    const handleNavigate = ()=>window.open(`${window.REACT_APP_ID_DOMAIN}/organization`, '_blank');
+    const handleNavigate = ()=>window.open(`${window.REACT_APP_ID_DOMAIN}/Organization/${services?.currentUserId}/User`, '_blank');
     return /*#__PURE__*/ jsx(PageManagement, {
         title: t('User.Title'),
         onChangeQueryInput: queryData,