awing-library 2.1.142-beta → 2.1.142

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

@@ -46,11 +46,21 @@ var react_1 = __importStar(require("react"));
 var Context_1 = __importDefault(require("../Context"));
 var Util_1 = require("./Util");
 var component_1 = __importDefault(require("./component"));
+var recoil_1 = require("recoil");
+var Recoils_1 = require("../../Recoils");
+var PasswordDialog_1 = __importDefault(require("./PasswordDialog"));
+var react_i18next_1 = require("react-i18next");
+var i18n_1 = __importDefault(require("../../../../../i18n"));
 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;
     var _a = react_1.default.useState(true), isLoading = _a[0], setIsLoading = _a[1];
     var _b = react_1.default.useState([]), eventData = _b[0], setEventData = _b[1];
+    var _c = react_1.default.useState(false), openPasswordDialog = _c[0], setOpenPasswordDialog = _c[1];
+    var _d = react_1.default.useState(null), currentExportParams = _d[0], setCurrentExportParams = _d[1];
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
+    var _e = react_1.default.useState(undefined), errrorExport = _e[0], setErrorExport = _e[1];
+    var campaignInfo = (0, recoil_1.useRecoilValue)(Recoils_1.campaignState);
     var placesOfCampaign = (0, react_1.useMemo)(function () {
         var result = [];
         subCampaigns.forEach(function (sub) {
@@ -73,9 +83,7 @@ var EventContainer = 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: Enum_2.TimelineType.Day,
-            campaignAdGroups: [
-                __assign({ campaignId: campaignId }, ids),
-            ],
+            campaignAdGroups: [__assign({ campaignId: campaignId }, ids)],
             analyticGroupBies: [
                 Enum_2.AnalyticGroupBy.GbEventLabel,
                 Enum_2.AnalyticGroupBy.GbTimeline,
@@ -86,26 +94,69 @@ var EventContainer = function (props) {
             .then(function (res) { return setEventData((0, Util_1.convertEventData)(res)); })
             .finally(function () { return setIsLoading(false); });
     };
-    var exportData = function (time, placeIds, ids) {
-        var places = placeIds.length ? placesOfCampaign.filter(function (p) {
-            return placeIds.includes(p.placeId);
-        }) : placesOfCampaign;
-        client
+    // Hàm này được tách riêng để có thể gọi từ callback của PasswordDialog
+    var handleExportWithParams = function (time, placeIds, ids, campaignPassword) {
+        var places = placeIds.length
+            ? placesOfCampaign.filter(function (p) { return placeIds.includes(p.placeId); })
+            : placesOfCampaign;
+        return client
             .campaignStatisticGetEvents({
             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: campaignId }, ids),
-            ],
+            campaignAdGroups: [__assign({ campaignId: campaignId }, ids)],
             analyticGroupBies: Object.values(Enum_2.AnalyticGroupBy).filter(function (g) { return !isNaN(Number(g)); }),
             ignoredEventLabels: Object.values(Enum_1.BaseEvent),
             placeIds: placeIds,
+            campaignPasswords: [
+                {
+                    campaignId: campaignId,
+                    password: campaignPassword,
+                },
+            ],
         })
             .then(function (res) {
+            setOpenPasswordDialog(false);
+            setErrorExport(undefined); // Reset error message on successful export
             (0, exportFile_1.downloadWithDataSet)("export_analytic_event_campaign_".concat(campaignId), (0, Util_1.convertToExportData)(res, places));
+        })
+            .catch(function (error) {
+            var _a;
+            if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.includes('Invalid password')) {
+                setErrorExport(t('Campaign.Password.ErrorMessage'));
+            }
         });
     };
-    return ((0, jsx_runtime_1.jsx)(component_1.default, { startDate: startDate, endDate: endDate, subCampaigns: subCampaigns, isLoading: isLoading, eventData: eventData, getEventData: getEventData, exportData: exportData, domains: domains }));
+    var exportData = function (time, placeIds, ids) {
+        // Lưu lại các tham số xuất dữ liệu để sử dụng sau khi xác thực mật khẩu
+        setCurrentExportParams({ time: time, placeIds: placeIds, ids: ids });
+        // Check if campaign has password protection
+        if ((campaignInfo === null || campaignInfo === void 0 ? void 0 : campaignInfo.password) && campaignInfo.hasPassword) {
+            setOpenPasswordDialog(true);
+            // Return a promise that will be resolved by the dialog callbacks
+            return new Promise(function (resolve) {
+                // This promise will be handled by the dialog callbacks
+                // The actual export will happen in the onConfirm callback if password is correct
+                resolve(true);
+            });
+        }
+        else {
+            // No password required
+            return handleExportWithParams(time, placeIds, ids);
+        }
+    };
+    // Xử lý khi xác nhận mật khẩu thành công
+    var handlePasswordConfirm = function (password) {
+        // setOpenPasswordDialog(false)
+        if (password && currentExportParams) {
+            var time = currentExportParams.time, placeIds = currentExportParams.placeIds, ids = currentExportParams.ids;
+            handleExportWithParams(time, placeIds, ids, password);
+        }
+    };
+    var resetErrorExport = function () {
+        if (errrorExport) // Only reset if there is an error
+            setErrorExport(undefined);
+    };
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(component_1.default, { startDate: startDate, endDate: endDate, subCampaigns: subCampaigns, isLoading: isLoading, eventData: eventData, getEventData: getEventData, exportData: exportData, domains: domains }), (0, jsx_runtime_1.jsx)(PasswordDialog_1.default, { open: openPasswordDialog, onConfirm: handlePasswordConfirm, onCancel: function () { return setOpenPasswordDialog(false); }, errorExport: errrorExport, resetErrorExport: resetErrorExport })] }));
 };
 exports.default = EventContainer;

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

