awing-library 2.1.15 → 2.1.16

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabInfomation.js

@@ -47,6 +47,7 @@ var recoil_1 = require("recoil");
 var AWING_1 = require("../../../AWING");
 var Recoils_1 = require("./Recoils");
 var Hooks_1 = __importDefault(require("../Hooks"));
+var i18n_1 = __importDefault(require("../../../i18n"));
 var Infomation = function () {
     var service = (0, Hooks_1.default)().service;
     var directories = (0, recoil_1.useRecoilValue)(Recoils_1.directoriesState);
@@ -54,7 +55,7 @@ var Infomation = function () {
     var _a = (0, recoil_1.useRecoilState)(Recoils_1.campaignState), campaign = _a[0], setCampaign = _a[1];
     var _b = (0, recoil_1.useRecoilState)(Recoils_1.campaignAttributesState), campaignAttributes = _b[0], setCampaignAttributes = _b[1];
     var setCampaignModel = (0, recoil_1.useSetRecoilState)(Recoils_1.campaignModelState);
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     (0, react_1.useEffect)(function () {
         if (!campaign.directoryId) {
             setCampaignModel((0, immer_1.default)(function (draft) {

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AdList.js

@@ -232,13 +232,13 @@ function AdList(props) {
     /**
      * Hàm khi xem preview
      */
-    var handlePreview = function (e, ad, doaminId) {
+    var handlePreview = function (e, ad, domainId) {
         e.stopPropagation();
-        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=false");
+        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=").concat(Boolean(service.domainsGetAll).toString());
         if (ad.welcomeId.length)
             url += "&welcomeId=".concat(ad.welcomeId);
-        if (doaminId)
-            url += "&doaminId=".concat(doaminId);
+        if (domainId)
+            url += "&domainId=".concat(domainId);
         window.open(url, '_blank');
     };
     var handlePreviewPage = function (e, ad) {

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.js

@@ -86,7 +86,7 @@ var Filters = function (_a) {
         handleFilters('startDate', value.startDate);
         handleFilters('endDate', value.endDate);
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: disabledCampaignFilter !== null && disabledCampaignFilter !== void 0 ? disabledCampaignFilter : true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
                         fullWidth: true,
                         className: classes.outlinedInput,
                     }, isDayBlocked: function (day) {

package/lib/ACM-AXN/CampaignSchedule/Components/RowAdvance/component.js

@@ -118,7 +118,7 @@ var RowAdvanceComponent = function (_a) {
     return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.TableRow, { className: "".concat((groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0
                 ? classes.styledNormalRow
                 : styledRow(priorityGroupLevel), " ").concat(classes.styledCommonRow), onClick: handleOnClick, children: headCells === null || headCells === void 0 ? void 0 : headCells.map(function (item, index) {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
                 switch (item.name) {
                     case Enum_1.HEAD_CELL_NAMES.CONTROL:
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", colSpan: colSpanFirstCell, className: item.id === Enum_1.HEAD_CELL_IDS.CONTROL
@@ -134,7 +134,10 @@ var RowAdvanceComponent = function (_a) {
                                 groupNames
                                     .slice(0, priorityGroupLevel - 1)
                                     .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((_b = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.placeId]) === null || _b === void 0 ? void 0 : _b.name) ||
-                                        (row === null || row === void 0 ? void 0 : row.totalPlace) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                        ((row === null || row === void 0 ? void 0 : row.totalPlace) !==
+                                            0
+                                            ? row === null || row === void 0 ? void 0 : row.totalPlace
+                                            : '') })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
                                 Enum_1.HEAD_CELL_NAMES.CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: (0, jsx_runtime_1.jsx)(CampaignLabel, { campaignId: row === null || row === void 0 ? void 0 : row.groupKeyId, campaigns: options === null || options === void 0 ? void 0 : options.campaigns, classes: classes }) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
@@ -158,32 +161,59 @@ var RowAdvanceComponent = function (_a) {
                     case Enum_1.HEAD_CELL_NAMES.TOTAL:
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: totalView }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.IMPRESSION:
-                        return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: row === null || row === void 0 ? void 0 : row.view }, item.id));
+                        return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "center", children: row === null || row === void 0 ? void 0 : row.view }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.FINAL_CLICK:
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: row === null || row === void 0 ? void 0 : row.click }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.CTR:
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: ctr }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: (_e = row === null || row === void 0 ? void 0 : row.campaign) === null || _e === void 0 ? void 0 : _e.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
+                                Enum_1.HEAD_CELL_NAMES.CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: ((_e = row === null || row === void 0 ? void 0 : row.campaign) === null || _e === void 0 ? void 0 : _e.name) !== ''
+                                    ? (_f = row === null || row === void 0 ? void 0 : row.campaign) === null || _f === void 0 ? void 0 : _f.name
+                                    : ((_g = row === null || row === void 0 ? void 0 : row.campaign) === null || _g === void 0 ? void 0 : _g.campaignId) !==
+                                        '0'
+                                        ? (_h = row === null || row === void 0 ? void 0 : row.campaign) === null || _h === void 0 ? void 0 : _h.campaignId
+                                        : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.CAMPAIGN) === -1 ? ( // Nếu fieldGroup có index < thằng groupKeyName hiện tại thì hiển thị total hoac name ngược lại phải thụt đầu dòng
-                                (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: (_f = row === null || row === void 0 ? void 0 : row.campaign) === null || _f === void 0 ? void 0 : _f.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN) === -1 ? ( // Nếu fieldGroup có index < thằng groupKeyName hiện tại thì hiển thị total hoac name ngược lại phải thụt đầu dòng
+                                (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: ((_j = row === null || row === void 0 ? void 0 : row.campaign) === null || _j === void 0 ? void 0 : _j.name) !== ''
+                                        ? (_k = row === null || row === void 0 ? void 0 : row.campaign) === null || _k === void 0 ? void 0 : _k.name
+                                        : ((_l = row === null || row === void 0 ? void 0 : row.campaign) === null || _l === void 0 ? void 0 : _l.campaignId) !==
+                                            '0'
+                                            ? (_m = row === null || row === void 0 ? void 0 : row.campaign) === null || _m === void 0 ? void 0 : _m.campaignId
+                                            : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_g = row === null || row === void 0 ? void 0 : row.domain) === null || _g === void 0 ? void 0 : _g.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
+                                Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_o = row === null || row === void 0 ? void 0 : row.domain) === null || _o === void 0 ? void 0 : _o.name) !== ''
+                                    ? (_p = row === null || row === void 0 ? void 0 : row.domain) === null || _p === void 0 ? void 0 : _p.name
+                                    : ((_q = row === null || row === void 0 ? void 0 : row.domain) === null || _q === void 0 ? void 0 : _q.domainId) !== '0'
+                                        ? (_r = row === null || row === void 0 ? void 0 : row.domain) === null || _r === void 0 ? void 0 : _r.domainId
+                                        : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_h = row === null || row === void 0 ? void 0 : row.domain) === null || _h === void 0 ? void 0 : _h.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_s = row === null || row === void 0 ? void 0 : row.domain) === null || _s === void 0 ? void 0 : _s.name) !== ''
+                                        ? (_t = row === null || row === void 0 ? void 0 : row.domain) === null || _t === void 0 ? void 0 : _t.name
+                                        : ((_u = row === null || row === void 0 ? void 0 : row.domain) === null || _u === void 0 ? void 0 : _u.domainId) !== '0'
+                                            ? (_v = row === null || row === void 0 ? void 0 : row.domain) === null || _v === void 0 ? void 0 : _v.domainId
+                                            : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_j = row === null || row === void 0 ? void 0 : row.place) === null || _j === void 0 ? void 0 : _j.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
+                                Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((_w = row === null || row === void 0 ? void 0 : row.place) === null || _w === void 0 ? void 0 : _w.name) !== ''
+                                    ? (_x = row === null || row === void 0 ? void 0 : row.place) === null || _x === void 0 ? void 0 : _x.name
+                                    : ((_y = row === null || row === void 0 ? void 0 : row.place) === null || _y === void 0 ? void 0 : _y.placeId) !== '0'
+                                        ? (_z = row === null || row === void 0 ? void 0 : row.place) === null || _z === void 0 ? void 0 : _z.placeId
+                                        : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
                                 // Nếu field hiện tại ko phải groupName đang showOn thì 3Th
                                 // TH1: field nằm trong groupNames nhưng đúng trước fieldNameShowOn hiển thị name
                                 // TH2: field nằm sau fieldNameShowOn trong groupNames hiển thi total
                                 // Th3: field ko trong groupNames hiển thị total hoặ thông tin schedule nếu nó là cấp cuối cùng
                                 groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_k = row === null || row === void 0 ? void 0 : row.place) === null || _k === void 0 ? void 0 : _k.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((_0 = row === null || row === void 0 ? void 0 : row.place) === null || _0 === void 0 ? void 0 : _0.name) !== ''
+                                        ? (_1 = row === null || row === void 0 ? void 0 : row.place) === null || _1 === void 0 ? void 0 : _1.name
+                                        : ((_2 = row === null || row === void 0 ? void 0 : row.place) === null || _2 === void 0 ? void 0 : _2.placeId) !==
+                                            '0'
+                                            ? (_3 = row === null || row === void 0 ? void 0 : row.place) === null || _3 === void 0 ? void 0 : _3.placeId
+                                            : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     default:
                         return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
                 }

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

@@ -196,7 +196,8 @@ var RowAdvanceContainer = function (_a) {
         ? true
         : priorityGroupLevel === (groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) + 1;
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(component_1.default, { stt: stt, row: row, options: options, headCells: headCells, priorityGroupLevel: priorityGroupLevel, groupNames: groupNames, handleOnClick: function () {
-                    headCells.length > 6
+                    headCells.length > 6 &&
+                        headCells[3].id === Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN
                         ? handleOnClickCampaignStatistic(row)
                         : handleOnClick(row);
                 }, open: open, expandDisabled: expandDisabled }), open && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (loadingPage === null || loadingPage === void 0 ? void 0 : loadingPage.pages) ? ((0, jsx_runtime_1.jsx)(material_1.TableRow, { children: (0, jsx_runtime_1.jsx)(material_1.TableCell, { colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, children: (0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {}) }) })) : ((0, jsx_runtime_1.jsx)(EnhancedPagination_1.default, { pageSize: pages === null || pages === void 0 ? void 0 : pages.pageSize, pageIndex: pages === null || pages === void 0 ? void 0 : pages.pageIndex, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, className: "".concat(classes.pagination, " ").concat((groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0

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

@@ -1,3 +1,3 @@
-import { ICampaignSchedulesComponentProps } from "./interface";
-declare const CampaignSchedulesComponent: ({ headCells, onDragOver, onDragStart, onDrop, scheduleGroups, page, handleChangePage, handleChangeRowsPerPage, filters, options, serviceCampaignSchedule }: ICampaignSchedulesComponentProps) => import("react/jsx-runtime").JSX.Element;
+import { ICampaignSchedulesComponentProps } from './interface';
+declare const CampaignSchedulesComponent: ({ headCells, onDragOver, onDragStart, onDrop, scheduleGroups, page, handleChangePage, handleChangeRowsPerPage, filters, options, serviceCampaignSchedule, }: ICampaignSchedulesComponentProps) => import("react/jsx-runtime").JSX.Element;
 export default CampaignSchedulesComponent;

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

@@ -15,22 +15,22 @@ var TableHeaderDragable_1 = __importDefault(require("./Components/TableHeaderDra
 var Enum_1 = require("./Enum");
 var useStyles = (0, styles_1.makeStyles)(function () { return ({
     root: {
-        width: "100%",
+        width: '100%',
     },
     paper: {
-        width: "100%",
-        marginBottom: "1rem",
-        boxShadow: "none",
+        width: '100%',
+        marginBottom: '1rem',
+        boxShadow: 'none',
     },
     wrapper: {
-        boxShadow: "0px 2px 1px -1px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%)",
-        borderRadius: "4px",
+        boxShadow: '0px 2px 1px -1px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%)',
+        borderRadius: '4px',
     },
     pagination: {
-        "&.MuiTablePagination-root": {
+        '&.MuiTablePagination-root': {
             // borderBottom: '1px solid #a3a3a345',
-            borderTop: "1px solid #a3a3a345",
-            width: "100%",
+            borderTop: '1px solid #a3a3a345',
+            width: '100%',
         },
     },
     primaryPaginations: {
@@ -48,7 +48,9 @@ var CampaignSchedulesComponent = function (_a) {
     var headCells = _a.headCells, onDragOver = _a.onDragOver, onDragStart = _a.onDragStart, onDrop = _a.onDrop, scheduleGroups = _a.scheduleGroups, page = _a.page, handleChangePage = _a.handleChangePage, handleChangeRowsPerPage = _a.handleChangeRowsPerPage, filters = _a.filters, options = _a.options, serviceCampaignSchedule = _a.serviceCampaignSchedule;
     var classes = useStyles();
     var groupLength = (_c = (_b = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (cell) { return cell.grouping; })) === null || _b === void 0 ? void 0 : _b.map(function (item) { return item.name; })) === null || _c === void 0 ? void 0 : _c.length;
-    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Table, { "aria-label": "Table-advance", children: [(0, jsx_runtime_1.jsx)(TableHeaderDragable_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: (0, jsx_runtime_1.jsx)(EnhancedPagination_1.default, { total: (scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.totalItemCount) ? scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.totalItemCount : scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.total, pageSize: page === null || page === void 0 ? void 0 : page.pageSize, pageIndex: page === null || page === void 0 ? void 0 : page.pageIndex, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, className: "".concat(classes.pagination, " ").concat(groupLength === 0
+    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Table, { "aria-label": "Table-advance", children: [(0, jsx_runtime_1.jsx)(TableHeaderDragable_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: (0, jsx_runtime_1.jsx)(EnhancedPagination_1.default, { total: (scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.total)
+                            ? scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.total
+                            : scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.totalItemCount, pageSize: page === null || page === void 0 ? void 0 : page.pageSize, pageIndex: page === null || page === void 0 ? void 0 : page.pageIndex, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, className: "".concat(classes.pagination, " ").concat(groupLength === 0
                             ? classes.nomarlPaginations
                             : groupLength === 1
                                 ? classes.secondaryPaginations
@@ -56,8 +58,8 @@ var CampaignSchedulesComponent = function (_a) {
                             var _a;
                             var groupNames = (_a = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (cell) { return cell.grouping; })) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.name; });
                             var filterBy = {
-                                startDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.startDate).format("YYYY-MM-DD"),
-                                endDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.endDate).format("YYYY-MM-DD"),
+                                startDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.startDate).format('YYYY-MM-DD'),
+                                endDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.endDate).format('YYYY-MM-DD'),
                                 campaignId: filters === null || filters === void 0 ? void 0 : filters.campaignId,
                                 placeIds: filters === null || filters === void 0 ? void 0 : filters.placeIds,
                                 domainId: filters === null || filters === void 0 ? void 0 : filters.domainId,

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

@@ -74,6 +74,7 @@ describe('DomainDirectory', function () {
                                 i18next: {},
                                 service: { directoriesGetAll: directoriesGetAll },
                                 appHelper: {},
+                                transactionType: {},
                             }, children: (0, jsx_runtime_1.jsx)(_1.default, { rootDirectoryId: '0' }) }) }));
                     loading = react_1.screen.getByRole('progressbar');
                     expect(loading).toBeInTheDocument();

package/lib/ACM-AXN/Directory/DomainDirectory/FolderDetail.test.js

@@ -22,6 +22,7 @@ describe('DomainDirectory', function () {
                     service: { directoriesGetChildDirectories: directoriesGetChildDirectories },
                     appHelper: {},
                     i18next: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(FolderDetail_1.default, { parentId: '0' }) }) }));
         var loading = react_1.screen.getByText('Common.NoData');
         expect(loading).toBeInTheDocument();

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

@@ -72,6 +72,7 @@ describe('MenuDirectory', function () {
                                 i18next: {},
                                 service: { menusGetAll: menusGetAll },
                                 appHelper: {},
+                                transactionType: {},
                             }, children: (0, jsx_runtime_1.jsx)(_1.default, {}) }) }));
                     loading = react_1.screen.getByRole('progressbar');
                     expect(loading).toBeInTheDocument();

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

@@ -74,6 +74,7 @@ describe('SystemDirectory', function () {
                                 i18next: {},
                                 service: { systemDirectoriesGetAll: systemDirectoriesGetAll },
                                 appHelper: {},
+                                transactionType: {},
                             }, children: (0, jsx_runtime_1.jsx)(_1.default, { rootDirectoryId: '0' }) }) }));
                     loading = react_1.screen.getByRole('progressbar');
                     expect(loading).toBeInTheDocument();

package/lib/ACM-AXN/Directory/components/CreateOrEditFolder.test.js

@@ -53,6 +53,7 @@ describe('CreateOrEditFolder', function () {
                     },
                     appHelper: {},
                     i18next: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(CreateOrEditFolder_1.default, { updateDirectory: mockUpdateDirectory }) }) }));
         var loading = react_1.screen.getByText('Common.Loading');
         expect(loading).toBeInTheDocument();

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

@@ -66,6 +66,7 @@ describe('AddAuthen', function () {
                     service: { usersGet: usersGet, groupsGetAll: groupsGetAll },
                     appHelper: {},
                     i18next: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(AddAuthen_1.default, { oldSelected: [], onSubmit: mockSubmit }) }) }));
         expect(mockGetUser.mock.calls.length).toEqual(1);
         expect(mockGetGroup.mock.calls.length).toEqual(1);
@@ -80,6 +81,7 @@ describe('AddAuthen', function () {
                                 service: { usersGet: usersGet, groupsGetAll: groupsGetAll },
                                 appHelper: {},
                                 i18next: {},
+                                transactionType: {},
                             }, children: (0, jsx_runtime_1.jsx)(AddAuthen_1.default, { oldSelected: [], onSubmit: mockSubmit }) }) }));
                     buttonClose = react_1.screen.getByRole('button', { name: 'Close' });
                     buttonSave = react_1.screen.getByRole('button', { name: 'Common.Save' });

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

