awing-library 2.1.106-beta → 2.1.107-beta

package/lib/ACM-AXN/Campaign/Container.js

@@ -241,7 +241,7 @@ var CampaignContainer = function () {
                                             color: '#000',
                                             fontSize: '1.1rem',
                                             marginLeft: '8px',
-                                            fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2"',
+                                            fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2" !important',
                                         }, children: (0, Utils_1.getCampaignPriority)(row === null || row === void 0 ? void 0 : row.campaignGroup.priority) }), 
                                     //Check trong ads có bất kỳ ad nào isReverved
                                     (row === null || row === void 0 ? void 0 : row.campaignGroup.isReserved) && ((0, jsx_runtime_1.jsx)(material_1.Chip, { sx: {

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

@@ -67,24 +67,24 @@ function AdList(props) {
     var onCreate = props.onCreate, onChange = props.onChange, onDelete = props.onDelete, onAdsValidChange = props.onAdsValidChange;
     var t = (0, react_i18next_1.useTranslation)().t;
     var _a = (0, Context_1.useAwing)().appHelper, confirm = _a.confirm, alert = _a.alert;
-    var service = (0, Hooks_1.default)().service;
+    var _b = (0, Hooks_1.default)(), service = _b.service, defaultDomainId = _b.domainId;
     var ads = (0, recoil_1.useRecoilValue)(atoms_1.adListState);
-    var _b = (0, recoil_1.useRecoilState)(atoms_1.adSelectedState), adSelected = _b[0], setAdSelected = _b[1];
-    var _c = (0, recoil_1.useRecoilState)(atoms_1.adOpenState), adOpen = _c[0], setAdOpen = _c[1];
+    var _c = (0, recoil_1.useRecoilState)(atoms_1.adSelectedState), adSelected = _c[0], setAdSelected = _c[1];
+    var _d = (0, recoil_1.useRecoilState)(atoms_1.adOpenState), adOpen = _d[0], setAdOpen = _d[1];
     var copiedAd = (0, recoil_1.useRecoilValue)(atoms_1.copiedAdState);
     var hasClassC = (0, recoil_1.useRecoilValue)((0, atoms_1.checkGroupsClassCState)(adSelected.map(function (x) { return x.subCampaignId; })));
-    var _d = (0, react_1.useState)({
+    var _e = (0, react_1.useState)({
         welcomeId: '',
         loginId: '',
         domainIds: [],
-    }), previewId = _d[0], setPreviewId = _d[1];
-    var _e = react_1.default.useState(), anchorEl = _e[0], setAnchorEl = _e[1];
+    }), previewId = _e[0], setPreviewId = _e[1];
+    var _f = react_1.default.useState(), anchorEl = _f[0], setAnchorEl = _f[1];
     var open = Boolean(anchorEl);
     // valid theo cấu trúc { [campaignGroupId]: { [adId]: boolean } }
-    var _f = (0, react_1.useState)({}), adsValid = _f[0], setAdsValid = _f[1];
-    var _g = (0, react_1.useState)(false), isAdvancedDrawerOpen = _g[0], setIsAdvancedDrawerOpen = _g[1];
-    var _h = (0, recoil_1.useRecoilState)(Recoils_1.weightState), weightProps = _h[0], setWeightState = _h[1];
-    var _j = (0, react_1.useState)(false), isMultiEditDrawerOpen = _j[0], setIsMultiEditDrawerOpen = _j[1];
+    var _g = (0, react_1.useState)({}), adsValid = _g[0], setAdsValid = _g[1];
+    var _h = (0, react_1.useState)(false), isAdvancedDrawerOpen = _h[0], setIsAdvancedDrawerOpen = _h[1];
+    var _j = (0, recoil_1.useRecoilState)(Recoils_1.weightState), weightProps = _j[0], setWeightState = _j[1];
+    var _k = (0, react_1.useState)(false), isMultiEditDrawerOpen = _k[0], setIsMultiEditDrawerOpen = _k[1];
     (0, react_1.useEffect)(function () {
         var newAdValid = {};
         ads.forEach(function (ad) {
@@ -233,6 +233,7 @@ function AdList(props) {
      * Hàm khi xem preview
      */
     var handlePreview = function (e, ad, domainId) {
+        if (domainId === void 0) { domainId = defaultDomainId; }
         e.stopPropagation();
         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)

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

@@ -15,6 +15,7 @@ var Utils_1 = require("../../Utils");
 var Helpers_1 = require("../../../../Utils/Helpers");
 var ClassicBaseDrawer_1 = __importDefault(require("../../../../Commons/Components/ClassicBaseDrawer"));
 var Context_1 = require("../../../../Context");
+var moment_1 = __importDefault(require("moment"));
 function EditAds(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var PlaceFilterField = (0, Hooks_1.default)().placeMultiSelectComponent;
@@ -76,6 +77,7 @@ function EditAds(props) {
             type: 'date-range',
             label: t('Campaign.Ad.Time'),
             required: true,
+            isDayBlocked: function (day) { return (0, moment_1.default)().startOf('day').valueOf() > day.valueOf(); }
         },
         {
             fieldName: 'isReserved',
@@ -113,28 +115,28 @@ function EditAds(props) {
     var convertAd = function (inputObj) {
         var result = {};
         selectedFields.forEach(function (f) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             switch (f) {
                 case 'time':
-                    result.startDate = (0, Helpers_1.convertDateTimeToTimestamp)((_b = (_a = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time) === null || _a === void 0 ? void 0 : _a.startDate) === null || _b === void 0 ? void 0 : _b.toDate());
-                    result.endDate = (0, Helpers_1.convertDateTimeToTimestamp)((_d = (_c = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time) === null || _c === void 0 ? void 0 : _c.endDate) === null || _d === void 0 ? void 0 : _d.toDate());
+                    result.startDate = (0, Helpers_1.convertDateTimeToTimestamp)((_a = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time[0]) === null || _a === void 0 ? void 0 : _a.toDate());
+                    result.endDate = (0, Helpers_1.convertDateTimeToTimestamp)((_b = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time[1]) === null || _b === void 0 ? void 0 : _b.toDate());
                     break;
                 case 'placeFilter':
                     result.placeFilter = placeFilterValue;
                     result.places = selectedPlaces;
                     break;
                 case 'loginId':
-                    result.loginId = (_e = inputObj[f]) === null || _e === void 0 ? void 0 : _e.value;
+                    result.loginId = (_c = inputObj[f]) === null || _c === void 0 ? void 0 : _c.value;
                     result.loginPage = {
-                        pageId: (_f = inputObj[f]) === null || _f === void 0 ? void 0 : _f.value,
-                        title: (_g = inputObj[f]) === null || _g === void 0 ? void 0 : _g.text,
+                        pageId: (_d = inputObj[f]) === null || _d === void 0 ? void 0 : _d.value,
+                        title: (_e = inputObj[f]) === null || _e === void 0 ? void 0 : _e.text,
                     };
                     break;
                 case 'welcomeId':
-                    result.welcomeId = (_h = inputObj[f]) === null || _h === void 0 ? void 0 : _h.value;
+                    result.welcomeId = (_f = inputObj[f]) === null || _f === void 0 ? void 0 : _f.value;
                     result.welcomePage = {
-                        pageId: (_j = inputObj[f]) === null || _j === void 0 ? void 0 : _j.value,
-                        title: (_k = inputObj[f]) === null || _k === void 0 ? void 0 : _k.text,
+                        pageId: (_g = inputObj[f]) === null || _g === void 0 ? void 0 : _g.value,
+                        title: (_h = inputObj[f]) === null || _h === void 0 ? void 0 : _h.text,
                     };
                     break;
                 default:

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

@@ -76,7 +76,7 @@ function SubCampaignDetail(props) {
                             }, disabled: isCreate, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignTicket.ACTIVE, children: t('Campaign.Active') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignTicket.INACTIVE, children: t('Campaign.InActive') })] }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: subCampaign.isReserved, onChange: function (e) {
                                     e.persist();
                                     onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { isReserved: e.target.checked })); });
-                                }, name: "isReserved", color: "primary" }), label: translationText.reserved, style: { marginTop: 6 } }) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsxs)(material_1.TextField, { id: "priority", select: true, required: true, variant: "standard", fullWidth: true, label: translationText.priority, value: isNaN(Number(subCampaign.priority))
+                                }, name: "isReserved", color: "primary" }), label: translationText.reserved, style: { marginTop: 6 } }) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "priority", select: true, required: true, variant: "standard", fullWidth: true, label: translationText.priority, value: isNaN(Number(subCampaign.priority))
                                 ? subCampaign.priority
                                 : Object.values(Types_1.CampaignPriority)[subCampaign.priority], onChange: function (e) {
                                 var newPriority = Object.values(Types_1.CampaignPriority).indexOf(e.target.value);
@@ -87,7 +87,7 @@ function SubCampaignDetail(props) {
                                     setSubValid(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: true, bonusAmount: true })); });
                                     return newSubCamp;
                                 });
