awing-library 2.1.147-beta → 2.1.147

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/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',

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

@@ -42,16 +42,16 @@ var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
-var Hooks_1 = __importDefault(require("../../../../ACM-AXN/Campaign/Hooks"));
 var Enum_2 = require("../../../../ACM-AXN/Common/Enum");
 var lodash_1 = require("lodash");
 var Utils_1 = require("../../Utils");
 var Recoils_1 = require("../Recoils");
 var material_1 = require("@mui/material");
+var Hooks_1 = __importDefault(require("../../../../ACM-AXN/Campaign/Hooks"));
 function SubCampaignDetail(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
-    var service = (0, Hooks_1.default)().service;
     var subCampaign = props.subCampaign, onSubCampaignChange = props.onSubCampaignChange, onChangeSubCampaignStatus = props.onChangeSubCampaignStatus;
+    var service = (0, Hooks_1.default)().service;
     var getFormValid = function () { return ({
         name: (0, Utils_1.nameValid)(subCampaign.name),
         bookingAmount: !(0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB) || (0, Utils_1.bookingValid)(subCampaign.bookingAmount),
@@ -75,7 +75,8 @@ function SubCampaignDetail(props) {
      */
     var translationText = {
         name: t('Campaign.Name'),
-        ticket: t('Campaign.Ticket'),
+        status: t('Campaign.Ticket'),
+        subCampaignLable: t('Campaign.BillingUnit.subCampaignLable'),
         BillingUnit: t('Campaign.BillingUnit.Title'),
         priority: t('Campaign.Detail.Priority'),
         booking: t('Campaign.BookingText'),
@@ -89,9 +90,9 @@ function SubCampaignDetail(props) {
                                 onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { name: e.target.value })); });
                             }, error: subValid.name !== undefined && !subValid.name, helperText: subValid.name !== undefined && !subValid.name
                                 ? translationText.helperText
-                                : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsxs)(material_1.TextField, { id: "ticket", name: "ticket", variant: "standard", select: true, required: true, fullWidth: true, label: translationText.ticket, value: subCampaign.ticket, onChange: function (e) {
-                                onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { ticket: Number(e.target.value) })); });
-                            }, disabled: isCreate, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Enum_1.CampaignTicket.ACTIVE, children: t('Campaign.Active') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Enum_1.CampaignTicket.INACTIVE, children: t('Campaign.InActive') })] }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "priority", select: true, required: true, variant: "standard", fullWidth: true, label: translationText.priority, value: isNaN(Number(subCampaign.priority))
+                                : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "status", name: "status", variant: "standard", select: true, required: true, fullWidth: true, label: translationText.status, value: subCampaign.status, onChange: function (e) {
+                                onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { status: Number(e.target.value) })); });
+                            }, disabled: isCreate, children: (0, Utils_1.getCampaignStatus)(!Boolean(service.attributesGetByObjectTypeCode)).map(function (item) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: item.value, children: t("Campaign.Status.".concat(item.key)) }, item.key)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: true, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "priority", select: true, required: true, variant: "standard", fullWidth: true, label: translationText.priority, value: isNaN(Number(subCampaign.priority))
                                 ? subCampaign.priority
                                 : Object.values(Enum_1.CampaignPriority)[subCampaign.priority], onChange: function (e) {
                                 var newPriority = Object.values(Enum_1.CampaignPriority).indexOf(e.target.value);
@@ -99,43 +100,53 @@ function SubCampaignDetail(props) {
                                     var newSubCamp = __assign(__assign(__assign(__assign({}, pre), { priority: newPriority }), ((0, Utils_1.checkPriority)(newPriority, Enum_1.CampaignPriority.ClassB)
                                         ? {
                                             bookingAmount: 10,
-                                            billingUnit: Enum_2.AnalyticType.AUTHENTICATION,
+                                            billingUnit: Enum_2.AnalyticType.Authentication,
+                                            billingUnitLabel: Enum_2.AnalyticType[Enum_2.AnalyticType.Authentication],
                                         }
                                         : {
                                             bookingAmount: 0,
-                                            billingUnit: Enum_2.AnalyticType.AUTHENTICATION,
+                                            billingUnit: Enum_2.AnalyticType.Authentication,
+                                            billingUnitLabel: Enum_2.AnalyticType[Enum_2.AnalyticType.Authentication],
                                         })), { bonusAmount: 0 });
                                     setSubValid(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: true, bonusAmount: true })); });
                                     return newSubCamp;
                                 });