@@ -91,6 +91,7 @@ describe('CreateOrEditPermission', function () {
                             systemDirectoryPermissionPut: systemDirectoryPermissionPut,
                         },
                         appHelper: {},
+                        transactionType: {},
                     }, children: (0, jsx_runtime_1.jsx)(CreateOrEditPermission_1.default, {}) }) }));
             expect(react_1.screen.getByText('UserOrGroup')).toBeInTheDocument();
             expect(react_1.screen.getByText('SetPermission')).toBeInTheDocument();
@@ -108,6 +109,7 @@ describe('CreateOrEditPermission', function () {
                         systemDirectoryPermissionPut: systemDirectoryPermissionPut,
                     },
                     appHelper: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(CreateOrEditPermission_1.default, { isSystemDirectory: true }) }) }));
         expect(react_1.screen.getByText('UserOrGroup')).toBeInTheDocument();
         expect(react_1.screen.getByText('SetPermission')).toBeInTheDocument();

package/lib/ACM-AXN/Directory/components/Permission/ManagementPermission.test.js

@@ -48,6 +48,7 @@ describe('Management', function () {
                         systemDirectoriesGet: systemDirectoriesGet,
                     },
                     appHelper: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(Management_1.default, {}) }) }));
         expect(react_1.screen.getByText('Directory.ObjectPermission')).toBeInTheDocument();
     });
