awing-library 2.1.144-beta → 2.1.145-beta

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

@@ -38,7 +38,6 @@ var sumBy = require('lodash/sumBy');
 var DetailGroupBy = function (props) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var statisticalData = props.statisticalData;
-    console.log("statisticalData", statisticalData);
     var services = (0, Context_1.default)().services;
     var _a = react_1.default.useState([]), groupByValues = _a[0], setGroupByValues = _a[1];
     var getHeadCells = function () {
@@ -121,7 +120,6 @@ var DetailGroupBy = function (props) {
                 });
                 return check;
             });
-            // console.log("groupFilters", groupFilters, groupByValues)
             if (groupFilters.length < groupByValues.length) {
                 var dataView = uniqBy(groupPlaces, groupByValues[groupFilters.length]).map(function (place) {
                     var _a;

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

@@ -116,13 +116,22 @@ function convertToExport(subCampaigns, data, timelineType, places) {
     subCampaigns.forEach(function (sub) {
         var _a;
         (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
-            var adData = data.filter(function (d) {
+            var adData = data
+                .filter(function (d) {
                 var _a;
                 return (d.campaignGroupId === ((_a = sub === null || sub === void 0 ? void 0 : sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.id) &&
                     d.campaignAdId === ad.id);
-            }).map(function (x) { return (__assign(__assign({}, x), Object.assign.apply(Object, __spreadArray([{}], x.analyticEventSummaries.map(function (y) {
+            })
+                .map(function (x) { return (__assign(__assign({}, x), Object.assign.apply(Object, __spreadArray(__spreadArray([{}], Object.values(Enum_1.BaseEvent).map(function (v) {
+                var _a;
+                return (_a = {},
+                    _a[v] = 0,
+                    _a);
+            }), false), x.analyticEventSummaries.map(function (y) {
                 var _a;
-                return (_a = {}, _a[y.eventLabel] = y.total, _a);
+                return (_a = {},
+                    _a[y.eventLabel] = y.total,
+                    _a);
             }), false)))); });
             result.push({
                 columns: isShouldHeader
@@ -141,7 +150,6 @@ function convertToExport(subCampaigns, data, timelineType, places) {
                 data: dataGroupByTimeline('All', adData, timelineType).map(function (d) { var _a; return __spreadArray([(_a = sub === null || sub === void 0 ? void 0 : sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.name, ad === null || ad === void 0 ? void 0 : ad.name], d, true); }),
             });
             isShouldHeader = false;
-            console.log("value placeId", adData);
             Array.prototype.push.apply(result, (0, lodash_1.chain)(adData)
                 .groupBy('placeId')
                 .map(function (value, key) {
@@ -249,29 +257,30 @@ function dataGroupByTimeline(place, data, timelineType) {
     var result = (0, lodash_1.chain)(data)
         .groupBy('timeline')
         .map(function (value, key) {
-        console.log("value", value, value.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.AUTHENTICATION; }));
         var dateString = (0, Helpers_1.dateTimeToString)((0, Helpers_1.convertTimelineToDateTime)(key, timelineType), timelineType === Helpers_1.TIMELINE_TYPE.DAY
             ? 'DD/MM/YYYY'
             : 'DD/MM/YYYY, H:mm');
         // let impression = sumBy(value, BaseEvent[AnalyticType.VIEW])
-        var impression = (0, lodash_1.sumBy)(value.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.VIEW; }), Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
-        var click = (0, lodash_1.sumBy)(value.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.CLICK; }), Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]);
-        var authen = (0, lodash_1.sumBy)(value.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.AUTHENTICATION; }), Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]);
-        var arr = [place, dateString, impression, authen, click];
+        var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
+        var click = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]);
+        var authen = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]);
+        var er = impression !== 0 ? (authen * 100) / impression : 0;
+        var ctr = impression !== 0 ? (click * 100) / impression : 0;
+        var arr = [place, dateString, impression, authen, click, Number(er.toFixed(2)), Number(ctr.toFixed(2))];
         return arr;
     })
         .value();
-    var impr = (0, lodash_1.sumBy)(data.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.VIEW; }), Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
-    var clk = (0, lodash_1.sumBy)(data.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.CLICK; }), Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]);
-    var authen = (0, lodash_1.sumBy)(data.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.AUTHENTICATION; }), Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]);
+    var impr = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
+    var clk = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]);
+    var authen = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]);
     result.push([
         place,
         i18n_1.default.t('Schedule.Total'),
         impr,
         authen,
         clk,
-        (impr !== 0 ? (authen * 100) / impr : 0).toFixed(2),
-        (impr !== 0 ? (clk * 100) / impr : 0).toFixed(2),
+        Number((impr !== 0 ? ((authen * 100) / impr) : 0).toFixed(2)),
+        Number((impr !== 0 ? ((clk * 100) / impr) : 0).toFixed(2)),
     ]);
     return result;
 }

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AddOrEditRule/RuleForm/LimitEvent.js

