awing-library 2.1.129-beta → 2.1.131-beta

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

@@ -18,14 +18,13 @@ export declare const markBillingType: (subCampaigns: CampaignGroupModel[], data:
     placeId?: string | undefined;
     domainId?: string | undefined;
     timeline?: number | undefined;
-    analyticEventSummaries?: IAnalyticEventSummary[] | undefined;
+    analyticEventSummaries: IAnalyticEventSummary[];
     campaignGroupId?: number | undefined;
     campaignAdId?: number | undefined;
 }[];
 export declare function convertToShowDetail(subCampaigns: CampaignGroupModel[], data: IAnalyticCampaignSummary[], selectedDomains: any[], selectedPlaces: any[]): any[];
 export declare function dataGroupByTimeline(place: any, data: any, timelineType: any): any[][];
 export declare function dataGroupByPlace(subCampaigns: CampaignGroupModel[], ids: any): any[];
-export declare const sumEvent: (data: IAnalyticEventSummary[] | undefined, eventLabel: string) => number;
 export declare const convertToChartData: (data: IAnalyticCampaignSummary[], campaignGroups: CampaignGroupModel[]) => ({
     label: string;
     type: string;

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

@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.groupBy = exports.convertToChartData = exports.sumEvent = exports.dataGroupByPlace = exports.dataGroupByTimeline = exports.convertToShowDetail = exports.markBillingType = exports.placesToDomains = exports.convertToExport = exports.convertToExportData = exports.convertToExportDataGroupBy = void 0;
+exports.groupBy = exports.convertToChartData = exports.dataGroupByPlace = exports.dataGroupByTimeline = exports.convertToShowDetail = exports.markBillingType = exports.placesToDomains = exports.convertToExport = exports.convertToExportData = exports.convertToExportDataGroupBy = void 0;
 var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
 var Helpers_1 = require("../../../../../Utils/Helpers");
 var lodash_1 = __importStar(require("lodash"));
@@ -128,7 +128,7 @@ function convertToExport(subCampaigns, data, timelineType, places) {
                         'Place',
                         'Time',
                         i18n_1.default.t('Common.Impression'),
-                        'Engagement / Spot',
+                        i18n_1.default.t("Campaign.EngagementPerSpot"),
                         i18n_1.default.t('Common.FinalClick'),
                     ]
                     : Array(7).fill(''),
@@ -198,7 +198,6 @@ function convertToShowDetail(subCampaigns, data, selectedDomains, selectedPlaces
     var result = [];
     subCampaigns.forEach(function (sub) {
         var _a;
-        console.log("sub", sub);
         (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
             var _a, _b;
             var adPlaces = ((_a = ad === null || ad === void 0 ? void 0 : ad.places) === null || _a === void 0 ? void 0 : _a.concat(((_b = ad === null || ad === void 0 ? void 0 : ad.deletedPlaces) === null || _b === void 0 ? void 0 : _b.map(function (item) { return (__assign(__assign({}, item), { isDeleted: true })); })) || [])) || [];
@@ -217,7 +216,7 @@ function convertToShowDetail(subCampaigns, data, selectedDomains, selectedPlaces
                     var _a;
                     var event = (_a = d.analyticEventSummaries) === null || _a === void 0 ? void 0 : _a.find(function (_a) {
                         var eventLabel = _a.eventLabel;
-                        return eventLabel === Enum_1.BaseEvent[sub.campaignGroup.billingUnit];
+                        return (eventLabel === Enum_1.BaseEvent[sub.campaignGroup.billingUnit]);
                     });
                     return sum + ((event === null || event === void 0 ? void 0 : event.total) || 0);
                 }, 0);
@@ -297,11 +296,6 @@ function dataGroupByPlace(subCampaigns, ids) {
         .value();
 }
 exports.dataGroupByPlace = dataGroupByPlace;
-var sumEvent = function (data, eventLabel) {
-    if (data === void 0) { data = []; }
-    return (0, lodash_1.sumBy)(data, function (y) { return (y.total && y.eventLabel === eventLabel) ? y.total : 0; });
-};
-exports.sumEvent = sumEvent;
 var convertToChartData = function (data, campaignGroups) {
     var _a;
     var convertData = Object.assign.apply(Object, __spreadArray([{}], [Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW], Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK], 'Spot', 'Engagement'].map(function (x) {
@@ -310,12 +304,16 @@ var convertToChartData = function (data, campaignGroups) {
     }), false));
     var startDate = Number.MAX_SAFE_INTEGER;
     var endDate = 0;
-    data.forEach(function (x, index) {
+    data.forEach(function (x) {
+        var _a;
         startDate = Math.min(startDate, Number(x.timeline));
         endDate = Math.max(endDate, Number(x.timeline));
-        var billingUnit = (0, lodash_1.get)(campaignGroups, [x.campaignGroupId - 1]).campaignGroup.billingUnit;
+        var subCampaign = campaignGroups.find(function (c) { return c.campaignGroup.id === x.campaignGroupId; });
+        if (!subCampaign)
+            return;
+        var billingUnit = subCampaign.campaignGroup.billingUnit;
         var hasAuthen = billingUnit === Enum_2.AnalyticType.AUTHENTICATION;
-        var isSpot = hasAuthen && (0, lodash_1.get)(campaignGroups, [x.campaignGroupId - 1, 'ads', x.campaignAdId - 1]).type === Enum_1.AdType.VIDEO;
+        var isSpot = hasAuthen && ((_a = subCampaign.ads.find(function (s) { return s.id === x.campaignAdId; })) === null || _a === void 0 ? void 0 : _a.type) === Enum_1.AdType.VIDEO;
         var timeline = x.timeline.toString();
         x.analyticEventSummaries.forEach(function (event) {
             var _a;

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

@@ -47,12 +47,12 @@ var AnalyticContainer = function (props) {
     }, [subCampaigns]);
     var filterPlaces = function (ids) {
         var result = [];
-        subCampaigns.map(function (sub) {
+        subCampaigns.forEach(function (sub) {
             var _a;
-            (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.map(function (ad) {
+            (_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)); })) {
-                    (_a = ad === null || ad === void 0 ? void 0 : ad.places) === null || _a === void 0 ? void 0 : _a.map(function (place) {
+                    (_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);
                         }
@@ -74,7 +74,7 @@ var AnalyticContainer = function (props) {
             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.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); }),
+            campaignAdGroups: ids.length ? ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); }) : [{ campaignId: campaignId }],
             placeIds: placeIds,
             includedEventLabels: Object.values(Enum_1.BaseEvent)
         }).then(function (res) {

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

@@ -7,7 +7,9 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = __importDefault(require("react"));
 var component_1 = __importDefault(require("./component"));
 var moment_1 = __importDefault(require("moment"));
+var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
 var Helpers_1 = require("../../../../../Utils/Helpers");
+var lodash_1 = __importDefault(require("lodash"));
 var Context_1 = __importDefault(require("../Context"));
 var exportFile_1 = require("../../../../../ACM-AXN/CampaignSchedule/exportFile");
 var CustomerContainer = function (props) {
@@ -38,25 +40,17 @@ var CustomerContainer = function (props) {
     };
     var getCustomerData = function (time) {
         setIsLoading(true);
-        // client
-        //     .statisticCampaignGetAnalyticCustomer(
-        //         moment(startDate).format(DATE_FORMAT),
-        //         moment(endDate).format(DATE_FORMAT),
-        //         campaignId
-        //     )
-        //     .then((res) => {
-        //         let tmp_audienceOverviews = filteredData(
-        //             res.audienceObjects,
-        //             _.cloneDeep(time.startDate),
-        //             _.cloneDeep(time.endDate)
-        //         )
-        //         setCustomerData({
-        //             audienceObjects: res.audienceObjects, 
-        //             audienceOverviews: tmp_audienceOverviews as [],
-        //             totalUser: res.totalUser!,
-        //         })
-        //     })
-        //     .finally(() => setIsLoading(false))
+        client
+            .campaignStatisticGetCustomer((0, moment_1.default)(startDate).format(Enum_1.DATE_FORMAT), (0, moment_1.default)(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({
+                audienceObjects: res.audienceObjects,
+                audienceOverviews: tmp_audienceOverviews,
+                totalUser: res.totalUser,
+            });
+        })
+            .finally(function () { return setIsLoading(false); });
     };
     var exportData = function () {
         (0, exportFile_1.downloadWithDataSet)("export_analytic_customer_campaign_".concat(campaignId), convertToExportData(customerData));

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

@@ -0,0 +1,7 @@
+import { CampaignAd } from '../../../../../ACM-AXN/Campaign/Types';
+import { AnalyticEvent, AnalyticEventModelResponse, IAnalyticCampaignSummary } from '../Types';
+export declare const convertEventData: (data: IAnalyticCampaignSummary[]) => AnalyticEventModelResponse[];
+export declare function convertToExportData(data: AnalyticEvent[], places: NonNullable<CampaignAd['places']>): {
+    columns: string[];
+    data: string[][];
+}[];

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

@@ -0,0 +1,101 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    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)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToExportData = exports.convertEventData = void 0;
+var Helpers_1 = require("../../../../../Utils/Helpers");
+var lodash_1 = __importStar(require("lodash"));
+var Utils_1 = require("../Utils");
+var convertEventData = function (data) { return (0, lodash_1.uniqBy)(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;
+        })
+            .reduce(function (total, e) { return total + e.total; }, 0),
+    }); });
+}).flat(), "eventLabel"); };
+exports.convertEventData = convertEventData;
+function convertToExportData(data, places) {
+    var headCell = new Set(['Place', 'Mac Address', 'Created date', 'View Number', 'Event label']);
+    var exportData = [];
+    (0, lodash_1.default)(data).groupBy('id')
+        .map(function (value, key) {
+        var events = value.map(function (v) { return v.events; }).flat().filter(function (e) { return e.viewNumber; });
+        Object.keys(Object.assign.apply(Object, __spreadArray([{}], events.map(function (e) { return (0, Helpers_1.parseJSON)(e.eventObject); }), false))).forEach(headCell.add, headCell);
+        return events.map(function (e) { return (__assign(__assign({}, e), { analyticId: key })); });
+    })
+        .flatten()
+        .value()
+        .forEach(function (el) {
+        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('') : [
+            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'),
+        ];
+        rowData.push(el.viewNumber.toString(), el.eventLabel);
+        columns.forEach(function (c, idx) {
+            if (idx > 4) {
+                var row = (0, Helpers_1.parseJSON)(el.eventObject)[c];
+                rowData.push(row ? typeof row === 'string'
+                    ? row
+                    : JSON.stringify(row) : '');
+            }
+        });
+        exportData.push(rowData);
+    });
+    return [
+        {
+            columns: Array.from(headCell),
+            data: exportData,
+        },
+    ];
+}
+exports.convertToExportData = convertToExportData;

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

@@ -38,13 +38,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-var react_1 = __importStar(require("react"));
-var component_1 = __importDefault(require("./component"));
-var Helpers_1 = require("../../../../../Utils/Helpers");
-var Context_1 = __importDefault(require("../Context"));
-var moment_1 = __importDefault(require("moment"));
 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 moment_1 = __importDefault(require("moment"));
+var react_1 = __importStar(require("react"));
+var Context_1 = __importDefault(require("../Context"));
+var Util_1 = require("./Util");
+var component_1 = __importDefault(require("./component"));
 var EventContainer = function (props) {
     var campaignId = props.campaignId, startDate = props.startDate, endDate = props.endDate, subCampaigns = props.subCampaigns, domains = props.domains;
     var client = (0, Context_1.default)().services;
@@ -67,80 +68,44 @@ var EventContainer = function (props) {
     }, [subCampaigns]);
     var getEventData = function (time, placeIds, ids) {
         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: Enum_2.TimelineType.Day,
-            campaignAdGroups: [__assign({ campaignId: "5344841815813731135" }, ids)],
+            campaignAdGroups: [
+                __assign({ campaignId: campaignId }, ids),
+            ],
+            analyticGroupBies: [
+                Enum_2.AnalyticGroupBy.GbEventLabel,
+                Enum_2.AnalyticGroupBy.GbTimeline,
+            ],
+            ignoredEventLabels: Object.values(Enum_1.BaseEvent),
             placeIds: placeIds,
-        }).then(function (res) {
-            console.log("res", res);
-        }).finally(function () { return setIsLoading(false); });
-        // client
-        //     .statisticCampaignGetAnalyticEvent({
-        //         startDate: time.startDate.toDateString(),
-        //         endDate: time.endDate.toDateString(),
-        //         campaignAdGroups: [{ campaignId, ...ids }],
-        //         placeIds,
-        //     } as any)
-        //     .then(setEventData)
-        //     .finally(() => setIsLoading(false))
+        })
+            .then(function (res) { return setEventData((0, Util_1.convertEventData)(res)); })
+            .finally(function () { return setIsLoading(false); });
     };
     var exportData = function (time, placeIds, ids) {
         var places = placesOfCampaign.filter(function (p) {
             return placeIds.includes(p.placeId);
         });
-        // client
-        //     .statisticCampaignGetEvents({
-        //         startDate: time.startDate.toDateString(),
-        //         endDate: time.endDate.toDateString(),
-        //         campaignAdGroups: [{ campaignId, ...ids }],
-        //         placeIds,
-        //     } as any)
-        //     .then((responses) => {
-        //         // if (responses.data.status === STATUS_CODE.OK) {
-        //         downloadWithDataSet(
-        //             `export_analytic_event_campaign_${campaignId}`,
-        //             convertToExportData(responses, places)
-        //         )
-        //     })
-    };
-    function convertToExportData(data, places) {
-        var columns = ['Place', 'Mac Address', 'Created date', 'Event label'];
-        var exportData = [];
-        data === null || data === void 0 ? void 0 : data.forEach(function (el) {
-            var place = places.find(function (x) { return x.placeId === el.placeId; });
-            var rowData = [
-                place ? place.name : el.placeId,
-                el.macAddress,
-                (0, Helpers_1.dateTimeToString)((0, Helpers_1.convertTimestampToDateTime)(el.createdDate), 'DD/MM/YYYY, HH'),
-                el.eventLabel,
-            ];
-            var eventObject = JSON.parse(el.eventObject);
-            var keyNames = Object.keys(eventObject);
-            var _loop_1 = function (i) {
-                if (!columns.some(function (x) { return x === keyNames[i]; })) {
-                    columns.push(keyNames[i]);
-                }
-            };
-            for (var i = 0; i < keyNames.length; i++) {
-                _loop_1(i);
-            }
-            for (var i = 4; i < columns.length; i++) {
-                var dataObj = eventObject[columns[i]];
-                rowData.push(typeof dataObj === 'string'
-                    ? dataObj
-                    : JSON.stringify(dataObj));
-            }
-            exportData.push(rowData);
+        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),
+            timelineType: Enum_2.TimelineType.Day,
+            campaignAdGroups: [
+                __assign({ campaignId: campaignId }, ids),
+            ],
+            analyticGroupBies: Object.values(Enum_2.AnalyticGroupBy).filter(function (g) { return !isNaN(Number(g)); }),
+            ignoredEventLabels: Object.values(Enum_1.BaseEvent),
+            placeIds: placeIds,
+        })
+            .then(function (res) {
+            (0, exportFile_1.downloadWithDataSet)("export_analytic_event_campaign_".concat(campaignId), (0, Util_1.convertToExportData)(res, places));
         });
