awing-library 2.1.179-dev → 2.1.181-dev

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.js +10 -40
  2. package/lib/AWING/BasicDataForm/BasicDataForm.js +3 -1
  3. package/lib/AWING/Chart/BarLineComponent.js +0 -1
  4. package/package.json +2 -3
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.js CHANGED
@@ -143,7 +143,6 @@ function convertToExport(subCampaigns, data, timelineType, places, campaignName,
143
143
  subCampaigns.forEach(function (sub) {
144
144
  var _a;
145
145
  (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
146
- var hasSpot = false;
147
146
  var adData = data
148
147
  .filter(function (d) {
149
148
  var _a;
@@ -151,7 +150,7 @@ function convertToExport(subCampaigns, data, timelineType, places, campaignName,
151
150
  d.campaignAdId === ad.id);
152
151
  })
153
152
  // eslint-disable-next-line no-sequences
154
- .map(function (x) { return ((hasSpot = hasSpot || x.isSPot), __assign(__assign({}, x), Object.assign.apply(Object, __spreadArray(__spreadArray([{}], Object.values(Enum_1.BaseEvent).map(function (v) {
153
+ .map(function (x) { return (__assign(__assign({}, x), Object.assign.apply(Object, __spreadArray(__spreadArray([{}], Object.values(Enum_1.BaseEvent).map(function (v) {
155
154
  var _a;
156
155
  return (_a = {},
157
156
  _a[v] = 0,
@@ -360,26 +359,15 @@ function dataGroupByTimeline(place, data, timelineType) {
360
359
  : 'DD/MM/YYYY, H:mm');
361
360
  var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
362
361
  var authen = value.reduce(function (sum, d) {
363
- var _a, _b;
364
- if (d.isSPot) {
365
- return (sum +
366
- Number((_a = d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
367
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _a !== void 0 ? _a : 0));
368
- }
369
- return sum + Number((_b = d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _b !== void 0 ? _b : 0);
362
+ return (sum +
363
+ Number(d[Enum_1.BaseEvent[Number(d.billingUnit)]] || 0));
370
364
  }, 0);
371
365
  return [place, dateString, impression, authen];
372
366
  })
373
367
  .value();
374
368
  var impressionTotal = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
375
369
  var authenTotal = data.reduce(function (sum, d) {
376
- var _a, _b;
377
- if (d.isSPot) {
378
- return ((_a = sum +
379
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
380
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _a !== void 0 ? _a : 0);
381
- }
382
- return (_b = sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _b !== void 0 ? _b : 0;
370
+ return (sum + d[Enum_1.BaseEvent[Number(d.billingUnit)]]);
383
371
  }, 0);
384
372
  var totalArr = [
385
373
  place,
@@ -400,24 +388,15 @@ function dataGroupByTimelineAndPlaces(place, province, district, data, timelineT
400
388
  : 'DD/MM/YYYY, H:mm');
401
389
  var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
402
390
  var authen = value.reduce(function (sum, d) {
403
- if (d.isSPot) {
404
- return (sum +
405
- Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
406
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0));
407
- }
408
- return sum + Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0);
391
+ return (sum +
392
+ Number(d[Enum_1.BaseEvent[Number(d.billingUnit)]] || 0));
409
393
  }, 0);
410
394
  return [place, province, district, dateString, impression, authen];
411
395
  })
412
396
  .value();
413
397
  var impressionTotal = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
414
398
  var authenTotal = data.reduce(function (sum, d) {
415
- if (d.isSPot) {
416
- return (sum +
417
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
418
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]);
419
- }
420
- return sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]];
399
+ return (sum + d[Enum_1.BaseEvent[Number(d.billingUnit)]]);
421
400
  }, 0);
422
401
  var totalArr = [
423
402
  place,
@@ -440,24 +419,15 @@ function dataGroupByAd(data, timelineType) {
440
419
  : 'DD/MM/YYYY, H:mm');
441
420
  var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
442
421
  var authen = value.reduce(function (sum, d) {
443
- if (d.isSPot) {
444
- return (sum +
445
- Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
446
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0));
447
- }
448
- return sum + Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0);
422
+ return (sum +
423
+ Number(d[Enum_1.BaseEvent[Number(d.billingUnit)]] || 0));
449
424
  }, 0);
450
425
  return [dateString, impression, authen];
451
426
  })
452
427
  .value();
453
428
  var impressionTotal = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
454
429
  var authenTotal = data.reduce(function (sum, d) {
455
- if (d.isSPot) {
456
- return (sum +
457
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
458
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]);
459
- }
460
- return sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]];
430
+ return (sum + d[Enum_1.BaseEvent[Number(d.billingUnit)]]);
461
431
  }, 0);
462
432
  var totalArr = [i18n_1.default.t('Schedule.Total'), impressionTotal, authenTotal];
463
433
  result.push(totalArr);
package/lib/AWING/BasicDataForm/BasicDataForm.js CHANGED
@@ -65,6 +65,7 @@ var BasicDataForm = function (props) {
65
65
  var _b = react_1.default.useState(function () {
66
66
  return getCurrentObj({ oldValue: oldValue, fields: fields });
67
67
  }), currentObj = _b[0], setCurrentObj = _b[1];
68
+ var renderCount = react_1.default.useRef(0);
68
69
  var _c = react_1.default.useState({}), currentValid = _c[0], setCurrentValid = _c[1];
69
70
  var errorText = react_1.default.useRef({
70
71
  default: t('Common.InvalidData'),
@@ -100,7 +101,7 @@ var BasicDataForm = function (props) {
100
101
  : (0, exports.DefaultCheckValid)(fieldType, value);
101
102
  };
102
103
  react_1.default.useEffect(function () {
103
- if (oldValue) {
104
+ if (oldValue && renderCount.current !== 0) {
104
105
  setCurrentObj(getCurrentObj({ oldValue: oldValue, fields: fields }));
105
106
  var valid = {};
106
107
  for (var i = 0; i < fields.length; i++) {
@@ -109,6 +110,7 @@ var BasicDataForm = function (props) {
109
110
  }
110
111
  setCurrentValid(valid);
111
112
  }
113
+ renderCount.current += 1;
112
114
  // eslint-disable-next-line react-hooks/exhaustive-deps
113
115
  }, []);
114
116
  var handleChange = function (fieldName, fieldValue) {
package/lib/AWING/Chart/BarLineComponent.js CHANGED
@@ -46,7 +46,6 @@ var BarLineComponent = function (props) {
46
46
  //Sửa lại với thời gian theo giờ
47
47
  var timeFormat = (_a = tooltipItems[0].raw) === null || _a === void 0 ? void 0 : _a.x;
48
48
  var isTimelineHour = (timeFormat === null || timeFormat === void 0 ? void 0 : timeFormat.length) > 8;
49
- debugger;
50
49
  if (isTimelineHour) {
51
50
  var timeText = (0, moment_1.default)(timeFormat, 'YYYYMMDDHH').format('HH[h] DD-MM-YYYY');
52
51
  return t('Common.Hour') + ': ' + timeText;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "awing-library",
3
- "version": "2.1.179-dev",
3
+ "version": "2.1.181-dev",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -26,7 +26,6 @@
26
26
  "@mui/lab": "5.0.0-alpha.149",
27
27
  "@mui/material": "^5.14.14",
28
28
  "@mui/styles": "^5.14.14",
29
- "@mui/x-charts": "^6.19.3",
30
29
  "@mui/x-date-pickers": "6.18.1",
31
30
  "@mui/x-tree-view": "^6.17.0",
32
31
  "@testing-library/jest-dom": "^6.1.4",
@@ -39,7 +38,7 @@
39
38
  "@types/react": "^18.2.31",
40
39
  "@types/react-dom": "^18.2.14",
41
40
  "aphrodite": "^2.4.0",
42
- "chart.js": "^4.4.1",
41
+ "chart.js": "^4.4.3",
43
42
  "chartjs-adapter-moment": "^1.0.1",
44
43
  "clsx": "^2.1.1",
45
44
  "concurrently": "^8.2.2",