@@ -62,6 +63,7 @@ describe('Management', function () {
                         systemDirectoriesGet: systemDirectoriesGet,
                     },
                     appHelper: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(Management_1.default, {}) }) }));
         expect(mockDirectoryGet).toHaveBeenCalled();
     });
@@ -76,6 +78,7 @@ describe('Management', function () {
                         systemDirectoriesGet: systemDirectoriesGet,
                     },
                     appHelper: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(Management_1.default, { isSystemDirectory: true }) }) }));
         expect(mockDirectoryGet).not.toHaveBeenCalled();
         expect(mockSystemDirectoryGet).toHaveBeenCalled();

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

@@ -62,6 +62,7 @@ describe('Menu Management', function () {
                         menuPermissionPut: menuPermissionPut,
                     },
                     appHelper: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(MenuPermissionManagement_1.default, {}) }) }));
         expect(react_1.screen.getByText('Directory.ObjectPermission')).toBeInTheDocument();
     });
@@ -78,6 +79,7 @@ describe('Menu Management', function () {
                         menuPermissionPut: menuPermissionPut,
                     },
                     appHelper: {},
+                    transactionType: {},
                 }, children: (0, jsx_runtime_1.jsx)(MenuPermissionManagement_1.default, {}) }) }));
         expect(mockGetMenu).toHaveBeenCalled();
         expect(mockUsersGet).toHaveBeenCalled();

