awing-library 2.1.21 → 2.1.22-stage

package/lib/AWING/DateRangePicker/component.js

@@ -235,36 +235,54 @@ var DateRangePickerWrapper = function (props) {
         onDatesChange(daterange);
         // setFocusedInput(null);
     };
+    var getDataSet = function (moment) {
+        return moment.set({
+            hour: 0,
+            minute: 0,
+            second: 0,
+            millisecond: 0,
+        });
+    };
+    var resetDate = function () {
+        setStartDate(initialStartDate);
+        setEndDate(initialEndDate);
+        setInputValue("".concat(moment(initialStartDate).format('DD/MM/YYYY'), " - ").concat(moment(initialEndDate).format('DD/MM/YYYY')));
+        callback({
+            startDate: getDataSet(moment(initialStartDate, 'DD/MM/YYYY')),
+            endDate: getDataSet(moment(initialEndDate, 'DD/MM/YYYY')),
+        });
+    };
     var handleChangeInput = function (e) {
         var fieldValue = e.target.value;
         setInputValue(fieldValue);
         var fieldValueArr = (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(' - ')) || [];
         var year1900 = moment('1900-01-01');
         var momentStartDate = moment(fieldValueArr[0], 'DD/MM/YYYY');
+        var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
+        if (isDayBlocked && isDayBlocked(momentStartDate)) {
+            setIsValid(true);
+            resetDate();
+            return;
+        }
+        if (isDayBlocked && isDayBlocked(momentEndDate)) {
+            setIsValid(true);
+            resetDate();
+            return;
+        }
         if (momentStartDate.isValid() && momentStartDate.diff(year1900) >= 0) {
             setStartDate(momentStartDate);
         }
-        var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
         if (momentEndDate.isValid() && momentEndDate.diff(year1900) >= 0) {
             setEndDate(momentEndDate);
         }
         if (moment(fieldValueArr[0], 'DD/MM/YYYY', true).isValid() &&
             moment(fieldValueArr[1], 'DD/MM/YYYY', true).isValid() &&
             momentEndDate.diff(momentStartDate) >= 0) {
-            momentStartDate.set({
-                hour: 0,
-                minute: 0,
-                second: 0,
-                millisecond: 0,
-            });
-            momentEndDate.set({
-                hour: 0,
-                minute: 0,
-                second: 0,
-                millisecond: 0,
-            });
-            callback({ startDate: momentStartDate, endDate: momentEndDate });
             setIsValid(true);
+            callback({
+                startDate: getDataSet(momentStartDate),
+                endDate: getDataSet(momentEndDate),
+            });
         }
         else
             setIsValid(false);

package/lib/AWING/Form/Utils/Types.d.ts

@@ -1 +1,5 @@
 export type FieldValues = Record<string, any>;
+export type FieldOptions = {
+    required: boolean;
+    onValidate: (value: any) => boolean;
+};

package/lib/AWING/Form/useForm.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FieldOptions } from './Utils/Types';
 export declare const useForm: (props: {
     defaultValue: Record<string, any>;
 }) => {
@@ -9,9 +10,7 @@ export declare const useForm: (props: {
         watch: boolean;
     };
     formValue: Record<string, any>;
-    register: (fieldPath: string, options?: {
-        required: boolean;
-    }) => {
+    register: (fieldPath: string, options?: FieldOptions) => {
         required: boolean | undefined;
         name: string;
         value: any;

package/lib/AWING/Form/useForm.js

@@ -53,7 +53,8 @@ var useForm = function (props) {
     var _updateFieldArray = function (name, value) {
         (0, set_1.default)(_formControl.current, name, value);
     };
-    var getValues = function (fieldNames) {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var getValues = react_1.default.useCallback(function (fieldNames) {
         var data = (0, convertToArrayPayload_1.default)(fieldNames).map(function (fieldName) {
             return (0, cloneProxy_1.default)((0, get_1.default)(_formControl.current, fieldName));
         });
@@ -61,16 +62,17 @@ var useForm = function (props) {
             return data;
         if (data.length && data.length === 1)
             return data[0];
-    };
+    }, []);
     var register = function (fieldPath, options) {
         var isRequired = options === null || options === void 0 ? void 0 : options.required;
+        var onValidate = options === null || options === void 0 ? void 0 : options.onValidate;
         return {
             required: isRequired,
             name: fieldPath,
             value: getValues(fieldPath),
             onBlur: function (e) {
-                if (isRequired) {
-                    if (!getValues(fieldPath)) {
+                if (isRequired || onValidate) {
+                    if (!getValues(fieldPath) || (onValidate && !onValidate(getValues(fieldPath)))) {
                         _formError.current.push(fieldPath);
                     }
                     else {

package/lib/AWING/GroupTable/GroupTable.js

@@ -33,7 +33,7 @@ var CircularProgress_1 = __importDefault(require("../CircularProgress"));
 var CustomRow_1 = __importDefault(require("./CustomRow"));
 var NoData_1 = __importDefault(require("../NoData"));
 var constants_1 = require("../../constants");
-var isEqual = require("lodash/isEqual");
+var lodash_1 = require("lodash");
 function GroupTable(props) {
     var headCells = props.headCells, filters = props.filters, onGetData = props.onGetData, customRow = props.customRow, onRowClicked = props.onRowClicked;
     var row = customRow || CustomRow_1.default;
@@ -41,7 +41,7 @@ function GroupTable(props) {
     var _b = (0, react_1.useState)(0), groupPageIndex = _b[0], setGroupPageIndex = _b[1];
     var _c = (0, react_1.useState)(constants_1.PAGE_SIZE_DEFAULT), groupPageSize = _c[0], setGroupPageSize = _c[1];
     var _d = (0, react_1.useState)(0), totalCount = _d[0], setTotalCount = _d[1];
-    var _e = (0, react_1.useState)(false), loading = _e[0], setLoading = _e[1];
+    var _e = (0, react_1.useState)(true), loading = _e[0], setLoading = _e[1];
     var groupKeys = headCells
         .filter(function (headCell) { return headCell.isGrouping; })
         .map(function (headCell) { return headCell.field; });
@@ -50,15 +50,15 @@ function GroupTable(props) {
     }, [headCells]);
     (0, react_1.useEffect)(function () {
         handleGetGroupData();
-    }, [headCells, groupPageSize, groupPageIndex]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [JSON.stringify(headCells), groupPageSize, groupPageIndex]);
     var handleGetGroupData = function () {
         setLoading(true);
         onGetData(filters, groupPageIndex, groupPageSize).then(function (result) {
-            setLoading(false);
-            !isEqual(data, result.data) && setData(result.data);
-            !isEqual(totalCount, result.totalCount) &&
+            !(0, lodash_1.isEqual)(data, result.data) && setData(result.data);
+            !(0, lodash_1.isEqual)(totalCount, result.totalCount) &&
                 setTotalCount(result.totalCount);
-        });
+        }).finally(function () { setLoading(false); });
     };
     var handleChangePage = function (newPage) {
         setGroupPageIndex(newPage);

package/lib/AWING/Hooks/index.d.ts

@@ -0,0 +1 @@
+export * from './useGetData';

package/lib/AWING/Hooks/index.js

@@ -0,0 +1,17 @@
+"use strict";
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./useGetData"), exports);

package/lib/AWING/Hooks/useGetData.d.ts

@@ -0,0 +1,9 @@
+type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
+type Params<T extends (...args: any[]) => any> = T extends (...args: infer P) => any ? P : never;
+type ReturnType<T extends (...args: any[]) => any> = T extends (...args: any[]) => infer R ? R : never;
+type Fetcher<ParamsType extends any[] = any[], ReturnType = any> = (...params: ParamsType) => Promise<ReturnType>;
+export declare const useGetData: <T extends Fetcher<any[], any>>(params: Params<T>, fetcher: T) => {
+    data: UnwrapPromise<ReturnType<T>> | undefined;
+    isLoading: boolean;
+};
+export default useGetData;

package/lib/AWING/Hooks/useGetData.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useGetData = void 0;
+var lodash_1 = require("lodash");
+var react_1 = __importDefault(require("react"));
+var useGetData = function (params, fetcher) {
+    var _a = react_1.default.useState(true), isLoading = _a[0], setLoading = _a[1];
+    var _b = react_1.default.useState(), data = _b[0], setData = _b[1];
+    react_1.default.useEffect(function () {
+        fetchData(params);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, params);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var fetchData = react_1.default.useCallback((0, lodash_1.debounce)(function (params) {
+        setLoading(true);
+        fetcher.apply(void 0, params).then(function (result) { return setData(result); })
+            .finally(function () { setLoading(false); });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, 100), []);
+    return { data: data, isLoading: isLoading };
+};
+exports.useGetData = useGetData;
+exports.default = exports.useGetData;

package/lib/AWING/NumberFormat/index.d.ts

@@ -1,3 +1,5 @@
 import { TextFieldProps } from '@mui/material';
-export declare const NumberFormat: (props: TextFieldProps) => import("react/jsx-runtime").JSX.Element;
+export declare const NumberFormat: (props: TextFieldProps & {
+    min?: number;
+}) => import("react/jsx-runtime").JSX.Element;
 export default NumberFormat;

package/lib/AWING/NumberFormat/index.js

@@ -32,7 +32,7 @@ var helper_1 = require("../helper");
 var Context_1 = __importDefault(require("../../Context"));
 var react_1 = require("react");
 var NumberFormat = function (props) {
-    var value = props.value, onChange = props.onChange, other = __rest(props, ["value", "onChange"]);
+    var value = props.value, onChange = props.onChange, min = props.min, other = __rest(props, ["value", "onChange", "min"]);
     var i18next = (0, react_1.useContext)(Context_1.default).i18next;
     var handleChange = function (event) {
         var el = event.target;
@@ -65,7 +65,7 @@ var NumberFormat = function (props) {
                 .replace(new RegExp(escapeRegExp(decimalSeparator), 'g'), ''));
         }
         //add negation back
-        if (hasNegation)
+        if (hasNegation && min !== 0)
             num = '-' + num;
         return num;
     }

package/lib/AWING/ultis/validation.d.ts

@@ -10,6 +10,7 @@ export declare function dateRangeValid(value: (Date | null | undefined)[] | null
 export declare function emailValid(value: string | null | undefined): boolean;
 export declare function numberOnlyValid(value: string | null | undefined): boolean;
 export declare function urlValid(value: string | null | undefined): boolean;
+export declare function colorValid(value: string | null | undefined): boolean;
 export declare function passwordValid(value: string | null | undefined): boolean;
 export declare function containsOnlyDigits(str: string): boolean;
 export declare function logicExpressionValid(value: string | null | undefined): boolean;

package/lib/AWING/ultis/validation.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.textValidation = exports.logicExpressionValid = exports.containsOnlyDigits = exports.passwordValid = exports.urlValid = exports.numberOnlyValid = exports.emailValid = exports.dateRangeValid = exports.dateValid = exports.notNullValid = exports.stringNullableValid = exports.stringNotNullValid = exports.numberNotNullValid = exports.numberPercentageNotNullValid = exports.positiveNumberNotNullValid = exports.arrayIsNotEmptyValid = void 0;
+exports.textValidation = exports.logicExpressionValid = exports.containsOnlyDigits = exports.passwordValid = exports.colorValid = exports.urlValid = exports.numberOnlyValid = exports.emailValid = exports.dateRangeValid = exports.dateValid = exports.notNullValid = exports.stringNullableValid = exports.stringNotNullValid = exports.numberNotNullValid = exports.numberPercentageNotNullValid = exports.positiveNumberNotNullValid = exports.arrayIsNotEmptyValid = void 0;
 /* eslint-disable no-useless-escape */
 var i18n_1 = __importDefault(require("../../i18n"));
 var lodash_1 = __importDefault(require("lodash"));
@@ -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) {
@@ -69,6 +77,11 @@ function urlValid(value) {
     }
 }
 exports.urlValid = urlValid;
+function colorValid(value) {
+    var re = /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/;
+    return value !== undefined && value !== null && re.test('#' + value);
+}
+exports.colorValid = colorValid;
 function passwordValid(value) {
     var re = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$/;
     return value === undefined && value === null && re.test(value);
@@ -96,7 +109,7 @@ exports.logicExpressionValid = logicExpressionValid;
 var textValidation = function (str, length, required, pattern, invertRegex) {
     if (length === void 0) { length = 50; }
     if (required === void 0) { required = true; }
-    if (pattern === void 0) { pattern = /^[a-zA-Z0-9\/\-_.()\[\] ]+$/g; }
+    if (pattern === void 0) { pattern = /^[a-zA-Z0-9đĐ\/\-_.()\[\] \u0080-\uFFFF]+$/g; }
     var validRes = {
         valid: true,
         message: [],
@@ -106,18 +119,12 @@ var textValidation = function (str, length, required, pattern, invertRegex) {
         validRes.valid = false;
         validRes.message.push(i18n_1.default.t('Common.Required'));
     }
-    var textTransform = String(str)
-        .normalize('NFD')
-        .toLowerCase()
-        .replace(/\s\s+/g, ' ')
-        .replace(/[\u0300-\u036f]/g, '')
-        .replace(/đ/g, 'd')
-        .trim();
-    if (textTransform && pattern && !pattern.test(textTransform)) {
+    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');
-            validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(textTransform.match(invertedRegex))).join(' ')));
+            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(' ')));
         }
     }
     var byteSize = new Blob([str]).size;

package/lib/Commons/Components/ClassicDrawer.js

@@ -52,7 +52,7 @@ var Drawer = function (props) {
     var navigate = (0, Router_1.useNavigate)();
     var location = (0, Router_1.useLocation)();
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
-    var _b = react_1.default.useState(true), open = _b[0], setOpen = _b[1];
+    var _b = react_1.default.useState(false), open = _b[0], setOpen = _b[1];
     var _c = react_1.default.useState(false), loading = _c[0], setLoading = _c[1];
     var timer = react_1.default.useRef();
     react_1.default.useEffect(function () {
@@ -63,6 +63,7 @@ var Drawer = function (props) {
     }, []);
     var closeDrawer = function (action) {
         if (action === void 0) { action = CloseAction.Close; }
+        setOpen(false);
         timer.current = window.setTimeout(function () {
             var _a;
             ((_a = location.state) === null || _a === void 0 ? void 0 : _a.type) === 'history'
@@ -78,7 +79,6 @@ var Drawer = function (props) {
                 .then(function (state) {
                 setTimeout(function () {
                     snackbar('success');
-                    console.log('success');
                 }, 700);
                 closeDrawer((typeof state === 'string' && state) ? state : CloseAction.Reload);
             })

package/lib/Commons/Components/DeprecatedEnhancedDialog.js

@@ -74,7 +74,7 @@ var EnhancedDialog = function (props) {
     };
     return ((0, jsx_runtime_1.jsxs)(Dialog_1.default, { open: isOpen, onClose: handleClose, "aria-labelledby": "alert-dialog-title", "aria-describedby": "alert-dialog-description", maxWidth: "sm", fullWidth: true, children: [(0, jsx_runtime_1.jsx)(DialogTitle_1.default, { id: "alert-dialog-title", children: title !== null && title !== void 0 ? title : t('Dialog.Title') }), (0, jsx_runtime_1.jsxs)(DialogContent_1.default, { children: [(0, jsx_runtime_1.jsx)(DialogContentText_1.default, { id: "alert-dialog-description", sx: { marginBottom: function (theme) { return theme.spacing(1.5); } }, children: content !== null && content !== void 0 ? content : t('Dialog.Content') }), !notIncludeInput && ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ autoFocus: true, margin: "dense", label: props.label, rows: 2, multiline: true, type: "text", name: "text", value: text, onChange: function (e) {
                             setText(e.target.value);
-                            setValid((0, validation_1.textValidation)(e.target.value));
+                            setValid((0, validation_1.textValidation)(e.target.value, 50, true, false));
                         }, fullWidth: true, onKeyDown: handleKeyDown, error: !checkValid.valid, helperText: !checkValid.valid ? checkValid.message : '' }, textFieldProps)))] }), (0, jsx_runtime_1.jsxs)(DialogActions_1.default, { children: [(0, jsx_runtime_1.jsx)(Button_1.default, { onClick: handleClose, color: "secondary", children: t('Common.Cancel') }), (0, jsx_runtime_1.jsx)(Button_1.default, { disabled: !(!notIncludeInput && checkValid.valid), onClick: function () { return handleSubmit(); }, color: "primary", children: t('Common.Agree') })] })] }));
 };
 exports.default = EnhancedDialog;

package/lib/Commons/Hooks/usePath.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Helpers_1 = require("../../Utils/Helpers");
-var react_router_1 = require("react-router");
+var react_router_dom_1 = require("react-router-dom");
 var usePath = function () {
-    var location = (0, react_router_1.useLocation)();
-    var params = (0, react_router_1.useParams)();
+    var location = (0, react_router_dom_1.useLocation)();
+    var params = (0, react_router_dom_1.useParams)();
     var path = (0, Helpers_1.getRoutePath)(location, params);
     return path;
 };

package/lib/Utils/Helpers.d.ts

@@ -2,7 +2,7 @@ import moment from 'moment';
 import type { Params, Location } from '../AWING/Router';
 import { DataObject } from '../AWING';
 import { AnalyticDataProviderModel, FileResponse } from '../Commons/Types';
-import { Timestamp } from '../ACM-AXN/Campaign/Types';
+import { Timestamp } from '../ACM-AXN/Common/Types';
 export declare enum TIMELINE_TYPE {
     HOUR = 0,
     DAY = 1
@@ -15,7 +15,7 @@ export declare enum TIMELINE_TYPE {
  */
 export declare function getCookie(name: string): string | undefined;
 export declare function dateToString(date: moment.MomentInput): string;
-export declare function formatNumber(num: number | bigint | undefined): string;
+export declare function formatNumber(num: number | bigint | string | undefined): string;
 export declare function getQueryVariable(variable: string): string;
 export declare function displayLongString(str: string, maxLength: number): string;
 export declare function generateUUID(): string;
@@ -27,7 +27,7 @@ export declare function timestampToStringDDMMYYYYHHmm(date: {
 }): string | null;
 export declare const getRoutePath: (location: Location, params: Params) => string;
 export declare function calculatorDirectoryIdRoot(directoriesTree: any): number;
-export declare function changeToAlias(str: string): string;
+export declare function changeToAlias(str?: string): string;
 export declare const offlinePaginate: (array: DataObject[], pageIndex: number, pageSize: number) => DataObject[];
 export declare function convertArrayToObject(array: any, keyName: string): any;
 export declare function roundDecimalNumber(number: any): string | null;
@@ -105,3 +105,11 @@ export interface IHeadCells {
 export declare const updateObjectFields: (originalObj: any, changedValues: any) => any;
 export declare function formatChartNumber(val: any, language: string): string;
 export declare const setObject: <O extends {}>(obj: O, arrKey: Array<keyof O>, value: unknown) => void;
+export declare function fillMissingDates(data: Array<{
+    x: string;
+    y: number;
+}>, startDate?: string | Date | number, endDate?: string | Date | number, format?: string | 'YYYYMMDD' | 'YYYYMMDDHH'): {
+    x: string;
+    y: number;
+}[];
+export declare function parseJSON(str: string): any;

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)) {
@@ -23,11 +46,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setObject = exports.formatChartNumber = exports.updateObjectFields = exports.validateNumber = exports.getToday = exports.convertDataSetPattern = exports.convertAnalyticModelToChartDataAdvance = exports.getStartOfDay = exports.timestampToStringDDMMYYYY = exports.dateToStringDDMMYYYY = exports.convertTimelineToDateTime = exports.dateTimeToString = exports.convertTimestampToDateTime = exports.convertDateTimeToTimestamp = exports.checkValidUrl = exports.validateAnalyticTypes = exports.stringToListAccessPoint = exports.checkValidMacAddress = exports.checkValidStringListAP = exports.convertTimeLine = exports.WMAPEcalculator = exports.roundDecimalNumber = exports.convertArrayToObject = exports.offlinePaginate = exports.changeToAlias = exports.calculatorDirectoryIdRoot = exports.getRoutePath = exports.timestampToStringDDMMYYYYHHmm = exports.dateToStringddddDDMMYYYYHHmm = exports.downloadZipFile = exports.downloadFilePattern = exports.generateUUID = exports.displayLongString = exports.getQueryVariable = exports.formatNumber = exports.dateToString = exports.getCookie = exports.TIMELINE_TYPE = void 0;
+exports.parseJSON = exports.fillMissingDates = exports.setObject = exports.formatChartNumber = exports.updateObjectFields = exports.validateNumber = exports.getToday = exports.convertDataSetPattern = exports.convertAnalyticModelToChartDataAdvance = exports.getStartOfDay = exports.timestampToStringDDMMYYYY = exports.dateToStringDDMMYYYY = exports.convertTimelineToDateTime = exports.dateTimeToString = exports.convertTimestampToDateTime = exports.convertDateTimeToTimestamp = exports.checkValidUrl = exports.validateAnalyticTypes = exports.stringToListAccessPoint = exports.checkValidMacAddress = exports.checkValidStringListAP = exports.convertTimeLine = exports.WMAPEcalculator = exports.roundDecimalNumber = exports.convertArrayToObject = exports.offlinePaginate = exports.changeToAlias = exports.calculatorDirectoryIdRoot = exports.getRoutePath = exports.timestampToStringDDMMYYYYHHmm = exports.dateToStringddddDDMMYYYYHHmm = exports.downloadZipFile = exports.downloadFilePattern = exports.generateUUID = exports.displayLongString = exports.getQueryVariable = exports.formatNumber = exports.dateToString = exports.getCookie = exports.TIMELINE_TYPE = void 0;
 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";
@@ -55,8 +78,9 @@ function dateToString(date) {
 }
 exports.dateToString = dateToString;
 function formatNumber(num) {
-    if (num || num === 0) {
-        return new Intl.NumberFormat(i18n_1.default.language === 'vi' ? 'vi-VN' : 'en-US').format(num);
+    var value = Number(Number(num).toFixed(2));
+    if (value || value === 0) {
+        return new Intl.NumberFormat(i18n_1.default.language === 'vi' ? 'vi-VN' : 'en-US').format(value);
     }
     else
         return '';
@@ -197,6 +221,7 @@ function calculatorDirectoryIdRoot(directoriesTree) {
 }
 exports.calculatorDirectoryIdRoot = calculatorDirectoryIdRoot;
 function changeToAlias(str) {
+    if (str === void 0) { str = ''; }
     // Chuyển toàn bộ Tiếng Việt sang không dấu viết thường và các kí tự đặc biệt thành dấu "-"
     return str
         .trim()
@@ -540,3 +565,39 @@ var setObject = function (obj, arrKey, value) {
     (0, lodash_1.set)(obj, arrKey.reduce(function (acc, val) { return acc + '[' + val + ']'; }, ''), value);
 };
 exports.setObject = setObject;
+function fillMissingDates(data, startDate, endDate, format) {
+    if (startDate === void 0) { startDate = ''; }
+    if (endDate === void 0) { endDate = ''; }
+    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)).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
+    var dates = [];
+    // Iterate through the date range
+    for (var m = (0, moment_1.default)(start); m.isSameOrBefore(end); m.add(1, format === 'YYYYMMDD' ? 'days' : 'hours')) {
+        dates.push(m.format(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.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) {
+    try {
+        return JSON.parse(str || "{}");
+    }
+    catch (e) {
+        return str;
+    }
+}
+exports.parseJSON = parseJSON;