awing-library 2.1.8-beta → 2.1.8

package/lib/ACM-AXN/CampaignSchedule/container.js

@@ -62,40 +62,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var lodash_1 = __importDefault(require("lodash"));
-var moment_1 = __importDefault(require("moment"));
 var react_1 = require("react");
+var react_helmet_async_1 = require("react-helmet-async");
 var react_i18next_1 = require("react-i18next");
 var CircularProgress_1 = require("../../AWING/CircularProgress");
 var ContentHeader_1 = __importDefault(require("./Components/ContentHeader"));
 var ControlPanel_1 = __importDefault(require("./Components/ControlPanel"));
 var DataConfig_1 = require("./DataConfig");
+var DataConfigAXN_1 = require("./DataConfigAXN");
 var Enum_1 = require("./Enum");
 var component_1 = __importDefault(require("./component"));
-var exportFile_1 = require("./exportFile");
-var react_helmet_async_1 = require("react-helmet-async");
 var CampaignScheduleContainer = function (_a) {
     var _b;
-    var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule;
+    var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c, title = _a.title, disabledCampaignFilter = _a.disabledCampaignFilter;
     var t = (0, react_i18next_1.useTranslation)().t;
-    var _c = (0, react_1.useState)(null), dragPlace = _c[0], setDragPlace = _c[1];
-    var _d = (0, react_1.useState)(initialFilters), filters = _d[0], setFilters = _d[1];
+    var _d = (0, react_1.useState)(null), dragPlace = _d[0], setDragPlace = _d[1];
+    var _e = (0, react_1.useState)(initialFilters), filters = _e[0], setFilters = _e[1];
     var pagingGroupBy = serviceCampaignSchedule.pagingGroupBy, paging = serviceCampaignSchedule.paging, exportExcel = serviceCampaignSchedule.exportExcel, placesPermission = serviceCampaignSchedule.placesPermission, campaignPlan = serviceCampaignSchedule.campaignPlan, domains = serviceCampaignSchedule.domains;
-    var _e = (0, react_1.useState)({
+    var _f = (0, react_1.useState)({
         campaigns: {},
         places: {},
         domains: {},
-    }), options = _e[0], setOptions = _e[1];
-    var _f = (0, react_1.useState)(initialHeadCells), headCells = _f[0], setHeadCells = _f[1];
-    var _g = (0, react_1.useState)(), scheduleGroups = _g[0], setScheduleGroups = _g[1];
-    var _h = (0, react_1.useState)(Enum_1.initialPage), page = _h[0], setPage = _h[1];
-    var _j = (0, react_1.useState)({
+    }), options = _f[0], setOptions = _f[1];
+    var _g = (0, react_1.useState)(initialHeadCells), headCells = _g[0], setHeadCells = _g[1];
+    var _h = (0, react_1.useState)(), scheduleGroups = _h[0], setScheduleGroups = _h[1];
+    var _j = (0, react_1.useState)(Enum_1.initialPage), page = _j[0], setPage = _j[1];
+    var _k = (0, react_1.useState)({
         campaigns: false,
         places: false,
         export: false,
         pages: false,
-    }), loadingFlags = _j[0], setLoadingFlags = _j[1];
-    var _k = (0, react_1.useState)(initialHeadCells), panels = _k[0], setPanels = _k[1];
-    var _l = (0, react_1.useState)(false), view = _l[0], setView = _l[1];
+    }), loadingFlags = _k[0], setLoadingFlags = _k[1];
+    var _l = (0, react_1.useState)(initialHeadCells), panels = _l[0], setPanels = _l[1];
+    var _m = (0, react_1.useState)(false), view = _m[0], setView = _m[1];
     var handleLoading = function (typeLoading, value) {
         setLoadingFlags(function (prevLoadingFlags) {
             var _a;
@@ -122,103 +121,105 @@ var CampaignScheduleContainer = function (_a) {
     };
     (0, react_1.useEffect)(function () {
         var getScheduleGroupsData = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var groupNames, startDate, endDate, campaignId, placeIds, groupBy, pageIndex, pageSize;
+            var groupNames, groupBy, pageIndex, pageSize, params, error_1, error_2;
             var _a;
             return __generator(this, function (_b) {
-                groupNames = (_a = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (item) { return item.grouping; })) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.name; });
-                startDate = filters.startDate, endDate = filters.endDate, campaignId = filters.campaignId, placeIds = filters.placeIds;
-                groupBy = (groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0 ? null : groupNames[0];
-                pageIndex = page.pageIndex;
-                pageSize = page.pageSize;
-                if (groupBy) {
-                    handleLoading('pages', true);
-                    pagingGroupBy((0, moment_1.default)(startDate).startOf('day').format('YYYY-MM-DD'), (0, moment_1.default)(endDate).endOf('day').format('YYYY-MM-DD'), campaignId, groupBy, pageIndex, pageSize, placeIds)
-                        .then(setScheduleGroups)
-                        .catch(function (error) {
-                        console.log(error);
-                        // snackbar("error");
-                    })
-                        .finally(function () {
-                        handleLoading('pages', false);
-                    });
-                }
-                else {
-                    handleLoading('pages', true);
-                    paging((0, moment_1.default)(startDate).startOf('day').format('YYYY-MM-DD'), (0, moment_1.default)(endDate).endOf('day').format('YYYY-MM-DD'), campaignId, pageIndex, pageSize, placeIds)
-                        .then(setScheduleGroups)
-                        .catch(function (error) {
-                        console.log(error);
-                        // snackbar("error");
-                    })
-                        .finally(function () {
-                        handleLoading('pages', false);
-                    });
+                switch (_b.label) {
+                    case 0:
+                        groupNames = (_a = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (item) { return item.grouping; })) === null || _a === void 0 ? void 0 : _a.map(function (item) {
+                            switch (item.name) {
+                                case 'placeCampaign':
+                                    return 'placeId';
+                                case 'domainCampaign':
+                                    return 'domainId';
+                                case 'campaignCampaign':
+                                    return 'campaignId';
+                                default:
+                                    return item.name;
+                            }
+                        });
+                        groupBy = (groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0 ? null : groupNames[0];
+                        pageIndex = page.pageIndex;
+                        pageSize = page.pageSize;
+                        params = __assign(__assign({}, filters), { groupBy: groupBy, pageIndex: pageIndex, pageSize: pageSize });
+                        if (!groupBy) return [3 /*break*/, 5];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, pagingGroupBy(params, setScheduleGroups, handleLoading)];
+                    case 2:
+                        _b.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_1 = _b.sent();
+                        console.log(error_1);
+                        return [3 /*break*/, 4];
+                    case 4: return [3 /*break*/, 8];
+                    case 5:
+                        _b.trys.push([5, 7, , 8]);
+                        return [4 /*yield*/, paging(params, setScheduleGroups, handleLoading)];
+                    case 6:
+                        _b.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
+                        error_2 = _b.sent();
+                        console.log(error_2);
+                        return [3 /*break*/, 8];
+                    case 8: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         }); };
         getScheduleGroupsData();
     }, [page.pageSize, page.pageIndex, view, filters.campaignId]);
     var handleExportExcel = function () {
-        handleLoading('export', true);
-        var startDate = filters.startDate, endDate = filters.endDate, campaignId = filters.campaignId, placeIds = filters.placeIds;
-        var excelName = "AWING_REPORT_TRAFFIC_DISTRIBUTION_".concat(startDate.format('DD-MM-YYYY'), "_TO_").concat(endDate.format('DD-MM-YYYY'));
-        exportExcel((0, moment_1.default)(startDate).startOf('day').format('YYYY-MM-DD'), (0, moment_1.default)(endDate).endOf('day').format('YYYY-MM-DD'), campaignId, placeIds)
-            .then(function (res) {
-            var _a = (0, DataConfig_1.DataSetConfigs)(res, options.campaigns, options.places, t), results = _a.results, mergeConfigs = _a.mergeConfigs;
-            (0, exportFile_1.downloadWithDataSet)(excelName, results, mergeConfigs);
-        })
-            .catch(function (err) {
-            // snackbar("error");
-        })
-            .finally(function () {
-            handleLoading('export', false);
-        });
+        var params = __assign(__assign({}, filters), { options: options });
+        exportExcel(params, typeSystemAXN ? DataConfigAXN_1.DataSetConfigsAXN : DataConfig_1.DataSetConfigs, t);
     };
     var getAllPlaces = function () {
-        handleLoading('places', true);
-        placesPermission()
-            .then(function (res) {
-            setOptions(function (prevState) { return (__assign(__assign({}, prevState), { places: lodash_1.default.keyBy(res, 'placeId') })); });
-        })
-            .catch(function (error) {
-            console.log(error);
-            // snackbar("error");
-        })
-            .finally(function () {
-            handleLoading('places', false);
-        });
+        if (placesPermission) {
+            handleLoading('places', true);
+            placesPermission()
+                .then(function (res) {
+                setOptions(function (prevState) { return (__assign(__assign({}, prevState), { places: lodash_1.default.keyBy(res, 'placeId') })); });
+            })
+                .catch(function (error) {
+                console.log(error);
+                // snackbar("error");
+            })
+                .finally(function () {
+                handleLoading('places', false);
+            });
+        }
     };
     var getAllDomains = function () {
-        handleLoading('domains', true);
-        domains()
-            .then(function (res) {
-            setOptions(function (prevState) { return (__assign(__assign({}, prevState), { domains: lodash_1.default.keyBy(res, 'domainId') })); });
-        })
-            .catch(function (error) {
-            console.log(error);
-            // snackbar("error");
-        })
-            .finally(function () {
-            handleLoading('domains', false);
-        });
+        if (domains) {
+            handleLoading('domains', true);
+            domains()
+                .then(function (res) {
+                setOptions(function (prevState) { return (__assign(__assign({}, prevState), { domains: lodash_1.default.keyBy(res, 'domainId') })); });
+            })
+                .catch(function (error) {
+                console.log(error);
+                // snackbar("error");
+            })
+                .finally(function () {
+                handleLoading('domains', false);
+            });
+        }
     };
-    var fetchCampaignCurrentRun = function () {
-        var startDate = filters.startDate, endDate = filters.endDate;
-        handleLoading('campaigns', true);
-        campaignPlan((0, moment_1.default)(startDate).startOf('day').format('YYYY-MM-DD'), (0, moment_1.default)(endDate).endOf('day').format('YYYY-MM-DD'))
-            .then(function (res) {
-            var listCampaign = res === null || res === void 0 ? void 0 : res.map(function (item) { return (__assign(__assign({}, item.campaign), { isNetwork: item.isNetworkCampaign })); });
-            setOptions(function (prevState) { return (__assign(__assign({}, prevState), { campaigns: lodash_1.default.keyBy(listCampaign, 'id') })); });
-        })
-            .catch(function (err) {
-            console.log(err);
-            // snackbar("error");
-        })
-            .finally(function () {
-            handleLoading('campaigns', false);
+    var fetchCampaignCurrentRun = function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!campaignPlan) return [3 /*break*/, 2];
+                    return [4 /*yield*/, campaignPlan(filters, setOptions)];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2: return [2 /*return*/];
+            }
         });
-    };
+    }); };
     (0, react_1.useEffect)(function () {
         getAllPlaces();
         fetchCampaignCurrentRun();
@@ -315,7 +316,7 @@ var CampaignScheduleContainer = function (_a) {
         ], false), panels.slice(indexMatch + 1), true));
         setPanels(newPanels);
     }
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: t('Schedule.TrafficDistribution') }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: t('Schedule.TrafficDistribution') }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent }), loadingFlags.pages ||
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }), loadingFlags.pages ||
                         loadingFlags.campaigns ||
                         loadingFlags.places ? ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(CircularProgress_1.CircularProgress, {}) })) : ((0, jsx_runtime_1.jsx)(component_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop, scheduleGroups: scheduleGroups, page: page, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, options: options, filters: filters, serviceCampaignSchedule: serviceCampaignSchedule }))] })] }));
 };