@@ -35,7 +35,6 @@ var LimitEvent = function (props) {
         var _a;
         onChange(__assign(__assign({}, rule), (_a = {}, _a[fieldName] = fieldValue, _a)));
     };
-    console.log("rule", rule);
     var _g = (0, Hooks_2.useGetData)([loginPageIds], service.pagesGetPageViewEventByPageIds), data = _g.data, isLoading = _g.isLoading;
     var eventSelected = react_1.default.useMemo(function () {
         return (0, lodash_1.default)(data)

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

@@ -44,10 +44,10 @@ var recoil_1 = require("recoil");
 var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
 var Hooks_1 = __importDefault(require("../../../../ACM-AXN/Campaign/Hooks"));
 var Enum_2 = require("../../../../ACM-AXN/Common/Enum");
-var AWING_1 = require("../../../../AWING");
 var lodash_1 = require("lodash");
 var Utils_1 = require("../../Utils");
 var Recoils_1 = require("../Recoils");
+var material_1 = require("@mui/material");
 function SubCampaignDetail(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var service = (0, Hooks_1.default)().service;
@@ -58,18 +58,12 @@ function SubCampaignDetail(props) {
         bonusAmount: (0, Utils_1.bonusValid)(subCampaign.bonusAmount),
         billingUnit: subCampaign.billingUnit !== null,
     }); };
-    var cacheSubId = react_1.default.useRef();
-    (0, react_1.useEffect)(function () {
-        cacheSubId.current = subCampaign.id;
-        return function () {
-            cacheSubId.current = undefined;
-        };
-    }, [subCampaign.id]);
+    var _a = react_1.default.useState(getFormValid), subValid = _a[0], setSubValid = _a[1];
     var isCreate = (0, recoil_1.useRecoilValue)(Recoils_1.isCreateState);
     (0, react_1.useEffect)(function () {
         onSubCampaignChange(function (prev) { return (0, lodash_1.cloneDeep)(prev); });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [subCampaign.id, onSubCampaignChange]);
+    }, [onSubCampaignChange]);
     (0, react_1.useEffect)(function () {
         onChangeSubCampaignStatus(Object.values(getFormValid()).every(Boolean));
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -91,117 +85,57 @@ function SubCampaignDetail(props) {
         helperText: t('Common.Required'),
         notNegative: t('Common.NotNegative'),
     };
-    var fields = react_1.default.useMemo(function () {
-        var tempField = [
-            {
-                fieldName: 'name',
-                type: 'text',
-                label: translationText.name,
-                required: true,
-                gridSize: 4,
-                pattern: false,
-                length: 500,
-            },
-            {
-                fieldName: 'ticket',
-                type: 'select',
-                label: translationText.ticket,
-                required: true,
-                gridSize: 4,
-                disabled: isCreate,
-                options: [
-                    {
-                        text: t('Campaign.Active'),
-                        value: Enum_1.CampaignTicket.ACTIVE,
-                    },
-                    {
-                        text: t('Campaign.InActive'),
-                        value: Enum_1.CampaignTicket.INACTIVE,
-                    },
-                ],
-            },
-            {
-                fieldName: 'priority',
-                type: 'select',
-                gridSize: 4,
-                label: translationText.priority,
-                required: true,
-                options: Object.values(Enum_1.CampaignPriority).map(function (priority) { return ({
-                    text: t("Campaign.".concat(priority)),
-                    value: priority,
-                }); }),
-            },
-        ];
-        if ((0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB)) {
-            tempField.push({
-                fieldName: 'bookingAmount',
-                type: 'number',
-                gridSize: 4,
-                required: true,
-                label: translationText.booking,
-                InputProps: {
-                    type: 'number',
-                },
-                onValidate: function (value) { return (0, Utils_1.bookingValid)(Number(value)); },
-            }, {
-                fieldName: 'bonusAmount',
-                type: 'number',
-                gridSize: 4,
-                required: true,
-                label: translationText.booking,
-                InputProps: {
-                    type: 'number',
-                },
-                onValidate: function (value) { return (0, Utils_1.bonusValid)(Number(value)); },
-            });
-            if (service.attributesGetByObjectTypeCode) {
-                tempField.push({
-                    fieldName: 'billingUnit',
-                    type: 'select',
-                    gridSize: 4,
-                    label: translationText.BillingUnit,
-                    required: true,
-                    value: String(subCampaign.billingUnit),
-                    onValidate: function (value) { return value !== null; },
-                    options: Object.values(Enum_2.AnalyticType)
-                        .filter(function (item) { return !isNaN(Number(item)); })
-                        .map(function (item) { return ({
-                        text: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[item])))),
-                        value: item,
-                    }); }),
-                });
-            }
-        }
-        tempField.push({
-            fieldName: 'isReserved',
-            type: 'checkbox',
-            gridSize: 4,
-            label: translationText.reserved,
-        });
-        return tempField;
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [subCampaign]);
-    var handleUpdate = react_1.default.useCallback(function (data, valid, fieldName) {
-        if (!fieldName || cacheSubId.current !== subCampaign.id)
-            return;
-        onSubCampaignChange(function (pre) {
-            var _a;
-            return fieldName === 'priority'
-                ? __assign(__assign(__assign(__assign({}, pre), { priority: data[fieldName] }), ((0, Utils_1.checkPriority)(data[fieldName], Enum_1.CampaignPriority.ClassB)
-                    ? {
-                        bookingAmount: 10,
-                        billingUnit: null,
-                    }
-                    : {
-                        bookingAmount: 0,
-                        billingUnit: 0,
-                    })), { bonusAmount: 0 }) : __assign(__assign({}, pre), (_a = {}, _a[fieldName] = data[fieldName], _a));
-        });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [subCampaign.id, onSubCampaignChange]);
-    return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(AWING_1.DataForm, { padding: "none", fields: fields, oldValue: __assign(__assign({}, subCampaign), { priority: isNaN(Number(subCampaign.priority))
-                    ? subCampaign.priority
-                    : Object.values(Enum_1.CampaignPriority)[subCampaign.priority] }), onUpdate: handleUpdate }) }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingBottom: 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: "name", name: "name", variant: "standard", required: true, fullWidth: true, label: translationText.name, value: subCampaign.name, onChange: function (e) {
+                                onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { name: e.target.value })); });
+                            }, error: subValid.name !== undefined && !subValid.name, helperText: subValid.name !== undefined && !subValid.name
+                                ? translationText.helperText
+                                : '' }) }), (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: "ticket", name: "ticket", variant: "standard", select: true, required: true, fullWidth: true, label: translationText.ticket, value: subCampaign.ticket, onChange: function (e) {
+                                onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { ticket: Number(e.target.value) })); });
+                            }, disabled: isCreate, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Enum_1.CampaignTicket.ACTIVE, children: t('Campaign.Active') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Enum_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.TextField, { id: "priority", select: true, required: true, variant: "standard", fullWidth: true, label: translationText.priority, value: isNaN(Number(subCampaign.priority))
+                                ? subCampaign.priority
+                                : Object.values(Enum_1.CampaignPriority)[subCampaign.priority], onChange: function (e) {
+                                var newPriority = Object.values(Enum_1.CampaignPriority).indexOf(e.target.value);
+                                onSubCampaignChange(function (pre) {
+                                    var newSubCamp = __assign(__assign(__assign(__assign({}, pre), { priority: newPriority }), ((0, Utils_1.checkPriority)(newPriority, Enum_1.CampaignPriority.ClassB)
+                                        ? {
+                                            bookingAmount: 10,
+                                            billingUnit: Enum_2.AnalyticType.AUTHENTICATION,
+                                        }
+                                        : {
+                                            bookingAmount: 0,
+                                            billingUnit: Enum_2.AnalyticType.AUTHENTICATION,
+                                        })), { bonusAmount: 0 });
+                                    setSubValid(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: true, bonusAmount: true })); });
+                                    return newSubCamp;
+                                });
+                            }, children: Object.values(Enum_1.CampaignPriority).map(function (priority) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: priority, children: t("Campaign.".concat(priority)) }, priority)); }) }) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: [(0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB) && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, 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) {
+                                        onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: Number(e.target.value) })); });
+                                    }, onFocus: function (event) { return event.target.select(); }, error: subValid.bookingAmount !== undefined &&
+                                        !subValid.bookingAmount, helperText: subValid.bookingAmount !== undefined &&
+                                        !subValid.bookingAmount
+                                        ? subCampaign.bookingAmount < 0
+                                            ? translationText.notNegative
+                                            : translationText.helperText
+                                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bonusAmount", variant: "standard", fullWidth: true, type: "number", label: translationText.bonus, value: subCampaign.bonusAmount, onChange: function (e) {
+                                        var value = Number(e.target.value);
+                                        onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bonusAmount: value })); });
+                                    }, onFocus: function (event) { return event.target.select(); }, error: subValid.bonusAmount !== undefined &&
+                                        !subValid.bonusAmount, helperText: subValid.bonusAmount !== undefined &&
+                                        !subValid.bonusAmount
+                                        ? subCampaign.bonusAmount < 0
+                                            ? translationText.notNegative
+                                            : translationText.helperText
+                                        : '' }) }), !service.attributesGetByObjectTypeCode ? ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
+                                        onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { billingUnit: Number(e.target.value) })); });
+                                    }, error: subValid.billingUnit !== undefined &&
+                                        !subValid.billingUnit, helperText: subValid.billingUnit !== undefined &&
+                                        !subValid.billingUnit
+                                        ? translationText.helperText
+                                        : '', children: Object.values(Enum_2.AnalyticType)
+                                        .filter(function (item) { return !isNaN(Number(item)); })
+                                        .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)); }) }) })) : null] })), (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 })); });
+                                }, name: "isReserved", color: "primary" }), label: translationText.reserved, style: { marginTop: 6 } }) })] })] }));
 }
 exports.default = SubCampaignDetail;

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

