awing-library 2.1.129-beta → 2.1.130-beta

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

@@ -18,7 +18,7 @@ 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;
 }[];

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

@@ -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(''),

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,2 @@
+import { AnalyticEventModelResponse, IAnalyticCampaignSummary } from '../Types';
+export declare const convertEventData: (data: IAnalyticCampaignSummary[]) => AnalyticEventModelResponse[];

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertEventData = void 0;
+var lodash_1 = 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;

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

@@ -45,6 +45,7 @@ var Context_1 = __importDefault(require("../Context"));
 var moment_1 = __importDefault(require("moment"));
 var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
 var Enum_2 = require("../../../../../ACM-AXN/Common/Enum");
+var Util_1 = require("./Util");
 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;
@@ -72,10 +73,13 @@ var EventContainer = function (props) {
             endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),
             timelineType: Enum_2.TimelineType.Day,
             campaignAdGroups: [__assign({ campaignId: "5344841815813731135" }, 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); });
+        }).then(function (res) { return setEventData((0, Util_1.convertEventData)(res)); }).finally(function () { return setIsLoading(false); });
         // client
         //     .statisticCampaignGetAnalyticEvent({
         //         startDate: time.startDate.toDateString(),
@@ -90,6 +94,15 @@ var EventContainer = function (props) {
         var places = placesOfCampaign.filter(function (p) {
             return placeIds.includes(p.placeId);
         });
+        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: "5344841815813731135" }, ids)],
+            analyticGroupBies: Object.values(Enum_2.AnalyticGroupBy).filter(function (g) { return !isNaN(Number(g)); }),
+            ignoredEventLabels: Object.values(Enum_1.BaseEvent),
+            placeIds: placeIds,
+        });
         // client
         //     .statisticCampaignGetEvents({
         //         startDate: time.startDate.toDateString(),

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;
 }
@@ -74,7 +74,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/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/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.130-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",