-                            }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignPriority.ClassA, children: t('Campaign.ClassA') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignPriority.ClassB, children: t('Campaign.ClassB') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignPriority.ClassC, children: t('Campaign.ClassC') })] }) }), (0, Utils_1.checkPriority)(subCampaign.priority, Types_1.CampaignPriority.ClassB) && ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bookingAmount", required: true, fullWidth: true, variant: "standard", type: "number", label: translationText.booking, value: subCampaign.bookingAmount, onChange: function (e) {
+                            }, children: Object.values(Types_1.CampaignPriority).map(function (priority) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: priority, children: t("Campaign.".concat(priority)) }, priority)); }) }) }), (0, Utils_1.checkPriority)(subCampaign.priority, Types_1.CampaignPriority.ClassB) && ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bookingAmount", required: true, fullWidth: true, variant: "standard", type: "number", label: translationText.booking, value: subCampaign.bookingAmount, onChange: function (e) {
                                 var value = Number(e.target.value);
                                 handleChangeStatus('bookingAmount', (0, Utils_1.bookingValid)(value));
                                 onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: value })); });

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

@@ -109,7 +109,7 @@ function SubCampaignPreview(_a) {
                                     fontSize: '14px',
                                     color: isActive ? '#008000' : '#8D8D8D',
                                 } })) : ((0, jsx_runtime_1.jsx)(RemoveCircle_1.default, { fontSize: "small", style: { fontSize: '14px' }, color: "primary" })), (0, jsx_runtime_1.jsx)(material_1.Typography, { component: 'span', sx: {
-                                    fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2"',
+                                    fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2" !important',
                                     fontSize: 18,
                                 }, children: (0, Utils_1.getCampaignPriority)(subCampaign.campaignGroup.priority) })] }) }), action: (0, jsx_runtime_1.jsx)(AWING_1.Actions, { menus: __spreadArray([
                         {

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

@@ -151,7 +151,6 @@ function TabSubCampaign() {
             changeList.forEach(function (adChange) {
                 var _a;
                 var subCampIdx = result.findIndex(function (x) { var _a; return ((_a = x.campaignGroup) === null || _a === void 0 ? void 0 : _a.id) === adChange.subCampaignId; });
-                // console.log('subCampIdx', subCampIdx)
                 if (subCampIdx >= 0) {
                     var adIdx = ((_a = result[subCampIdx].ads) === null || _a === void 0 ? void 0 : _a.findIndex(function (x) { return x.id === adChange.adId; })) || 0;
                     if (adIdx >= 0) {

package/lib/ACM-AXN/CampaignPlan/Container.js

@@ -56,7 +56,8 @@ function Container() {
             .finally(function () {
             setLoading(false);
         });
-    }, [service, filterBy, queryInput]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [filterBy, queryInput]);
     var handleUpdateFilterBy = function (name, value) {
         if (filterBy[name] !== value) {
             setFilterBy(function (oldData) {

package/lib/ACM-AXN/CampaignPlan/Detail.js

@@ -70,7 +70,10 @@ function CampaignPlanDetail() {
                         field: 'name',
                         headerName: t('CampaignPlan.Group'),
                         valueGetter: function (row) {
-                            return "".concat(row.name, " ").concat(getCampaignPriority(row.priority));
+                            return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [row.name, ' ', (0, jsx_runtime_1.jsx)(material_1.Typography, { component: 'span', sx: {
+                                            fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2" !important',
+                                            fontSize: 18,
+                                        }, children: getCampaignPriority(row.priority) })] }));
                         },
                     },
                     {

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

@@ -170,7 +170,7 @@ 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: "center", children: row === null || row === void 0 ? void 0 : row.view }, item.id));
+                        return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", 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:

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

@@ -129,9 +129,9 @@ var RowAdvanceContainer = function (_a) {
                 switch (_b.label) {
                     case 0:
                         groupByMapping = (_a = {},
-                            _a[Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN] = Enum_1.HEAD_CELL_NAMES.CAMPAIGN,
-                            _a[Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN] = Enum_1.HEAD_CELL_NAMES.PLACE,
-                            _a[Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN] = Enum_1.HEAD_CELL_NAMES.DOMAIN,
+                            _a[Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN] = "campaignId",
+                            _a[Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN] = "placeId",
+                            _a[Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN] = "domainId",
                             _a);
                         groupBy = groupByMapping[groupBy] || groupBy;
                         params = __assign(__assign({}, filterBy), { groupBy: groupBy, pageIndex: pageIndex, pageSize: pageSize });

package/lib/ACM-AXN/Notifications/NotificationDetail/index.js

@@ -70,11 +70,14 @@ var NotificationDetail = function (props) {
         status: Constant_1.Constants.ALL_STATUS,
     }), valueFilter = _a[0], setValueFilter = _a[1];
     var _b = react_1.default.useState(false), isLoading = _b[0], setIsLoading = _b[1];
-    var _c = react_1.default.useState(-1), count = _c[0], setCount = _c[1];
-    var _d = (0, react_1.useState)([]), notificationMessage = _d[0], setNotificationMessage = _d[1];
+    var _c = react_1.default.useState(0), count = _c[0], setCount = _c[1];
+    var _d = react_1.default.useState(true), isInViewPort = _d[0], setIsInViewPort = _d[1];
+    var _e = (0, react_1.useState)([]), notificationMessage = _e[0], setNotificationMessage = _e[1];
     var totalItemCount = (0, react_1.useRef)(0);
     (0, react_1.useEffect)(function () {
-        var observer = new IntersectionObserver(handleIntersection);
+        var observer = new IntersectionObserver(function (entries) {
+            entries.map(function (entry) { return entry.isIntersecting; }).forEach(setIsInViewPort);
+        });
         var lastItem = document.getElementById('last-Item');
         if (observer && lastItem) {
             setIsLoading(true);
@@ -83,46 +86,40 @@ var NotificationDetail = function (props) {
         return function () {
             if (observer) {
                 observer.disconnect();
+                observer = null;
             }
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     (0, react_1.useEffect)(function () {
-        console.log({
-            count: count,
-            totalItemCount: totalItemCount,
-            notificationMessage: notificationMessage
-        });
-        if (count >= 0 &&
-            (totalItemCount.current > notificationMessage.length ||
-                notificationMessage.length === 0)) {
-            console.log("run");
-            setIsLoading(true);
-            service
-                .notificationsPaging(count, Constant_1.Constants.PAGE_SIZE_DEFAULT, valueFilter.textSearch, valueFilter.status, [])
-                .then(function (res) {
-                setNotificationMessage(function (prevMessages) {
-                    var newItems = res.items.filter(function (newItem) {
-                        return !prevMessages.some(function (prevItem) { return prevItem.id === newItem.id; });
-                    });
-                    return __spreadArray(__spreadArray([], prevMessages, true), newItems, true);
+        setIsLoading(true);
+        service
+            .notificationsPaging(count, Constant_1.Constants.PAGE_SIZE_DEFAULT, valueFilter.textSearch, valueFilter.status, [])
+            .then(function (res) {
+            setNotificationMessage(function (prevMessages) {
+                var newItems = res.items.filter(function (newItem) {
+                    return !prevMessages.some(function (prevItem) { return prevItem.id === newItem.id; });
                 });
-                totalItemCount.current = res.totalItemCount;
-            })
-                .finally(function () {
-                setIsLoading(false);
+                return __spreadArray(__spreadArray([], prevMessages, true), newItems, true);
             });
-        }
+            totalItemCount.current = res.totalItemCount;
+        })
+            .finally(function () {
+            setIsLoading(false);
+        });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [count, valueFilter.textSearch, valueFilter.status]);
-    var handleIntersection = (0, react_1.useCallback)(function (entries) {
-        var firsEntry = entries[0];
-        if (firsEntry.isIntersecting) {
+    (0, react_1.useEffect)(function () {
+        if (isInViewPort &&
+            notificationMessage.length < totalItemCount.current &&
+            !isLoading) {
             setCount(function (old) { return old + 1; });
         }
-    }, []);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [isInViewPort]);
     var handleValueFilter = function (textSearch, tabs) {
-        textSearch.length === 0 ? setCount(0) : setCount(-1);
         setNotificationMessage([]);
+        setCount(0);
         totalItemCount.current = 0;
         setValueFilter({
             textSearch: textSearch,

package/lib/ACM-AXN/Notifications/Types.d.ts

@@ -76,7 +76,7 @@ export interface NotificationMessageField {
 export interface PagedList_1OfNotificationMessage {
     items?: NotificationMessage[] | undefined;
     pageCount?: number;
-    totalItemCount?: number;
+    totalItemCount: number;
     pageNumber?: number;
     pageSize?: number;
     hasPreviousPage?: boolean;

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewContent.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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) {
@@ -73,16 +62,16 @@ var Recoil_1 = require("../Recoil");
 var Utils_1 = require("../Utils");
 var Styles_1 = require("./Styles");
 var ViewContent = function (_a) {
-    var _b, _c, _d, _e;
+    var _b, _c, _d, _e, _f;
     var viewInfoData = _a.viewInfoData, pageId = _a.pageId, viewNumber = _a.viewNumber, onChange = _a.onChange, isCreate = _a.isCreate;
-    var _f = (0, Context_2.default)(), service = _f.service, pageCode = _f.pageCode, domainId = _f.domainId, CONFIGS = _f.configs;
+    var _g = (0, Context_2.default)(), service = _g.service, pageCode = _g.pageCode, domainId = _g.domainId, CONFIGS = _g.configs;
     var appHelper = (0, Context_1.useAwing)().appHelper;
-    var _g = react_1.default.useState(''), scriptValidationTemplate = _g[0], setScriptValidationTemplate = _g[1];
-    var _h = react_1.default.useState(''), scriptAutoField = _h[0], setScriptAutoField = _h[1];
-    var _j = react_1.default.useState(false), loading = _j[0], setLoading = _j[1];
+    var _h = react_1.default.useState(''), scriptValidationTemplate = _h[0], setScriptValidationTemplate = _h[1];
+    var _j = react_1.default.useState(''), scriptAutoField = _j[0], setScriptAutoField = _j[1];
+    var _k = react_1.default.useState(false), loading = _k[0], setLoading = _k[1];
     var isUniq = react_1.default.useRef(false);
     var rootDirectory = (0, recoil_1.useRecoilValue)(Recoil_1.pageRootDeirectory);
-    var _k = (0, recoil_1.useRecoilState)(Recoil_1.pageEventState), events = _k[0], setEvent = _k[1];
+    var _l = (0, recoil_1.useRecoilState)(Recoil_1.pageEventState), events = _l[0], setEvent = _l[1];
     react_1.default.useEffect(function () {
         if (viewInfoData === null || viewInfoData === void 0 ? void 0 : viewInfoData.templateId) {
             setLoading(true);
@@ -100,7 +89,6 @@ var ViewContent = function (_a) {
     }, [viewInfoData.templateId, viewInfoData.viewDatas.length]);
     react_1.default.useEffect(function () {
         if (!isUniq.current) {
-            console.log("uniq...");
             setEvent(function (prev) {
                 return (0, lodash_1.uniqBy)(prev, function (a) {
                     return JSON.stringify({
@@ -116,7 +104,7 @@ var ViewContent = function (_a) {
     }, [events]);
     var handleResData = function (res) {
         onChange(['viewDatas'], (0, Utils_1.getTemplateDatas)(res.templateParameters, viewInfoData, pageId, viewNumber));
-        setEvent(function (prev) { return __spreadArray(__spreadArray([], res.templateEvents.map(function (item) { return ({ id: item.id, event: item.event, viewNumber: viewNumber + 1, pageId: pageId, protected: true }); }), true), prev, true); });
+        setEvent(function (prev) { var _a; return __spreadArray(__spreadArray([], (_a = res === null || res === void 0 ? void 0 : res.templateEvents) === null || _a === void 0 ? void 0 : _a.map(function (item) { return ({ id: item.id, event: item.event, viewNumber: viewNumber + 1, pageId: pageId, protected: true }); }), true), prev, true); });
         isUniq.current = false;
         onChange(['templateValidation'], res.template.validation);
         onChange(['templateHandleEvent'], res.template.autoField);
@@ -174,7 +162,7 @@ var ViewContent = function (_a) {
                             ? CONFIGS.FILE_TEMP_PATH
                             : CONFIGS.FILE_STATIC_PATH, "/").concat(pageCode === enums_1.PageCode.Lgn
                             ? 'lgn'
-                            : 'wlc', "/").concat((_d = (_c = viewInfoData.viewDatas) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.pageId), enablePreview: pageCode === enums_1.PageCode.Lgn, advanceFields: (_e = viewInfoData.viewDatas) === null || _e === void 0 ? void 0 : _e.filter(function (item) { return item === null || item === void 0 ? void 0 : item.isAdvanced; }).map(function (field) { return field.fieldName; }), scriptValidate: scriptValidationTemplate, scriptAutoField: scriptAutoField, domainId: domainId, configs: CONFIGS, 
+                            : 'wlc', "/").concat((_d = (_c = viewInfoData.viewDatas) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.pageId), enablePreview: pageCode === enums_1.PageCode.Lgn, advanceFields: (_f = (_e = viewInfoData.viewDatas) === null || _e === void 0 ? void 0 : _e.filter(function (item) { return item === null || item === void 0 ? void 0 : item.isAdvanced; })) === null || _f === void 0 ? void 0 : _f.map(function (field) { return field.fieldName; }), scriptValidate: scriptValidationTemplate, scriptAutoField: scriptAutoField, domainId: domainId, configs: CONFIGS, 
                         // validStatus={validStatus}
                         validStatus: viewInfoData.validStatus, viewEvents: events === null || events === void 0 ? void 0 : events.filter(function (item) { return item.viewNumber === viewNumber + 1; }), onChange: handleOnChange, onChangeViewValid: function (status) {
                             onChange(['isValidationFields'], [status]);
@@ -182,11 +170,6 @@ var ViewContent = function (_a) {
                             onChange(['validProcessStatus'], processValue);
                         }, onNotifyError: function (errorMessage) {
                             appHelper.snackbar('error', errorMessage);
-                        }, onUploadFile: onUploadFile, onChangeEvent: function (values) {
-                            setEvent(function (prev) {
-                                return prev.filter(function (item) { return item.viewNumber !== viewNumber + 1; }).concat(values.map(function (value) { return (__assign(__assign({}, value), { viewNumber: viewNumber + 1, pageId: pageId })); }));
-                            });
-                            isUniq.current = false;
-                        } }) }) })) })) }));
+                        }, onUploadFile: onUploadFile }) }) })) })) }));
 };
 exports.default = ViewContent;

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewInfo.js

@@ -69,7 +69,7 @@ var ViewInfo = function (_a) {
     }, []);
     var handleChangeForm = react_1.default.useCallback(function (obj, _valid, keyUpdate) {
         var _a;
-        if ((0, lodash_1.isEmpty)(obj))
+        if (!keyUpdate)
             return;
         if (['templateTypeId', 'directoryId'].includes(keyUpdate)) {
             if (keyUpdate === 'directoryId') {
@@ -118,7 +118,7 @@ var ViewInfo = function (_a) {
     };
     var templateOptions = react_1.default.useMemo(function () {
         var result = [];
-        if (Boolean(viewInfoData.templateTypeId)) {
+        if (viewInfoData.templateTypeId) {
             templates
                 .filter(function (x) {
                 return x.pageCode ===
@@ -135,7 +135,7 @@ var ViewInfo = function (_a) {
             })
                 .forEach(function (template) { return result.push(template); });
         }
-        return result;
+        return result.sort(function (a, b) { return a.description.localeCompare(b.description); });
     }, [viewInfoData, templates, pageCode]);
     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(AWING_1.DataForm, { fields: [
                 {

package/lib/ACM-AXN/Page/Import/index.js

@@ -90,6 +90,7 @@ var ImportPage = function () {
                         label: 'File',
                         inputProps: {
                             value: tempFile === null || tempFile === void 0 ? void 0 : tempFile.name,
+                            readOnly: true,
                         },
                         required: true,
                     },

package/lib/ACM-AXN/ScheduleCompletionRate/Container.js

@@ -173,6 +173,7 @@ function Container() {
                                         align: 'right',
                                     };
                                 },
+                                valueGetter: function (row) { return row.rate.toFixed(2); },
                             },
                         ], rows: (0, Helpers_1.offlinePaginate)(schedules, queryInput.pageIndex, queryInput.pageSize), sortModel: sortModels, onSortModelChange: setSortModels, getRowId: function (row) {
                             return [(0, Helpers_1.generateUUID)(), row.campaignId, row.groupId].join('.');

package/lib/ACM-AXN/Statistics/ControlPanel.d.ts

@@ -1,2 +1,2 @@
 import { BaseStatistics } from './interface';
-export default function ControlPanel<F>({ onChangeQueryInput, onChangeExportInput, initialFilters, isLoadings, infoSX, }: BaseStatistics<F>): import("react/jsx-runtime").JSX.Element;
+export default function ControlPanel<F>({ onChangeQueryInput, onChangeExportInput, initialFilters, isLoadings, disableView, }: BaseStatistics<F>): import("react/jsx-runtime").JSX.Element;

package/lib/ACM-AXN/Statistics/ControlPanel.js

@@ -55,13 +55,13 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
     },
 }); });
 function ControlPanel(_a) {
-    var _b;
-    var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, initialFilters = _a.initialFilters, isLoadings = _a.isLoadings, infoSX = _a.infoSX;
+    var _b, _c, _d;
+    var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, initialFilters = _a.initialFilters, isLoadings = _a.isLoadings, _e = _a.disableView, disableView = _e === void 0 ? false : _e;
     var classes = useStyles();
     var t = (0, react_i18next_1.useTranslation)().t;
-    var _c = (0, react_1.useState)(), queryInput = _c[0], setQueryInput = _c[1];
-    var _d = (0, react_1.useState)([]), elementInputs = _d[0], setElementInputs = _d[1];
-    var _e = (0, react_1.useState)(false), isShowFilterEnhanced = _e[0], setIsHideFieldAdvanced = _e[1];
+    var _f = (0, react_1.useState)(), queryInput = _f[0], setQueryInput = _f[1];
+    var _g = (0, react_1.useState)([]), elementInputs = _g[0], setElementInputs = _g[1];
+    var _h = (0, react_1.useState)(false), isShowFilterEnhanced = _h[0], setIsHideFieldAdvanced = _h[1];
     var flagRef = (0, react_1.useRef)('-1');
     var getView = function () {
         var _a;
@@ -226,7 +226,12 @@ function ControlPanel(_a) {
                                 }
                                 : {}), { children: fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.component }), idx) }));
                     }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, sx: { paddingTop: '24px !important' }, children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", color: "primary", onClick: getView, style: { height: '40px' }, disabled: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.chartLoading) ||
-                                    (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === '0', children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: function () { return onChangeExportInput(queryInput); }, color: "inherit", disabled: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.exportLoading) ||
+                                    (disableView &&
+                                        (queryInput === null || queryInput === void 0 ? void 0 : queryInput.placeIds) &&
+                                        ((_c = queryInput === null || queryInput === void 0 ? void 0 : queryInput.placeIds) === null || _c === void 0 ? void 0 : _c.length) === 0) ||
+                                    (disableView &&
+                                        (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) && ((queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === '0' ||
+                                        (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === undefined)), children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: function () { return onChangeExportInput(queryInput); }, color: "inherit", disabled: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.exportLoading) ||
                                     (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === '0', style: {
                                     marginLeft: '16px',
                                     height: '40px',
@@ -236,8 +241,7 @@ function ControlPanel(_a) {
                                     }, styleIcon: {
                                         width: '25px !important',
                                         height: '25px !important',
-                                    } })) : ((0, jsx_runtime_1.jsx)(GetApp_1.default, {})) }), elementInputs.filter(function (item) { return item.isEnhanced === true; })
-                                .length > 0 && ((0, jsx_runtime_1.jsx)(material_1.IconButton, { sx: { marginLeft: '10px' }, onClick: onShowFilterEnhanced, children: isShowFilterEnhanced ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) }))] })] }), isShowFilterEnhanced && ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, justifyContent: "flex-end", spacing: 2, sx: { paddingRight: '3rem' }, children: elementInputs
+                                    } })) : ((0, jsx_runtime_1.jsx)(GetApp_1.default, {})) }), ((_d = elementInputs.filter(function (item) { return item.isEnhanced === true; })) === null || _d === void 0 ? void 0 : _d.length) > 0 && ((0, jsx_runtime_1.jsx)(material_1.IconButton, { sx: { marginLeft: '10px' }, onClick: onShowFilterEnhanced, children: isShowFilterEnhanced ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) }))] })] }), isShowFilterEnhanced && ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, justifyContent: "flex-end", spacing: 2, sx: { paddingRight: '3rem' }, children: elementInputs
                     .filter(function (item) { return item.isEnhanced === true; })
                     .map(function (fieldFilterEnhanced, idx) {
                     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: (fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.col)

package/lib/ACM-AXN/Statistics/container.d.ts

@@ -1,2 +1,2 @@
 import { IStatisticsProps } from './interface';
-export default function StatisticsContainer<F>({ dataChart, onChangeQueryInput, onChangeExportInput, isLoadings, initialFilters, configChart, title, timeline, chart, children, infoSX, }: IStatisticsProps<F>): import("react/jsx-runtime").JSX.Element;
+export default function StatisticsContainer<F>({ dataChart, onChangeQueryInput, onChangeExportInput, isLoadings, initialFilters, configChart, title, timeline, chart, children, infoSX, disableView }: IStatisticsProps<F>): import("react/jsx-runtime").JSX.Element;

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

@@ -13,8 +13,8 @@ var BarLineComponent_1 = __importDefault(require("../../AWING/Chart/BarLineCompo
 var PieComponent_1 = __importDefault(require("../../AWING/Chart/PieComponent"));
 var react_helmet_async_1 = require("react-helmet-async");
 function StatisticsContainer(_a) {
-    var dataChart = _a.dataChart, onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, isLoadings = _a.isLoadings, initialFilters = _a.initialFilters, configChart = _a.configChart, title = _a.title, timeline = _a.timeline, chart = _a.chart, children = _a.children, infoSX = _a.infoSX;
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [title && ((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.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
+    var dataChart = _a.dataChart, onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, isLoadings = _a.isLoadings, initialFilters = _a.initialFilters, configChart = _a.configChart, title = _a.title, timeline = _a.timeline, chart = _a.chart, children = _a.children, infoSX = _a.infoSX, disableView = _a.disableView;
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [title && ((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.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX, disableView: disableView }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
                                 marginTop: '1.5rem',
                                 width: '100%',
                             }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, className: 'chart-region', children: (dataChart === null || dataChart === void 0 ? void 0 : dataChart.length) > 0 &&

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

@@ -7,6 +7,7 @@ export interface BaseStatistics<F> {
     isLoadings: ILoadings;
     timeline?: number;
     infoSX?: InfoSX;
+    disableView?: boolean;
 }
 export interface InfoSX {
     dateRangePicker?: number;

package/lib/ACM-AXN/StatisticsAudienceDemographic/container.d.ts

@@ -1,2 +1,2 @@
 import { IStatisticsAudienceDemographicContainerProps } from './interfaces';
-export default function StatisticsAudienceDemographicContainer<F>({ onChangeQueryInput, onChangeExportInput, isLoadings, initialFilters, title, dataDisplay, chart, infoSX, children, }: IStatisticsAudienceDemographicContainerProps<F>): import("react/jsx-runtime").JSX.Element;
+export default function StatisticsAudienceDemographicContainer<F>({ onChangeQueryInput, onChangeExportInput, isLoadings, initialFilters, title, dataDisplay, chart, infoSX, children, disableView }: IStatisticsAudienceDemographicContainerProps<F>): import("react/jsx-runtime").JSX.Element;

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

@@ -9,8 +9,8 @@ var ControlPanel_1 = __importDefault(require("../../ACM-AXN/Statistics/ControlPa
 var ContentHeader_1 = __importDefault(require("../CampaignSchedule/Components/ContentHeader"));
 var Tabs_1 = __importDefault(require("./Tabs"));
 function StatisticsAudienceDemographicContainer(_a) {
-    var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, isLoadings = _a.isLoadings, initialFilters = _a.initialFilters, title = _a.title, dataDisplay = _a.dataDisplay, chart = _a.chart, infoSX = _a.infoSX, children = _a.children;
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX }), (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
+    var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, isLoadings = _a.isLoadings, initialFilters = _a.initialFilters, title = _a.title, dataDisplay = _a.dataDisplay, chart = _a.chart, infoSX = _a.infoSX, children = _a.children, disableView = _a.disableView;
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX, disableView: disableView }), (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
                                 width: '100%',
                             }, children: dataDisplay === null ? (children) : ((0, jsx_runtime_1.jsx)(Tabs_1.default, { data: dataDisplay, isLoading: isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.chartLoading, chart: chart })) })] }) })] }));
 }

