awing-library 2.1.15-beta → 2.1.15

package/README.md

@@ -35,32 +35,17 @@ yarn build
 -   Step 2: Tạo link thư viện
 
 ```shell
+yarn build
 yarn link
-```
--   Tạo Link react
-
-```shell
 cd node_modules/react
 yarn link
-```
-
--   Tạo Link react-dom
-
-```shell
+cd ../..
 cd node_modules/react-dom
 yarn link
-```
-
--   Tạo Link @mui/material
-
-```shell
+cd ../..
 cd node_modules/@mui/material
 yarn link
-```
-
--   Tạo Link @mui/styles
-
-```shell
+cd ../../..
 cd node_modules/@mui/styles
 yarn link
 ```

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

@@ -49,7 +49,7 @@ var CampaignContainer = function () {
     var _c = (0, react_1.useState)([]), directories = _c[0], setDirectories = _c[1];
     var _d = (0, react_1.useState)([]), collapseIds = _d[0], setCollapseId = _d[1];
     var _e = (0, react_1.useState)(), listCampaign = _e[0], setListCampaign = _e[1];
-    var _f = (0, react_1.useState)(false), loading = _f[0], setLoading = _f[1];
+    var _f = (0, react_1.useState)(true), loading = _f[0], setLoading = _f[1];
     (0, react_1.useEffect)(function () {
         if (location.pathname.endsWith(Constant_1.Constants.CAMPAIGN_PATH)) {
             fetchDirectories();
@@ -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/Recoils.js

@@ -98,7 +98,7 @@ exports.campaignAttributesState = (0, recoil_1.selector)({
         var campaignModel = get(exports.campaignModelState);
         set(exports.campaignModelState, campaignAttributes instanceof recoil_1.DefaultValue ?
             campaignAttributes : __assign(__assign({}, campaignModel), { campaignAttributes: campaignAttributes }));
-        if (!get(exports.confirmExitState))
+        if (!get(exports.confirmExitState) && Array.isArray(campaignAttributes) && !!campaignAttributes.at(-1))
             set(exports.confirmExitState, true);
     }
 });

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/AdList.js

@@ -60,6 +60,9 @@ var Utils_1 = require("../../Utils");
 var Helpers_1 = require("../../../../Utils/Helpers");
 var Context_1 = require("../../../../Context");
 var Recoils_1 = require("../Recoils");
+var DomainPreview_1 = __importDefault(require("../../../../ACM-AXN/DomainPreview"));
+var Constant_1 = require("../../../../ACM-AXN/Campaign/Constant");
+var PreviewButton_1 = __importDefault(require("../../../../ACM-AXN/DomainPreview/PreviewButton"));
 function AdList(props) {
     var onCreate = props.onCreate, onChange = props.onChange, onDelete = props.onDelete, onAdsValidChange = props.onAdsValidChange;
     var t = (0, react_i18next_1.useTranslation)().t;
@@ -70,11 +73,18 @@ function AdList(props) {
     var _c = (0, recoil_1.useRecoilState)(atoms_1.adOpenState), adOpen = _c[0], setAdOpen = _c[1];
     var copiedAd = (0, recoil_1.useRecoilValue)(atoms_1.copiedAdState);
     var hasClassC = (0, recoil_1.useRecoilValue)((0, atoms_1.checkGroupsClassCState)(adSelected.map(function (x) { return x.subCampaignId; })));
+    var _d = (0, react_1.useState)({
+        welcomeId: '',
+        loginId: '',
+        domainIds: [],
+    }), previewId = _d[0], setPreviewId = _d[1];
+    var _e = react_1.default.useState(), anchorEl = _e[0], setAnchorEl = _e[1];
+    var open = Boolean(anchorEl);
     // valid theo cấu trúc { [campaignGroupId]: { [adId]: boolean } }
-    var _d = (0, react_1.useState)({}), adsValid = _d[0], setAdsValid = _d[1];
-    var _e = (0, react_1.useState)(false), isAdvancedDrawerOpen = _e[0], setIsAdvancedDrawerOpen = _e[1];
-    var _f = (0, recoil_1.useRecoilState)(Recoils_1.weightState), weightProps = _f[0], setWeightState = _f[1];
-    var _g = (0, react_1.useState)(false), isMultiEditDrawerOpen = _g[0], setIsMultiEditDrawerOpen = _g[1];
+    var _f = (0, react_1.useState)({}), adsValid = _f[0], setAdsValid = _f[1];
+    var _g = (0, react_1.useState)(false), isAdvancedDrawerOpen = _g[0], setIsAdvancedDrawerOpen = _g[1];
+    var _h = (0, recoil_1.useRecoilState)(Recoils_1.weightState), weightProps = _h[0], setWeightState = _h[1];
+    var _j = (0, react_1.useState)(false), isMultiEditDrawerOpen = _j[0], setIsMultiEditDrawerOpen = _j[1];
     (0, react_1.useEffect)(function () {
         var newAdValid = {};
         ads.forEach(function (ad) {
@@ -219,6 +229,33 @@ function AdList(props) {
         advanced: t('Campaign.Advanced'),
         delete: t('Common.Delete'),
     };
+    /**
+     * Hàm khi xem preview
+     */
+    var handlePreview = function (e, ad, doaminId) {
+        e.stopPropagation();
+        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=false");
+        if (ad.welcomeId.length)
+            url += "&welcomeId=".concat(ad.welcomeId);
+        if (doaminId)
+            url += "&doaminId=".concat(doaminId);
+        window.open(url, '_blank');
+    };
+    var handlePreviewPage = function (e, ad) {
+        var _a, _b;
+        e.stopPropagation();
+        setPreviewId({
+            welcomeId: ad.welcomeId,
+            loginId: ad.loginId,
+            domainIds: (_b = (_a = ad.places) === null || _a === void 0 ? void 0 : _a.map(function (x) { return x.domainId; })) !== null && _b !== void 0 ? _b : [],
+        });
+        setAnchorEl(e.currentTarget);
+    };
+    var handlePreviewClose = function (event) {
+        event.stopPropagation();
+        setPreviewId({});
+        setAnchorEl(null);
+    };
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [weightProps.isOpen && ((0, jsx_runtime_1.jsx)(Weight_1.default, {})), (0, jsx_runtime_1.jsxs)(material_1.TableContainer, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "h4", sx: {
                             padding: function (theme) { return theme.spacing(2); },
                             fontSize: '16px!important',
@@ -261,6 +298,7 @@ function AdList(props) {
                                                     }, onChange: handleMultiUpdate })), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: translationText.delete, children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: function () {
                                                             return handleMultiDelete(adSelected);
                                                         }, "aria-label": "delete", children: (0, jsx_runtime_1.jsx)(Delete_1.default, { fontSize: "small" }) }) })] })), (0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: onCreate && ((0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { variant: "outlined", color: "error", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { startIcon: (0, jsx_runtime_1.jsx)(Add_1.default, {}), onClick: function () { return handleAddAd(); }, children: t('Common.Create') }), copiedAd !== undefined && ((0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-label": "paste", onClick: function () { return handleAddAd(true); }, children: (0, jsx_runtime_1.jsx)(Assignment_1.default, {}) }))] })) })] }) }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: ads.map(function (ad, idx) {
+                                    var _a;
                                     var isOpen = adOpen !== undefined &&
                                         adOpen.adId === ad.id &&
                                         adOpen.subCampaignId === ad.campaignGroupId;
@@ -270,7 +308,9 @@ function AdList(props) {
                                     };
                                     return ((0, jsx_runtime_1.jsx)(AdRow_1.default, { ad: ad, onChange: function (adSetStateAction) {
                                             return onChange([adDefine], adSetStateAction);
-                                        }, onChangeStatus: function (status) {
+                                        }, previewButton: (0, jsx_runtime_1.jsx)("span", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "preview", onClick: function (e) {
+                                                    handlePreview(e, ad);
+                                                }, disabled: !((_a = ad.loginId) === null || _a === void 0 ? void 0 : _a.length), sx: { borderRadius: '15%' }, children: (0, jsx_runtime_1.jsx)(DomainPreview_1.default, { handlePreviewPage: function (e) { return handlePreviewPage(e, ad); }, isSelectDomain: Boolean(service.domainsGetAll) }) }) }), onChangeStatus: function (status) {
                                             return handleChangeAdStatus(ad, status);
                                         }, onDelete: function () {
                                             return handleMultiDelete([adDefine]);
@@ -302,6 +342,10 @@ function AdList(props) {
                                                     ]);
                                             });
                                         } }, idx));