-                            }, children: Object.values(Enum_1.CampaignPriority).map(function (priority) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: priority, children: t("Campaign.".concat(priority)) }, priority)); }) }) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: [(0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB) && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bookingAmount", required: true, fullWidth: true, variant: "standard", type: "number", label: translationText.booking, value: subCampaign.bookingAmount, onChange: function (e) {
-                                        onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: Number(e.target.value) })); });
-                                    }, onFocus: function (event) { return event.target.select(); }, error: subValid.bookingAmount !== undefined &&
-                                        !subValid.bookingAmount, helperText: subValid.bookingAmount !== undefined &&
-                                        !subValid.bookingAmount
-                                        ? subCampaign.bookingAmount < 0
-                                            ? translationText.notNegative
-                                            : translationText.helperText
-                                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bonusAmount", variant: "standard", fullWidth: true, type: "number", label: translationText.bonus, value: subCampaign.bonusAmount, onChange: function (e) {
-                                        var value = Number(e.target.value);
-                                        onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bonusAmount: value })); });
-                                    }, onFocus: function (event) { return event.target.select(); }, error: subValid.bonusAmount !== undefined &&
-                                        !subValid.bonusAmount, helperText: subValid.bonusAmount !== undefined &&
-                                        !subValid.bonusAmount
-                                        ? subCampaign.bonusAmount < 0
-                                            ? translationText.notNegative
-                                            : translationText.helperText
-                                        : '' }) }), !service.attributesGetByObjectTypeCode ? ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
+                            }, children: Object.values(Enum_1.CampaignPriority).map(function (priority) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: priority, children: t("Campaign.".concat(priority)) }, priority)); }) }) })] }), (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: (0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB) && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bookingAmount", required: true, fullWidth: true, variant: "standard", type: "number", label: translationText.booking, value: subCampaign.bookingAmount, onChange: function (e) {
+                                    onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: Number(e.target.value), bonusAmount: Math.round(Number(e.target.value) * 0.05) })); });
+                                }, onFocus: function (event) { return event.target.select(); }, error: subValid.bookingAmount !== undefined &&
+                                    !subValid.bookingAmount, helperText: subValid.bookingAmount !== undefined &&
+                                    !subValid.bookingAmount
+                                    ? subCampaign.bookingAmount < 0
+                                        ? translationText.notNegative
+                                        : translationText.helperText
+                                    : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bonusAmount", variant: "standard", fullWidth: true, type: "number", label: translationText.bonus, value: subCampaign.bonusAmount, onChange: function (e) {
+                                    var value = Number(e.target.value);
+                                    onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bonusAmount: value })); });
+                                }, onFocus: function (event) { return event.target.select(); }, error: subValid.bonusAmount !== undefined &&
+                                    !subValid.bonusAmount, helperText: subValid.bonusAmount !== undefined &&
+                                    !subValid.bonusAmount
+                                    ? subCampaign.bonusAmount < 0
+                                        ? translationText.notNegative
+                                        : translationText.helperText
+                                    : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: Boolean(service.attributesGetByObjectTypeCode) ?
+                                ((0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.subCampaignLable, value: [Enum_2.AnalyticType[subCampaign.billingUnit], subCampaign.billingUnitLabel || Enum_2.AnalyticType[Enum_2.AnalyticType.Authentication]].join(">"), onChange: function (e) {
+                                        var _a = e.target.value.split(">"), billingUnit = _a[0], billingUnitLabel = _a[1];
+                                        onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { billingUnit: Enum_2.AnalyticType[billingUnit], billingUnitLabel: billingUnitLabel })); });
+                                    }, error: !!subValid.billingUnit && !subValid.billingUnit, helperText: !!subValid.billingUnit && !subValid.billingUnit
+                                        ? translationText.helperText
+                                        : '', children: Enum_2.MarkAnalyticTypes
+                                        .map(function (type) {
+                                        var value = [Enum_2.AnalyticType[type.billingUnit], type.billingUnitLabel].join(">");
+                                        return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: value, children: t("Campaign.BillingUnit.".concat(value)) }, value));
+                                    }) })) :
+                                ((0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
                                         onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { billingUnit: Number(e.target.value) })); });
