awing-library 2.1.18-beta → 2.1.20-beta

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 (11) hide show
  1. package/lib/ACM-AXN/Campaign/Container.js +5 -6
  2. package/lib/ACM-AXN/Campaign/Container.test.js +1 -1
  3. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AdDetail.test.js +1 -1
  4. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/Advanced.js +16 -1
  5. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignList.test.js +1 -1
  6. package/lib/ACM-AXN/Campaign/Utils.js +1 -1
  7. package/lib/ACM-AXN/Statistics/ControlPanel.js +23 -9
  8. package/lib/ACM-AXN/Statistics/Enums.d.ts +1 -0
  9. package/lib/ACM-AXN/Statistics/Enums.js +1 -0
  10. package/lib/ACM-AXN/Statistics/container.js +1 -1
  11. package/package.json +1 -1
package/lib/ACM-AXN/Campaign/Container.js CHANGED
@@ -256,20 +256,19 @@ var CampaignContainer = function () {
256
256
  },
257
257
  {
258
258
  field: 'booking',
259
- headerName: t('Campaign.BookingText'),
259
+ headerName: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: '150px', textAlign: 'right' }, children: t('Campaign.BookingText') }),
260
260
  valueGetter: function (row) {
261
261
  var _a;
262
+ var text = '';
262
263
  if ((_a = row === null || row === void 0 ? void 0 : row.campaign) === null || _a === void 0 ? void 0 : _a.id) {
263
- return (0, Utils_1.getTotalBooking)(row === null || row === void 0 ? void 0 : row.campaignGroups);
264
+ text = (0, Utils_1.getTotalBooking)(row === null || row === void 0 ? void 0 : row.campaignGroups);
264
265
  }
265
266
  else {
266
- return (0, Utils_1.checkPriority)(row.campaignGroup.priority, Types_1.CampaignPriority.ClassB)
267
+ text = (0, Utils_1.checkPriority)(row.campaignGroup.priority, Types_1.CampaignPriority.ClassB)
267
268
  ? (0, Helpers_1.roundDecimalNumber)(row.campaignGroup.bookingAmount)
268
269
  : 'N/A';
269
270
  }
270
- },
271
- TableCellProps: {
272
- align: 'right',
271
+ return (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: '150px', textAlign: 'right' }, children: text });
273
272
  },
274
273
  },
275
274
  ], rows: (0, Utils_1.formatListCampaign)(listCampaign === null || listCampaign === void 0 ? void 0 : listCampaign.items, collapseIds) || [], rowActions: [
package/lib/ACM-AXN/Campaign/Container.test.js CHANGED
@@ -244,7 +244,7 @@ jest.mock('CustomHooks/useAppHelper', function () { return ({
244
244
  }); },
245
245
  }); });
246
246
  // Mock PageManagement
