awing-library 2.1.2-stable.33 → 2.1.2-stable.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AWING/DataForm/container.test.js +4 -4
- package/dist/AWING/DirectoryTree/FilterTreeView/Container.d.ts.map +1 -1
- package/dist/AWING/DirectoryTree/FilterTreeView/Container.js +10 -10
- package/dist/AWING/DirectoryTree/FilterTreeView/types.d.ts +1 -1
- package/dist/AWING/DirectoryTree/FilterTreeView/types.d.ts.map +1 -1
- package/dist/AWING/DirectoryTree/helper.d.ts +2 -0
- package/dist/AWING/DirectoryTree/helper.d.ts.map +1 -1
- package/dist/AWING/DirectoryTree/helper.js +7 -1
- package/dist/Features/SYSTEM/User/Services.d.ts +1 -0
- package/dist/Features/SYSTEM/User/Services.d.ts.map +1 -1
- package/dist/Features/SYSTEM/User/container.d.ts.map +1 -1
- package/dist/Features/SYSTEM/User/container.js +1 -1
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ var __webpack_modules__ = {
|
|
|
9
9
|
"AWING/DataInput": function(module) {
|
|
10
10
|
module.exports = __WEBPACK_EXTERNAL_MODULE__DataInput_index_js_c7933a4f__;
|
|
11
11
|
},
|
|
12
|
-
"
|
|
12
|
+
"AWING/helper": function(module) {
|
|
13
13
|
module.exports = __WEBPACK_EXTERNAL_MODULE__helper_js_663c9e82__;
|
|
14
14
|
}
|
|
15
15
|
};
|
|
@@ -92,9 +92,9 @@ jest.mock('@mui/material', ()=>({
|
|
|
92
92
|
})
|
|
93
93
|
}));
|
|
94
94
|
const mockInputFactory = __webpack_require__("AWING/DataInput")["default"];
|
|
95
|
-
const mockCalculateValue = __webpack_require__("
|
|
96
|
-
const mockConvertFormulaToBinaryTree = __webpack_require__("
|
|
97
|
-
const mockReplaceFieldsValue = __webpack_require__("
|
|
95
|
+
const mockCalculateValue = __webpack_require__("AWING/helper").calculateValue;
|
|
96
|
+
const mockConvertFormulaToBinaryTree = __webpack_require__("AWING/helper").convertFormulaToBinaryTree;
|
|
97
|
+
const mockReplaceFieldsValue = __webpack_require__("AWING/helper").replaceFieldsValue;
|
|
98
98
|
describe('DataForm Component', ()=>{
|
|
99
99
|
const mockFields = [
|
|
100
100
|
{
|
|
@@ -1 +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,
|
|
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,2CAqEjD;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -6,14 +6,14 @@ import { Grid, Paper } from "@mui/material";
|
|
|
6
6
|
import { CircularProgress } from "../../index.js";
|
|
7
7
|
import ShowTreeItem from "../ShowTreeItem/index.js";
|
|
8
8
|
import { useFilterTreeViewStyles } from "../components/Styled.js";
|
|
9
|
-
import {
|
|
9
|
+
import { getRootItems } from "../helper.js";
|
|
10
10
|
function FilterTreeView(props) {
|
|
11
11
|
const { t } = useTranslation();
|
|
12
12
|
const { items, onDirectoryOpen, onTreeItemClick, isLoading, loadingFocusedId, rootDirectoryId, sx } = props;
|
|
13
13
|
const classes = useFilterTreeViewStyles();
|
|
14
|
-
const [expanded, setExpanded] = useState([
|
|
14
|
+
const [expanded, setExpanded] = useState(rootDirectoryId ? [
|
|
15
15
|
rootDirectoryId.toString()
|
|
16
|
-
]);
|
|
16
|
+
] : []);
|
|
17
17
|
if (isLoading) return /*#__PURE__*/ jsx("div", {
|
|
18
18
|
className: classes.CircularRoot,
|
|
19
19
|
children: /*#__PURE__*/ jsx(CircularProgress, {})
|
|
@@ -37,7 +37,7 @@ function FilterTreeView(props) {
|
|
|
37
37
|
...item,
|
|
38
38
|
isLoading: item.isLoading || void 0 !== loadingFocusedId && item.value === loadingFocusedId
|
|
39
39
|
}));
|
|
40
|
-
const
|
|
40
|
+
const rootItems = getRootItems(itemsWithLoading);
|
|
41
41
|
return /*#__PURE__*/ jsx(Grid, {
|
|
42
42
|
container: true,
|
|
43
43
|
spacing: 2,
|
|
@@ -53,17 +53,17 @@ function FilterTreeView(props) {
|
|
|
53
53
|
style: {
|
|
54
54
|
width: '100%'
|
|
55
55
|
},
|
|
56
|
-
children:
|
|
56
|
+
children: rootItems.length > 0 ? /*#__PURE__*/ jsx(Fragment, {
|
|
57
57
|
children: /*#__PURE__*/ jsx(SimpleTreeView, {
|
|
58
58
|
className: `${classes.root} ${classes.treeviewStyle}`,
|
|
59
59
|
onExpandedItemsChange: handleChangeTreeView,
|
|
60
60
|
expandedItems: expanded,
|
|
61
61
|
sx: sx,
|
|
62
|
-
children:
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
62
|
+
children: rootItems.map((rootItem)=>/*#__PURE__*/ jsx(ShowTreeItem, {
|
|
63
|
+
rootItem: rootItem,
|
|
64
|
+
items: itemsWithLoading,
|
|
65
|
+
onTreeItemClick: onTreeItemClick
|
|
66
|
+
}, rootItem.value))
|
|
67
67
|
})
|
|
68
68
|
}) : null
|
|
69
69
|
})
|
|
@@ -4,7 +4,7 @@ export type FilterTreeViewProps = {
|
|
|
4
4
|
items: TreeItemOption[];
|
|
5
5
|
onDirectoryOpen: (id: TreeItemOption['value'], treeItem?: TreeItemOption) => void;
|
|
6
6
|
onTreeItemClick: (id: TreeItemOption['value'], treeItem?: TreeItemOption) => void;
|
|
7
|
-
rootDirectoryId
|
|
7
|
+
rootDirectoryId?: TreeItemOption['value'];
|
|
8
8
|
isLoading?: boolean;
|
|
9
9
|
loadingFocusedId?: TreeItemOption['value'];
|
|
10
10
|
sx?: SxProps<Theme>;
|
|
@@ -1 +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;
|
|
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,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"}
|
|
@@ -2,6 +2,8 @@ import { Directory } from '../../Features/SYSTEM/Directory';
|
|
|
2
2
|
import { TreeItemOption } from './interface';
|
|
3
3
|
/** Get root item for TreeView */
|
|
4
4
|
export declare const getRootItem: (items: TreeItemOption[]) => TreeItemOption | undefined;
|
|
5
|
+
/** Get all root items for TreeView — items whose parentObjectId is absent from the list */
|
|
6
|
+
export declare const getRootItems: (items: TreeItemOption[]) => TreeItemOption[];
|
|
5
7
|
/**
|
|
6
8
|
* Phân tách path, path truyền vào phải đúng định dạng '.path.path.path.'
|
|
7
9
|
* VD: '.12.22.1321.' => ['12', '22', '1321']
|
|
@@ -1 +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"}
|
|
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,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"}
|
|
@@ -5,6 +5,12 @@ const getRootItem = (items)=>{
|
|
|
5
5
|
return res;
|
|
6
6
|
}, items[0]);
|
|
7
7
|
};
|
|
8
|
+
const getRootItems = (items)=>{
|
|
9
|
+
if (!items.length) return [];
|
|
10
|
+
const levels = items.map((x)=>x.level).filter((x)=>void 0 !== x);
|
|
11
|
+
const minLevel = Math.min(...levels);
|
|
12
|
+
return items.filter((x)=>x.level === minLevel);
|
|
13
|
+
};
|
|
8
14
|
const getSplitPath = (path, space = '.')=>{
|
|
9
15
|
const result = path.split(space);
|
|
10
16
|
if (result.length < 3 || path.charAt(0) !== space || path.charAt(path.length - 1) !== space) return [];
|
|
@@ -46,4 +52,4 @@ const sortByDirectoryPath = (data)=>{
|
|
|
46
52
|
return aParts.length - bParts.length;
|
|
47
53
|
});
|
|
48
54
|
};
|
|
49
|
-
export { getChildrenByParentPath, getRootItem, getSplitPath, sortByDirectoryPath };
|
|
55
|
+
export { getChildrenByParentPath, getRootItem, getRootItems, getSplitPath, sortByDirectoryPath };
|
|
@@ -1 +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;
|
|
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;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/User/container.tsx"],"names":[],"mappings":"AAaA,iBAAS,aAAa,
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/User/container.tsx"],"names":[],"mappings":"AAaA,iBAAS,aAAa,4CA0HrB;AACD,eAAe,aAAa,CAAC"}
|
|
@@ -62,7 +62,7 @@ function UserContainer() {
|
|
|
62
62
|
id
|
|
63
63
|
});
|
|
64
64
|
};
|
|
65
|
-
const handleNavigate = ()=>window.open(`${window.REACT_APP_ID_DOMAIN}/
|
|
65
|
+
const handleNavigate = ()=>window.open(`${window.REACT_APP_ID_DOMAIN}/Organization/${services?.currentUserId}/User`, '_blank');
|
|
66
66
|
return /*#__PURE__*/ jsx(PageManagement, {
|
|
67
67
|
title: t('User.Title'),
|
|
68
68
|
onChangeQueryInput: queryData,
|