awing-library 2.1.166-dev → 2.1.168-dev

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/ChartWithType.js

@@ -104,6 +104,9 @@ var ChartWithType = function (props) {
                                     },
                                     beginAtZero: true
                                 },
+                                yAxis: {
+                                    display: false,
+                                },
                             },
                         } }) })) : ((0, jsx_runtime_1.jsx)(Detail_1.default, { statisticalData: statisticalData })) })] }));
 };

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.js

@@ -446,7 +446,7 @@ var convertToChartData = function (data, campaignGroups, time) {
             fill: false,
             pointStyle: 'circle',
             yAxisID: 'y',
-            variant: String(index),
+            variant: key,
         };
     }).filter(Boolean);
 };

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Event/Util.js

@@ -10,29 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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)) {
@@ -42,12 +19,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToExportData = exports.convertEventData = void 0;
 var Helpers_1 = require("../../../../../Utils/Helpers");
-var lodash_1 = __importStar(require("lodash"));
+var lodash_1 = __importDefault(require("lodash"));
 var Utils_1 = require("../Utils");
-var convertEventData = function (data) { return (0, lodash_1.uniqBy)(data.map(function (el) {
+var convertEventData = function (data) { return data.map(function (el) {
     return el.analyticEventSummaries.map(function (x, index, events) { return ({
         timeline: el.timeline,
         eventLabel: (0, Utils_1.extractEvent)(x.eventLabel).eventName,
@@ -58,7 +38,7 @@ var convertEventData = function (data) { return (0, lodash_1.uniqBy)(data.map(fu
         })
             .reduce(function (total, e) { return total + e.total; }, 0),
     }); });
-}).flat(), "eventLabel"); };
+}).flat(); };
 exports.convertEventData = convertEventData;
 function convertToExportData(data, places) {
     var headCell = new Set(['Place', 'Mac Address', 'Created date', 'View Number', 'Event label']);

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Utils.js

@@ -27,7 +27,10 @@ var getTime = function (subCampaigns) {
 exports.getTime = getTime;
 var extractEvent = function (eventLabel) {
     if (eventLabel === void 0) { eventLabel = ''; }
-    var _a = eventLabel.match(/^(\d+)_([\s\S]*)$/) || [], view = _a[1], eventName = _a[2];
+    if (!eventLabel) {
+        throw new Error('Event label is required');
+    }
+    var _a = eventLabel.match(/^(\d+)_([\s\S]*)$/) || ['', '1', eventLabel], view = _a[1], eventName = _a[2];
     return { view: view, eventName: eventName };
 };
 exports.extractEvent = extractEvent;

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

@@ -133,6 +133,7 @@ function SubCampaignDetail(props) {
                                         ? translationText.helperText
                                         : '', children: Object.values(Enum_2.AnalyticType)
                                         .filter(function (item) { return !isNaN(Number(item)); })
+                                        .filter(Boolean)
                                         .map(function (type) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: type, children: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[type])))) }, type)); }) }) })] })), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, 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 })); });

package/lib/ACM-AXN/Campaign/Enum.d.ts