-                                }) })] })] })] }));
+                                }) })] })] }), open &&
+                (0, jsx_runtime_1.jsx)(PreviewButton_1.default, { anchorEl: anchorEl, open: open, domainIds: previewId.domainIds, handlePreviewClose: handlePreviewClose, handlePreviewDomain: function (event, domainId) {
+                        handlePreview(event, ads.find(function (x) { return x.loginId === previewId.loginId; }), domainId);
+                        // handlePreview(previewId, domainId)
+                    }, service: service })] }));
 }
 exports.default = AdList;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AdRow.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { AdDetailProps } from './AdDetail';
 type AdRowProps = AdDetailProps & {
     /**
@@ -24,6 +25,10 @@ type AdRowProps = AdDetailProps & {
      * Trạng thái lỗi hay không của quảng cáo
      */
     error?: boolean;
+    /**
+     * Preview Button
+     */
+    previewButton: React.ReactNode;
 };
 export default function AdRow(props: AdRowProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -62,7 +62,6 @@ var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var material_1 = require("@mui/material");
-var Visibility_1 = __importDefault(require("@mui/icons-material/Visibility"));
 var KeyboardArrowDown_1 = __importDefault(require("@mui/icons-material/KeyboardArrowDown"));
 var KeyboardArrowUp_1 = __importDefault(require("@mui/icons-material/KeyboardArrowUp"));
 var CheckCircle_1 = __importDefault(require("@mui/icons-material/CheckCircle"));
@@ -87,27 +86,16 @@ var AWING_1 = require("../../../../AWING");
 var Constant_1 = require("../../Constant");
 var Recoils_1 = require("../Recoils");
 function AdRow(props) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     var t = (0, react_i18next_1.useTranslation)().t;
-    var ad = props.ad, onChange = props.onChange, onDelete = props.onDelete, open = props.open, onToggle = props.onToggle, isSelected = props.isSelected, onCheck = props.onCheck, error = props.error, other = __rest(props, ["ad", "onChange", "onDelete", "open", "onToggle", "isSelected", "onCheck", "error"]);
+    var ad = props.ad, onChange = props.onChange, onDelete = props.onDelete, open = props.open, onToggle = props.onToggle, isSelected = props.isSelected, onCheck = props.onCheck, error = props.error, previewButton = props.previewButton, other = __rest(props, ["ad", "onChange", "onDelete", "open", "onToggle", "isSelected", "onCheck", "error", "previewButton"]);
     var service = (0, Hooks_1.default)().service;
     var setCopiedAd = (0, recoil_1.useSetRecoilState)(atoms_1.copiedAdState);
     var setWeightState = (0, recoil_1.useSetRecoilState)(Recoils_1.weightState);
-    var _f = (0, react_1.useState)(false), openCopiedMessage = _f[0], setOpenCopiedMessage = _f[1];
-    var _g = (0, react_1.useState)(false), showTheSource = _g[0], setShowTheSource = _g[1];
-    var _h = (0, react_1.useState)(false), isAdvancedDrawerOpen = _h[0], setIsAdvancedDrawerOpen = _h[1];
-    var _j = (0, react_1.useState)(false), isWeightDrawerOpen = _j[0], setIsWeightDrawerOpen = _j[1];
+    var _e = (0, react_1.useState)(false), openCopiedMessage = _e[0], setOpenCopiedMessage = _e[1];
+    var _f = (0, react_1.useState)(false), showTheSource = _f[0], setShowTheSource = _f[1];
+    var _g = (0, react_1.useState)(false), isAdvancedDrawerOpen = _g[0], setIsAdvancedDrawerOpen = _g[1];
     var isClassC = (0, recoil_2.useRecoilValue)((0, atoms_2.checkGroupsClassCState)([ad.campaignGroupId]));
-    /**
-     * Hàm khi xem preview
-     */
-    var handlePreview = function (e) {
-        e.stopPropagation();
-        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=false");
-        if (ad.welcomeId.length)
-            url += "&welcomeId=".concat(ad.welcomeId);
-        window.open(url, '_blank');
-    };
     var translationText = {
         preview: t('Common.Preview'),
         copy: t('Common.Copy'),
@@ -147,7 +135,7 @@ function AdRow(props) {
                                                 Constant_1.Constants.CAMPAIGN_EDIT_PAGE,
                                                 Enum_1.PAGE_CODES.PageCodeWelcome,
                                                 ad.welcomeId,
-                                            ].join('/'), children: (_d = ad.welcomePage) === null || _d === void 0 ? void 0 : _d.title }) })] }))] }), (0, jsx_runtime_1.jsxs)(material_1.TableCell, { sx: { padding: function (theme) { return theme.spacing(0, 2); } }, align: "right", children: [(0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: translationText.preview, children: (0, jsx_runtime_1.jsx)("span", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "preview", onClick: handlePreview, disabled: !((_e = ad.loginId) === null || _e === void 0 ? void 0 : _e.length), children: (0, jsx_runtime_1.jsx)(Visibility_1.default, { fontSize: "small" }) }) }) }), (0, jsx_runtime_1.jsx)(AWING_1.Actions, { menus: __spreadArray([
+                                            ].join('/'), children: (_d = ad.welcomePage) === null || _d === void 0 ? void 0 : _d.title }) })] }))] }), (0, jsx_runtime_1.jsxs)(material_1.TableCell, { sx: { padding: function (theme) { return theme.spacing(0, 2); } }, align: "right", children: [(0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: translationText.preview, children: (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: previewButton }) }), (0, jsx_runtime_1.jsx)(AWING_1.Actions, { menus: __spreadArray([
                                     {
                                         icon: (0, jsx_runtime_1.jsx)(FileCopyOutlined_1.default, {}),
                                         action: function () {

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

@@ -62,6 +62,7 @@ var AddOrEditRule = function (props) {
             _a[Utils_1.RuleType.TargetAge] = t('Campaign.RuleType.TargetAge'),
             _a[Utils_1.RuleType.TargetOS] = t('Campaign.RuleType.TargetOS'),
             _a[Utils_1.RuleType.TargetDevice] = t('Campaign.RuleType.TargetDevice'),
+            _a[Utils_1.RuleType.RetargetMacAddress] = t('Campaign.RuleType.RetargetMacAddress'),
             _a),
         save: t('Common.Save'),
         invalidData: t('Common.InvalidData'),
@@ -109,10 +110,10 @@ var AddOrEditRule = function (props) {
                 return {
                     value: Array.isArray(rule.value) && rule.value.length > 0,
                 };
-            // case RuleType.RetargetMacAddress:
-            //     return {
-            //         value: Array.isArray(rule.value) && rule.value.length > 0
-            //     };
+            case Utils_1.RuleType.RetargetMacAddress:
+                return {
+                    value: Array.isArray(rule.value) && rule.value.length > 0,
+                };
             default:
                 return {};
         }
@@ -157,14 +158,8 @@ var AddOrEditRule = function (props) {
                 return ((0, jsx_runtime_1.jsx)(RuleForm_1.TargetOS, { valids: valids, rule: currentRule, onChange: handleOnChange, deviceInfoGetAllRuleOsVersions: service === null || service === void 0 ? void 0 : service.deviceInfoGetAllRuleOsVersions }));
             case Utils_1.RuleType.TargetDevice:
                 return ((0, jsx_runtime_1.jsx)(RuleForm_1.TargetDevice, { valids: valids, rule: currentRule, onChange: handleOnChange, deviceInfoGetAllRuleDevices: service === null || service === void 0 ? void 0 : service.deviceInfoGetAllRuleDevices }));
-            // case RuleType.RetargetMacAddress:
-            //     return (
-            //         <RetargetMacAddress
-            //             valids={valids}
-            //             rule={currentRule}
-            //             onChange={handleOnChange}
-            //         />
-            //     );
+            case Utils_1.RuleType.RetargetMacAddress:
+                return ((0, jsx_runtime_1.jsx)(RuleForm_1.RetargetMacAddress, { valids: valids, rule: currentRule, onChange: handleOnChange, remarketingListGetAll: service === null || service === void 0 ? void 0 : service.remarketingListGetAll }));
             default:
                 return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
         }

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AddOrEditRule/RuleForm/RetargetMacAddress/container.d.ts

@@ -3,6 +3,7 @@ interface Props {
     rule: AdvancedRule;
     valids: any;
     onChange: (rule: AdvancedRule) => void;
+    remarketingListGetAll: () => Promise<any[]>;
 }
 declare const RetargetMacAddressContainer: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default RetargetMacAddressContainer;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AddOrEditRule/RuleForm/RetargetMacAddress/container.js

@@ -19,19 +19,11 @@ var react_1 = __importDefault(require("react"));
 var component_1 = __importDefault(require("./component"));
 var RetargetMacAddressContainer = function (props) {
     var _a = react_1.default.useState([]), remarketingLists = _a[0], setRemarketingLists = _a[1];
+    var remarketingListGetAll = props.remarketingListGetAll;
     react_1.default.useEffect(function () {
-        // client.
-        // RemarketingListService.getAllRemarketingList()
-        //     .then((res) => {
-        //         if (res.data.status === STATUS_CODE.OK)
-        //         {
-        //             setRemarketingLists(res.data.data);
-        //         }
-        //         else {
-        //             Snackbar(SNACKBAR_TYPES.ERROR);
-        //         }
-        //     })
-        //     .catch(() => Snackbar(SNACKBAR_TYPES.ERROR));
+        remarketingListGetAll()
+            .then(setRemarketingLists)
+            .catch(function (err) { return console.log(err); });
     }, []);
     return (0, jsx_runtime_1.jsx)(component_1.default, __assign({ remarketingLists: remarketingLists }, props));
 };

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.d.ts

@@ -80,6 +80,7 @@ export declare const RuleType: {
     TargetAge: number;
     TargetOS: number;
     TargetDevice: number;
+    RetargetMacAddress: number;
 };
 export declare const RuleTypeOfCalculator: {
     TargetGender: number;
@@ -87,6 +88,13 @@ export declare const RuleTypeOfCalculator: {
     TargetOS: number;
     TargetDevice: number;
 };
+export declare const RuleTypeOfCalculatorAXN: {
+    TargetGender: number;
+    TargetAge: number;
+    TargetOS: number;
+    TargetDevice: number;
+    RetargetMacAddress: number;
+};
 export declare const RuleGender: {
     Female: string;
     Male: string;

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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CampaignType = exports.ageRangeValueToText = exports.RuleAgeRange = exports.DEMO_GRAPHIC_AGE_RANGE = exports.getDescription = exports.isAdActive = exports.RuleGender = exports.RuleTypeOfCalculator = exports.RuleType = exports.nextChar = exports.getName = exports.getDefaultRule = exports.bonusValid = exports.bookingValid = exports.adsClassCValid = exports.groupClassCValid = exports.groupClassBValid = exports.campaignAdsValid = exports.ruleValid = exports.verifyExpr = exports.advancedValid = exports.weightsValid = exports.placeFilterValid = exports.dateRangeValid = exports.pageValid = exports.campaignAdValid = exports.validateAnalyticTypes = exports.checkValidUrl = exports.tabPartnerValid = exports.tabInfomationValid = exports.attributesValid = exports.nameValid = exports.directoryValid = exports.advancedSearchFormatDate = exports.getCampaignPriority = exports.checkCampaignIsRunning = exports.formatListCampaign = exports.getTotalBooking = exports.checkPriority = exports.getIndexPriority = void 0;
+exports.CampaignType = exports.ageRangeValueToText = exports.RuleAgeRange = exports.DEMO_GRAPHIC_AGE_RANGE = exports.getDescription = exports.isAdActive = exports.RuleGender = exports.RuleTypeOfCalculatorAXN = exports.RuleTypeOfCalculator = exports.RuleType = exports.nextChar = exports.getName = exports.getDefaultRule = exports.bonusValid = exports.bookingValid = exports.adsClassCValid = exports.groupClassCValid = exports.groupClassBValid = exports.campaignAdsValid = exports.ruleValid = exports.verifyExpr = exports.advancedValid = exports.weightsValid = exports.placeFilterValid = exports.dateRangeValid = exports.pageValid = exports.campaignAdValid = exports.validateAnalyticTypes = exports.checkValidUrl = exports.tabPartnerValid = exports.tabInfomationValid = exports.attributesValid = exports.nameValid = exports.directoryValid = exports.advancedSearchFormatDate = exports.getCampaignPriority = exports.checkCampaignIsRunning = exports.formatListCampaign = exports.getTotalBooking = exports.checkPriority = exports.getIndexPriority = void 0;
 var Types_1 = require("./Types");
 var Enum_1 = require("./Enum");
 var Helpers_1 = require("../../Utils/Helpers");
@@ -343,12 +343,12 @@ var getDefaultRule = function (type) {
                 operator: Enum_1.EnumOperator.In.id,
                 value: [],
             };
-        // case RuleType.RetargetMacAddress:
-        //     return {
-        //         type: type,
-        //         operator: EnumOperator.IntersectExist.id,
-        //         value: '',
-        //     }
+        case exports.RuleType.RetargetMacAddress:
+            return {
+                type: type,
+                operator: Enum_1.EnumOperator.IntersectExist.id,
+                value: '',
+            };
         default:
             return {};
     }
@@ -373,14 +373,20 @@ exports.RuleType = {
     TargetAge: 4,
     TargetOS: 5,
     TargetDevice: 6,
-    // RetargetMacAddress: 7,
+    RetargetMacAddress: 7,
 };
 exports.RuleTypeOfCalculator = {
     TargetGender: 3,
     TargetAge: 4,
     TargetOS: 5,
     TargetDevice: 6,
-    // RetargetMacAddress: 7,
+};
+exports.RuleTypeOfCalculatorAXN = {
+    TargetGender: 3,
+    TargetAge: 4,
+    TargetOS: 5,
+    TargetDevice: 6,
+    RetargetMacAddress: 7,
 };
 exports.RuleGender = {
     Female: '0',
@@ -496,14 +502,12 @@ var getDescription = function (rule) {
                 result = result.replace('{1}', value.length);
             }
             break;
-        // case RuleType.RetargetMacAddress:
-        //     {
-        //         let textFormat = i18next.t(
-        //             'Campaign.Rule.DescriptionFormat.RetargetMacAddress'
-        //         )
-        //         result += textFormat.replace('{0}', rule.description)
-        //     }
-        //     break
+        case exports.RuleType.RetargetMacAddress:
+            {
+                var textFormat = i18n_1.default.t('Campaign.Rule.DescriptionFormat.RetargetMacAddress');
+                result += textFormat.replace('{0}', JSON.parse(rule.parameter || '{}').name);
+            }
+            break;
         default:
             break;
     }

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

@@ -19,18 +19,19 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 // import Constants from "Commons/Constants";
 var react_helmet_async_1 = require("react-helmet-async");
 var react_i18next_1 = require("react-i18next");
+var CreateDirectory_1 = __importDefault(require("../../AWING/Directory/CreateDirectory"));
 var Router_1 = require("../../AWING/Router");
 var i18n_1 = __importDefault(require("../../i18n"));
 var Constant_1 = require("./Constant");
 var Container_1 = __importDefault(require("./Container"));
 var Context_1 = require("./Context");
 var CreateOrEdit_1 = __importDefault(require("./CreateOrEdit"));
-var CreateDirectory_1 = __importDefault(require("../../AWING/Directory/CreateDirectory"));
+var Enum_1 = require("./Enum");
 var Campaign = function (props) {
     var paths = [
         {
             param: Constant_1.Constants.DIRECTORY_CREATE_DIRECTORY_PATH + '/:directoryId',
-            element: ((0, jsx_runtime_1.jsx)(CreateDirectory_1.default, __assign({ parentDirectory: 'campaign' }, props))),
+            element: ((0, jsx_runtime_1.jsx)(CreateDirectory_1.default, __assign({ parentDirectory: 'campaign', directoryRoot: Enum_1.DirectoryRoot.Campaign }, props))),
         },
         {
             param: Constant_1.Constants.CAMPAIGN_CREATE + '/:tabName/*',

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.d.ts

@@ -1,3 +1,3 @@
-import { IFiltersProps } from "../../interface";
-declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
+import { IFiltersProps } from '../../interface';
+declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
 export default Filters;