awing-library 2.1.135-beta → 2.1.135

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

@@ -10,26 +10,36 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    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 });
 var jsx_runtime_1 = require("react/jsx-runtime");
+var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
+var exportFile_1 = require("../../../../../ACM-AXN/CampaignSchedule/exportFile");
+var Enum_2 = require("../../../../../ACM-AXN/Common/Enum");
+var Helpers_1 = require("../../../../../Utils/Helpers");
+var lodash_1 = require("lodash");
+var moment_1 = __importDefault(require("moment"));
 var react_1 = require("react");
+var Context_1 = __importDefault(require("../Context"));
 var common_1 = require("../common");
 var Utils_1 = require("./Utils");
 var component_1 = __importDefault(require("./component"));
-var moment_1 = __importDefault(require("moment"));
-var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
-var lodash_1 = require("lodash");
-var Context_1 = __importDefault(require("../Context"));
-var exportFile_1 = require("../../../../../ACM-AXN/CampaignSchedule/exportFile");
 var AnalyticContainer = function (props) {
-    var campaignId = props.campaignId, startDate = props.startDate, endDate = props.endDate, subCampaigns = props.subCampaigns, domains = props.domains;
+    var campaignId = props.campaignId, startDate = props.startDate, endDate = props.endDate, subCampaigns = props.subCampaigns, domains = props.domains, campaignName = props.campaignName, fullPlaces = props.fullPlaces;
     var client = (0, Context_1.default)().services;
     var _a = (0, react_1.useState)(true), isLoading = _a[0], setIsLoading = _a[1];
     var _b = (0, react_1.useState)([]), statisticalChartData = _b[0], setStatisticalChartData = _b[1];
-    var _c = (0, react_1.useState)([]), statisticalData = _c[0], setStatisticalData = _c[1];
     var placesOfCampaign = (0, react_1.useMemo)(function () {
         var result = [];
         subCampaigns.forEach(function (sub) {
@@ -51,7 +61,11 @@ var AnalyticContainer = function (props) {
             var _a;
             (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
                 var _a;
-                if (ids.find(function (id) { var _a; return id.campaignGroupId == ((_a = sub === null || sub === void 0 ? void 0 : sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.id) && (!id.campaignAdId || id.campaignAdId == (ad === null || ad === void 0 ? void 0 : ad.id)); })) {
+                if (ids.find(function (id) {
+                    var _a;
+                    return id.campaignGroupId == ((_a = sub === null || sub === void 0 ? void 0 : sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.id) &&
+                        (!id.campaignAdId || id.campaignAdId == (ad === null || ad === void 0 ? void 0 : ad.id));
+                })) {
                     (_a = ad === null || ad === void 0 ? void 0 : ad.places) === null || _a === void 0 ? void 0 : _a.forEach(function (place) {
                         if (!result.find(function (r) { return r.placeId == place.placeId; })) {
                             result.push(place);
@@ -70,65 +84,116 @@ var AnalyticContainer = function (props) {
                 : selectedPlaces;
         var selectedDomains = (0, Utils_1.placesToDomains)(selectedPlaces, domains);
         setIsLoading(true);
-        client.campaignStatisticGet({
+        client
+            .campaignStatisticGet({
             startDate: (0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT),
             endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),
             timelineType: timelineType,
-            campaignAdGroups: ids.length ? ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); }) : [{ campaignId: campaignId }],
+            campaignAdGroups: ids.length
+                ? ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); })
+                : [{ campaignId: campaignId }],
+            analyticGroupBies: __spreadArray([
+                Enum_2.AnalyticGroupBy.GbEventLabel,
+                Enum_2.AnalyticGroupBy.GbTimeline,
+                Enum_2.AnalyticGroupBy.GbCampaignGroupId,
+                Enum_2.AnalyticGroupBy.GbCampaignAdId
+            ], statisticType ? [Enum_2.AnalyticGroupBy.GbPlaceId] : [], true),
             placeIds: placeIds,
-            includedEventLabels: Object.values(Enum_1.BaseEvent)
-        }).then(function (res) {
-            setStatisticalData((0, Utils_1.markBillingType)(subCampaigns, res));
-            setStatisticalChartData(statisticType ? (0, Utils_1.convertToShowDetail)(subCampaigns, res, selectedDomains, selectedPlaces) : res);
-        }).finally(function () { return setIsLoading(false); });
+            includedEventLabels: Object.values(Enum_1.BaseEvent),
+        })
+            .then(function (res) {
+            setStatisticalChartData(statisticType
+                ? (0, Utils_1.convertToShowDetail)(subCampaigns, res, selectedDomains, selectedPlaces)
+                : res);
+        })
+            .finally(function () { return setIsLoading(false); });
     };
     var exportData = function (time, placeIds, timelineType, exportType, ids) {
         var selectedPlaces = placeIds.length > 0
             ? placesOfCampaign.filter(function (p) { return placeIds.includes(p.placeId); })
             : placesOfCampaign;
-        // downloadWithDataSet
         var selectedDomains = (0, Utils_1.placesToDomains)(selectedPlaces, domains);
-        var exportObj = {
-            name: "export_statistic_campaign_".concat(campaignId),
-            data: []
-        };
-        switch (exportType) {
-            case common_1.EXPORT_TYPES.Domain: {
-                var newObjects = (0, lodash_1.chain)(selectedDomains)
-                    .groupBy('domainId')
-                    .map(function (value) {
-                    var currentPlaces = value
-                        .map(function (x) { return x.places; })
-                        .reduce(function (a, b) { return a.concat(b); }, []);
-                    return {
-                        objectId: value[0].domainId,
-                        objectName: value[0].domainName,
-                        places: currentPlaces,
-                    };
-                })
-                    .value();
-                exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, newObjects, timelineType, 'Domain');
-                exportObj.name += '_groupby_domain';
-                break;
-            }
-            case common_1.EXPORT_TYPES.Export: {
-                exportObj.data = (0, Utils_1.convertToExport)(subCampaigns, statisticalData, timelineType, selectedPlaces);
-                exportObj.name += '_total';
-                break;
+        var analyticInfo = (0, Utils_1.campaignAnalyticInfo)(ids.length ? subCampaigns.filter(function (s) { return ids.map(function (i) { return String(i.campaignGroupId); }).includes(String(s.campaignGroup.id)); }) : subCampaigns);
+        return client
+            .campaignStatisticGet({
+            startDate: (0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT),
+            endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),
+            timelineType: timelineType,
+            campaignAdGroups: ids.length
+                ? ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); })
+                : [{ campaignId: campaignId }],
+            analyticGroupBies: [
+                Enum_2.AnalyticGroupBy.GbEventLabel,
+                Enum_2.AnalyticGroupBy.GbTimeline,
+                Enum_2.AnalyticGroupBy.GbCampaignGroupId,
+                Enum_2.AnalyticGroupBy.GbCampaignAdId,
+                Enum_2.AnalyticGroupBy.GbPlaceId,
+            ],
+            placeIds: placeIds,
+            includedEventLabels: Object.values(Enum_1.BaseEvent),
+        })
+            .then(function (res) {
+            var statisticalData = (0, Utils_1.markBillingType)(subCampaigns, res);
+            var exportObj = {
+                name: '',
+                data: [],
+            };
+            switch (exportType) {
+                case common_1.EXPORT_TYPES.Domain: {
+                    var domainObj = (0, lodash_1.chain)(selectedDomains)
+                        .groupBy('domainId')
+                        .map(function (value) {
+                        var currentPlaces = value
+                            .map(function (x) { return x.places; })
+                            .reduce(function (a, b) { return a.concat(b); }, []);
+                        return {
+                            objectId: value[0].domainId,
+                            objectName: value[0].domainName,
+                            places: currentPlaces,
+                        };
+                    })
+                        .value();
+                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, domainObj, timelineType, 'Domain', campaignName !== null && campaignName !== void 0 ? campaignName : '');
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_domain');
+                    break;
+                }
+                case common_1.EXPORT_TYPES.Export: {
+                    exportObj.data = (0, Utils_1.convertToExport)(subCampaigns, statisticalData, timelineType, selectedPlaces, campaignName !== null && campaignName !== void 0 ? campaignName : '', fullPlaces);
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'total');
+                    break;
+                }
+                case common_1.EXPORT_TYPES.LocationGroup: {
+                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign', campaignName !== null && campaignName !== void 0 ? campaignName : '');
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_subcampaign');
+                    break;
+                }
+                case common_1.EXPORT_TYPES.Ad: {
+                    exportObj.data = (0, Utils_1.convertToExportByAd)(subCampaigns, statisticalData, timelineType, campaignName !== null && campaignName !== void 0 ? campaignName : '');
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'ad');
+                    break;
+                }
+                default: {
+                    exportObj.data = (0, Utils_1.convertToExportData)(statisticalData, selectedPlaces, timelineType, campaignName !== null && campaignName !== void 0 ? campaignName : '', fullPlaces);
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_place');
+                    break;
+                }
             }
-            case common_1.EXPORT_TYPES.LocationGroup: {
-                exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign');
-                exportObj.name += '_groupby_subcampaign';
-                break;
+            if (analyticInfo === null || analyticInfo === void 0 ? void 0 : analyticInfo.isAllReLabel) {
+                exportObj.data.forEach(function (data, index) {
+                    exportObj.data[index].columns = data.columns.filter(function (_, index) { return index !== data.columns.length - 2; });
+                    exportObj.data[index].data = data.data.map(function (col) { return col.filter(function (_, index) { return index !== col.length - 2; }); });
+                });
             }
-            default: {
-                exportObj.data = (0, Utils_1.convertToExportData)(statisticalData, selectedPlaces, timelineType);
-                exportObj.name += '_groupby_place';
-                break;
+            if (!(analyticInfo === null || analyticInfo === void 0 ? void 0 : analyticInfo.hasClick)) {
+                exportObj.data.forEach(function (data, index) {
+                    exportObj.data[index].columns = data.columns.filter(function (_, index) { return index !== data.columns.length - 1; });
+                    exportObj.data[index].data = data.data.map(function (col) { return col.filter(function (_, index) { return index !== col.length - 1; }); });
+                });
             }
-        }
-        (0, exportFile_1.downloadWithDataSet)(String(exportObj.name).toUpperCase(), exportObj.data);
-        return;
+            (0, Utils_1.addHeaderExcel)(exportObj.data, campaignName !== null && campaignName !== void 0 ? campaignName : '');
+            (0, exportFile_1.downloadWithDataSet)(String(exportObj.name).toUpperCase(), exportObj.data);
+            return;
+        });
     };
     return ((0, jsx_runtime_1.jsx)(component_1.default, { domains: domains, startDate: startDate, endDate: endDate, subCampaigns: subCampaigns, isLoading: isLoading, statisticalData: statisticalChartData, getStatisticalData: getStatisticalData, exportData: exportData }));
 };

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/ChartFilter.d.ts

@@ -5,7 +5,7 @@ interface Props {
     isExportType: boolean;
     onChangeQueryInput: (changeType: string, newValue: any) => void;
     onQueryData: () => void;
-    onExportData: (exportType?: string) => void;
+    onExportData: (exportType?: string) => void | Promise<void>;
     domains: any[];
 }
 declare const ChartFilterBox: (props: Props) => import("react/jsx-runtime").JSX.Element;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/ChartFilter.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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -53,7 +76,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var GetApp_1 = __importDefault(require("@mui/icons-material/GetApp"));
 var material_1 = require("@mui/material");
-var react_1 = require("react");
+var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 // import { EnhancedDateRangePicker } from 'Components/DateRangePicker'
 var Helpers_1 = require("../../../../Utils/Helpers");
@@ -65,6 +88,7 @@ var SplitButtonExportType_1 = __importDefault(require("./SplitButtonExportType")
 var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
 var i18n_1 = __importDefault(require("../../../../i18n"));
 var Context_1 = __importDefault(require("./Context"));
+var lab_1 = require("@mui/lab");
 var textFieldStyle = {
     '& .MuiOutlinedInput-input': {
         padding: '10.5px !important',
@@ -89,7 +113,8 @@ var ChartFilterBox = function (props) {
     var 
     // startDate, endDate,
     subCampaigns = props.subCampaigns, queryInput = props.queryInput, isExportType = props.isExportType, onChangeQueryInput = props.onChangeQueryInput, onQueryData = props.onQueryData, onExportData = props.onExportData, domains = props.domains;
-    var _a = (0, Context_1.default)(), client = _a.services, PlaceMultiSelect = _a.placeMultiSelectComponent;
+    var _a = react_1.default.useState(false), loading = _a[0], setLoading = _a[1];
+    var _b = (0, Context_1.default)(), client = _b.services, PlaceMultiSelect = _b.placeMultiSelectComponent;
     var placeGroups = (0, react_1.useMemo)(function () {
         return subCampaigns.map(function (x) { return ({
             groupId: x.campaignGroup.id,
@@ -209,6 +234,23 @@ var ChartFilterBox = function (props) {
             MONTH: t('Common.Month'),
         },
     };
+    var handleExport = react_1.default.useCallback(function (type) {
+        if (type === void 0) { type = ''; }
+        setLoading(true);
+        var result = onExportData(typeof type === 'string' ? type : '');
+        if (result instanceof Promise) {
+            result
+                .then(function () {
+                setLoading(false);
+            })
+                .catch(function () {
+                setLoading(false);
+            });
+        }
+        else {
+            setLoading(false);
+        }
+    }, [onExportData]);
     return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker
                 // noBorder
                 , { 
@@ -225,13 +267,9 @@ var ChartFilterBox = function (props) {
                     variant: "outlined", textFieldProps: {
                         fullWidth: true,
                         sx: textFieldStyle,
-                    } }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(PlaceMultiSelect
-                // disableCheckPermission={true}
-                , { 
-                    // disableCheckPermission={true}
-                    onChange: placeMultiSelectSubmit, initialOption: {
+                    } }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(PlaceMultiSelect, { disableCheckPermission: !client.domainsGetAll, onChange: placeMultiSelectSubmit, initialOption: {
                         placeGroups: placeGroups,
                         domains: domains.map(function (d) { return (__assign(__assign({}, d), { name: d.domainName })); }),
-                    }, isDisplayTextField: true, TextFieldProps: { sx: textFieldStyle }, onGetPlacesByFilter: handleGetPlacesByFilter }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: (0, jsx_runtime_1.jsx)(material_1.Button, { color: "primary", variant: "contained", fullWidth: true, onClick: function () { return onQueryData(); }, children: translationText.view }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: !isExportType ? ((0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", onClick: function () { return onExportData(); }, children: (0, jsx_runtime_1.jsx)(GetApp_1.default, {}) })) : ((0, jsx_runtime_1.jsx)(SplitButtonExportType_1.default, { onSubmit: function (exportType) { return onExportData(exportType); } })) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 })] }));
+                    }, isDisplayTextField: true, TextFieldProps: { sx: textFieldStyle }, onGetPlacesByFilter: handleGetPlacesByFilter }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: (0, jsx_runtime_1.jsx)(material_1.Button, { color: "primary", variant: "contained", fullWidth: true, onClick: function () { return onQueryData(); }, children: translationText.view }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: !isExportType ? ((0, jsx_runtime_1.jsx)(lab_1.LoadingButton, { variant: "outlined", onClick: handleExport, loading: loading, children: (0, jsx_runtime_1.jsx)(GetApp_1.default, {}) })) : ((0, jsx_runtime_1.jsx)(SplitButtonExportType_1.default, { loading: loading, onSubmit: onExportData })) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 })] }));
 };
 exports.default = ChartFilterBox;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Customer/component.js

@@ -53,10 +53,11 @@ var Customer = function (props) {
                                 // noBorder
                                 label: t('Common.View'), callback: function (value) {
                                     var _a, _b;
-                                    return changeQueryInput('time', {
-                                        startDate: (0, Helpers_1.getStartOfDay)((_a = value === null || value === void 0 ? void 0 : value.startDate) === null || _a === void 0 ? void 0 : _a.toDate()),
-                                        endDate: (0, Helpers_1.getStartOfDay)((_b = value === null || value === void 0 ? void 0 : value.endDate) === null || _b === void 0 ? void 0 : _b.toDate()),
-                                    });
+                                    Object.values(value).filter(Boolean).length > 1 &&
+                                        changeQueryInput('time', {
+                                            startDate: (0, Helpers_1.getStartOfDay)((_a = value === null || value === void 0 ? void 0 : value.startDate) === null || _a === void 0 ? void 0 : _a.toDate()),
+                                            endDate: (0, Helpers_1.getStartOfDay)((_b = value === null || value === void 0 ? void 0 : value.endDate) === null || _b === void 0 ? void 0 : _b.toDate()),
+                                        });
                                 }, initialStartDate: (0, moment_1.default)(queryInput.time.startDate), initialEndDate: (0, moment_1.default)(queryInput.time.endDate), isShowCalendarInfo: true, variant: "outlined", textFieldProps: {
                                     fullWidth: true,
                                     sx: {
@@ -103,10 +104,10 @@ var Customer = function (props) {
                                             ' ' +
                                             (0, Helpers_1.roundDecimalNumber)(customerData.totalUser),
                                         type: 'line',
-                                        data: customerData === null || customerData === void 0 ? void 0 : customerData.audienceObjects.map(function (item) { return ({
+                                        data: (0, Helpers_1.fillMissingDates)(customerData === null || customerData === void 0 ? void 0 : customerData.audienceObjects.map(function (item) { return ({
                                             x: String(item.timeline),
                                             y: item.totalUser,
-                                        }); }).sort(function (a, b) { return Number(a.x) - Number(b.x); }),
+                                        }); }), queryInput.time.startDate, queryInput.time.endDate),
                                         fill: false,
                                         pointStyle: 'rect',
                                         yAxisID: 'y',
@@ -118,6 +119,7 @@ var Customer = function (props) {
                                             title: {
                                                 text: t('Statistics.View'),
                                             },
+                                            beginAtZero: true,
                                         },
                                         yAxis: {
                                             display: false,

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Customer/container.js

@@ -41,7 +41,7 @@ var CustomerContainer = function (props) {
     var getCustomerData = function (time) {
         setIsLoading(true);
         client
-            .campaignStatisticGetCustomer((0, moment_1.default)(startDate).format(Enum_1.DATE_FORMAT), (0, moment_1.default)(endDate).format(Enum_1.DATE_FORMAT), campaignId)
+            .campaignStatisticGetCustomer((0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT), (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT), campaignId)
             .then(function (res) {
             var tmp_audienceOverviews = filteredData(res.audienceObjects, lodash_1.default.cloneDeep(time.startDate), lodash_1.default.cloneDeep(time.endDate));
             setCustomerData({

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

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var styles_1 = require("@mui/styles");
 var material_1 = require("@mui/material");
 var react_i18next_1 = require("react-i18next");
 var Helpers_1 = require("../../../../../Utils/Helpers");
+var i18n_1 = __importDefault(require("../../../../../i18n"));
 var useStyles = (0, styles_1.makeStyles)({
     table: {
         minWidth: 400,
@@ -19,7 +23,7 @@ var useStyles = (0, styles_1.makeStyles)({
 var EventTable = function (props) {
     var classes = useStyles();
     var eventDetails = props.data;
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var translationText = {
         eventLabel: t('Campaign.Detail.EventLabel'),
         number: t('Campaign.Detail.TotalEvents'),

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

@@ -47,18 +47,15 @@ exports.convertToExportData = exports.convertEventData = void 0;
 var Helpers_1 = require("../../../../../Utils/Helpers");
 var lodash_1 = __importStar(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,
         total: events
-            .filter(function (e) {
-            return (0, Utils_1.extractEvent)(e.eventLabel).eventName ===
-                (0, Utils_1.extractEvent)(x.eventLabel).eventName;
-        })
+            .filter(function (e) { return (0, lodash_1.isEqual)((0, Utils_1.extractEvent)(e.eventLabel), (0, Utils_1.extractEvent)(x.eventLabel)); })
             .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']);
@@ -75,7 +72,7 @@ function convertToExportData(data, places) {
         var columns = Array.from(headCell);
         var analytic = data.find(function (x) { return String(x.id) === el.analyticId; });
         var place = places.find(function (x) { return x.placeId === (analytic === null || analytic === void 0 ? void 0 : analytic.placeId); });
-        var rowData = el.viewNumber !== 1 ? Array(3).fill('') : [
+        var rowData = [
             place ? place.name : analytic === null || analytic === void 0 ? void 0 : analytic.placeId,
             analytic === null || analytic === void 0 ? void 0 : analytic.macAddress,
             (0, Helpers_1.dateTimeToString)((0, Helpers_1.convertTimestampToDateTime)(analytic.createdDate), 'DD/MM/YYYY, HH'),

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

@@ -49,7 +49,7 @@ var Event = function (props) {
     var queryData = function () {
         getEventData(queryInput.time, queryInput.placeIds, queryInput.ids);
     };
-    function convertDataSetPattern(eventData) {
+    function convertDataSetPattern(eventData, time) {
         return lodash_1.default.chain(eventData)
             .groupBy('eventLabel')
             .map(function (data, eventLabel) {
@@ -69,7 +69,7 @@ var Event = function (props) {
             return {
                 label: value.eventLabel + ' ' + (0, Helpers_1.roundDecimalNumber)(value.total),
                 type: 'line',
-                data: value.data,
+                data: (0, Helpers_1.fillMissingDates)(value.data, time.startDate, time.endDate),
                 fill: false,
                 pointStyle: 'rect',
                 yAxisID: 'y',
@@ -134,7 +134,7 @@ var Event = function (props) {
         }
         return result;
     };
-    var dataConvert = convertDataSetPattern(eventData);
+    var dataConvert = convertDataSetPattern(eventData, queryInput.time);
     return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(ChartFilter_1.default, { isExportType: false, subCampaigns: subCampaigns, queryInput: queryInput, onChangeQueryInput: changeQueryInput, onQueryData: queryData, onExportData: function () {
                         return exportData(queryInput.time, queryInput.placeIds, queryInput.ids);
                     }, domains: domains }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: isLoading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, sx: {

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

@@ -90,7 +90,7 @@ var EventContainer = function (props) {
         var places = placeIds.length ? placesOfCampaign.filter(function (p) {
             return placeIds.includes(p.placeId);
         }) : placesOfCampaign;
-        client
+        return client
             .campaignStatisticGetEvents({
             startDate: (0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT),
             endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/SplitButtonExportType.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface Props {
     onSubmit: (value: string) => void;
+    loading?: boolean;
 }
 declare const SplitButtonExportType: React.FC<Props>;
 export default SplitButtonExportType;

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

@@ -20,13 +20,25 @@ var material_1 = require("@mui/material");
 var ArrowDropDown_1 = __importDefault(require("@mui/icons-material/ArrowDropDown"));
 var common_1 = require("./common");
 var react_i18next_1 = require("react-i18next");
-var options = Object.values(common_1.EXPORT_TYPES).map(function (type, idx) { return type; });
+var i18n_1 = __importDefault(require("../../../../i18n"));
+var lab_1 = require("@mui/lab");
+var Context_1 = __importDefault(require("./Context"));
 var SplitButtonExportType = function (props) {
-    var onSubmit = props.onSubmit;
+    var onSubmit = props.onSubmit, loading = props.loading;
+    var services = (0, Context_1.default)().services;
     var _a = react_1.default.useState(false), open = _a[0], setOpen = _a[1];
     var anchorRef = react_1.default.useRef(null);
     var _b = react_1.default.useState(0), selectedIndex = _b[0], setSelectedIndex = _b[1];
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var options = react_1.default.useMemo(function () {
+        return Object.values(common_1.EXPORT_TYPES)
+            .map(function (type, idx) { return type; })
+            .filter(function (type) {
+            return services.domainsGetAll ? true : type !== 'Domain';
+        });
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []);
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var handleClick = function () {
         onSubmit(options[selectedIndex]);
     };
@@ -49,8 +61,9 @@ var SplitButtonExportType = function (props) {
         Domain: t("Campaign.ExportType.Domain"),
         Location: t('Campaign.ExportType.Location'),
         LocationGroup: t('Campaign.ExportType.LocationGroup'),
+        Ad: t('Campaign.ExportType.Ad'),
     };
-    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, direction: "column", alignItems: "center", children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, children: [(0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { variant: "outlined", color: "inherit", ref: anchorRef, "aria-label": "split button", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleClick, children: translationText[options[selectedIndex]] }), (0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-controls": open ? 'split-button-menu' : undefined, "aria-expanded": open ? 'true' : undefined, "aria-label": "select merge strategy", "aria-haspopup": "menu", onClick: handleToggle, children: (0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {}) })] }), (0, jsx_runtime_1.jsx)(material_1.Popper, { style: { zIndex: 99999 }, open: open, anchorEl: anchorRef.current, transition: true, children: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, direction: "column", alignItems: "center", children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, children: [(0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { disabled: loading, variant: "outlined", color: "inherit", ref: anchorRef, "aria-label": "split button", children: [(0, jsx_runtime_1.jsx)(lab_1.LoadingButton, { variant: 'outlined', onClick: handleClick, loading: loading, children: translationText[options[selectedIndex]] }), (0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-controls": open ? 'split-button-menu' : undefined, "aria-expanded": open ? 'true' : undefined, "aria-label": "select merge strategy", "aria-haspopup": "menu", onClick: handleToggle, children: (0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {}) })] }), (0, jsx_runtime_1.jsx)(material_1.Popper, { style: { zIndex: 99999 }, open: open, anchorEl: anchorRef.current, transition: true, children: function (_a) {
                         var TransitionProps = _a.TransitionProps, placement = _a.placement;
                         return ((0, jsx_runtime_1.jsx)(material_1.Grow, __assign({}, TransitionProps, { style: {
                                 transformOrigin: placement === 'bottom'

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Types.d.ts

@@ -2,6 +2,7 @@
 import { CampaignGroupModel, PlaceFilter } from '../../../../ACM-AXN/Campaign/Types';
 import { ShareType } from '../../../../ACM-AXN/Common/Enum';
 import { IStatisticDTO, Timestamp } from '../../../../ACM-AXN/Common/Types';
+import { AdministrativeUnitType } from '../../../../ACM-AXN/Page/enums';
 import { BaseChartComponent } from 'react-chartjs-2/dist/types';
 export interface IAudienceObjectOverview {
     timeline?: number;
@@ -81,6 +82,12 @@ export type DateRange = {
     startDate: Date;
     endDate: Date;
 };
+export type AdministrativeUnit = {
+    code?: string | undefined;
+    parentUnitCode?: string | undefined;
+    name?: string | undefined;
+    type?: AdministrativeUnitType;
+};
 export interface CampaignAnalyticService {
     campaignStatisticGetEvents(body: IStatisticDTO | undefined): Promise<AnalyticEvent[]>;
     campaignStatisticGetCustomer(startDate: string | undefined, endDate: string | undefined, campaignId: string | undefined): Promise<AudienceObjectReply>;
@@ -88,12 +95,15 @@ export interface CampaignAnalyticService {
     domainsGetAll?: () => Promise<IDomain[]>;
     placesGetPagingByPlaceFilter: (pageIndex?: number, pageSize?: number, body?: PlaceFilter) => Promise<any>;
     placesGetByPlaceFilter: (body?: PlaceFilter) => Promise<any[]>;
+    administrativeUnitsGet: () => Promise<AdministrativeUnit[]>;
 }
 export interface CampaignAnalyticProps {
     placeMultiSelectComponent: (p?: any) => JSX.Element;
+    fullPlaces?: AdministrativeUnit[];
     chart: BaseChartComponent;
     services: CampaignAnalyticService;
     campaignId: string;
+    campaignName?: string;
     isNetwork?: boolean;
     subCampaigns: CampaignGroupModel[];
 }

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/TabStatistic/common.d.ts

@@ -3,4 +3,5 @@ export declare const EXPORT_TYPES: {
     Domain: string;
     LocationGroup: string;
     Location: string;
+    Ad: string;
 };

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

@@ -4,6 +4,7 @@ exports.EXPORT_TYPES = void 0;
 exports.EXPORT_TYPES = {
     Export: "Export",
     Domain: "Domain",
-    LocationGroup: "LocationGroup",
-    Location: "Location",
+    LocationGroup: "LocationGroup", // Chiến dịch con
+    Location: "Location", // Địa điểm
+    Ad: "Ad" // Quảng cáo
 };

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

@@ -1,14 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_i18next_1 = require("react-i18next");
 var material_1 = require("@mui/material");
 var react_1 = require("react");
 var container_1 = require("./container");
+var i18n_1 = __importDefault(require("../../../../i18n"));
 var color = ['inherit', 'primary'];
 var variant = ['outlined', 'contained'];
 var TabStatistic = function (props) {
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var tabIndex = props.tabIndex, onChangeTab = props.onChangeTab, tabPanel = props.tabPanel, isNetwork = props.isNetwork;
     var translationText = (0, react_1.useMemo)(function () { return ({
         analytic: t('Campaign.Analytic'),
@@ -19,7 +23,7 @@ var TabStatistic = function (props) {
     var handleChangeTab = function (event) {
         onChangeTab(Number(event.target.tabIndex));
     };
-    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: function (theme) { return theme.spacing(2); } }, className: "ahihu", children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "h6", sx: {
+    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: function (theme) { return theme.spacing(2); } }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "h6", sx: {
                                     marginTop: function (theme) { return theme.spacing(1); },
                                     marginLeft: function (theme) { return theme.spacing(2); },
                                 }, children: translationText.title }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.ButtonGroup, { sx: {