247
- jest.mock('awing-library/lib/AWING/PageManagement', function () { return ({
247
+ jest.mock('AWING/PageManagement', function () { return ({
248
248
  PageManagement: function (props) {
249
249
  return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("button", { "data-testid": "onChangeQueryInput", onClick: function () {
250
250
  props.onChangeQueryInput({
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AdDetail.test.js CHANGED
@@ -16,7 +16,7 @@ function MockComponent(props) {
16
16
  // const MockComponentFactory = (name: string) => () => (props: any) => <div><div/>
17
17
  jest.mock('Features/PlaceFilter', function () { return MockComponent; });
18
18
  jest.mock("Components/Typescript/AsynchronousAutocomplete", function () { return MockComponent; });
19
- jest.mock("awing-library/lib/AWING/DateRangePicker", function () { return MockComponent; });
19
+ jest.mock("AWING/DateRangePicker", function () { return MockComponent; });
20
20
  jest.mock('Services/DirectoryPermission', function () { return ({
21
21
  getByObjectTypeCode: function () { return new Promise(function (resolve) {
22
22
  resolve({
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/Advanced.js CHANGED
@@ -33,6 +33,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
33
33
  __setModuleDefault(result, mod);
34
34
  return result;
35
35
  };
36
+ var __rest = (this && this.__rest) || function (s, e) {
37
+ var t = {};
38
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
39
+ t[p] = s[p];
40
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
41
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
42
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
43
+ t[p[i]] = s[p[i]];
44
+ }
45
+ return t;
46
+ };
36
47
  var __importDefault = (this && this.__importDefault) || function (mod) {
37
48
  return (mod && mod.__esModule) ? mod : { "default": mod };
38
49
  };
@@ -189,10 +200,14 @@ var Advanced = function (props) {
189
200
  onClose();
190
201
  }
191
202
  };
203
+ var ruleType = react_1.default.useMemo(function () {
204
+ var RetargetMacAddress = Utils_1.RuleType.RetargetMacAddress, other = __rest(Utils_1.RuleType, ["RetargetMacAddress"]);
205
+ return (service === null || service === void 0 ? void 0 : service.remarketingListGetAll) ? Utils_1.RuleType : other;
206
+ }, [service]);
192
207
  return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ClassicBaseDrawer_1.default, { title: translationText.advanced, open: isOpen, onSubmit: handleSubmit, onClose: handleClose, children: (0, jsx_runtime_1.jsx)(material_1.Paper, { sx: classes.paper, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, md: true }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, sx: classes.buttonGroup, children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", color: "primary", endIcon: (0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {}), "aria-controls": "simple-menu", "aria-haspopup": "true", onClick: function (e) {
193
208
  e.stopPropagation();
194
209
  setAnchorElRule(e.currentTarget);
195
- }, children: translationText.addRule }), (0, jsx_runtime_1.jsx)(material_1.Menu, { id: "simple-menu", anchorEl: anchorElRule, keepMounted: true, open: Boolean(anchorElRule), onClose: function () { return handleButtonMenuClose(); }, children: Object.keys(Utils_1.RuleType).map(function (type, idx) {
210
+ }, children: translationText.addRule }), (0, jsx_runtime_1.jsx)(material_1.Menu, { id: "simple-menu", anchorEl: anchorElRule, keepMounted: true, open: Boolean(anchorElRule), onClose: function () { return handleButtonMenuClose(); }, children: Object.keys(ruleType).map(function (type, idx) {
196
211
  var _a;
197
212
  return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: function () { return handleAddRule(type); }, children: ((_a = Object.entries(translationText.type).find(function (_a) {
198
213
  var k = _a[0], val = _a[1];
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignList.test.js CHANGED
@@ -14,7 +14,7 @@ var Recoils_1 = require("../Recoils");
14
14
  function MockComponent(props) {
15
15
  return (0, jsx_runtime_1.jsx)("div", {});
16
16
  }
17
- jest.mock('awing-library/lib/AWING', function () { return ({
17
+ jest.mock('AWING', function () { return ({
18
18
  Actions: MockComponent,
19
19
  }); });
20
20
  var RecoilObserver = function (_a) {
package/lib/ACM-AXN/Campaign/Utils.js CHANGED
@@ -505,7 +505,7 @@ var getDescription = function (rule) {
505
505
  case exports.RuleType.RetargetMacAddress:
506
506
  {
507
507
  var textFormat = i18n_1.default.t('Campaign.Rule.DescriptionFormat.RetargetMacAddress');
508
- result += textFormat.replace('{0}', rule.description);
508
+ result += textFormat.replace('{0}', JSON.parse(rule.parameter || '{}').name);
509
509
  }
510
510
  break;
511
511
  default:
package/lib/ACM-AXN/Statistics/ControlPanel.js CHANGED
@@ -56,13 +56,13 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
56
56
  },
57
57
  }); });
58
58
  function ControlPanel(_a) {
59
- var _b, _c;
59
+ var _b;
60
60
  var onChangeQueryInput = _a.onChangeQueryInput, onChangeExportInput = _a.onChangeExportInput, initialFilters = _a.initialFilters, isLoadings = _a.isLoadings, infoSX = _a.infoSX;
61
61
  var classes = useStyles();
62
62
  var t = (0, react_i18next_1.useTranslation)().t;
63
- var _d = (0, react_1.useState)(), queryInput = _d[0], setQueryInput = _d[1];
64
- var _e = (0, react_1.useState)([]), elementInputs = _e[0], setElementInputs = _e[1];
65
- var _f = (0, react_1.useState)(false), isShowFilterEnhanced = _f[0], setIsHideFieldAdvanced = _f[1];
63
+ var _c = (0, react_1.useState)(), queryInput = _c[0], setQueryInput = _c[1];
64
+ var _d = (0, react_1.useState)([]), elementInputs = _d[0], setElementInputs = _d[1];
65
+ var _e = (0, react_1.useState)(false), isShowFilterEnhanced = _e[0], setIsHideFieldAdvanced = _e[1];
66
66
  var flagRef = (0, react_1.useRef)('-1');
67
67
  var getView = function () {
68
68
  var _a;
@@ -158,6 +158,16 @@ function ControlPanel(_a) {
158
158
  var PlaceFilter = item === null || item === void 0 ? void 0 : item.nodeElement;
159
159
  var element = __assign({ component: ((0, jsx_runtime_1.jsx)(PlaceFilter, { onChange: function (event, value) {
160
160
  return handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, value === null || value === void 0 ? void 0 : value.placeId);
161
+ }, disabled: (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === '0' ||
162
+ (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === undefined }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'placeAutoComplete' }, item);
163
+ updatedElementInputs.push(element);
164
+ break;
165
+ }
166
+ case Enums_1.TYPE_FILTERS.DOMAIN_AUTOCOMPLETE: {
167
+ var DomainFilter = item === null || item === void 0 ? void 0 : item.nodeElement;
168
+ var element = __assign({ component: ((0, jsx_runtime_1.jsx)(DomainFilter, { onChange: function (event, value) {
169
+ item === null || item === void 0 ? void 0 : item.onChange(value === null || value === void 0 ? void 0 : value.domainId);
170
+ handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, value === null || value === void 0 ? void 0 : value.domainId);
161
171
  } }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'placeAutoComplete' }, item);
162
172
  updatedElementInputs.push(element);
163
173
  break;
@@ -208,7 +218,7 @@ function ControlPanel(_a) {
208
218
  return item.isEnhanced === false ||
209
219
  item.isEnhanced === undefined;
210
220
  })
211
- .map(function (fieldFilterEnhanced) {
221
+ .map(function (fieldFilterEnhanced, idx) {
212
222
  return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: (fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.col)
213
223
  ? fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.col
214
224
  : 3 }, ((fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.type) ===
@@ -220,12 +230,16 @@ function ControlPanel(_a) {
220
230
  },
221
231
  },
222
232
  }
223
- : {}), { children: fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.component })) }));
233
+ : {}), { children: fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.component }), idx) }));
224
234
  }) }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 2, style: {
225
235
  paddingTop: '24px',
226
236
  display: 'flex',
227
237
  flex: 'none',
228
- }, justifyContent: "flex-end", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", color: "primary", onClick: getView, style: { height: '40px' }, disabled: (_c = isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.chartLoading) !== null && _c !== void 0 ? _c : false, children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: function () { return onChangeExportInput(queryInput); }, color: "inherit", disabled: isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.exportLoading, style: {
238
+ }, justifyContent: "flex-end", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", color: "primary", onClick: getView, style: { height: '40px' }, disabled: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.chartLoading) ||
239
+ (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === '0' ||
240
+ (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === undefined, children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: function () { return onChangeExportInput(queryInput); }, color: "inherit", disabled: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.exportLoading) ||
241
+ (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === '0' ||
242
+ (queryInput === null || queryInput === void 0 ? void 0 : queryInput.domainId) === undefined, style: {
229
243
  marginLeft: '16px',
230
244
  height: '40px',
231
245
  }, children: (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.exportLoading) ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, { styleWrap: {
@@ -237,7 +251,7 @@ function ControlPanel(_a) {
237
251
  } })) : ((0, jsx_runtime_1.jsx)(GetApp_1.default, {})) }), elementInputs.filter(function (item) { return item.isEnhanced === true; })
238
252
  .length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: { marginLeft: '10px' }, children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: onShowFilterEnhanced, children: isShowFilterEnhanced ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) }) }))] })] }), isShowFilterEnhanced && ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, justifyContent: "flex-end", spacing: 2, sx: { paddingRight: '3rem' }, children: elementInputs
239
253
  .filter(function (item) { return item.isEnhanced === true; })
240
- .map(function (fieldFilterEnhanced) {
254
+ .map(function (fieldFilterEnhanced, idx) {
241
255
  return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: (fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.col)
242
256
  ? fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.col
243
257
  : 3, style: __assign({}, ((fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.type) ===
@@ -248,7 +262,7 @@ function ControlPanel(_a) {
248
262
  display: 'flex',
249
263
  flex: 'none',
250
264
  }
251
- : null)), children: fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.component }) }));
265
+ : null)), children: fieldFilterEnhanced === null || fieldFilterEnhanced === void 0 ? void 0 : fieldFilterEnhanced.component }, idx) }));
252
266
  }) }))] }));