-                                    }, error: subValid.billingUnit !== undefined &&
-                                        !subValid.billingUnit, helperText: subValid.billingUnit !== undefined &&
-                                        !subValid.billingUnit
+                                    }, error: !!subValid.billingUnit && !subValid.billingUnit, helperText: !!subValid.billingUnit && !subValid.billingUnit
                                         ? translationText.helperText
                                         : '', children: Object.values(Enum_2.AnalyticType)
                                         .filter(function (item) { return !isNaN(Number(item)); })
-                                        .map(function (type) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: type, children: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[type])))) }, type)); }) }) })) : null] })), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: subCampaign.isReserved, onChange: function (e) {
-                                    e.persist();
-                                    onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { isReserved: e.target.checked })); });
-                                }, name: "isReserved", color: "primary" }), label: translationText.reserved, style: { marginTop: 6 } }) })] })] }));
+                                        .filter(function (item) { return item !== Enum_2.AnalyticType.AuthenticationSuccess; })
+                                        .filter(Boolean)
+                                        .map(function (type) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: type, children: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[type])))) }, type)); }) })) })] })) })] }));
 }
 exports.default = SubCampaignDetail;

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

@@ -23,9 +23,8 @@ var subCampaignMock = {
     name: 'Test Campaign',
     bookingAmount: 100000,
     bonusAmount: 500000,
-    ticket: Enum_1.CampaignTicket.INACTIVE,
+    status: Enum_1.CampaignStatus.Draft,
     priority: Enum_1.CampaignPriority.ClassB,
-    isReserved: false,
     billingUnit: 1,
 };
 describe('<SubCampaignDetail />', function () {
@@ -36,19 +35,15 @@ describe('<SubCampaignDetail />', function () {
         expect(react_1.screen.getByLabelText(/^Campaign.Detail.Priority.*$/).textContent).toBe('Campaign.PriorityB');
         expect(react_1.screen.getByLabelText(/^Campaign.BookingText.*$/).value).toBe(subCampaignMock.bookingAmount.toString());
         expect(react_1.screen.getByLabelText(/^Campaign.BonusText.*$/).value).toBe(subCampaignMock.bonusAmount.toString());
-        expect(
-        // eslint-disable-next-line testing-library/no-container
-        container.querySelector('input[name="isReserved"]').checked).toBe(subCampaignMock.isReserved);
     });
     it('should render with correct information classA', function () {
-        var subCampaign = __assign(__assign({}, subCampaignMock), { priority: Enum_1.CampaignPriority.ClassA, ticket: Enum_1.CampaignTicket.ACTIVE, isReserved: true });
+        var subCampaign = __assign(__assign({}, subCampaignMock), { priority: Enum_1.CampaignPriority.ClassA, status: Enum_1.CampaignStatus.Active });
         var _a = (0, react_1.render)((0, jsx_runtime_1.jsx)(SubCampaignDetail_1.default, { subCampaign: subCampaign, onSubCampaignChange: function () { }, onChangeSubCampaignStatus: function () { } })), container = _a.container, getByLabelText = _a.getByLabelText, queryByLabelText = _a.queryByLabelText;
         expect(react_1.screen.getByLabelText(/^Campaign.Name.*$/).value).toBe(subCampaign.name);
         expect(react_1.screen.getByLabelText(/^Campaign.Ticket.*$/).textContent).toBe('Campaign.Active');
         expect(react_1.screen.getByLabelText(/^Campaign.Detail.Priority.*$/).textContent).toBe('Campaign.PriorityA');
         expect(react_1.screen.queryByLabelText(/^Campaign.BookingText.*$/)).toBeNull();
         expect(react_1.screen.queryByLabelText(/^Campaign.BonusText.*$/)).toBeNull();
-        expect(container.querySelector('input[name="isReserved"]').checked).toBe(subCampaign.isReserved);
     });
     it('should update sub campaign', function () {
         var state = __assign({}, subCampaignMock);
@@ -71,16 +66,11 @@ describe('<SubCampaignDetail />', function () {
         react_1.fireEvent.change(bonusInput, { target: { valueAsNumber: 837483 } });
         expect(onSubCampaignChange).toHaveBeenCalledTimes(3);
         expect(state.bonusAmount).toBe(837483);
-        var isReservedCheckbox = container.querySelector('input[name="isReserved"]');
-        expect(isReservedCheckbox).not.toBeNull();
-        react_1.fireEvent.click(isReservedCheckbox);
-        expect(onSubCampaignChange).toHaveBeenCalledTimes(4);
-        expect(state.isReserved).toBe(true);
         var selectParam = react_1.screen.getAllByRole('button');
         react_1.fireEvent.mouseDown(selectParam[0]);
         react_1.screen.getAllByRole('option')[0].click();
         expect(onSubCampaignChange).toHaveBeenCalledTimes(5);
-        expect(state.ticket).toBe(Enum_1.CampaignTicket.ACTIVE);
+        expect(state.status).toBe(Enum_1.CampaignStatus.Active);
         react_1.fireEvent.mouseDown(selectParam[1]);
         react_1.screen.getAllByRole('option')[2].click();
         expect(onSubCampaignChange).toHaveBeenCalledTimes(6);

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

@@ -15,22 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubCampaignPreview = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var Add_1 = __importDefault(require("@mui/icons-material/Add"));
-var CheckCircle_1 = __importDefault(require("@mui/icons-material/CheckCircle"));
 var Delete_1 = __importDefault(require("@mui/icons-material/Delete"));
 var FileCopy_1 = __importDefault(require("@mui/icons-material/FileCopy"));
-var RemoveCircle_1 = __importDefault(require("@mui/icons-material/RemoveCircle"));
 var material_1 = require("@mui/material");
+var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
+var react_1 = require("react");
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
-var atoms_1 = require("./atoms");
-var react_1 = require("react");
 var AWING_1 = require("../../../../AWING");
-var Recoils_1 = require("../Recoils");
-var Helpers_1 = require("../../../../Utils/Helpers");
-var Utils_1 = require("../../Utils");
 var Context_1 = require("../../../../Context");
 var i18n_1 = __importDefault(require("../../../../i18n"));
-var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
+var Helpers_1 = require("../../../../Utils/Helpers");
+var Utils_1 = require("../../Utils");
+var Recoils_1 = require("../Recoils");
+var atoms_1 = require("./atoms");
 function SubCampaignList(props) {
     var onAdd = props.onAdd, onDelete = props.onDelete;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
@@ -70,7 +68,7 @@ function SubCampaignPreview(_a) {
     var subCampaign = _a.subCampaign, isSelected = _a.isSelected, onSelect = _a.onSelect, onMultiSelect = _a.onMultiSelect, onDuplicate = _a.onDuplicate, onDelete = _a.onDelete, error = _a.error;
     var t = (0, react_i18next_1.useTranslation)().t;
     var today = (0, Helpers_1.getToday)();
-    var isActive = ((_b = subCampaign.campaignGroup) === null || _b === void 0 ? void 0 : _b.ticket) === Enum_1.CampaignTicket.ACTIVE &&
+    var isActive = ((_b = subCampaign.campaignGroup) === null || _b === void 0 ? void 0 : _b.status) === Enum_1.CampaignStatus.Active &&
         ((_c = subCampaign.ads) === null || _c === void 0 ? void 0 : _c.some(function (ad) {
             return ad.status &&
                 (0, Helpers_1.convertTimestampToDateTime)(ad.startDate) <= today &&
@@ -84,9 +82,44 @@ function SubCampaignPreview(_a) {
         numberHasRunText: t('Campaign.NumberHasRunText'),
         reserved: t('Campaign.Reserved'),
     };
+    var renderStatus = function () {
+        switch (subCampaign.campaignGroup.status) {
+            case Enum_1.CampaignStatus.Draft:
+                return ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: t('Campaign.Status.Draft'), style: {
+                        height: 18,
+                        backgroundColor: Enum_1.ColorCampaignStatus.Draft,
+                        color: 'white',
+                    } }));
+            case Enum_1.CampaignStatus.Reserved:
+                return ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: t('Campaign.Status.Reserved'), style: {
+                        height: 18,
+                        backgroundColor: Enum_1.ColorCampaignStatus.Reserved,
+                        color: 'white',
+                    } }));
+            case Enum_1.CampaignStatus.Pending:
+                return ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: t('Campaign.Status.Pending'), style: {
+                        height: 18,
+                        backgroundColor: Enum_1.ColorCampaignStatus.UnderApproval,
+                        color: 'white',
+                    } }));
+            case Enum_1.CampaignStatus.Active:
+                return ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: t('Campaign.Status.Active'), style: {
+                        height: 18,
+                        backgroundColor: isActive ? Enum_1.ColorCampaignStatus.Active : Enum_1.ColorCampaignStatus.UnActive,
+                        color: 'white',
+                    } }));
+            case Enum_1.CampaignStatus.Done:
+                return ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: t('Campaign.Status.Done'), style: {
+                        height: 18,
+                        backgroundColor: Enum_1.ColorCampaignStatus.Done,
+                        color: 'white',
+                    } }));
+        }
+    };
     return ((0, jsx_runtime_1.jsxs)(material_1.Card, { sx: {
             width: 214,
-            height: 124,
+            minHeight: 124,
+            height: 'auto',
             marginLeft: function (theme) { return theme.spacing(2); },
             cursor: 'pointer',
             border: "2px solid ".concat(isSelected ? '#2196F3' : '#fafafa'),
@@ -104,11 +137,7 @@ function SubCampaignPreview(_a) {
                             fontWeight: '500',
                         }, children: [subCampaign.campaignGroup.name.length > 30
                                 ? "".concat(subCampaign.campaignGroup.name.substring(0, 30), "...")
-                                : subCampaign.campaignGroup.name, subCampaign.campaignGroup.ticket ===
-                                Enum_1.CampaignTicket.ACTIVE ? ((0, jsx_runtime_1.jsx)(CheckCircle_1.default, { fontSize: "small", style: {
-                                    fontSize: '14px',
-                                    color: isActive ? '#008000' : '#8D8D8D',
-                                } })) : ((0, jsx_runtime_1.jsx)(RemoveCircle_1.default, { fontSize: "small", style: { fontSize: '14px' }, color: "primary" })), (0, jsx_runtime_1.jsx)(material_1.Typography, { component: 'span', sx: {
+                                : subCampaign.campaignGroup.name, (0, jsx_runtime_1.jsx)(material_1.Typography, { component: 'span', sx: {
                                     fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2" !important',
                                     fontSize: 18,
                                 }, children: (0, Utils_1.getCampaignPriority)(subCampaign.campaignGroup.priority) })] }) }), action: (0, jsx_runtime_1.jsx)(AWING_1.Actions, { menus: __spreadArray([
@@ -131,10 +160,6 @@ function SubCampaignPreview(_a) {
                                         ? " (+".concat((0, Helpers_1.formatNumber)(subCampaign.campaignGroup.bonusAmount), ")")
                                         : '' })] }) }), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: translationText.bonus, placement: "right", arrow: true, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", children: subCampaign.campaignGroup.numberHasRun
                                 ? "".concat(translationText.numberHasRunText, ": ").concat((0, Helpers_1.formatNumber)(subCampaign.campaignGroup.numberHasRun))
-                                : '' }) })] }), (0, jsx_runtime_1.jsx)(material_1.CardActions, { style: { padding: '0 8px' }, children: subCampaign.campaignGroup.isReserved && ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: translationText.reserved, style: {
-                        height: 18,
-                        backgroundColor: '#c49f47',
-                        color: 'white',
-                    } })) })] }));
+                                : '' }) })] }), (0, jsx_runtime_1.jsx)(material_1.CardActions, { style: { padding: '0 8px 8px 8px' }, children: renderStatus() })] }));
 }
 exports.SubCampaignPreview = SubCampaignPreview;

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

@@ -22,7 +22,7 @@ exports.subCampaignDetailValidState = (0, recoil_1.atom)({
                 return (result[sub.campaignGroup.id] =
                     (0, Utils_1.nameValid)(sub.campaignGroup.name) &&
                         (0, Utils_1.groupClassBValid)(sub.campaignGroup) &&
-                        (0, Utils_1.groupClassCValid)(sub));
+                        (0, Utils_1.groupClassCValid)(sub) && !!sub.campaignGroup.billingUnit);
             });
             return result;
         },
@@ -58,9 +58,10 @@ exports.subCampaignValidState = (0, recoil_1.selector)({
         var subCampaignAdsValid = get(exports.subCampaignAdsValidState);
         var result = {};
         subCampaigns.forEach(function (sub) {
+            var _a;
             return (result[sub.campaignGroup.id] =
                 subCampaignDetailValid[sub.campaignGroup.id] &&
-                    subCampaignAdsValid[sub.campaignGroup.id]);
+                    subCampaignAdsValid[sub.campaignGroup.id] && Boolean((_a = sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.billingUnit));
         });
         return result;
     },