package/lib/ACM-AXN/StatisticsAudienceDemographic/interfaces.d.ts

@@ -12,4 +12,5 @@ export interface IStatisticsAudienceDemographicContainerProps<F> {
         barChart: any;
         pieChart: any;
     };
+    disableView?: boolean;
 }

package/lib/ACM-AXN/StatisticsByProvince/container.d.ts

@@ -1,2 +1,2 @@
 import { IStatisticsByProvinceContainerProps } from './interfaces';
-export default function StatisticsByProvinceContainer<F>({ onChangeQueryInput, onChangeExportInput, isLoadings, initialFilters, title, dataTable, headCells, infoSX, children, }: IStatisticsByProvinceContainerProps<F>): import("react/jsx-runtime").JSX.Element;
+export default function StatisticsByProvinceContainer<F>({ onChangeQueryInput, onChangeExportInput, isLoadings, initialFilters, title, dataTable, headCells, infoSX, children, disableView }: IStatisticsByProvinceContainerProps<F>): import("react/jsx-runtime").JSX.Element;

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

@@ -10,8 +10,8 @@ var AWING_1 = require("../../AWING");
 var ContentHeader_1 = __importDefault(require("../CampaignSchedule/Components/ContentHeader"));
 var DataTable_1 = __importDefault(require("./DataTable"));
 function StatisticsByProvinceContainer(_a) {
-    var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, isLoadings = _a.isLoadings, initialFilters = _a.initialFilters, title = _a.title, dataTable = _a.dataTable, headCells = _a.headCells, infoSX = _a.infoSX, children = _a.children;
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX }), (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
+    var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, isLoadings = _a.isLoadings, initialFilters = _a.initialFilters, title = _a.title, dataTable = _a.dataTable, headCells = _a.headCells, infoSX = _a.infoSX, children = _a.children, disableView = _a.disableView;
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX, disableView: disableView }), (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
                                 marginTop: '1.5rem',
                                 width: '100%',
                             }, children: dataTable === null ? (children) : ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.chartLoading) === false ? ((0, jsx_runtime_1.jsx)(DataTable_1.default, { headCells: headCells, rowsData: dataTable, isPagination: true, isLoading: false })) : ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) })) })] }) })] }));

