awing-library 2.1.125-beta → 2.1.126-beta

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

@@ -269,7 +269,7 @@ jest.mock('Commons/UseAxiosProvider', function () { return ({
     }); },
 }); });
 // Mock Drawer
-jest.mock('awing-library/lib/Commons/Components/ClassicDrawer', function () { return function (props) { return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("p", { children: props.title }), (0, jsx_runtime_1.jsx)("button", { "data-testid": "onSubmit", onClick: props.onSubmit, children: "submit" }), props.children] })); }; });
+jest.mock('Commons/Components/ClassicDrawer', function () { return function (props) { return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("p", { children: props.title }), (0, jsx_runtime_1.jsx)("button", { "data-testid": "onSubmit", onClick: props.onSubmit, children: "submit" }), props.children] })); }; });
 // Mock Infomation
 jest.mock('./Infomation', function () { return function (props) { return ((0, jsx_runtime_1.jsx)("div", { children: Object.entries(props).map(function (_a) {
         var key = _a[0], val = _a[1];

package/lib/ACM-AXN/Template/CreateOrEdit/Infomation.test.js

@@ -25,7 +25,7 @@ jest.mock('react-i18next', function () { return (__assign(__assign({}, jest.requ
 // Mock Utils/Helpers
 jest.mock('Utils/Helpers', function () { return (__assign(__assign({}, jest.requireActual('Utils/Helpers')), { downloadZipFile: function () { } })); });
 // Mock DataForm
-jest.mock('awing-library/lib/AWING', function () { return ({
+jest.mock('AWING', function () { return ({
     DataForm: function (props) {
         var _a, _b;
         props.fields.forEach(function (element) {

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

@@ -84,6 +84,16 @@ var Parameter = function (_a) {
             },
         });
     };
+    var tableRow = (0, Utils_1.flattenParameter)(rows).map(function (row) {
+        Object.keys(row).forEach(function (key) {
+            if (Array.isArray(row[key])) {
+                row[key] = row[key].filter(function (item) { return item !== ''; });
+                console.log(key, row[key]);
+            }
+        });
+        return row;
+    });
+    console.log("tableRow", tableRow);
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Box, { mt: 3, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, justifyContent: "space-between", alignItems: "center", children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "subtitle1", sx: {
                                 fontWeight: 'bold',
                                 color: '#000000',
@@ -148,11 +158,9 @@ var Parameter = function (_a) {
                                     error: row.errField, InputProps: {
                                         startAdornment: ((0, jsx_runtime_1.jsx)(material_1.Box, { component: 'span', sx: {
                                                 padding: '4px 0 5px',
-                                            }, children: row.parentFieldName.length
-                                                ? (row.parentFieldName.push(''),
-                                                    row.parentFieldName).join('.')
+                                            }, children: row.parentFieldName.length ? (row.parentFieldName.push(''), row.parentFieldName).join('.')
                                                 : null })),
-                                    }, fullWidth: true, name: [
+                                    }, required: true, fullWidth: true, name: [
                                         'fieldName',
                                         row.parentId,
                                         row.id,
@@ -261,7 +269,7 @@ var Parameter = function (_a) {
                                         .join('-'), color: "primary", defaultChecked: row.isAdvanced }, idx));
                             },
                         },
-                    ], rows: (0, Utils_1.flattenParameter)(rows), rowActions: [
+                    ], rows: tableRow, rowActions: [
                         {
                             icon: (0, jsx_runtime_1.jsx)(icons_material_1.DeleteForever, {}),
                             tooltipTitle: t('Common.Delete'),

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

@@ -114,11 +114,11 @@ jest.mock('react-i18next', function () { return (__assign(__assign({}, jest.requ
 // Mock React
 jest.mock('react', function () { return (__assign(__assign({}, jest.requireActual('react')), { forwardRef: jest.fn(function (arg) { return arg; }), useRef: function () { return ({ current: { click: function () { } } }); } })); });
 // Mock Drawer
-jest.mock('awing-library/lib/Commons/Components/ClassicDrawer', function () { return function (props) {
+jest.mock('Commons/Components/ClassicDrawer', function () { return function (props) {
     return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("button", { "data-testid": "onSubmit", onClick: props.onSubmit, children: "submit" }), props.children] }));
 }; });
 // Mock DataForm
-jest.mock('awing-library/lib/AWING', function () { return ({
+jest.mock('AWING', function () { return ({
     DataForm: function (props) {
         var _a, _b, _c;
         props.fields.forEach(function (element) {

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/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
@@ -105,3 +105,4 @@ 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(startDate?: string | Date, endDate?: string | Date, format?: 'YYYYMMDD' | 'YYYYMMDDHH'): string[];

package/lib/Utils/Helpers.js

@@ -23,7 +23,7 @@ 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.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");
@@ -541,3 +541,19 @@ 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(startDate, endDate, format) {
+    if (startDate === void 0) { startDate = ''; }
+    if (endDate === void 0) { endDate = ''; }
+    if (format === void 0) { format = 'YYYYMMDD'; }
+    // Parse the start and end dates
+    var start = (0, moment_1.default)(startDate);
+    var end = (0, moment_1.default)(endDate);
+    // 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));
+    }
+    return dates;
+}
+exports.fillMissingDates = fillMissingDates;

package/lib/translate/en/translation.json

@@ -1,5 +1,6 @@
 {
     "Common": {
+        "DateRangePickerLabel": "Date",
         "NotNegative": "Not negative value!",
         "Existed": "{0} is already existed!",
         "lg": "en",
@@ -60,7 +61,7 @@
         "ViewBy": "View By",
         "NotUsage": "Not Usage",
         "Usage": "Usage",
-        "FinalClick": "Final Click",
+        "FinalClick": "Click",
         "Label": "Label",
         "Permission": "Permission",
         "Download": "Download",
@@ -238,6 +239,9 @@
         "DisplayedRow ": "of"
     },
     "Campaign": {
+        "Engagement": "Engagement",
+        "Egr": "Engagement rate",
+        "Spot": "Spot",
         "ClickToCopy": "Click to copy",
         "Copied": "Copied",
         "Create": "Create campaign",

package/lib/translate/vi/translation.json

@@ -1,5 +1,6 @@
 {
     "Common": {
+        "DateRangePickerLabel": "Ngày tháng",
         "NotNegative": "Không được nhập số âm!",
         "Existed": "{0} đã tồn tại!",
         "lg": "vn",
@@ -220,6 +221,11 @@
         "DisplayedRow ": "trong"
     },
     "Campaign": {
+        "Engagement": "Lượt tương tác",
+        "Egr": "Tỉ lệ tương tác",
+        "Spot": "Spot",
+        "Impression": "Lượt hiển thị",
+        "Click": "Lượt kết nối",
         "Create": "Tạo chiến dịch",
         "ClickToCopy": "Nhấn để sao chép",
         "Copied": "Đã sao chép",
@@ -471,7 +477,7 @@
         "BillingUnit": {
             "Title": "Đơn vị",
             "View": "Impression",
-            "Authentication": "Engagement / Spot",
+            "Authentication": "Lượt tương tác / Spot",
             "Click": "Click"
         }
     },

package/package.json

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