awing-library 2.1.8-beta → 2.1.9-beta

package/lib/ACM-AXN/Directory/Constant.d.ts

@@ -7,6 +7,7 @@ declare const Constants: {
     DIRECTORY_ADD_PERMISSION_ADD_NEWAUTHEN: string;
     DIRECTORY_EDIT_PERMISSION: string;
     MENU_DIRECTORY_PERMISSION: string;
+    MENU_DIRECTORY_ADD_PERMISSION: string;
     SYSTEM_DIRECTORY_PERMISSION: string;
 };
 export default Constants;

package/lib/ACM-AXN/Directory/Constant.js

@@ -9,6 +9,7 @@ var Constants = {
     DIRECTORY_ADD_PERMISSION_ADD_NEWAUTHEN: 'AddNewAuthen',
     DIRECTORY_EDIT_PERMISSION: 'EditPermission',
     MENU_DIRECTORY_PERMISSION: 'MenuPermission',
+    MENU_DIRECTORY_ADD_PERMISSION: 'MenuAddPermission',
     SYSTEM_DIRECTORY_PERMISSION: 'SystemPermission',
 };
 exports.default = Constants;

package/lib/ACM-AXN/Directory/components/Permission/AddAuthen.d.ts

@@ -1,5 +1,9 @@
 import { IUSerOrGroup } from '../../interface';
 interface Props {
+    initialLoad?: {
+        users: IUSerOrGroup[];
+        groups: IUSerOrGroup[];
+    };
     oldSelected: IUSerOrGroup[];
     onSubmit: (selected: IUSerOrGroup[]) => void;
 }

package/lib/ACM-AXN/Directory/components/Permission/AddAuthen.js