package/lib/ACM-AXN/StatisticsByProvince/interfaces.d.ts

@@ -9,6 +9,7 @@ export interface IStatisticsByProvinceContainerProps<F> {
     headCells: any;
     infoSX?: any;
     children?: any;
+    disableView?: boolean;
 }
 export type Order = 'asc' | 'desc';
 export type HeadCell = {

package/lib/ACM-AXN/TransactionLog/Detail.js

@@ -92,7 +92,7 @@ var newStyles = {
             removedGutterBackground: '#ececec',
         },
         titleBlock: {
-            fontFamily: 'Roboto',
+            fontFamily: "'AW-Roboto', sans-serif",
             fontSize: '12px',
             fontWeight: 'bold',
         },

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

@@ -37,7 +37,6 @@ var react_1 = require("react");
 var react_i18next_1 = require("react-i18next");
 var i18n_1 = __importDefault(require("../../i18n"));
 var Form_1 = require("../../AWING/Form");
-var Event_1 = __importDefault(require("./TemplateField/Event"));
 function ViewTemplate(_a) {
     var _b = _a.templateDatas, templateDatas = _b === void 0 ? [] : _b, pagePath = _a.pagePath, _c = _a.enablePreview, enablePreview = _c === void 0 ? true : _c, _d = _a.advanceFields, advanceFields = _d === void 0 ? [] : _d, _e = _a.templateLabelName, templateLabelName = _e === void 0 ? "" : _e, _f = _a.domainId, domainId = _f === void 0 ? "" : _f, _g = _a.validStatus, validStatus = _g === void 0 ? true : _g, _h = _a.scriptAutoField, scriptAutoField = _h === void 0 ? "" : _h, _j = _a.scriptValidate, scriptValidate = _j === void 0 ? "" : _j, configs = _a.configs, onChange = _a.onChange, _k = _a.onChangeViewValid, onChangeViewValid = _k === void 0 ? function (status) {
         console.log(status);
@@ -89,7 +88,7 @@ function ViewTemplate(_a) {
     return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 4, children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: enablePreview ? 8 : 12, children: [templateLabelName && ((0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "body1", style: {
                             fontWeight: "bold",
                             textTransform: "uppercase",
-                        }, children: templateLabelName })), fields && renderFields(fields, false), (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { id: "advance-option", style: {
+                        }, children: templateLabelName })), fields && renderFields(fields, false), fields && advanceFields.length > 0 && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { id: "advance-option", style: {
                                     display: "flex",
                                     flexDirection: "row",
                                     justifyContent: "space-between",
@@ -97,7 +96,7 @@ function ViewTemplate(_a) {
                                     cursor: "pointer",
                                 }, onClick: function () {
                                     setAdvanceOptionExpand(!advanceOptionExpand);
-                                }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { style: { fontWeight: "bold" }, children: t("ViewTemplate.AdvanceOption") }), (0, jsx_runtime_1.jsx)(material_1.IconButton, { children: advanceOptionExpand ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) })] }), advanceOptionExpand && ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [fields && advanceFields.length > 0 && renderFields(fields, true), (0, jsx_runtime_1.jsx)(Event_1.default, __assign({}, props))] }))] })] }), enablePreview && ((0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 4, children: [(0, jsx_runtime_1.jsx)(Preview_1.default, { domainId: domainId || "", validStatus: validStatus, configs: CONFIGS, pagePath: pagePath, templateDatas: templateDatas }), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", children: t("ViewTemplate.PreviewLoadingNote") })] }))] }));
+                                }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { style: { fontWeight: "bold" }, children: t("ViewTemplate.AdvanceOption") }), (0, jsx_runtime_1.jsx)(material_1.IconButton, { children: advanceOptionExpand ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) })] }), advanceOptionExpand && ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, children: renderFields(fields, true) }))] }))] }), enablePreview && ((0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 4, children: [(0, jsx_runtime_1.jsx)(Preview_1.default, { domainId: domainId || "", validStatus: validStatus, configs: CONFIGS, pagePath: pagePath, templateDatas: templateDatas }), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", children: t("ViewTemplate.PreviewLoadingNote") })] }))] }));
 }
 exports.default = ViewTemplate;
 var getChilds = function (fields, fieldInfo) {

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

@@ -49,7 +49,7 @@ export interface FieldProps {
     onNotifyError: (errorMessage: string) => void;
     onUploadFile: (files: any[]) => Promise<string>;
 }
-export interface ViewTemplateProps extends EventsProps {
+export interface ViewTemplateProps extends Partial<EventsProps> {
     templateDatas: FieldInfo[];
     /**
      * Đường dẫn tuyệt đối các file của page

package/lib/AWING/Chart/BarLineComponent.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
+var material_1 = require("@mui/material");
 var Helpers_1 = require("../../Utils/Helpers");
 require("chartjs-adapter-moment");
 var moment_1 = __importDefault(require("moment"));
@@ -69,10 +70,14 @@ var BarLineComponent = function (props) {
                 titleColor: '#212121',
                 bodyFont: {
                     size: 14,
-                    family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                    family: "'AW-Roboto', sans-serif",
                     lineHeight: 1.5,
                 },
             },
+            htmlLegend: {
+                // ID of the container to put the legend in
+                containerID: 'legend-container',
+            },
             legend: {
                 position: 'bottom',
                 labels: {
@@ -84,11 +89,11 @@ var BarLineComponent = function (props) {
                     boxPadding: 50,
                     font: {
                         size: 15,
-                        family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                        family: "'AW-Roboto', sans-serif",
                         lineHeight: 1.5,
                     },
                 },
-                display: true,
+                display: false,
             },
         },
         scales: {
@@ -119,7 +124,7 @@ var BarLineComponent = function (props) {
                     title: {
                         font: {
                             size: 14,
-                            family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                            family: "'AW-Roboto', sans-serif",
                         },
                     },
                 },
@@ -142,7 +147,7 @@ var BarLineComponent = function (props) {
                     font: {
                         size: 14,
                         weight: 'bold',
-                        family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                        family: "'AW-Roboto', sans-serif",
                     },
                 },
             },
@@ -161,7 +166,7 @@ var BarLineComponent = function (props) {
                     font: {
                         size: 14,
                         weight: 'bold',
-                        family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                        family: "'AW-Roboto', sans-serif",
                     },
                 },
             },
@@ -182,10 +187,83 @@ var BarLineComponent = function (props) {
         }),
     };
     var Chart = chart;
-    return ((0, jsx_runtime_1.jsx)("div", { style: {
+    var getOrCreateLegendList = function (chart, id) {
+        var legendContainer = document.getElementById(id);
+        var listContainer = legendContainer === null || legendContainer === void 0 ? void 0 : legendContainer.querySelector('ul');
+        if (!listContainer) {
+            listContainer = document.createElement('ul');
+            listContainer.style.display = 'flex';
+            listContainer.style.flexDirection = 'row';
+            listContainer.style.margin = '0';
+            listContainer.style.padding = '0';
+            legendContainer === null || legendContainer === void 0 ? void 0 : legendContainer.appendChild(listContainer);
+        }
+        return listContainer;
+    };
+    var htmlLegendPlugin = {
+        id: 'htmlLegend',
+        afterUpdate: function (chart, args, options) {
+            var ul = getOrCreateLegendList(chart, options.containerID);
+            // Remove old legend items
+            while (ul.firstChild) {
+                ul.firstChild.remove();
+            }
+            // Reuse the built-in legendItems generator
+            var items = chart.options.plugins.legend.labels.generateLabels(chart);
+            items.forEach(function (item) {
+                var li = document.createElement('li');
+                li.style.alignItems = 'center';
+                li.style.cursor = 'pointer';
+                li.style.display = 'flex';
+                li.style.flexDirection = 'row';
+                li.style.marginLeft = '10px';
+                li.onclick = function () {
+                    var type = chart.config.type;
+                    if (type === 'pie' || type === 'doughnut') {
+                        // Pie and doughnut charts only have a single dataset and visibility is per item
+                        chart.toggleDataVisibility(item.index);
+                    }
+                    else {
+                        chart.setDatasetVisibility(item.datasetIndex, !chart.isDatasetVisible(item.datasetIndex));
+                    }
+                    chart.update();
+                };
+                // Color box
+                var boxSpan = document.createElement('span');
+                boxSpan.style.background = item.fillStyle;
+                boxSpan.style.borderColor = item.strokeStyle;
+                boxSpan.style.borderWidth = item.lineWidth + 'px';
+                boxSpan.style.display = 'inline-block';
+                boxSpan.style.flexShrink = '0';
+                boxSpan.style.height = '20px';
+                boxSpan.style.marginRight = '10px';
+                boxSpan.style.width = '20px';
+                boxSpan.style.borderRadius = '20px';
+                // Text
+                var textContainer = document.createElement('p');
+                textContainer.style.color = item.fontColor;
+                textContainer.style.margin = '0';
+                textContainer.style.padding = '0';
+                textContainer.style.textDecoration = item.hidden
+                    ? 'line-through'
+                    : '';
+                var text = document.createTextNode(item.text);
+                textContainer.appendChild(text);
+                li.appendChild(boxSpan);
+                li.appendChild(textContainer);
+                ul.appendChild(li);
+            });
+        },
+    };
+    return ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: {
             width: width,
             height: height,
             position: 'relative',
-        }, children: (0, jsx_runtime_1.jsx)(Chart, { data: chartData, type: type, options: (0, Helpers_1.updateObjectFields)(options, optionCustom) }) }));
+            marginBottom: '80px',
+        }, children: [(0, jsx_runtime_1.jsx)(Chart, { data: chartData, type: type, options: (0, Helpers_1.updateObjectFields)(options, optionCustom), plugins: [htmlLegendPlugin] }), (0, jsx_runtime_1.jsx)(material_1.Box, { id: "legend-container", sx: {
+                    marginTop: '35px',
+                    display: 'flex',
+                    justifyContent: 'center',
+                } })] }));
 };
 exports.default = BarLineComponent;

package/lib/AWING/Chart/PieComponent.js

@@ -38,7 +38,7 @@ var PieComponent = function (_a) {
                     pointStyle: 'circle',
                     font: {
                         size: 14,
-                        family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                        family: "'AW-Roboto', sans-serif",
                         lineHeight: 1.5,
                     },
                 },
@@ -54,7 +54,7 @@ var PieComponent = function (_a) {
                 bodySpacing: 8,
                 bodyFont: {
                     size: 14,
-                    family: "'AW-Roboto', Helvetica, Arial, sans-serif",
+                    family: "'AW-Roboto', sans-serif",
                     lineHeight: 1.5,
                 },
                 callbacks: {

package/lib/AWING/DataForm/DataInput.js

@@ -110,7 +110,7 @@ function DataInput(props) {
         case 'autocomplete': {
             return ((0, jsx_runtime_1.jsx)(material_1.Autocomplete, { multiple: fieldDefinition.multiple, options: fieldDefinition.options, getOptionLabel: function (option) { var _a, _b; return (_b = (_a = option.label) !== null && _a !== void 0 ? _a : option.text) !== null && _b !== void 0 ? _b : ''; }, isOptionEqualToValue: function (option, value) {
                     return (option === null || option === void 0 ? void 0 : option.value) === (value === null || value === void 0 ? void 0 : value.value);
-                }, disableclearable: fieldDefinition.disableClearable, getOptionDisabled: function (option) { return option === null || option === void 0 ? void 0 : option.disabled; }, onChange: function (e, value) {
+                }, getOptionKey: function (option) { return option.value; }, disableclearable: fieldDefinition.disableClearable, getOptionDisabled: function (option) { return option === null || option === void 0 ? void 0 : option.disabled; }, onChange: function (e, value) {
                     var newValue = fieldDefinition.multiple
                         ? value.map(function (x) { return x === null || x === void 0 ? void 0 : x.value; })
                         : value === null || value === void 0 ? void 0 : value.value;

package/lib/AWING/DataGrid/interface.d.ts

@@ -7,7 +7,45 @@ export interface GridSortModel {
     field: string;
     sort: GridSortDirection;
 }
-export interface DataGridColumnDefinition {
+interface DataGridColumnDefinitionBase {
+    /**
+     * Tên trường
+     */
+    field: string;
+    /**
+     * Nội dung hiển thị ở header
+     */
+    headerName: ReactNode;
+    /**
+     * Nếu bằng true thì sẽ cho phép sort theo trường này
+     */
+    sortable?: boolean;
+    options?: any[];
+    /**
+     * Hàm kiểm tra giá trị điền khi sửa trực tiếp trường này
+     *
+     * @param value Giá trị
+     */
+    checkValid?(value: any): boolean;
+    /**
+     * Kiểu dữ liệu của trường
+     */
+    type?: 'text' | 'number';
+    /**
+     * Cách lấy nội dung hiển thị khác, nếu có
+     *
+     * @param row Một đối tượng trong danh sách hiển thị
+     * @param idx Số thứ tự của đối tượng trong danh sách
+     */
+    valueGetter?(row: any, idx: number, stt: number): ReactNode;
+    /**
+     * Độ rộng của cột
+     */
+    width?: string | number;
+    TableCellProps?: TableCellProps;
+    dynamicTableCellProps?: (row: any) => TableCellProps;
+}
+export interface DataGridColumnDefinition extends DataGridColumnDefinitionBase {
     /**
      * Tên trường
      */

package/lib/AWING/GroupTable/GroupTable.js

@@ -50,7 +50,8 @@ function GroupTable(props) {
     }, [headCells]);
     (0, react_1.useEffect)(function () {
         handleGetGroupData();
-    }, [headCells, groupPageSize, groupPageIndex]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [groupPageSize, groupPageIndex]);
     var handleGetGroupData = function () {
         setLoading(true);
         onGetData(filters, groupPageIndex, groupPageSize).then(function (result) {

package/lib/translate/en/translation.json

@@ -161,7 +161,7 @@
     },
     "InvalidMessage": {
         "InvalidNotExistedUsername": "Username is invalid or not existed",
-        "InvalidAccountConnected": "Account has been added to this domain!"
+        "InvalidAccountConnected": "Account is already existed!"
     },
     "ViewTemplate": {
         "Value": "Value",

package/lib/translate/vi/translation.json

@@ -125,7 +125,7 @@
     },
     "InvalidMessage": {
         "InvalidNotExistedUsername": "Tài khoản không tồn tại",
-        "InvalidAccountConnected": "Tài khoản đã được gắn vào domain này rồi!"
+        "InvalidAccountConnected": "Tài khoản đã tồn tại!"
     },
     "User": {
         "Username": "Tài khoản",

package/package.json

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