@@ -1,6 +1,7 @@
 import React from 'react';
 interface Props {
     onSubmit: (value: string) => void;
+    loading?: boolean;
 }
 declare const SplitButtonExportType: React.FC<Props>;
 export default SplitButtonExportType;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/SplitButtonExportType.js

@@ -20,13 +20,25 @@ var material_1 = require("@mui/material");
 var ArrowDropDown_1 = __importDefault(require("@mui/icons-material/ArrowDropDown"));
 var common_1 = require("./common");
 var react_i18next_1 = require("react-i18next");
-var options = Object.values(common_1.EXPORT_TYPES).map(function (type, idx) { return type; });
+var i18n_1 = __importDefault(require("../../../../i18n"));
+var lab_1 = require("@mui/lab");
+var Context_1 = __importDefault(require("./Context"));
 var SplitButtonExportType = function (props) {
-    var onSubmit = props.onSubmit;
+    var onSubmit = props.onSubmit, loading = props.loading;
+    var services = (0, Context_1.default)().services;
     var _a = react_1.default.useState(false), open = _a[0], setOpen = _a[1];
     var anchorRef = react_1.default.useRef(null);
     var _b = react_1.default.useState(0), selectedIndex = _b[0], setSelectedIndex = _b[1];
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var options = react_1.default.useMemo(function () {
+        return Object.values(common_1.EXPORT_TYPES)
+            .map(function (type, idx) { return type; })
+            .filter(function (type) {
+            return services.domainsGetAll ? true : type !== 'Domain';
+        });
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []);
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var handleClick = function () {
         onSubmit(options[selectedIndex]);
     };
@@ -49,8 +61,9 @@ var SplitButtonExportType = function (props) {
         Domain: t("Campaign.ExportType.Domain"),
         Location: t('Campaign.ExportType.Location'),
         LocationGroup: t('Campaign.ExportType.LocationGroup'),
+        Ad: t('Campaign.ExportType.Ad'),
     };
-    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, direction: "column", alignItems: "center", children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, children: [(0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { variant: "outlined", color: "inherit", ref: anchorRef, "aria-label": "split button", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleClick, children: translationText[options[selectedIndex]] }), (0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-controls": open ? 'split-button-menu' : undefined, "aria-expanded": open ? 'true' : undefined, "aria-label": "select merge strategy", "aria-haspopup": "menu", onClick: handleToggle, children: (0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {}) })] }), (0, jsx_runtime_1.jsx)(material_1.Popper, { style: { zIndex: 99999 }, open: open, anchorEl: anchorRef.current, transition: true, children: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, direction: "column", alignItems: "center", children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, children: [(0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { disabled: loading, variant: "outlined", color: "inherit", ref: anchorRef, "aria-label": "split button", children: [(0, jsx_runtime_1.jsx)(lab_1.LoadingButton, { variant: 'outlined', onClick: handleClick, loading: loading, children: translationText[options[selectedIndex]] }), (0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-controls": open ? 'split-button-menu' : undefined, "aria-expanded": open ? 'true' : undefined, "aria-label": "select merge strategy", "aria-haspopup": "menu", onClick: handleToggle, children: (0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {}) })] }), (0, jsx_runtime_1.jsx)(material_1.Popper, { style: { zIndex: 99999 }, open: open, anchorEl: anchorRef.current, transition: true, children: function (_a) {
                         var TransitionProps = _a.TransitionProps, placement = _a.placement;
                         return ((0, jsx_runtime_1.jsx)(material_1.Grow, __assign({}, TransitionProps, { style: {
                                 transformOrigin: placement === 'bottom'

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

@@ -2,6 +2,7 @@
 import { CampaignGroupModel, PlaceFilter } from '../../../../ACM-AXN/Campaign/Types';
 import { ShareType } from '../../../../ACM-AXN/Common/Enum';
 import { IStatisticDTO, Timestamp } from '../../../../ACM-AXN/Common/Types';
+import { AdministrativeUnitType } from '../../../../ACM-AXN/Page/enums';
 import { BaseChartComponent } from 'react-chartjs-2/dist/types';
 export interface IAudienceObjectOverview {
     timeline?: number;
@@ -81,6 +82,12 @@ export type DateRange = {
     startDate: Date;
     endDate: Date;
 };
+export type AdministrativeUnit = {
+    code?: string | undefined;
+    parentUnitCode?: string | undefined;
+    name?: string | undefined;
+    type?: AdministrativeUnitType;
+};
 export interface CampaignAnalyticService {
     campaignStatisticGetEvents(body: IStatisticDTO | undefined): Promise<AnalyticEvent[]>;
     campaignStatisticGetCustomer(startDate: string | undefined, endDate: string | undefined, campaignId: string | undefined): Promise<AudienceObjectReply>;
@@ -88,12 +95,15 @@ export interface CampaignAnalyticService {
     domainsGetAll?: () => Promise<IDomain[]>;
     placesGetPagingByPlaceFilter: (pageIndex?: number, pageSize?: number, body?: PlaceFilter) => Promise<any>;
     placesGetByPlaceFilter: (body?: PlaceFilter) => Promise<any[]>;
+    administrativeUnitsGet: () => Promise<AdministrativeUnit[]>;
 }
 export interface CampaignAnalyticProps {
     placeMultiSelectComponent: (p?: any) => JSX.Element;
+    fullPlaces?: AdministrativeUnit[];
     chart: BaseChartComponent;
     services: CampaignAnalyticService;
     campaignId: string;
+    campaignName?: string;
     isNetwork?: boolean;
     subCampaigns: CampaignGroupModel[];
 }

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

@@ -27,7 +27,10 @@ var getTime = function (subCampaigns) {
 exports.getTime = getTime;
 var extractEvent = function (eventLabel) {
     if (eventLabel === void 0) { eventLabel = ''; }
-    var _a = eventLabel.match(/^(\d+)_([\s\S]*)$/) || [], view = _a[1], eventName = _a[2];
+    if (!eventLabel) {
+        throw new Error('Event label is required');
+    }
+    var _a = eventLabel.match(/^(\d+)_([\s\S]*)$/) || ['', '1', eventLabel], view = _a[1], eventName = _a[2];
     return { view: view, eventName: eventName };
 };
 exports.extractEvent = extractEvent;

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

@@ -3,4 +3,5 @@ export declare const EXPORT_TYPES: {
     Domain: string;
     LocationGroup: string;
     Location: string;
+    Ad: string;
 };

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/common.js

@@ -4,6 +4,7 @@ exports.EXPORT_TYPES = void 0;
 exports.EXPORT_TYPES = {
     Export: "Export",
     Domain: "Domain",
-    LocationGroup: "LocationGroup",
-    Location: "Location",
+    LocationGroup: "LocationGroup", // Chiến dịch con
+    Location: "Location", // Địa điểm
+    Ad: "Ad" // Quảng cáo
 };

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

@@ -1,14 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_i18next_1 = require("react-i18next");
 var material_1 = require("@mui/material");
 var react_1 = require("react");
 var container_1 = require("./container");
+var i18n_1 = __importDefault(require("../../../../i18n"));
 var color = ['inherit', 'primary'];
 var variant = ['outlined', 'contained'];
 var TabStatistic = function (props) {
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var tabIndex = props.tabIndex, onChangeTab = props.onChangeTab, tabPanel = props.tabPanel, isNetwork = props.isNetwork;
     var translationText = (0, react_1.useMemo)(function () { return ({
         analytic: t('Campaign.Analytic'),
@@ -19,7 +23,7 @@ var TabStatistic = function (props) {
     var handleChangeTab = function (event) {
         onChangeTab(Number(event.target.tabIndex));
     };
-    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: function (theme) { return theme.spacing(2); } }, className: "ahihu", children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "h6", sx: {
+    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: function (theme) { return theme.spacing(2); } }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "h6", sx: {
                                     marginTop: function (theme) { return theme.spacing(1); },
                                     marginLeft: function (theme) { return theme.spacing(2); },
                                 }, children: translationText.title }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.ButtonGroup, { sx: {

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

@@ -39,13 +39,42 @@ var Context_1 = __importStar(require("./Context"));
 var Hooks_1 = require("../../../../AWING/Hooks");
 exports.tabs = { ANALYTIC: 0, EVENT: 1, CUSTOMER: 2 };
 function TabStatisticsContainer() {
-    var _a = (0, Context_1.default)(), client = _a.services, campaignId = _a.campaignId, subCampaigns = _a.subCampaigns, isNetwork = _a.isNetwork;
+    var _a = (0, Context_1.default)(), client = _a.services, campaignId = _a.campaignId, subCampaigns = _a.subCampaigns, isNetwork = _a.isNetwork, campaignName = _a.campaignName, fullPlaces = _a.fullPlaces;
     var _b = (0, react_1.useState)(exports.tabs.ANALYTIC), tabIndex = _b[0], setTabIndex = _b[1];
     var time = (0, react_1.useMemo)(function () { return (0, Utils_1.getTime)(subCampaigns); }, [subCampaigns]);
+    var _c = (0, Hooks_1.useGetData)([], function () {
+        return client.domainsGetAll
+            ? client === null || client === void 0 ? void 0 : client.domainsGetAll().then(function (res) {
+                var campaignDomains = [];
+                subCampaigns.forEach(function (s) {
+                    var _a;
+                    (_a = s === null || s === void 0 ? void 0 : s.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
+                        var _a;
+                        (_a = ad === null || ad === void 0 ? void 0 : ad.places) === null || _a === void 0 ? void 0 : _a.forEach(function (p) {
+                            var _a;
+                            var idx = campaignDomains.findIndex(function (c) { return c.domainId === p.domainId; });
+                            if (idx > -1) {
+                                campaignDomains[idx].places.push(p);
+                            }
+                            else {
+                                var domainName = (_a = res.find(function (d) { return d.domainId === p.domainId; })) === null || _a === void 0 ? void 0 : _a.name;
+                                campaignDomains.push({
+                                    domainId: p.domainId,
+                                    domainName: domainName,
+                                    places: [p],
+                                });
+                            }
+                        });
+                    });
+                });
+                return campaignDomains;
+            })
+            : Promise.resolve([]);
+    }), isLoading = _c.isLoading, data = _c.data;
     var tabPanel = function () {
         switch (tabIndex) {
             case exports.tabs.ANALYTIC:
-                return ((0, jsx_runtime_1.jsx)(Analytic_1.default, { campaignId: campaignId, subCampaigns: subCampaigns, startDate: time.startDate, endDate: time.endDate, domains: data }));
+                return ((0, jsx_runtime_1.jsx)(Analytic_1.default, { campaignId: campaignId, subCampaigns: subCampaigns, startDate: time.startDate, endDate: time.endDate, domains: data, campaignName: campaignName, fullPlaces: fullPlaces }));
             case exports.tabs.EVENT:
                 return ((0, jsx_runtime_1.jsx)(Event_1.default, { campaignId: campaignId, startDate: time.startDate, endDate: time.endDate, subCampaigns: subCampaigns, domains: data }));
             case exports.tabs.CUSTOMER:
@@ -54,33 +83,6 @@ function TabStatisticsContainer() {
                 return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
         }
     };
-    var _c = (0, Hooks_1.useGetData)([], function () {
-        return client.domainsGetAll ? client === null || client === void 0 ? void 0 : client.domainsGetAll().then(function (res) {
-            var campaignDomains = [];
-            subCampaigns.forEach(function (s) {
-                var _a;
-                (_a = s === null || s === void 0 ? void 0 : s.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
-                    var _a;
-                    (_a = ad === null || ad === void 0 ? void 0 : ad.places) === null || _a === void 0 ? void 0 : _a.forEach(function (p) {
-                        var _a;
-                        var idx = campaignDomains.findIndex(function (c) { return c.domainId === p.domainId; });
-                        if (idx > -1) {
-                            campaignDomains[idx].places.push(p);
-                        }
-                        else {
-                            var domainName = (_a = res.find(function (d) { return d.domainId === p.domainId; })) === null || _a === void 0 ? void 0 : _a.name;
-                            campaignDomains.push({
-                                domainId: p.domainId,
-                                domainName: domainName,
-                                places: [p],
-                            });
-                        }
-                    });
-                });
-            });
-            return campaignDomains;
-        }) : Promise.resolve([]);
-    }), isLoading = _c.isLoading, data = _c.data;
     var handleChangeTab = function (newValue) {
         setTabIndex(newValue);
     };

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

@@ -348,7 +348,7 @@ 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(event, ads.find(function (x) { return x.loginId === previewId.loginId && x.welcomeId === previewId.welcomeId; }), domainId);
                         // handlePreview(previewId, domainId)
                     }, service: service })] }));
 }

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

@@ -200,6 +200,6 @@ function AdRow(props) {
                             paddingBottom: 0,
                             paddingTop: 0,
                             borderBottomWidth: open ? 1 : 0,
-                        }, colSpan: 3, children: (0, jsx_runtime_1.jsx)(material_1.Collapse, { in: open, timeout: "auto", unmountOnExit: true, children: (0, jsx_runtime_1.jsx)(material_1.Box, { margin: 1, children: (0, jsx_runtime_1.jsx)(AdDetail_1.default, __assign({ ad: ad, onChange: onChange }, other)) }) }) })] })] }));
+                        }, colSpan: 3, children: (0, jsx_runtime_1.jsx)(material_1.Collapse, { in: open, timeout: "auto", unmountOnExit: true, children: (0, jsx_runtime_1.jsx)(material_1.Box, { margin: 1, sx: { height: '416px' }, children: (0, jsx_runtime_1.jsx)(AdDetail_1.default, __assign({ ad: ad, onChange: onChange }, other)) }) }) })] })] }));
 }
 exports.default = AdRow;

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