package/lib/ACM-AXN/GroupUser/CreateOrEdit.js

@@ -10,6 +10,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,18 +34,18 @@ var SearchUser_1 = __importDefault(require("./User/SearchUser"));
 var Hooks_1 = __importDefault(require("./Hooks"));
 var Constants_1 = require("../../ACM-AXN/User/Constants");
 var CreateOrEdit = function () {
-    var _a;
+    var _a, _b;
     var groupId = (0, Router_1.useParams)().groupId;
     var t = (0, react_i18next_1.useTranslation)().t;
     var service = (0, Hooks_1.default)().service;
-    var _b = (0, react_1.useState)(false), confirmExit = _b[0], setConfirmExit = _b[1];
-    var _c = (0, react_1.useState)(false), isValid = _c[0], setValid = _c[1];
-    var _d = (0, react_1.useState)([]), users = _d[0], setUsers = _d[1];
-    var _e = (0, react_1.useState)({
+    var _c = (0, react_1.useState)(false), confirmExit = _c[0], setConfirmExit = _c[1];
+    var _d = (0, react_1.useState)(false), isValid = _d[0], setValid = _d[1];
+    var _e = (0, react_1.useState)([]), users = _e[0], setUsers = _e[1];
+    var _f = (0, react_1.useState)({
         userIds: [],
         group: { name: '', description: '' },
-    }), businessUnitdata = _e[0], setBusinessUnitData = _e[1];
-    var _f = (0, react_1.useState)(true), loading = _f[0], setloading = _f[1];
+    }), businessUnitdata = _f[0], setBusinessUnitData = _f[1];
+    var _g = (0, react_1.useState)(true), loading = _g[0], setloading = _g[1];
     (0, react_1.useEffect)(function () {
         setloading(true);
         Promise.all([
@@ -56,13 +65,19 @@ var CreateOrEdit = function () {
             return (__assign(__assign({}, prev), { group: __assign(__assign({}, prev === null || prev === void 0 ? void 0 : prev.group), obj) }));
         });
     }, []);
+    var handleUpdateUser = (0, react_1.useCallback)(function (userIds) {
+        setConfirmExit(true);
+        setBusinessUnitData(function (prev) {
+            return Array.isArray(userIds) ? (__assign(__assign({}, prev), { userIds: userIds })) : userIds(prev);
+        });
+    }, []);
     var handleSubmit = (0, react_1.useCallback)(function () {
         if (groupId) {
             return service.groupsPut(groupId, businessUnitdata);
         }
         return service.groupsPost(businessUnitdata);
     }, [businessUnitdata, service, groupId]);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['UserGroup', groupId ? 'Edit' : 'Create'].join('.'))).concat(groupId ? ": ".concat((_a = businessUnitdata.group) === null || _a === void 0 ? void 0 : _a.name) : '', "\n                   "), onSubmit: handleSubmit, isLoadingButtonSubmit: false, disableButtonSubmit: !isValid, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: loading ? ((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.DataForm, { caption: t('UserGroup.TitleUserGroupInfo'), fields: [
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['UserGroup', groupId ? 'Edit' : 'Create'].join('.'))).concat(groupId ? ": ".concat((_a = businessUnitdata.group) === null || _a === void 0 ? void 0 : _a.name) : '', "\n                   "), onSubmit: handleSubmit, isLoadingButtonSubmit: false, disableButtonSubmit: !(isValid && ((_b = businessUnitdata.group) === null || _b === void 0 ? void 0 : _b.name)), confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: loading ? ((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.DataForm, { caption: t('UserGroup.TitleUserGroupInfo'), fields: [
                                 {
                                     fieldName: 'name',
                                     type: 'text',
@@ -76,16 +91,9 @@ var CreateOrEdit = function () {
                                     onValidate: function () { return true; },
                                 },
                             ], oldValue: businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.group, onUpdate: handleUpdate }), (0, jsx_runtime_1.jsx)(UserComponent_1.default, { rows: users.filter(function (user) { var _a; return (_a = businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.userIds) === null || _a === void 0 ? void 0 : _a.includes(user.userId); }), onChangeAddUser: function (userIds) {
-                                setBusinessUnitData(function (prev) { return (__assign(__assign({}, prev), { userIds: userIds })); });
+                                handleUpdateUser(function (prev) { return (__assign(__assign({}, prev), { userIds: userIds })); });
                             } })] })) }), (0, jsx_runtime_1.jsx)(Router_1.Routes, { children: (0, jsx_runtime_1.jsx)(Router_1.Route, { path: Constants_1.ADD_USER_TO_GROUP, element: (0, jsx_runtime_1.jsx)(SearchUser_1.default, { onChangeAddUser: function (userIds) {
-                            setBusinessUnitData(function (prev) {
-                                console.log('prev', prev);
-                                // return {
-                                //     ...prev,
-                                //     userIds: [...prev.userIds, ...userIds],
-                                // }
-                                return prev;
-                            });
+                            handleUpdateUser(function (prev) { return (__assign(__assign({}, prev), { userIds: __spreadArray(__spreadArray([], (prev.userIds || []), true), userIds, true) })); });
                         }, listUserId: (businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.userIds) || [], users: users }) }, Constants_1.ADD_USER_TO_GROUP) })] }));
 };
 exports.default = CreateOrEdit;