@@ -61,12 +61,12 @@ function AddAuthen(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var navigate = (0, react_router_dom_1.useNavigate)();
     var _a = (0, react_1.useContext)(Context_1.default), service = _a.service, snackbar = _a.appHelper.snackbar;
-    var oldSelected = props.oldSelected, onSubmit = props.onSubmit;
+    var initialLoad = props.initialLoad, oldSelected = props.oldSelected, onSubmit = props.onSubmit;
     var _b = (0, react_1.useState)(false), loading = _b[0], setLoading = _b[1];
     var _c = (0, react_1.useState)(''), searchKey = _c[0], setSearchKey = _c[1];
     var _d = (0, react_1.useState)(false), confirmExit = _d[0], setConfirmExit = _d[1];
-    var _e = (0, react_1.useState)([]), users = _e[0], setUsers = _e[1];
-    var _f = (0, react_1.useState)([]), groups = _f[0], setGroups = _f[1];
+    var _e = (0, react_1.useState)(initialLoad ? initialLoad.users : []), users = _e[0], setUsers = _e[1];
+    var _f = (0, react_1.useState)(initialLoad ? initialLoad.groups : []), groups = _f[0], setGroups = _f[1];
     var _g = (0, react_1.useState)(oldSelected), selected = _g[0], setSelected = _g[1];
     var usersFilter = users.filter(function (user) {
         return ((0, Helpers_1.changeToAlias)((user === null || user === void 0 ? void 0 : user.username) || '').includes((0, Helpers_1.changeToAlias)(searchKey)) ||
@@ -76,8 +76,10 @@ function AddAuthen(props) {
         return (0, Helpers_1.changeToAlias)((group === null || group === void 0 ? void 0 : group.name) || '').includes((0, Helpers_1.changeToAlias)(searchKey));
     });
     (0, react_1.useEffect)(function () {
-        setLoading(true);
-        fetchAllUserAndGroup();
+        if (!initialLoad) {
+            setLoading(true);
+            fetchAllUserAndGroup();
+        }
     }, []);
     var fetchAllUserAndGroup = function () { return __awaiter(_this, void 0, void 0, function () {
         var responses, userData, groupData, err_1;

package/lib/ACM-AXN/Directory/components/Permission/CreateOrEditPermission.d.ts

@@ -1,6 +1,5 @@
 interface Props {
     isSystemDirectory?: boolean;
-    isMenuDirectory?: boolean;
 }
 export default function CreateOrEditPermission(props: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/ACM-AXN/Directory/components/Permission/CreateOrEditPermission.js

@@ -40,7 +40,7 @@ function CreateOrEditPermission(props) {
 exports.default = CreateOrEditPermission;
 function Permission(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
-    var isSystemDirectory = props.isSystemDirectory, isMenuDirectory = props.isMenuDirectory;
+    var isSystemDirectory = props.isSystemDirectory;
     var _a = (0, react_1.useContext)(Context_1.default), service = _a.service, snackbar = _a.appHelper.snackbar;
     var _b = (0, AWING_1.useDrawer)(), drawerState = _b.drawerState, setDrawerState = _b.setDrawerState, setDrawerTitle = _b.setDrawerTitle, setConfirmExit = _b.setConfirmExit;
     var _c = (0, react_router_dom_1.useParams)(), directoryId = _c.directoryId, type = _c.type, id = _c.id;
@@ -53,15 +53,10 @@ function Permission(props) {
             setDrawerTitle(t('Directory.EditPermission'));
             setLoading(true);
             setDrawerState(AWING_1.DrawerStateEnum.LOADING);
-            var getPermission = isSystemDirectory
-                ? service.systemDirectoryPermissionGet
-                : service.directoryPermissionGet;
+            var getPermission = service.directoryPermissionGet;
             if (isSystemDirectory) {
                 getPermission = service.systemDirectoryPermissionGet;
             }
-            if (isMenuDirectory) {
-                getPermission = service.menuPermissionGet;
-            }
             getPermission(directoryId)
                 .then(function (res) {
                 var currentPermission = res.permissions.find(function (p) { return p.authenId == id; });
@@ -221,9 +216,6 @@ function Permission(props) {
         if (isSystemDirectory) {
             updatePermission = service.systemDirectoryPermissionPut;
         }
-        if (isMenuDirectory) {
-            updatePermission = service.menuPermissionPut;
-        }
         return updatePermission(directoryId, {
             directoryId: directoryId,
             permissions: convertPermissions,

package/lib/ACM-AXN/Directory/components/Permission/Management.d.ts

@@ -1,6 +1,5 @@
 interface Props {
     isSystemDirectory?: boolean;
-    isMenuDirectory?: boolean;
 }
 export default function Permission(props: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/ACM-AXN/Directory/components/Permission/Management.js

@@ -58,7 +58,7 @@ function Permission(props) {
 exports.default = Permission;
 function FolderPermission(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
-    var isSystemDirectory = props.isSystemDirectory, isMenuDirectory = props.isMenuDirectory;
+    var isSystemDirectory = props.isSystemDirectory;
     var setDrawerTitle = (0, AWING_1.useDrawer)().setDrawerTitle;
     var navigate = (0, react_router_dom_1.useNavigate)();
     var directoryId = (0, react_router_dom_1.useParams)().directoryId;
@@ -71,9 +71,6 @@ function FolderPermission(props) {
         if (isSystemDirectory) {
             getDirectory = service.systemDirectoriesGet;
         }
-        if (isMenuDirectory) {
-            getDirectory = service.menusGet;
-        }
         getDirectory(directoryId).then(function (res) {
             setDrawerTitle("".concat(t('Directory.ObjectPermission'), ": ").concat(res.name));
         });
@@ -94,12 +91,8 @@ function FolderPermission(props) {
         if (isSystemDirectory) {
             getPermission = service.systemDirectoryPermissionGet;
         }
-        if (isMenuDirectory) {
-            getPermission = service.menuPermissionGet;
-        }
         getPermission(directoryId)
             .then(function (res) {
-            console.log({ res: res });
             setPermissions(res.permissions.map(function (p) { return convertPermission(p); }));
             setLoading(false);
         })
@@ -114,9 +107,6 @@ function FolderPermission(props) {
             if (isSystemDirectory) {
                 deletePermission = service.systemDirectoryPermissionDelete;
             }
-            if (isMenuDirectory) {
-                deletePermission = service.menuPermissionDelete;
-            }
             deletePermission(directoryId, authenId, authenType)
                 .then(function () {
                 snackbar('success');

package/lib/ACM-AXN/Directory/components/Permission/MenuPermissions/MenuPermissionManagement.js

@@ -13,10 +13,11 @@ var react_router_dom_1 = require("react-router-dom");
 var Context_1 = __importDefault(require("../../../../../Context"));
 var Constant_1 = __importDefault(require("../../../Constant"));
 var PubSub_1 = require("../../../../../AWING/PubSub");
+var AddAuthen_1 = __importDefault(require("../AddAuthen"));
 function Permission() {
     var i18next = (0, react_1.useContext)(Context_1.default).i18next;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18next }).t;
-    return ((0, jsx_runtime_1.jsx)(AWING_1.DrawerNavigate, { title: t('Directory.ObjectPermission'), customButtonSubmit: (0, jsx_runtime_1.jsx)(material_1.Button, { component: react_router_dom_1.Link, color: 'primary', variant: "contained", to: Constant_1.default.DIRECTORY_ADD_PERMISSION, children: t('Directory.AddPermission') }), childrenWrapperStyle: { padding: function (theme) { return theme.spacing(3); } }, children: (0, jsx_runtime_1.jsx)(MenuPermissions, {}) }));
+    return ((0, jsx_runtime_1.jsx)(AWING_1.DrawerNavigate, { title: t('Directory.ObjectPermission'), customButtonSubmit: (0, jsx_runtime_1.jsx)(material_1.Button, { component: react_router_dom_1.Link, color: 'primary', variant: "contained", to: Constant_1.default.MENU_DIRECTORY_ADD_PERMISSION, children: t('Directory.AddPermission') }), childrenWrapperStyle: { padding: function (theme) { return theme.spacing(3); } }, children: (0, jsx_runtime_1.jsx)(MenuPermissions, {}) }));
 }
 exports.default = Permission;
 function MenuPermissions() {
@@ -67,7 +68,6 @@ function MenuPermissions() {
         var getPermission = service.menuPermissionGet;
         getPermission(directoryId)
             .then(function (res) {
-            console.log({ res: res });
             setPermissions(res.permissions);
             setLoading(false);
         })
@@ -90,56 +90,94 @@ function MenuPermissions() {
             });
         });
     };
-    return loading && loadingAuthen ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(AWING_1.DataGrid, { columns: [
-            {
-                field: '',
-                width: 50,
-                headerName: '#',
-                valueGetter: function (row, idx) {
-                    return idx + 1;
-                },
-            },
-            {
-                field: 'authenType',
-                width: 50,
-                headerName: '',
-                valueGetter: function (row, idx) {
-                    return row.authenType == 0 ? ((0, jsx_runtime_1.jsx)(icons_material_1.Person, { fontSize: "small" })) : ((0, jsx_runtime_1.jsx)(icons_material_1.Group, { fontSize: "small" }));
-                },
-            },
-            {
-                field: 'name',
-                headerName: t('Common.UserGroupUser'),
-                valueGetter: function (row, idx) {
-                    var _a, _b;
-                    return row.authenType == 0
-                        ? (_a = users.find(function (u) { return u.userId == row.authenId; })) === null || _a === void 0 ? void 0 : _a.username
-                        : (_b = groups.find(function (g) { return g.groupId == row.authenId; })) === null || _b === void 0 ? void 0 : _b.name;
-                },
-            },
-            {
-                field: 'inheritedPermission',
-                headerName: t('Directory.InheritedPermission'),
-                valueGetter: function (row, idx) {
-                    return row.inheritedPermission ? ((0, jsx_runtime_1.jsx)(icons_material_1.Check, { color: "primary" })) : ('');
-                },
-            },
-            {
-                field: 'explicitPermission',
-                headerName: t('Directory.ExplicitPermission'),
-                valueGetter: function (row, idx) {
-                    return row.explicitPermission ? ((0, jsx_runtime_1.jsx)(icons_material_1.Check, { color: "primary" })) : ('');
-                },
-            },
-        ], rows: permissions, rowActions: [
-            {
-                icon: (0, jsx_runtime_1.jsx)(icons_material_1.Clear, { fontSize: "small" }),
-                tooltipTitle: t('Common.Delete'),
-                action: function (id) {
-                    var row = permissions[id];
-                    handleDeletePermission(row.authenId, row.authenType);
-                },
-                isShouldHideActions: function (row) { return !row.explicitPermission; },
-            },
-        ] }));
+    var handleUpdateMenuPermission = function (selected) {
+        var temp = selected.map(function (s) {
+            var isGroup = s.groupId !== undefined;
+            return {
+                authenId: isGroup ? s.groupId : s.userId,
+                authenType: isGroup ? 1 : 0,
+                explicitPermission: true,
+            };
+        });
+        service
+            .menuPermissionPut(directoryId, {
+            menuId: directoryId,
+            permissions: temp,
+        })
+            .then(function () {
+            snackbar('success');
+            (0, PubSub_1.pub)('update-directory-permission');
+        })
+            .catch(function (err) {
+            snackbar('error');
+            console.log(err);
+        });
+    };
+    return loading && loadingAuthen ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.DataGrid, { columns: [
+                    {
+                        field: '',
+                        width: 50,
+                        headerName: '#',
+                        valueGetter: function (row, idx) {
+                            return idx + 1;
+                        },
+                    },
+                    {
+                        field: 'authenType',
+                        width: 50,
+                        headerName: '',
+                        valueGetter: function (row, idx) {
+                            return row.authenType == 0 ? ((0, jsx_runtime_1.jsx)(icons_material_1.Person, { fontSize: "small" })) : ((0, jsx_runtime_1.jsx)(icons_material_1.Group, { fontSize: "small" }));
+                        },
+                    },
+                    {
+                        field: 'name',
+                        headerName: t('Common.UserGroupUser'),
+                        valueGetter: function (row, idx) {
+                            var _a, _b;
+                            return row.authenType == 0
+                                ? (_a = users.find(function (u) { return u.userId == row.authenId; })) === null || _a === void 0 ? void 0 : _a.username
+                                : (_b = groups.find(function (g) { return g.groupId == row.authenId; })) === null || _b === void 0 ? void 0 : _b.name;
+                        },
+                    },
+                    {
+                        field: 'inheritedPermission',
+                        headerName: t('Directory.InheritedPermission'),
+                        valueGetter: function (row, idx) {
+                            return row.inheritedPermission ? ((0, jsx_runtime_1.jsx)(icons_material_1.Check, { color: "primary" })) : ('');
+                        },
+                    },
+                    {
+                        field: 'explicitPermission',
+                        headerName: t('Directory.ExplicitPermission'),
+                        valueGetter: function (row, idx) {
+                            return row.explicitPermission ? ((0, jsx_runtime_1.jsx)(icons_material_1.Check, { color: "primary" })) : ('');
+                        },
+                    },
+                ], rows: permissions, rowActions: [
+                    {
+                        icon: (0, jsx_runtime_1.jsx)(icons_material_1.Clear, { fontSize: "small" }),
+                        tooltipTitle: t('Common.Delete'),
+                        action: function (id) {
+                            var row = permissions[id];
+                            handleDeletePermission(row.authenId, row.authenType);
+                        },
+                        isShouldHideActions: function (row) {
+                            return !row.explicitPermission;
+                        },
+                    },
+                ] }), (0, jsx_runtime_1.jsx)(react_router_dom_1.Routes, { children: (0, jsx_runtime_1.jsx)(react_router_dom_1.Route, { path: Constant_1.default.MENU_DIRECTORY_ADD_PERMISSION, element: (0, jsx_runtime_1.jsx)(AddAuthen_1.default, { initialLoad: {
+                            users: users.filter(function (u) {
+                                return !permissions.find(function (p) {
+                                    return p.explicitPermission &&
+                                        p.authenId == u.userId;
+                                });
+                            }),
+                            groups: groups.filter(function (g) {
+                                return !permissions.find(function (p) {
+                                    return p.explicitPermission &&
+                                        p.authenId == g.groupId;
+                                });
+                            }),
+                        }, oldSelected: [], onSubmit: handleUpdateMenuPermission }) }) })] }));
 }

package/lib/ACM-AXN/Directory/components/Permission/index.d.ts

@@ -1,6 +1,5 @@
 interface Props {
     isSystemDirectory?: boolean;
-    isMenuDirectory?: boolean;
 }
 export default function DirectoryPermission(props: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/ACM-AXN/Directory/components/Permission/index.js

@@ -13,10 +13,10 @@ var CreateOrEditPermission_1 = __importDefault(require("./CreateOrEditPermission
 var react_router_dom_1 = require("react-router-dom");
 function DirectoryPermission(props) {
     var i18next = (0, react_1.useContext)(Context_1.default).i18next;
-    var isSystemDirectory = props.isSystemDirectory, isMenuDirectory = props.isMenuDirectory;
-    return ((0, jsx_runtime_1.jsxs)(react_i18next_1.I18nextProvider, { i18n: i18next, children: [(0, jsx_runtime_1.jsx)(Management_1.default, { isSystemDirectory: isSystemDirectory, isMenuDirectory: isMenuDirectory }), (0, jsx_runtime_1.jsxs)(react_router_dom_1.Routes, { children: [(0, jsx_runtime_1.jsx)(react_router_dom_1.Route, { path: Constant_1.default.DIRECTORY_ADD_PERMISSION + '/*', element: (0, jsx_runtime_1.jsx)(CreateOrEditPermission_1.default, { isSystemDirectory: isSystemDirectory, isMenuDirectory: isMenuDirectory }) }), (0, jsx_runtime_1.jsx)(react_router_dom_1.Route, { path: Constant_1.default.DIRECTORY_EDIT_PERMISSION +
+    var isSystemDirectory = props.isSystemDirectory;
+    return ((0, jsx_runtime_1.jsxs)(react_i18next_1.I18nextProvider, { i18n: i18next, children: [(0, jsx_runtime_1.jsx)(Management_1.default, { isSystemDirectory: isSystemDirectory }), (0, jsx_runtime_1.jsxs)(react_router_dom_1.Routes, { children: [(0, jsx_runtime_1.jsx)(react_router_dom_1.Route, { path: Constant_1.default.DIRECTORY_ADD_PERMISSION + '/*', element: (0, jsx_runtime_1.jsx)(CreateOrEditPermission_1.default, { isSystemDirectory: isSystemDirectory }) }), (0, jsx_runtime_1.jsx)(react_router_dom_1.Route, { path: Constant_1.default.DIRECTORY_EDIT_PERMISSION +
                             '/:type' +
                             '/:id' +
-                            '/*', element: (0, jsx_runtime_1.jsx)(CreateOrEditPermission_1.default, { isSystemDirectory: isSystemDirectory, isMenuDirectory: isMenuDirectory }) })] })] }));
+                            '/*', element: (0, jsx_runtime_1.jsx)(CreateOrEditPermission_1.default, { isSystemDirectory: isSystemDirectory }) })] })] }));
 }
 exports.default = DirectoryPermission;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.8-beta",
+  "version": "2.1.9-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",