253
267
  }
254
268
  exports.default = ControlPanel;
package/lib/ACM-AXN/Statistics/Enums.d.ts CHANGED
@@ -5,6 +5,7 @@ export declare enum TYPE_FILTERS {
5
5
  CAMPAIGN = "Campaign",
6
6
  PLACE = "Place",
7
7
  PLACE_AUTOCOMPLETE = "PlaceAutoComplete",
8
+ DOMAIN_AUTOCOMPLETE = "DomainAutoComplete",
8
9
  NETWORK = "NetWork",
9
10
  CAMPAIGN_DEFAULT = "CampaignDefault",
10
11
  INCLUDE_RESERVED = "IncludeReserved",
package/lib/ACM-AXN/Statistics/Enums.js CHANGED
@@ -9,6 +9,7 @@ var TYPE_FILTERS;
9
9
  TYPE_FILTERS["CAMPAIGN"] = "Campaign";
10
10
  TYPE_FILTERS["PLACE"] = "Place";
11
11
  TYPE_FILTERS["PLACE_AUTOCOMPLETE"] = "PlaceAutoComplete";
12
+ TYPE_FILTERS["DOMAIN_AUTOCOMPLETE"] = "DomainAutoComplete";
12
13
  TYPE_FILTERS["NETWORK"] = "NetWork";
13
14
  TYPE_FILTERS["CAMPAIGN_DEFAULT"] = "CampaignDefault";
14
15
  TYPE_FILTERS["INCLUDE_RESERVED"] = "IncludeReserved";
package/lib/ACM-AXN/Statistics/container.js CHANGED
@@ -17,7 +17,7 @@ function StatisticsContainer(_a) {
17
17
  return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [title && ((0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) })), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsx)(material_1.Paper, { children: (0, jsx_runtime_1.jsxs)("div", { style: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { onChangeQueryInput: onChangeQueryInput, onChangeExportInput: onChangeExportInput, initialFilters: initialFilters, isLoadings: isLoadings, infoSX: infoSX }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "center", sx: {
18
18
  marginTop: '1.5rem',
19
19
  width: '100%',
20
- }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (dataChart === null || dataChart === void 0 ? void 0 : dataChart.length) > 0 &&
20
+ }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, className: 'chart-region', children: (dataChart === null || dataChart === void 0 ? void 0 : dataChart.length) > 0 &&
21
21
  (isLoadings === null || isLoadings === void 0 ? void 0 : isLoadings.chartLoading) === false ? ((configChart === null || configChart === void 0 ? void 0 : configChart.type) === Enums_1.TYPE_CHART.BAR_LINE ? ((0, jsx_runtime_1.jsx)(BarLineComponent_1.default, { type: 'bar', dataChart: dataChart, data: [], optionCustom: configChart === null || configChart === void 0 ? void 0 : configChart.options, timeline: timeline, chart: chart === null || chart === void 0 ? void 0 : chart.barChart })) : ((0, jsx_runtime_1.jsx)(PieComponent_1.default, { type: 'pie', data: dataChart, chart: chart === null || chart === void 0 ? void 0 : chart.pieChart }))) : ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) }), children && ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: children }))] })] }) })] }));
22
22
  }
23
23
  exports.default = StatisticsContainer;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "awing-library",
3
- "version": "2.1.18-beta",
3
+ "version": "2.1.20-beta",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",