@@ -35,7 +35,6 @@ var LimitEvent = function (props) {
         var _a;
         onChange(__assign(__assign({}, rule), (_a = {}, _a[fieldName] = fieldValue, _a)));
     };
-    console.log("rule", rule);
     var _g = (0, Hooks_2.useGetData)([loginPageIds], service.pagesGetPageViewEventByPageIds), data = _g.data, isLoading = _g.isLoading;
     var eventSelected = react_1.default.useMemo(function () {
         return (0, lodash_1.default)(data)
@@ -79,7 +78,7 @@ var LimitEvent = function (props) {
                         return handleChangeParameter('eventLabel', e.target.value);
                     }, error: valids && !valids.eventLabel, helperText: valids && !valids.eventLabel
                         ? translationText.helperText
-                        : '', children: Object.keys(eventSelected).map(function (event, index) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: event, children: event }, index)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "viewNumber", name: "viewNumber", variant: "standard", disabled: !((_c = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _c === void 0 ? void 0 : _c.eventLabel), required: true, select: true, fullWidth: true, label: translationText.viewNumber, value: (_e = (_d = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _d === void 0 ? void 0 : _d.viewNumber) !== null && _e !== void 0 ? _e : '', onChange: function (e) {
+                        : '', children: Object.keys(eventSelected).map(function (event, index) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: event, children: event }, index)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "viewNumber", name: "viewNumber", variant: "standard", disabled: !((_c = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _c === void 0 ? void 0 : _c.eventLabel), required: true, select: true, fullWidth: true, label: translationText.viewNumber, value: (_e = (_d = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _d === void 0 ? void 0 : _d.viewNumber) !== null && _e !== void 0 ? _e : "", onChange: function (e) {
                         return handleChangeParameter('viewNumber', e.target.value);
                     }, error: valids && !valids.viewNumber, helperText: valids && !valids.viewNumber
                         ? translationText.helperText

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

@@ -39,9 +39,9 @@ var TargetOSContainer = function (props) {
             if (!rule ||
                 !osVerList.some(function (x) { return x.value === rule.value; }) ||
                 !osVerList.some(function (x) { return x.osName === rule.parameter.os; })) {
-                onChange(__assign(__assign({}, rule), { value: osVerList[0].value, parameter: JSON.stringify({
+                onChange(__assign(__assign({}, rule), { value: osVerList[0].value, parameter: {
                         os: osVerList[0].osName,
-                    }) }));
+                    } }));
             }
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -180,6 +180,7 @@ var Advanced = function (props) {
         type: {
             LimitView: t('Campaign.RuleType.LimitView'),
             LimitClick: t('Campaign.RuleType.LimitClick'),
+            Authentication: t('Campaign.RuleType.Engagement'),
             LimitEvent: t('Campaign.RuleType.LimitEvent'),
             TargetGender: t('Campaign.RuleType.TargetGender'),
             TargetAge: t('Campaign.RuleType.TargetAge'),
@@ -189,7 +190,6 @@ var Advanced = function (props) {
             RetargetPlace: t('Campaign.RuleType.RetargetPlace'),
             RetargetDomain: t('Campaign.RuleType.RetargetDomain'),
             RetargetMacAddress: t('Campaign.RuleType.RetargetMacAddress'),
-            Authentication: t('Campaign.RuleType.Engagement'),
         },
     };
     var handleSubmit = function () {

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

@@ -77,11 +77,11 @@ function EditAds(props) {
             label: t('Campaign.Ad.Time'),
             required: true,
         },
-        {
-            fieldName: 'isReserved',
-            type: 'checkbox',
-            label: t('Campaign.Ad.Reserved'),
-        },
+        // {
+        // 	fieldName: 'isReserved',
+        // 	type: 'checkbox',
+        // 	label: t('Campaign.Ad.Reserved'),
+        // },
         {
             fieldName: 'placeFilter',
             type: 'text',