awing-library 2.1.127-beta → 2.1.129-beta

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

@@ -308,13 +308,11 @@ var convertToChartData = function (data, campaignGroups) {
         var _a;
         return (_a = {}, _a[x] = { total: 0, chartData: [] }, _a);
     }), false));
-    var startDate = '';
-    var endDate = '';
+    var startDate = Number.MAX_SAFE_INTEGER;
+    var endDate = 0;
     data.forEach(function (x, index) {
-        if (index === 0)
-            startDate = x.timeline.toString();
-        if (index === data.length - 1)
-            endDate = x.timeline.toString();
+        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 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;
@@ -333,7 +331,6 @@ var convertToChartData = function (data, campaignGroups) {
             }
         });
     });
-    var timeLineArr = (0, Helpers_1.fillMissingDates)(startDate, endDate, endDate.length === 10 ? 'YYYYMMDDHH' : 'YYYYMMDD');
     var translate = (_a = {},
         _a[Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]] = 'Common.Impression',
         _a[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] = 'Statistics.NumberOfConnections',
@@ -347,14 +344,10 @@ var convertToChartData = function (data, campaignGroups) {
             var y = _a.y;
             return Number(y) !== 0;
         })) {
-            lodash_1.default.xor(timeLineArr, data.map(function (_a) {
-                var x = _a.x;
-                return x;
-            })).forEach(function (x) { return data.push({ x: x, y: 0 }); });
             return {
                 label: "".concat(i18n_1.default.t(translate[key]), " ").concat((0, Helpers_1.roundDecimalNumber)(value.total)),
                 type: 'line',
-                data: lodash_1.default.orderBy(data, ['x'], ['asc']),
+                data: (0, Helpers_1.fillMissingDates)(data, startDate, endDate),
                 fill: false,
                 pointStyle: 'circle',
                 yAxisID: 'y',

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

@@ -1,4 +1,15 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -63,11 +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 ({
-                campaignId: campaignId,
-                campaignGroupId: id.campaignGroupId,
-                campaignAdId: id.campaignAdId
-            }); }),
+            campaignAdGroups: ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); }),
             placeIds: placeIds,
             includedEventLabels: Object.values(Enum_1.BaseEvent)
         }).then(function (res) {

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

@@ -1,11 +1,13 @@
 import { CampaignGroupModel } from '../../../../../ACM-AXN/Campaign/Types';
+import { DateRange } from '../Types';
+import { ICampaignAdGroup } from '../Analytic/container';
 interface Props {
     isLoading: boolean;
     startDate: Date;
     endDate: Date;
     subCampaigns: CampaignGroupModel[];
     eventData: any;
-    getEventData: any;
+    getEventData: (time: DateRange, placeIds: string[], ids: ICampaignAdGroup) => void;
     exportData: any;
     domains: any[];
 }

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

@@ -142,7 +142,7 @@ var Event = function (props) {
                         paddingTop: 4,
                         marginTop: 2,
                         marginLeft: -1,
-                    }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 7 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(MultipleHierarchicalChoice_1.MultipleHierarchicalChoice, { onChange: handleGroupChange, options: groupOptions, placeholder: t('Campaign.SelectGroup'), label: t('Common.ViewBy'), value: getValue() }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
+                    }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 7 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(MultipleHierarchicalChoice_1.MultipleHierarchicalChoice, { onChange: handleGroupChange, options: groupOptions, placeholder: t('Campaign.SelectGroup'), label: t('Common.ViewBy'), value: getValue(), maxSelected: 1 }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
                                     padding: function (theme) { return theme.spacing(1); },
                                     paddingLeft: function (theme) { return theme.spacing(16); },
                                     paddingRight: function (theme) { return theme.spacing(16); },

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

@@ -1,4 +1,15 @@
 "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);
@@ -31,6 +42,9 @@ 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 Enum_2 = require("../../../../../ACM-AXN/Common/Enum");
 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;
@@ -53,6 +67,15 @@ var EventContainer = function (props) {
     }, [subCampaigns]);
     var getEventData = function (time, placeIds, ids) {
         setIsLoading(true);
+        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)],
+            placeIds: placeIds,
+        }).then(function (res) {
+            console.log("res", res);
+        }).finally(function () { return setIsLoading(false); });
         // client
         //     .statisticCampaignGetAnalyticEvent({
         //         startDate: time.startDate.toDateString(),

package/lib/Utils/Helpers.d.ts

@@ -105,4 +105,10 @@ export interface IHeadCells {
 export declare const updateObjectFields: (originalObj: any, changedValues: any) => any;
 export declare function formatChartNumber(val: any, language: string): string;
 export declare const setObject: <O extends {}>(obj: O, arrKey: Array<keyof O>, value: unknown) => void;
-export declare function fillMissingDates(startDate?: string | Date, endDate?: string | Date, format?: 'YYYYMMDD' | 'YYYYMMDDHH'): string[];
+export declare function fillMissingDates(data: Array<{
+    x: string;
+    y: number;
+}>, startDate?: string | Date | number, endDate?: string | Date | number, format?: 'YYYYMMDD' | 'YYYYMMDDHH'): {
+    x: string;
+    y: number;
+}[];

package/lib/Utils/Helpers.js

@@ -541,19 +541,25 @@ var setObject = function (obj, arrKey, value) {
     (0, lodash_1.set)(obj, arrKey.reduce(function (acc, val) { return acc + '[' + val + ']'; }, ''), value);
 };
 exports.setObject = setObject;
-function fillMissingDates(startDate, endDate, format) {
+function fillMissingDates(data, startDate, endDate, format) {
     if (startDate === void 0) { startDate = ''; }
     if (endDate === void 0) { endDate = ''; }
     if (format === void 0) { format = 'YYYYMMDD'; }
+    var result = data.concat();
     // Parse the start and end dates
-    var start = (0, moment_1.default)(startDate);
-    var end = (0, moment_1.default)(endDate);
+    var start = (0, moment_1.default)(isNaN(Number(startDate)) ? startDate : String(startDate));
+    var end = (0, moment_1.default)(isNaN(Number(endDate)) ? endDate : String(endDate));
+    if (start.isAfter(end))
+        throw new Error('Start date must be before end date');
     // Array to hold the complete range of dates
     var dates = [];
     // Iterate through the date range
     for (var m = (0, moment_1.default)(start); m.isSameOrBefore(end); m.add(1, format === 'YYYYMMDD' ? 'days' : 'hours')) {
         dates.push(m.format(format));
     }
-    return dates;
+    (0, lodash_1.xor)(data.map(function (d) { return d.x; }), dates).forEach(function (x) {
+        result.push({ x: x, y: 0 });
+    });
+    return (0, lodash_1.orderBy)(result, ['x'], ['asc']);
 }
 exports.fillMissingDates = fillMissingDates;

package/package.json

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