@@ -130,13 +130,13 @@ export declare enum AdType {
 export declare enum CampaignRuleType {
     LimitView = 0,
     LimitClick = 1,
+    Authentication = 8,
     LimitEvent = 2,
     TargetGender = 3,
     TargetAge = 4,
     TargetOS = 5,
     TargetDevice = 6,
-    RetargetMacAddress = 7,
-    Authentication = 8
+    RetargetMacAddress = 7
 }
 /**
  * Enum bao gồm các phép toán

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

@@ -117,13 +117,13 @@ var CampaignRuleType;
 (function (CampaignRuleType) {
     CampaignRuleType[CampaignRuleType["LimitView"] = 0] = "LimitView";
     CampaignRuleType[CampaignRuleType["LimitClick"] = 1] = "LimitClick";
+    CampaignRuleType[CampaignRuleType["Authentication"] = 8] = "Authentication";
     CampaignRuleType[CampaignRuleType["LimitEvent"] = 2] = "LimitEvent";
     CampaignRuleType[CampaignRuleType["TargetGender"] = 3] = "TargetGender";
     CampaignRuleType[CampaignRuleType["TargetAge"] = 4] = "TargetAge";
     CampaignRuleType[CampaignRuleType["TargetOS"] = 5] = "TargetOS";
     CampaignRuleType[CampaignRuleType["TargetDevice"] = 6] = "TargetDevice";
     CampaignRuleType[CampaignRuleType["RetargetMacAddress"] = 7] = "RetargetMacAddress";
-    CampaignRuleType[CampaignRuleType["Authentication"] = 8] = "Authentication";
 })(CampaignRuleType || (exports.CampaignRuleType = CampaignRuleType = {}));
 /**
  * Enum bao gồm các phép toán

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

@@ -109,7 +109,7 @@ function Container() {
                             },
                             {
                                 field: 'totalRun',
-                                headerName: "".concat(t('CampaignPlan.HasRun'), " (").concat(t('Common.BillingUnit'), ")"),
+                                headerName: "".concat(t('CampaignPlan.HasRun'), " (").concat(t('Campaign.BillingUnit.Title'), ")"),
                                 type: 'number',
                                 width: 200,
                                 TableCellProps: {
@@ -118,7 +118,7 @@ function Container() {
                             },
                             {
                                 field: 'totalExpected',
-                                headerName: "".concat(t('CampaignPlan.WillRun'), " (").concat(t('Common.BillingUnit'), ")"),
+                                headerName: "".concat(t('CampaignPlan.WillRun'), " (").concat(t('Campaign.BillingUnit.Title'), ")"),
                                 valueGetter: function (row) {
                                     return row.isContainClassB
                                         ? (0, Helpers_1.formatNumber)(row.totalExpected)

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

@@ -78,7 +78,7 @@ function CampaignPlanDetail() {
                     },
                     {
                         field: 'totalRun',
-                        headerName: "".concat(t('CampaignPlan.HasRun'), " (").concat(t('Common.BillingUnit'), ")"),
+                        headerName: "".concat(t('CampaignPlan.HasRun'), " (").concat(t('Campaign.BillingUnit.Title'), ")"),
                         type: 'number',
                         TableCellProps: {
                             align: 'right',
@@ -86,7 +86,7 @@ function CampaignPlanDetail() {
                     },
                     {
                         field: 'totalExpected',
-                        headerName: "".concat(t('CampaignPlan.WillRun'), " (").concat(t('Common.BillingUnit'), ")"),
+                        headerName: "".concat(t('CampaignPlan.WillRun'), " (").concat(t('Campaign.BillingUnit.Title'), ")"),
                         valueGetter: function (row) {
                             return row.priority ===
                                 Utils_1.CAMPAIGN_PRIORITY.CLASS_B

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

@@ -96,7 +96,7 @@ var Filters = function (_a) {
                                 setTypeView({
                                     type: e.target.value,
                                 });
-                            }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.billingUnit, children: t('Common.BillingUnit') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.impression, children: t('Common.Impression') })] })] }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 3, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: isFutureDate !== null && isFutureDate !== void 0 ? isFutureDate : 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: {
+                            }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.billingUnit, children: t('Campaign.BillingUnit.Title') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.impression, children: t('Common.Impression') })] })] }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 3, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: isFutureDate !== null && isFutureDate !== void 0 ? isFutureDate : 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/DataConfig.js

@@ -44,13 +44,13 @@ var DataSetConfigs = function (exportData, campaigns, places, t, isBilling) {
                         style: { font: { sz: '13' } },
                     },
                     {
-                        value: (0, Helpers_1.formatNumber)(isBilling ? data.rateBilling : data.rate || 0),
+                        value: isBilling ? data.rateBilling : data.rate || 0,
                         style: { font: { sz: '13' } },
                     },
                     {
-                        value: (0, Helpers_1.formatNumber)(isBilling
+                        value: isBilling
                             ? data.totalQuantityBilling
-                            : data.totalQuantity || 0),
+                            : data.totalQuantity || 0,
                         style: { font: { sz: '12' } },
                     },
                 ];

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

@@ -22,7 +22,7 @@ var DataSetConfigsAXN = function (t, exportData, domains, campaigns, places, isB
                 '#',
                 t('Schedule.Campaign'),
                 t('Schedule.Place'),
-                t('Schedule.Date'),
+                t('Schedule.    Date'),
                 "".concat(t('Schedule.Rate'), " (%)"),
                 t('Schedule.Total'),
             ],
@@ -46,13 +46,13 @@ var DataSetConfigsAXN = function (t, exportData, domains, campaigns, places, isB
                         style: { font: { sz: '13' } },
                     },
                     {
-                        value: (0, Helpers_1.formatNumber)(isBilling ? data.rateBilling : data.rate || 0),
+                        value: isBilling ? data.rateBilling : data.rate || 0,
                         style: { font: { sz: '13' } },
                     },
                     {
-                        value: (0, Helpers_1.formatNumber)(isBilling
+                        value: isBilling
                             ? data.totalQuantityBilling
-                            : data.totalQuantity || 0),
+                            : data.totalQuantity || 0,
                         style: { font: { sz: '12' } },
                     },
                 ];

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

@@ -146,7 +146,7 @@ function Filter(props) {
                                     setFilterType({
                                         type: e.target.value,
                                     });
-                                }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.billingUnit, children: t('Common.BillingUnit') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.impression, children: t('Common.Impression') })] })] }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
+                                }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.billingUnit, children: t('Campaign.BillingUnit.Title') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.impression, children: t('Common.Impression') })] })] }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
                         width: '260px',
                         minWidth: '260px',
                         marginRight: '16px',

package/lib/ACM-AXN/StatisticsAudienceDemographic/Tabs/AgeRange.js

@@ -62,6 +62,7 @@ var AgeRangeTabs = function (_a) {
                 fill: true,
                 borderWidth: 2,
                 yAxisID: 'y',
+                variant: '3',
             },
         ];
     };

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

@@ -58,7 +58,7 @@ var TemplateContainer = function () {
                     field: 'PageCode',
                     headerName: 'PageCode',
                     valueGetter: function (row) {
-                        return t("TemplateManagement.Page_".concat(row.pageCode));
+                        return t("TemplateManagement.Page_".concat(['wlc', 'lgn'].includes(row.pageCode) ? row.pageCode : row.pageCode === '0' ? 'wlc' : 'lgn'));
                     },
                 },
             ], loading: loading, rows: (templates === null || templates === void 0 ? void 0 : templates.templates) || [], onCreateButtonClick: handleNavigate, customActions: (0, jsx_runtime_1.jsx)(material_1.Button, { component: Router_1.Link, to: Constant_1.Constants.IMPORT_PATH, variant: "outlined", size: "medium", sx: { marginLeft: '16px', fontWeight: 'bold' }, children: t('Common.Import') }), rowActions: [

package/lib/ACM-AXN/Template/CreateOrEdit/index.js

@@ -153,7 +153,7 @@ var CreateOrEdit = function () {
     var fetchTemplateData = function () {
         if (templateId) {
             return service.templatesGet(templateId).then(function (res) {
-                setTemplateData(__assign(__assign({}, res), { templateParameters: (0, Utils_1.removeFiledName)(res.templateParameters) }));
+                setTemplateData(__assign(__assign({}, res), { template: __assign(__assign({}, res.template), { pageCode: isNaN(Number(res.template.pageCode)) ? res.template.pageCode : Number(res.template.pageCode) ? 'lgn' : 'wlc' }), templateParameters: (0, Utils_1.removeFiledName)(res.templateParameters) }));
             });
         }
     };

package/lib/ACM-AXN/Template/Import.js

@@ -51,7 +51,7 @@ var ImportTemplate = function () {
     };
     var handleSubmit = function () {
         var directoryId = bussinessData.directoryId, id = bussinessData.id, name = bussinessData.name;
-        return service.templatesImport(directoryId, id, name, {
+        return service.templatesImport(directoryId, id || '0', name, {
             data: tempFile,
             fileName: tempFile === null || tempFile === void 0 ? void 0 : tempFile.name,
         });
@@ -59,7 +59,7 @@ var ImportTemplate = function () {
     var handleChangeFormData = (0, react_1.useCallback)(function (obj, valid, key) {
         setBussinessData(function (prev) {
             var _a;
-            return (__assign(__assign({}, prev), (_a = {}, _a[key] = obj[key], _a.id = prev.id || (obj === null || obj === void 0 ? void 0 : obj.id) || '0', _a.directoryId = (obj === null || obj === void 0 ? void 0 : obj.directoryId) || rootDirectoryId, _a)));
+            return (__assign(__assign({}, prev), (_a = {}, _a[key] = obj[key], _a.directoryId = (obj === null || obj === void 0 ? void 0 : obj.directoryId) || rootDirectoryId, _a)));
         });
     }, [rootDirectoryId]);
     return ((0, jsx_runtime_1.jsxs)(ClassicDrawer_1.default, { title: t('TemplateManagement.ImportTemplate'), onSubmit: handleSubmit, disableButtonSubmit: !(tempFile === null || tempFile === void 0 ? void 0 : tempFile.name), confirmExit: true, childrenWrapperStyle: { padding: 0 }, children: [(0, jsx_runtime_1.jsx)(AWING_1.DataForm, { fields: [

package/lib/AWING/Chart/Styles.js

@@ -46,32 +46,65 @@ var styledLineFill = function (defaultStyle, variant) {
     }
 };
 exports.styledLineFill = styledLineFill;
+// Click: 004b95
+// Impression: d10717
+// Engagement: 0082ed
+// ER: 8bc1f7
+// CTR: 518be9
+// Các đường phụ 
+// ef9234, 5752d1, 38812f
 function getColorByVariant(variant) {
-    switch (variant) {
+    switch (String(variant).toLowerCase()) {
         case '0':
-            return '#0055b8';
+        case 'impression':
+        case 'view':
+            return '#d10717';
         case '1':
-            return '#dd040c';
+        case 'click':
+            return '#004b95';
         case '2':
-            return 'green';
+        case 'engagement':
+        case 'authentication':
+            return '#0082ed';
         case '3':
-            return 'violet';
+        case 'spot':
+        case 'er':
+            return '#8bc1f7';
         case '4':
-            return 'black';
+        case 'ctr':
+            return '#518be9';
         case '5':
-            return 'yellow';
+        case 'other':
+            return '#ef9234';
         case '6':
-            return 'indigo';
+        case 'other1':
+            return '#5752d1';
         case '7':
-            return 'orange';
-        case '8':
-            return 'cyan';
-        case '9':
-            return 'lime';
-        case undefined:
-            return '#80b0ff';
+        case 'other2':
+            return '#38812f';
+        // case '0':
+        //     return '#0055b8'
+        // case '1':
+        //     return '#dd040c'
+        // case '2':
+        //     return 'green'
+        // case '3':
+        //     return 'violet'
+        // case '4':
+        //     return 'black'
+        // case '5':
+        //     return 'yellow'
+        // case '6':
+        //     return 'indigo'
+        // case '7':
+        //     return 'orange'
+        // case '8':
+        //     return 'cyan'
+        // case '9':
+        // return 'lime'
         default:
-            return '#' + Math.floor(Math.random() * 16777216).toString(16);
+            return '#38812f';
+        // return '#' + Math.floor(Math.random() * 16777216).toString(16)
     }
 }
 var getStyle = function (defaultStyle, type, color) {

package/lib/AWING/DataForm/DataInput.js

@@ -43,14 +43,17 @@ var GeoFencing_1 = __importDefault(require("../../ACM-AXN/GeoFencing"));
 var i18n_1 = __importDefault(require("../../i18n"));
 var omit = require('lodash/omit');
 function DataInput(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var fieldDefinition = props.fieldDefinition, onChange = props.onChange, value = props.value, error = props.error, disableHelperText = props.disableHelperText;
     var fieldName = fieldDefinition.fieldName, type = fieldDefinition.type, onValidate = fieldDefinition.onValidate, min = fieldDefinition.min, max = fieldDefinition.max, pattern = fieldDefinition.pattern, other = __rest(fieldDefinition, ["fieldName", "type", "onValidate", "min", "max", "pattern"]);
-    var _m = react_2.default.useState(t('Common.InvalidData')), errorText = _m[0], setErrorText = _m[1];
+    var _o = react_2.default.useState(t('Common.InvalidData')), errorText = _o[0], setErrorText = _o[1];
     var checkValidationValue = function (fieldDefinition, val) {
         if (!fieldDefinition.required &&
-            (val === undefined || val === null || val === '' || (Array.isArray(val) && val.length === 0)))
+            (val === undefined ||
+                val === null ||
+                val === '' ||
+                (Array.isArray(val) && val.length === 0)))
             return true;
         if (fieldDefinition.onValidate)
             return fieldDefinition.onValidate(val, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.length, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.pattern);
@@ -135,7 +138,7 @@ function DataInput(props) {
                     : undefined }));
         }
         case 'checkbox': {
-            return ((0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { id: fieldName.toString(), name: fieldName.toString(), checked: value, onChange: function (event) {
+            return ((0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { disabled: (_d = fieldDefinition.disabled) !== null && _d !== void 0 ? _d : false, id: fieldName.toString(), name: fieldName.toString(), checked: value, onChange: function (event) {
                             return onChange(event.target.checked, checkValidationValue(fieldDefinition, event.target.checked));
                         }, color: "primary", readOnly: fieldDefinition.readOnly }), label: fieldDefinition.label }) }));
         }
@@ -144,7 +147,7 @@ function DataInput(props) {
                     return onChange(date === null || date === void 0 ? void 0 : date.toDate(), checkValidationValue(fieldDefinition, date === null || date === void 0 ? void 0 : date.toDate()));
                 }, readOnly: fieldDefinition.readOnly, slotProps: {
                     textField: __assign(__assign({ required: fieldDefinition.required, fullWidth: true, variant: 'standard' }, other), { error: error, helperText: !disableHelperText && error
-                            ? (_d = fieldDefinition.helperText) !== null && _d !== void 0 ? _d : t('Common.InvalidData')
+                            ? (_e = fieldDefinition.helperText) !== null && _e !== void 0 ? _e : t('Common.InvalidData')
                             : '' }),
                 } }));
         }
@@ -153,12 +156,12 @@ function DataInput(props) {
                     return onChange(date === null || date === void 0 ? void 0 : date.toDate(), checkValidationValue(fieldDefinition, date === null || date === void 0 ? void 0 : date.toDate()));
                 }, slotProps: {
                     textField: __assign(__assign({ required: fieldDefinition.required, fullWidth: true, variant: 'standard' }, other), { error: error, helperText: !disableHelperText && error
-                            ? (_e = fieldDefinition.helperText) !== null && _e !== void 0 ? _e : t('Common.InvalidData')
+                            ? (_f = fieldDefinition.helperText) !== null && _f !== void 0 ? _f : t('Common.InvalidData')
                             : '' }),
                 }, readOnly: fieldDefinition.readOnly }));
         }
         case 'date-range': {
-            var _o = other, isDayBlocked = _o.isDayBlocked, isOutsideRange = _o.isOutsideRange;
+            var _p = other, isDayBlocked = _p.isDayBlocked, isOutsideRange = _p.isOutsideRange;
             return ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { noBorder: true, variant: "standard", textFieldProps: __assign({ fullWidth: true, style: { margin: '8px 0px' } }, omit(other, ['isDayBlocked', 'isOutsideRange'])), value: {
                     startDate: (value === null || value === void 0 ? void 0 : value[0]) || null,
                     endDate: (value === null || value === void 0 ? void 0 : value[1]) || null,
@@ -166,7 +169,7 @@ function DataInput(props) {
                     var newValue = [dateRange.startDate, dateRange.endDate];
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, label: fieldDefinition.label, error: error, helperText: !disableHelperText && error
-                    ? (_f = fieldDefinition.helperText) !== null && _f !== void 0 ? _f : t('Common.InvalidData')
+                    ? (_g = fieldDefinition.helperText) !== null && _g !== void 0 ? _g : t('Common.InvalidData')
                     : '', disableHelperText: disableHelperText, isDayBlocked: isDayBlocked, isOutsideRange: isOutsideRange }));
         }
         case 'number': {
@@ -174,7 +177,7 @@ function DataInput(props) {
                     var newValue = Number(event.target.value);
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_g = fieldDefinition.helperText) !== null && _g !== void 0 ? _g : t('Common.InvalidData')
+                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
                     : '' })));
         }
         case 'radio': {
@@ -189,7 +192,7 @@ function DataInput(props) {
         case 'text':
         case 'text-area': {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: 'text', fullWidth: true, variant: "standard", multiline: fieldDefinition.type === 'text-area', error: error, helperText: !disableHelperText && error
-                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : errorText
+                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : errorText
                     : '' }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 } })));
@@ -201,7 +204,7 @@ function DataInput(props) {
                         : event.target.value;
                     onChange(event.target.value, checkValidationValue(fieldDefinition, newValue));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : t('Common.InvalidData')
+                    ? (_k = fieldDefinition.helperText) !== null && _k !== void 0 ? _k : t('Common.InvalidData')
                     : '' }, other, { children: [!fieldDefinition.required && ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: "", children: (0, jsx_runtime_1.jsx)("em", { children: t('Common.None') }) })), fieldDefinition.options.map(function (item, index) {
                         var _a;
                         return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: item.value, disabled: item.disabled ||
@@ -215,7 +218,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(AWING_1.MultipleHierarchicalChoice, __assign({}, fieldDefinition, { variant: "standard", value: value, onChange: function (value) {
                     onChange(value, checkValidationValue(fieldDefinition, value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_k = fieldDefinition.helperText) !== null && _k !== void 0 ? _k : t('Common.InvalidData')
+                    ? (_l = fieldDefinition.helperText) !== null && _l !== void 0 ? _l : t('Common.InvalidData')
                     : '' })));
         }
         case 'geo-fencing': {
@@ -228,7 +231,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: fieldDefinition.type, fullWidth: true, variant: "standard" }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_l = fieldDefinition.helperText) !== null && _l !== void 0 ? _l : t('Common.InvalidData')
+                    ? (_m = fieldDefinition.helperText) !== null && _m !== void 0 ? _m : t('Common.InvalidData')
                     : '' })));
         }
     }

package/lib/AWING/ultis/validation.js

@@ -37,12 +37,20 @@ function notNullValid(value) {
 }
 exports.notNullValid = notNullValid;
 function dateValid(value) {
-    return Boolean(value && (0, moment_1.default)(value).isValid());
+    return Boolean(value && (value === null || value === void 0 ? void 0 : value.getFullYear()) > 1000 && (0, moment_1.default)(value).isValid());
 }
 exports.dateValid = dateValid;
 function dateRangeValid(value) {
-    return value !== undefined && value !== null && value.length === 2 && dateValid(value[0]) && dateValid(value[1]) &&
-        value[0] !== undefined && value[0] !== null && value[1] !== undefined && value[1] !== null && value[0] <= value[1];
+    return (value !== undefined &&
+        value !== null &&
+        value.length === 2 &&
+        dateValid(value[0]) &&
+        dateValid(value[1]) &&
+        value[0] !== undefined &&
+        value[0] !== null &&
+        value[1] !== undefined &&
+        value[1] !== null &&
+        value[0] <= value[1]);
 }
 exports.dateRangeValid = dateRangeValid;
 function emailValid(value) {
@@ -114,7 +122,8 @@ var textValidation = function (str, length, required, pattern, invertRegex) {
     if (str && pattern && !pattern.test(str)) {
         validRes.valid = false;
         if (invertRegex !== false) {
-            var invertedRegex = invertRegex || new RegExp("[^".concat(pattern.source.replace(/[*+?^${}|]/g, ''), "]").replace(/\[\[|\]\]/g, ']'), 'g');
+            var invertedRegex = invertRegex ||
+                new RegExp("[^".concat(pattern.source.replace(/[*+?^${}|]/g, ''), "]").replace(/\[\[|\]\]/g, ']'), 'g');
             validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(str.match(invertedRegex))).join(' ')));
         }
     }

package/lib/Utils/Helpers.js

@@ -10,6 +10,29 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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)) {
@@ -27,7 +50,7 @@ exports.parseJSON = exports.fillMissingDates = exports.setObject = exports.forma
 var moment_1 = __importDefault(require("moment"));
 var i18n_1 = __importDefault(require("../i18n"));
 var helper_1 = require("../AWING/helper");
-var lodash_1 = require("lodash");
+var lodash_1 = __importStar(require("lodash"));
 var TIMELINE_TYPE;
 (function (TIMELINE_TYPE) {
     TIMELINE_TYPE[TIMELINE_TYPE["HOUR"] = 0] = "HOUR";
@@ -548,8 +571,8 @@ function fillMissingDates(data, startDate, endDate, format) {
     if (format === void 0) { format = 'YYYYMMDD'; }
     var result = data.concat();
     // Parse the start and end dates
-    var start = (0, moment_1.default)(isNaN(Number(startDate)) ? startDate : String(startDate));
-    var end = (0, moment_1.default)(isNaN(Number(endDate)) ? endDate : String(endDate));
+    var start = (0, moment_1.default)(isNaN(Number(startDate)) ? startDate : String(startDate)).startOf('day');
+    var end = (0, moment_1.default)(isNaN(Number(endDate)) ? endDate : String(endDate)).endOf('day');
     if (start.isAfter(end))
         throw new Error('Start date must be before end date');
     // Array to hold the complete range of dates
@@ -561,7 +584,12 @@ function fillMissingDates(data, startDate, endDate, format) {
     (0, lodash_1.xor)(data.map(function (d) { return d.x; }), dates).forEach(function (x) {
         result.push({ x: x, y: 0 });
     });
-    return (0, lodash_1.orderBy)(result, ['x'], ['asc']);
+    return (0, lodash_1.default)(result).groupBy('x').map(function (value, key) {
+        return ({
+            x: key,
+            y: lodash_1.default.sumBy(value, 'y')
+        });
+    }).orderBy(['x'], ['asc']).value();
 }
 exports.fillMissingDates = fillMissingDates;
 function parseJSON(str) {

package/lib/translate/en/translation.json

@@ -69,7 +69,6 @@
         "Download": "Download",
         "View": "View",
         "Impression": "Impression",
-        "BillingUnit": "Billing unit",
         "TitleTypeView": "Show by",
         "Settings": "Settings",
         "Logout": "Logout",

package/lib/translate/vi/translation.json

@@ -40,7 +40,6 @@
         "View": "Xem",
         "ViewBy": "Xem theo",
         "Impression": "Impression",
-        "BillingUnit": "Đơn vị tính",
         "TitleTypeView": "Hiển thị theo",
         "Select": "Chọn",
         "Loading": "Đang tải...",
@@ -481,7 +480,7 @@
         "CantBeDelete": "Không thể xoá chiến dịch này",
         "Attributes": "Thuộc tính",
         "BillingUnit": {
-            "Title": "Đơn vị",
+            "Title": "Đơn vị tính tiền",
             "View": "Impression",
             "Authentication": "Engagement / Spot",
             "Click": "Click"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.166-dev",
+    "version": "2.1.168-dev",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",