@@ -88,12 +88,10 @@ var Parameter = function (_a) {
         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',

package/lib/translate/en/translation.json

@@ -1,6 +1,7 @@
 {
     "Common": {
         "Engagement": "Engagement",
+        "Spot": "Spot",
         "DateRangePickerLabel": "Date",
         "NotNegative": "Not negative value!",
         "Existed": "{0} is already existed!",

package/lib/translate/vi/translation.json

@@ -1,6 +1,7 @@
 {
     "Common": {
         "Engagement": "Engagement",
+        "Spot": "Spot",
         "DateRangePickerLabel": "Ngày tháng",
         "NotNegative": "Không được nhập số âm!",
         "Existed": "{0} đã tồn tại!",

package/package.json

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

package/lib/ACM-AXN/ViewTemplate/TemplateField/Utils.d.ts

@@ -1,5 +0,0 @@
-import { ViewTemplateEvents } from "./Event";
-export declare const validEvents: (events: ViewTemplateEvents[]) => {
-    valid: boolean;
-    message: string;
-};

package/lib/ACM-AXN/ViewTemplate/TemplateField/Utils.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validEvents = void 0;
-var validEvents = function (events) {
-    var result = {
-        valid: true,
-        message: '',
-    };
-    console.log("aa12aa", events);
-    // const aa = uniqWith(events, (a, b) => a.event === b.event)
-    // console.log("aa", aa, events)
-    return result;
-};
-exports.validEvents = validEvents;