awing-library 2.1.18-beta → 2.1.19-beta

package/lib/ACM-AXN/Campaign/Container.js

@@ -256,20 +256,19 @@ var CampaignContainer = function () {
                 },
                 {
                     field: 'booking',
-                    headerName: t('Campaign.BookingText'),
+                    headerName: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: '150px', textAlign: 'right' }, children: t('Campaign.BookingText') }),
                     valueGetter: function (row) {
                         var _a;
+                        var text = '';
                         if ((_a = row === null || row === void 0 ? void 0 : row.campaign) === null || _a === void 0 ? void 0 : _a.id) {
-                            return (0, Utils_1.getTotalBooking)(row === null || row === void 0 ? void 0 : row.campaignGroups);
+                            text = (0, Utils_1.getTotalBooking)(row === null || row === void 0 ? void 0 : row.campaignGroups);
                         }
                         else {
-                            return (0, Utils_1.checkPriority)(row.campaignGroup.priority, Types_1.CampaignPriority.ClassB)
+                            text = (0, Utils_1.checkPriority)(row.campaignGroup.priority, Types_1.CampaignPriority.ClassB)
                                 ? (0, Helpers_1.roundDecimalNumber)(row.campaignGroup.bookingAmount)
                                 : 'N/A';
                         }
-                    },
-                    TableCellProps: {
-                        align: 'right',
+                        return (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: '150px', textAlign: 'right' }, children: text });
                     },
                 },
             ], rows: (0, Utils_1.formatListCampaign)(listCampaign === null || listCampaign === void 0 ? void 0 : listCampaign.items, collapseIds) || [], rowActions: [

package/lib/ACM-AXN/Campaign/Container.test.js

@@ -244,7 +244,7 @@ jest.mock('CustomHooks/useAppHelper', function () { return ({
     }); },
 }); });
 // Mock PageManagement
-jest.mock('awing-library/lib/AWING/PageManagement', function () { return ({
+jest.mock('AWING/PageManagement', function () { return ({
     PageManagement: function (props) {
         return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("button", { "data-testid": "onChangeQueryInput", onClick: function () {
                         props.onChangeQueryInput({

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AdDetail.test.js

@@ -16,7 +16,7 @@ function MockComponent(props) {
 // const MockComponentFactory = (name: string) => () => (props: any) => <div><div/>
 jest.mock('Features/PlaceFilter', function () { return MockComponent; });
 jest.mock("Components/Typescript/AsynchronousAutocomplete", function () { return MockComponent; });
-jest.mock("awing-library/lib/AWING/DateRangePicker", function () { return MockComponent; });
+jest.mock("AWING/DateRangePicker", function () { return MockComponent; });
 jest.mock('Services/DirectoryPermission', function () { return ({
     getByObjectTypeCode: function () { return new Promise(function (resolve) {
         resolve({

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/Advanced.js

@@ -33,6 +33,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -189,10 +200,14 @@ var Advanced = function (props) {
             onClose();
         }
     };
+    var ruleType = react_1.default.useMemo(function () {
+        var RetargetMacAddress = Utils_1.RuleType.RetargetMacAddress, other = __rest(Utils_1.RuleType, ["RetargetMacAddress"]);
+        return (service === null || service === void 0 ? void 0 : service.remarketingListGetAll) ? Utils_1.RuleType : other;
+    }, [service]);
     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) {
                                                     e.stopPropagation();
                                                     setAnchorElRule(e.currentTarget);
-                                                }, 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) {
+                                                }, 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) {
                                                     var _a;
                                                     return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: function () { return handleAddRule(type); }, children: ((_a = Object.entries(translationText.type).find(function (_a) {
                                                             var k = _a[0], val = _a[1];

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignList.test.js

@@ -14,7 +14,7 @@ var Recoils_1 = require("../Recoils");
 function MockComponent(props) {
     return (0, jsx_runtime_1.jsx)("div", {});
 }
-jest.mock('awing-library/lib/AWING', function () { return ({
+jest.mock('AWING', function () { return ({
     Actions: MockComponent,
 }); });
 var RecoilObserver = function (_a) {

package/lib/ACM-AXN/Campaign/Utils.js

@@ -505,7 +505,7 @@ var getDescription = function (rule) {
         case exports.RuleType.RetargetMacAddress:
             {
                 var textFormat = i18n_1.default.t('Campaign.Rule.DescriptionFormat.RetargetMacAddress');
-                result += textFormat.replace('{0}', rule.description);
+                result += textFormat.replace('{0}', JSON.parse(rule.parameter || '{}').name);
             }
             break;
         default:

package/package.json

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