-        return [
-            {
-                columns: columns,
-                data: exportData,
-            },
-        ];
-    }
+    };
     return ((0, jsx_runtime_1.jsx)(component_1.default, { startDate: startDate, endDate: endDate, subCampaigns: subCampaigns, isLoading: isLoading, eventData: eventData, getEventData: getEventData, exportData: exportData, domains: domains }));
 };
 exports.default = EventContainer;

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

@@ -12,15 +12,15 @@ export interface AudienceObjectReply {
     totalUser?: number;
 }
 export interface IAnalyticEventSummary {
-    eventLabel?: string | undefined;
-    total?: number;
+    eventLabel: string;
+    total: number;
 }
 export interface IAnalyticCampaignSummary {
     campaignId?: string;
     placeId?: string;
     domainId?: string;
     timeline?: number;
-    analyticEventSummaries?: IAnalyticEventSummary[] | undefined;
+    analyticEventSummaries: IAnalyticEventSummary[];
     campaignGroupId?: number;
     campaignAdId?: number;
 }
@@ -34,19 +34,27 @@ export interface AnalyticEventModelResponse {
     timeline: number;
     total: number;
 }
-export interface AnalyticEvent {
+export interface IEvent {
     eventLabel: string;
     eventObject: string;
+    viewNumber: number;
+    createdDate: Timestamp;
+}
+export interface AnalyticEvent {
+    id: number;
+    sessionId: string;
     placeId: string;
     domainId: string;
-    pageId: string;
     campaignId: string;
     campaignGroupId: number;
+    campaignAdId: number;
     macAddress: string;
     apMac: string;
-    sessionId: string;
+    isNetwork: boolean;
+    url: string;
+    userAgent: string;
+    events: IEvent[];
     createdDate: Timestamp;
-    campaignAdId: number;
 }
 export interface IDomain {
     domainId?: string;
@@ -74,7 +82,7 @@ export type DateRange = {
     endDate: Date;
 };
 export interface CampaignAnalyticService {
-    campaignStatisticGetEvents(body: AnalyticEventModel | undefined): Promise<AnalyticEvent[]>;
+    campaignStatisticGetEvents(body: IStatisticDTO | undefined): Promise<AnalyticEvent[]>;
     campaignStatisticGetCustomer(startDate: string | undefined, endDate: string | undefined, campaignId: string | undefined): Promise<AudienceObjectReply>;
     campaignStatisticGet(body: IStatisticDTO | undefined): Promise<IAnalyticCampaignSummary[]>;
     domainsGetAll?: () => Promise<IDomain[]>;

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

@@ -37,12 +37,9 @@ var component_1 = __importDefault(require("./component"));
 var AWING_1 = require("../../../../AWING");
 var Context_1 = __importStar(require("./Context"));
 var Hooks_1 = require("../../../../AWING/Hooks");
-var fakeCampaignData_json_1 = __importDefault(require("./fakeCampaignData.json"));
 exports.tabs = { ANALYTIC: 0, EVENT: 1, CUSTOMER: 2 };
 function TabStatisticsContainer() {
-    var _a = (0, Context_1.default)(), client = _a.services, xxy = _a.campaignId, xxx = _a.subCampaigns, isNetwork = _a.isNetwork;
-    var campaignId = fakeCampaignData_json_1.default.campaign.id;
-    var subCampaigns = fakeCampaignData_json_1.default.campaignGroups;
+    var _a = (0, Context_1.default)(), client = _a.services, campaignId = _a.campaignId, subCampaigns = _a.subCampaigns, isNetwork = _a.isNetwork;
     var _b = (0, react_1.useState)(exports.tabs.ANALYTIC), tabIndex = _b[0], setTabIndex = _b[1];
     var time = (0, react_1.useMemo)(function () { return (0, Utils_1.getTime)(subCampaigns); }, [subCampaigns]);
     var tabPanel = function () {

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

@@ -20,7 +20,7 @@ export declare enum HEAD_CELL_IDS {
     CAMPAIGN_CAMPAIGN = "campaignCampaign"
 }
 export declare enum HEAD_CELL_NAMES {
-    AUTHENTICATION = "Engagement/ Spot",
+    AUTHENTICATION = "Engagement",
     ER = "Er",
     CONTROL = "collapse-stt",
     PLACE = "placeid",

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

@@ -28,7 +28,7 @@ var HEAD_CELL_IDS;
 })(HEAD_CELL_IDS || (exports.HEAD_CELL_IDS = HEAD_CELL_IDS = {}));
 var HEAD_CELL_NAMES;
 (function (HEAD_CELL_NAMES) {
-    HEAD_CELL_NAMES["AUTHENTICATION"] = "Engagement/ Spot";
+    HEAD_CELL_NAMES["AUTHENTICATION"] = "Engagement";
     HEAD_CELL_NAMES["ER"] = "Er";
     HEAD_CELL_NAMES["CONTROL"] = "collapse-stt";
     HEAD_CELL_NAMES["PLACE"] = "placeid";

package/lib/Utils/Helpers.d.ts

@@ -112,3 +112,4 @@ export declare function fillMissingDates(data: Array<{
     x: string;
     y: number;
 }[];
+export declare function parseJSON(str: string): any;

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.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;
+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");
@@ -563,3 +563,12 @@ function fillMissingDates(data, startDate, endDate, format) {
     return (0, lodash_1.orderBy)(result, ['x'], ['asc']);
 }
 exports.fillMissingDates = fillMissingDates;
+function parseJSON(str) {
+    try {
+        return JSON.parse(str || "{}");
+    }
+    catch (e) {
+        return str;
+    }
+}
+exports.parseJSON = parseJSON;

package/lib/translate/en/translation.json

@@ -1,5 +1,6 @@
 {
     "Common": {
+        "Engagement": "Engagement",
         "DateRangePickerLabel": "Date",
         "NotNegative": "Not negative value!",
         "Existed": "{0} is already existed!",
@@ -240,6 +241,7 @@
     },
     "Campaign": {
         "Engagement": "Engagement",
+        "EngagementPerSpot": "Engagement / Spot",
         "Egr": "Engagement rate",
         "Spot": "Spot",
         "ClickToCopy": "Click to copy",

package/lib/translate/vi/translation.json

@@ -1,5 +1,6 @@
 {
     "Common": {
+        "Engagement": "Engagement",
         "DateRangePickerLabel": "Ngày tháng",
         "NotNegative": "Không được nhập số âm!",
         "Existed": "{0} đã tồn tại!",
@@ -222,6 +223,7 @@
     },
     "Campaign": {
         "Engagement": "Lượt tương tác",
+        "EngagementPerSpot": "Engagement / Spot",
         "Egr": "Tỉ lệ tương tác",
         "Spot": "Spot",
         "Impression": "Lượt hiển thị",

package/package.json

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

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/fakeCampaignData.json

@@ -1,397 +0,0 @@
-{
-    "campaign": {
-        "id": "5344841815813731135",
-        "directoryId": "5",
-        "directoryPath": ".0.5.5344841815813731135.",
-        "name": "D-TES-362",
-        "createdDate": {
-            "seconds": "1715826943",
-            "nanos": 0
-        }
-    },
-    "campaignGroups": [
-        {
-            "campaignGroup": {
-                "numberHasRun": 0,
-                "id": 1,
-                "campaignId": "5344841815813731135",
-                "name": "Sub-Campaign 1",
-                "ticket": 1,
-                "priority": 1,
-                "bookingAmount": 10,
-                "bonusAmount": 0,
-                "isReserved": false,
-                "billingUnit": 1
-            },
-            "ads": [
-                {
-                    "loginPage": {
-                        "pageId": "5597952621104150331",
-                        "directoryId": "12",
-                        "pageCode": "lgn",
-                        "title": "Mediacom_Nutriboost_T5/24_Banner 1",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.12.5597952621104150331.",
-                        "createdDate": {
-                            "seconds": "1715253305",
-                            "nanos": 0
-                        }
-                    },
-                    "welcomePage": {
-                        "pageId": "4920522790503873987",
-                        "directoryId": "11",
-                        "pageCode": "wlc",
-                        "title": "Trí Khang_Marial Gel_T5/24",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.11.4920522790503873987.",
-                        "createdDate": {
-                            "seconds": "1715161995",
-                            "nanos": 0
-                        }
-                    },
-                    "places": [
-                        {
-                            "placeId": "5504693026866563256",
-                            "domainId": "4913100144472996590",
-                            "name": "AWING HEAD OFFICE",
-                            "address": "Hà Nội",
-                            "description": "",
-                            "longitude": 105.82840602165118,
-                            "latitude": 20.99985249638673,
-                            "communeCode": "00352",
-                            "districtCode": "009",
-                            "provinceCode": "01",
-                            "status": 0,
-                            "joinedDate": {
-                                "seconds": "1631777426",
-                                "nanos": 0
-                            }
-                        }
-                    ],
-                    "deletedPlaces": null,
-                    "id": 1,
-                    "campaignId": "5344841815813731135",
-                    "campaignGroupId": 1,
-                    "name": "Ad 1",
-                    "status": true,
-                    "type": 6,
-                    "loginId": "5597952621104150331",
-                    "welcomeId": "4920522790503873987",
-                    "startDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "endDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "placeFilter": {
-                        "operandGroups": [
-                            {
-                                "operands": [
-                                    {
-                                        "type": 2,
-                                        "operator": 7,
-                                        "value": "[\"4913100144472996590\"]"
-                                    },
-                                    {
-                                        "type": 0,
-                                        "operator": 7,
-                                        "value": "[\"5504693026866563256\"]"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    "weights": [],
-                    "advanced": null
-                },
-                {
-                    "loginPage": {
-                        "pageId": "5597952621104150331",
-                        "directoryId": "12",
-                        "pageCode": "lgn",
-                        "title": "Mediacom_Nutriboost_T5/24_Banner",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.12.5597952621104150331.",
-                        "createdDate": {
-                            "seconds": "1715253305",
-                            "nanos": 0
-                        }
-                    },
-                    "welcomePage": {
-                        "pageId": "4920522790503873987",
-                        "directoryId": "11",
-                        "pageCode": "wlc",
-                        "title": "Trí Khang_Marial Gel_T5/24",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.11.4920522790503873987.",
-                        "createdDate": {
-                            "seconds": "1715161995",
-                            "nanos": 0
-                        }
-                    },
-                    "places": [
-                        {
-                            "placeId": "5504693026866563256",
-                            "domainId": "4913100144472996590",
-                            "name": "AWING HEAD OFFICE",
-                            "address": "Hà Nội",
-                            "description": "",
-                            "longitude": 105.82840602165118,
-                            "latitude": 20.99985249638673,
-                            "communeCode": "00352",
-                            "districtCode": "009",
-                            "provinceCode": "01",
-                            "status": 0,
-                            "joinedDate": {
-                                "seconds": "1631777426",
-                                "nanos": 0
-                            }
-                        }
-                    ],
-                    "deletedPlaces": null,
-                    "id": 1,
-                    "campaignId": "5344841815813731135",
-                    "campaignGroupId": 1,
-                    "name": "Ad 2",
-                    "status": true,
-                    "type": 3,
-                    "loginId": "5597952621104150331",
-                    "welcomeId": "4920522790503873987",
-                    "startDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "endDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "placeFilter": {
-                        "operandGroups": [
-                            {
-                                "operands": [
-                                    {
-                                        "type": 2,
-                                        "operator": 7,
-                                        "value": "[\"4913100144472996590\"]"
-                                    },
-                                    {
-                                        "type": 0,
-                                        "operator": 7,
-                                        "value": "[\"5504693026866563256\"]"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    "weights": [],
-                    "advanced": null
-                }
-            ]
-        },
-        {
-            "campaignGroup": {
-                "numberHasRun": 0,
-                "id": 2,
-                "campaignId": "5344841815813731135",
-                "name": "Sub-Campaign 2",
-                "ticket": 1,
-                "priority": 1,
-                "bookingAmount": 10,
-                "bonusAmount": 0,
-                "isReserved": false,
-                "billingUnit": 0
-            },
-            "ads": [
-                {
-                    "loginPage": {
-                        "pageId": "5597952621104150331",
-                        "directoryId": "12",
-                        "pageCode": "lgn",
-                        "title": "Mediacom_Nutriboost_T5/24_Banner 1",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.12.5597952621104150331.",
-                        "createdDate": {
-                            "seconds": "1715253305",
-                            "nanos": 0
-                        }
-                    },
-                    "welcomePage": {
-                        "pageId": "4920522790503873987",
-                        "directoryId": "11",
-                        "pageCode": "wlc",
-                        "title": "Trí Khang_Marial Gel_T5/24",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.11.4920522790503873987.",
-                        "createdDate": {
-                            "seconds": "1715161995",
-                            "nanos": 0
-                        }
-                    },
-                    "places": [
-                        {
-                            "placeId": "5504693026866563256",
-                            "domainId": "4913100144472996590",
-                            "name": "AWING HEAD OFFICE",
-                            "address": "Hà Nội",
-                            "description": "",
-                            "longitude": 105.82840602165118,
-                            "latitude": 20.99985249638673,
-                            "communeCode": "00352",
-                            "districtCode": "009",
-                            "provinceCode": "01",
-                            "status": 0,
-                            "joinedDate": {
-                                "seconds": "1631777426",
-                                "nanos": 0
-                            }
-                        }
-                    ],
-                    "deletedPlaces": null,
-                    "id": 21,
-                    "campaignId": "5344841815813731135",
-                    "campaignGroupId": 21,
-                    "name": "Ad 21",
-                    "status": true,
-                    "type": 6,
-                    "loginId": "5597952621104150331",
-                    "welcomeId": "4920522790503873987",
-                    "startDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "endDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "placeFilter": {
-                        "operandGroups": [
-                            {
-                                "operands": [
-                                    {
-                                        "type": 2,
-                                        "operator": 7,
-                                        "value": "[\"4913100144472996590\"]"
-                                    },
-                                    {
-                                        "type": 0,
-                                        "operator": 7,
-                                        "value": "[\"5504693026866563256\"]"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    "weights": [],
-                    "advanced": null
-                },
-                {
-                    "loginPage": {
-                        "pageId": "5597952621104150331",
-                        "directoryId": "12",
-                        "pageCode": "lgn",
-                        "title": "Mediacom_Nutriboost_T5/24_Banner",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.12.5597952621104150331.",
-                        "createdDate": {
-                            "seconds": "1715253305",
-                            "nanos": 0
-                        }
-                    },
-                    "welcomePage": {
-                        "pageId": "4920522790503873987",
-                        "directoryId": "11",
-                        "pageCode": "wlc",
-                        "title": "Trí Khang_Marial Gel_T5/24",
-                        "layoutId": "0",
-                        "transitionId": 0,
-                        "commonHtml": "",
-                        "directoryPath": ".0.6.11.4920522790503873987.",
-                        "createdDate": {
-                            "seconds": "1715161995",
-                            "nanos": 0
-                        }
-                    },
-                    "places": [
-                        {
-                            "placeId": "5504693026866563256",
-                            "domainId": "4913100144472996590",
-                            "name": "AWING HEAD OFFICE",
-                            "address": "Hà Nội",
-                            "description": "",
-                            "longitude": 105.82840602165118,
-                            "latitude": 20.99985249638673,
-                            "communeCode": "00352",
-                            "districtCode": "009",
-                            "provinceCode": "01",
-                            "status": 0,
-                            "joinedDate": {
-                                "seconds": "1631777426",
-                                "nanos": 0
-                            }
-                        }
-                    ],
-                    "deletedPlaces": null,
-                    "id": 2,
-                    "campaignId": "5344841815813731135",
-                    "campaignGroupId": 2,
-                    "name": "Ad 212121",
-                    "status": true,
-                    "type": 3,
-                    "loginId": "5597952621104150331",
-                    "welcomeId": "4920522790503873987",
-                    "startDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "endDate": {
-                        "seconds": "1715792400",
-                        "nanos": 0
-                    },
-                    "placeFilter": {
-                        "operandGroups": [
-                            {
-                                "operands": [
-                                    {
-                                        "type": 2,
-                                        "operator": 7,
-                                        "value": "[\"4913100144472996590\"]"
-                                    },
-                                    {
-                                        "type": 0,
-                                        "operator": 7,
-                                        "value": "[\"5504693026866563256\"]"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    "weights": [],
-                    "advanced": null
-                }
-            ]
-        }
-    ],
-    "campaignAttributes": [
-        {
-            "campaignId": "5344841815813731135",
-            "attributeId": 1
-        }
-    ],
-    "campaignPartner": null
-}