package/lib/ACM-AXN/GroupUser/User/UserComponent.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" />
 import { DataObject } from '../../../AWING';
+import { IGroupModel } from '../Types';
 interface UserComponentProps {
     rows: DataObject[];
-    onChangeAddUser: (ids: string[]) => void;
+    onChangeAddUser: (ids: IGroupModel['userIds']) => void;
 }
 declare const UserComponent: React.FC<UserComponentProps>;
 export default UserComponent;

package/lib/ACM-AXN/GroupUser/User/UserComponent.js

@@ -12,18 +12,24 @@ var Constants_1 = require("../../../ACM-AXN/User/Constants");
 var UserComponent = function (_a) {
     var rows = _a.rows, onChangeAddUser = _a.onChangeAddUser;
     var t = (0, react_i18next_1.useTranslation)().t;
-    var _b = (0, react_1.useTransition)(), startTransition = _b[1];
     var appHelper = (0, Context_1.useAwing)().appHelper;
+    var _b = (0, react_1.useTransition)(), startTransition = _b[1];
     var _c = (0, react_1.useState)([]), gridUser = _c[0], setGridUser = _c[1];
-    var _d = (0, react_1.useState)({
+    var _d = (0, react_1.useState)(true), trigger = _d[0], setTrigger = _d[1];
+    var _e = (0, react_1.useState)({
         pageIndex: 0,
         pageSize: 10,
-    }), queryParams = _d[0], setQueryParams = _d[1];
+    }), queryParams = _e[0], setQueryParams = _e[1];
     (0, react_1.useLayoutEffect)(function () {
-        setGridUser(rows);
-    }, [rows]);
+        if (trigger) {
+            setGridUser(rows);
+            setTrigger(false);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     var handleDelete = function (id) {
         startTransition(function () {
+            setTrigger(true);
             onChangeAddUser(rows
                 .filter(function (item) { return item.userId !== id; })
                 .map(function (item) { return item.userId; }));

package/lib/ACM-AXN/Notifications/NotificationDetail/NotificationList/NotificationItem/Message.d.ts

@@ -3,8 +3,9 @@
  * @author dauquan1108@gmail.com on 11/27/2023.
  *
  **/
-import { NotificationMessageField, SagaTransactionType } from '../../../Types';
-export declare const getFullDescription: (type: SagaTransactionType, translation: any, fields: NotificationMessageField[]) => {
+import { NotificationMessageField } from '../../../Types';
+import { SagaTransactionType } from '../../../../../ACM-AXN/TransactionLog/Types';
+export declare const getFullDescription: (type: SagaTransactionType[string], translation: any, fields: NotificationMessageField[], transactionType: SagaTransactionType) => {
     title: import("react/jsx-runtime").JSX.Element;
     url: string;
 };