package/lib/ACM-AXN/CampaignSchedule/interface.d.ts

@@ -1,10 +1,20 @@
 /// <reference types="react" />
-import moment from "moment";
+import moment from 'moment';
 export interface ICampaignScheduleContainerProps {
     initialFilters: any;
     initialHeadCells: IHeadCells[];
     placeMultiSelectComponent: (p?: any) => JSX.Element;
-    serviceCampaignSchedule: any;
+    serviceCampaignSchedule: {
+        pagingGroupBy: any;
+        paging: any;
+        exportExcel: any;
+        placesPermission?: any;
+        campaignPlan?: any;
+        domains?: any;
+    };
+    typeSystemAXN?: boolean;
+    title: string;
+    disabledCampaignFilter?: boolean;
 }
 export interface ILoadingFlags {
     campaigns?: boolean;
@@ -84,6 +94,7 @@ export interface IFilters {
     startDate: moment.Moment;
     endDate: moment.Moment;
     campaignId: string;
+    domainId?: string;
     placeIds: [];
     groupBy?: string;
 }
@@ -92,7 +103,7 @@ export interface ICampaignSchedulesComponentProps {
     onDragOver: (e: any) => void;
     onDragStart: (e: any) => void;
     onDrop: (e: any, i: any) => void;
-    scheduleGroups: IPagedList_1OfCampaignScheduleGroup;
+    scheduleGroups: any;
     page: {
         pageSize: number;
         pageIndex: number;
@@ -172,6 +183,7 @@ export interface IControlPanelProps {
     panels: IHeadCells[];
     loadingFlags: ILoadingFlags;
     placeMultiSelectComponent: (p?: any) => JSX.Element;
+    disabledCampaignFilter?: boolean;
 }
 export interface IGroupPanelProps {
     unGroupField: any;
@@ -186,6 +198,7 @@ export interface IFiltersProps {
     loadingFlags: ILoadingFlags;
     placeMultiSelectComponent: (p?: any) => JSX.Element;
     handleExportExcel: () => void;
+    disabledCampaignFilter?: boolean;
 }
 export interface IOptions {
     campaigns: any;

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/DomainDirectory/index.js

@@ -83,7 +83,6 @@ function DomainDirectory(props) {
                 case 1:
                     res = _a.sent();
                     convertedData = (0, function_1.convertData)(res);
-                    console.log({ convertedData: convertedData });
                     return [2 /*return*/, convertedData[0]];
             }
         });

package/lib/ACM-AXN/Directory/MenuDirectory/MenuDirectory.test.d.ts

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

package/lib/ACM-AXN/Directory/MenuDirectory/MenuDirectory.test.js

@@ -0,0 +1,90 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("@testing-library/react");
+var _1 = __importDefault(require("."));
+var react_router_dom_1 = require("react-router-dom");
+var Context_1 = __importDefault(require("../../../Context"));
+describe('MenuDirectory', function () {
+    var mockGetData = jest.fn();
+    var menusGetAll = function (id, deepLevel) {
+        mockGetData(id, deepLevel);
+        return new Promise(function (resolve) {
+            resolve([
+                {
+                    parentMenuId: '-1',
+                    name: 'root',
+                    order: 0,
+                    menuId: '0',
+                    menuPath: '.0.',
+                    level: 0,
+                    description: null,
+                },
+            ]);
+        });
+    };
+    it('renders the component', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var loading;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    (0, react_1.render)((0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Context_1.default.Provider, { value: {
+                                routes: [],
+                                i18next: {},
+                                service: { menusGetAll: menusGetAll },
+                                appHelper: {},
+                            }, children: (0, jsx_runtime_1.jsx)(_1.default, {}) }) }));
+                    loading = react_1.screen.getByRole('progressbar');
+                    expect(loading).toBeInTheDocument();
+                    // wait for the loading folder
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            var folder = react_1.screen.getByText('root');
+                            expect(folder).toBeInTheDocument();
+                        })];
+                case 1:
+                    // wait for the loading folder
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/lib/ACM-AXN/Directory/MenuDirectory/index.js

@@ -49,13 +49,12 @@ var Constant_1 = __importDefault(require("../Constant"));
 var react_router_dom_1 = require("react-router-dom");
 var Context_1 = __importDefault(require("../../../Context"));
 var react_i18next_1 = require("react-i18next");
-var uniq = require('lodash/uniq');
 function MenuDirectory() {
     var _this = this;
     var _a = (0, react_1.useContext)(Context_1.default), service = _a.service, i18next = _a.i18next;
-    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18next }).t;
+    var _b = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18next }), t = _b.t, i18n = _b.i18n;
     var navigate = (0, react_router_dom_1.useNavigate)();
-    var _b = (0, react_1.useState)(), data = _b[0], setData = _b[1];
+    var _c = (0, react_1.useState)(), data = _c[0], setData = _c[1];
     (0, react_1.useEffect)(function () {
         // Call API to get data
         handleFetchData();
@@ -86,14 +85,14 @@ function MenuDirectory() {
     }); };
     var handleGetMoreData = function (nodeId) { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            console.log(nodeId);
             return [2 /*return*/];
         });
     }); };
-    if (!data) {
+    var translateData = (0, function_1.translateMenu)(data, i18n, t);
+    if (!translateData) {
         return (0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {});
     }
-    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, spacing: 2, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.Paper, { style: { padding: '8px' }, children: (0, jsx_runtime_1.jsx)(AWING_1.HierarchyTree, { data: data, hideSelectCheckbox: true, onGetMoreData: handleGetMoreData, actionComponentProps: {
+    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, spacing: 2, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.Paper, { style: { padding: '8px' }, children: (0, jsx_runtime_1.jsx)(AWING_1.HierarchyTree, { data: translateData, hideSelectCheckbox: true, onGetMoreData: handleGetMoreData, actionComponentProps: {
                         actions: [
                             {
                                 icon: ((0, jsx_runtime_1.jsx)(icons_material_1.Settings, { fontSize: "small", color: "action" })),

package/lib/ACM-AXN/Directory/SystemDirectory/index.js

@@ -63,10 +63,10 @@ function SystemDirectory(props) {
     var _this = this;
     var rootDirectoryId = props.rootDirectoryId;
     var _a = (0, react_1.useContext)(Context_1.default), service = _a.service, i18next = _a.i18next;
-    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18next }).t;
+    var _b = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18next }), t = _b.t, i18n = _b.i18n;
     var navigate = (0, react_router_dom_1.useNavigate)();
-    var _b = (0, react_1.useState)(), data = _b[0], setData = _b[1];
-    var _c = (0, react_1.useState)([]), idCalled = _c[0], setIdCalled = _c[1];
+    var _c = (0, react_1.useState)(), data = _c[0], setData = _c[1];
+    var _d = (0, react_1.useState)([]), idCalled = _d[0], setIdCalled = _d[1];
     (0, react_1.useEffect)(function () {
         // Call API to get data
         handleFetchData();
@@ -116,10 +116,11 @@ function SystemDirectory(props) {
             }
         });
     }); };
-    if (!data) {
+    var translateData = (0, function_1.translateMenu)(data, i18n, t);
+    if (!translateData) {
         return (0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {});
     }
-    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, spacing: 2, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.Paper, { style: { padding: '8px' }, children: (0, jsx_runtime_1.jsx)(AWING_1.HierarchyTree, { data: data, hideSelectCheckbox: true, onGetMoreData: handleGetMoreData, actionComponentProps: {
+    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, spacing: 2, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.Paper, { style: { padding: '8px' }, children: (0, jsx_runtime_1.jsx)(AWING_1.HierarchyTree, { data: translateData, hideSelectCheckbox: true, onGetMoreData: handleGetMoreData, actionComponentProps: {
                         actions: [
                             {
                                 icon: ((0, jsx_runtime_1.jsx)(icons_material_1.Settings, { fontSize: "small", color: "action" })),

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