awing-library 2.1.222-dev → 2.1.224-dev

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

@@ -25,7 +25,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
-var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
 var Hooks_1 = __importDefault(require("../../../../ACM-AXN/Campaign/Hooks"));
 var Constant_1 = require("../../../../ACM-AXN/Common/Constant");
 var Router_1 = require("../../../../AWING/Router");
@@ -35,7 +34,7 @@ var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var Recoils_1 = require("../Recoils");
 var atoms_1 = require("../TabSubCampaign/atoms");
-var RowTable_1 = require("./RowTable");
+var RowTable_1 = __importDefault(require("./RowTable"));
 function TabApprove() {
     var t = (0, react_i18next_1.useTranslation)().t;
     var campaignId = (0, Router_1.useParams)().campaignId;
@@ -66,20 +65,34 @@ function TabApprove() {
         return url;
     };
     var mergedData = function (data) {
-        return data.reduce(function (acc, curr) {
-            var found = acc.find(function (item) { return item.linkPreview === curr.linkPreview; });
-            if (found) {
-                // Nếu link đã tồn tại, gộp subCampaign
-                found.subCampaigns.push(curr.subCampaigns[0]);
+        return data.reduce(function (acc, detail) {
+            var existingLink = acc.find(function (l) { return l.linkPreview === detail.linkPreview; });
+            if (existingLink) {
+                var existingCampaign = existingLink.campaign.find(function (item) {
+                    return item.subCampaigns.find(function (subCampaign) {
+                        return subCampaign.id ===
+                            detail.campaign[0].subCampaigns[0].id;
+                    });
+                });
+                if (existingCampaign) {
+                    existingCampaign.ads.push({
+                        id: detail.campaign[0].ads[0].id,
+                        name: detail.campaign[0].ads[0].name,
+                    });
+                }
+                else {
+                    detail.campaign.forEach(function (item) {
+                        existingLink.campaign.push(item);
+                    });
+                }
             }
             else {
-                // Nếu link chưa tồn tại, thêm vào acc với subCampaign là mảng
                 acc.push({
                     id: generateRandomId(),
-                    linkPreview: curr.linkPreview,
-                    description: curr.description,
-                    status: curr.status,
-                    subCampaigns: [curr.subCampaigns[0]],
+                    linkPreview: detail.linkPreview,
+                    campaign: detail.campaign,
+                    status: detail.status,
+                    description: detail.description,
                 });
             }
             return acc;
@@ -96,14 +109,25 @@ function TabApprove() {
                 });
                 if (isDomain) {
                     return {
-                        subCampaigns: [
+                        linkPreview: renderLinkPreview(ad, domainId),
+                        campaign: [
                             {
-                                id: subCampaign.campaignGroup.id,
-                                name: subCampaign.campaignGroup
-                                    .name,
+                                subCampaigns: [
+                                    {
+                                        id: subCampaign
+                                            .campaignGroup.id,
+                                        name: subCampaign
+                                            .campaignGroup.name,
+                                    },
+                                ],
+                                ads: [
+                                    {
+                                        id: ad.id,
+                                        name: ad.name,
+                                    },
+                                ],
                             },
                         ],
-                        linkPreview: renderLinkPreview(ad, domainId),
                         description: '',
                         status: 0,
                     };
@@ -124,72 +148,107 @@ function TabApprove() {
         setCampaignApproval(function (prevState) {
             if (!prevState)
                 return [];
-            // Tìm index của campaign cần update trong mảng
-            var campaignIndex = prevState === null || prevState === void 0 ? void 0 : prevState.findIndex(function (campaign) { return campaign.id === id; });
-            if (campaignIndex === -1)
-                return prevState; // Nếu không tìm thấy, trả về state cũ
-            // Tạo bản sao của state
-            var newState = __spreadArray([], prevState, true);
-            // Update thông tin của campaign
-            newState[campaignIndex] = __assign(__assign({}, newState[campaignIndex]), { status: Enum_1.CampaignApprovalStatus[row.status], description: row.description, linkPreview: row.linkPreview, subCampaignId: row.subCampaigns
-                    .map(function (sub) { return sub.id; })
-                    .join(',') });
+            var newState = prevState.map(function (item) {
+                if (item.id === id) {
+                    return __assign(__assign({}, item), row);
+                }
+                return item;
+            });
             return newState;
         });
     }, [setCampaignApproval]);
-    var transformedData = function (originalData) {
-        return originalData
-            .map(function (campaign) {
-            return campaign.detail.map(function (detailItem) {
-                var _a;
-                return ({
-                    id: detailItem.id,
-                    campaignId: campaignId,
-                    domainId: campaign.domain.domainId,
-                    subCampaignId: ((_a = detailItem.subCampaigns) === null || _a === void 0 ? void 0 : _a.map(function (sub) { return sub.id; }).join(',')) || undefined,
-                    linkPreview: detailItem.linkPreview,
-                    status: Enum_1.CampaignApprovalStatus[detailItem.status],
-                    description: detailItem.description,
+    function flattenData(data) {
+        var flattened = [];
+        data.forEach(function (item) {
+            item.detail.forEach(function (detail) {
+                detail.campaign.forEach(function (campaign) {
+                    campaign.ads.forEach(function (ad) {
+                        var _a;
+                        flattened.push({
+                            id: item.id,
+                            campaignId: campaignId,
+                            domainId: item.domain.domainId,
+                            status: detail.status,
+                            description: detail.description,
+                            subId: (_a = campaign.subCampaigns[0]) === null || _a === void 0 ? void 0 : _a.id,
+                            adId: ad === null || ad === void 0 ? void 0 : ad.id,
+                        });
+                    });
                 });
             });
-        })
-            .flat();
-    };
-    var dataTable = (0, react_1.useMemo)(function () {
-        if (!domains.length)
-            return [];
-        var data;
-        if (campaignApproval === null || campaignApproval === void 0 ? void 0 : campaignApproval.length) {
-            // Nếu campaignApproval đã có sẵn dữ liệu, chuyển đổi ngược lại thành dạng IDataTable
-            var groupedData = lodash_1.default.groupBy(campaignApproval, 'domainId');
-            data = Object.entries(groupedData).map(function (_a) {
-                var _b;
-                var domainId = _a[0], items = _a[1];
-                return ({
-                    id: generateRandomId(),
+        });
+        return flattened;
+    }
+    var unflattenData = function (inputData) {
+        var subCampaignsFlat = subCampaigns.flatMap(function (item) {
+            var subCampaignId = item.campaignGroup.id;
+            var subCampaignName = item.campaignGroup.name;
+            return item.ads.map(function (ad) { return ({
+                subCampaignId: subCampaignId,
+                subCampaignName: subCampaignName,
+                adId: ad.id,
+                adName: ad.name,
+                loginId: ad.loginId,
+                welcomeId: ad.welcomeId,
+            }); });
+        });
+        var findAd = function (subId, adId) {
+            var ad = subCampaignsFlat.find(function (item) { return item.adId === adId && item.subCampaignId === subId; });
+            return ad;
+        };
+        var groupedData = inputData.reduce(function (acc, item) {
+            var _a, _b, _c;
+            if (!acc[Number(item.domainId)]) {
+                var domain = domains.find(function (d) { return d.domainId === item.domainId; });
+                acc[Number(item.domainId)] = {
+                    id: item.id,
                     domain: {
-                        domainName: ((_b = domains.find(function (d) { return d.domainId === domainId; })) === null || _b === void 0 ? void 0 : _b.name) || 'Unknown',
-                        domainId: domainId,
+                        domainName: domain === null || domain === void 0 ? void 0 : domain.name,
+                        domainId: domain === null || domain === void 0 ? void 0 : domain.domainId,
                     },
-                    detail: items.map(function (item) {
-                        var _a;
-                        return ({
+                    detail: [
+                        {
                             id: generateRandomId(),
-                            status: Enum_1.CampaignApprovalStatus[item.status],
-                            linkPreview: item.linkPreview,
-                            subCampaigns: ((_a = item.subCampaignId) === null || _a === void 0 ? void 0 : _a.split(',').map(function (id) {
-                                var _a;
-                                return ({
-                                    id: id,
-                                    name: ((_a = subCampaigns.find(function (sc) { return sc.campaignGroup.id.toString() === id; })) === null || _a === void 0 ? void 0 : _a.campaignGroup.name) || "".concat(id)
-                                });
-                            })) || [],
+                            linkPreview: renderLinkPreview((_a = findAd(item.subId, item.adId)) !== null && _a !== void 0 ? _a : {}, item.domainId),
+                            campaign: [],
+                            status: item.status,
                             description: item.description,
-                        });
-                    }),
+                        },
+                    ],
+                };
+            }
+            var campaign = acc[Number(item.domainId)].detail[0]
+                .campaign;
+            var subCampaign = campaign.find(function (c) { return c.subCampaigns[0].id === item.subId; });
+            if (!subCampaign) {
+                var sub = subCampaigns.find(function (subCampaign) {
+                    return subCampaign.campaignGroup.id === item.subId;
                 });
+                subCampaign = {
+                    subCampaigns: [
+                        {
+                            id: sub.campaignGroup.id,
+                            name: sub.campaignGroup.name,
+                        },
+                    ],
+                    ads: [],
+                };
+                campaign.push(subCampaign);
+            }
+            subCampaign.ads.push({
+                id: item.adId,
+                name: (_c = (_b = findAd(subCampaign.subCampaigns[0].id, item.adId)) === null || _b === void 0 ? void 0 : _b.adName) !== null && _c !== void 0 ? _c : '',
             });
-            return data;
+            return acc;
+        }, {});
+        return Object.values(groupedData);
+    };
+    var dataTable = (0, react_1.useMemo)(function () {
+        if (!domains.length)
+            return [];
+        var data;
+        if (campaignApproval === null || campaignApproval === void 0 ? void 0 : campaignApproval.length) {
+            return unflattenData(campaignApproval);
         }
         data = domains.map(function (domain) {
             return {
@@ -218,23 +277,22 @@ function TabApprove() {
     }, [domainIds]);
     (0, react_1.useEffect)(function () {
         if (dataTable.length > 0) {
-            setCampaignApproval(transformedData(dataTable));
+            setCampaignApproval(flattenData(dataTable));
         }
     }, [dataTable]);
-    return ((0, jsx_runtime_1.jsxs)(material_1.TableContainer, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", sx: {
-                    margin: '1rem',
-                }, children: t('Campaign.Approval.GetApprovalInformation') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", color: "primary", disabled: !rowSelected.length, children: t('Campaign.Approval.SendEmail') }), (0, jsx_runtime_1.jsxs)(material_1.Table, { sx: {
+    return ((0, jsx_runtime_1.jsxs)(material_1.TableContainer, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", color: "primary", disabled: !rowSelected.length, sx: {
+                    margin: '1rem'
+                }, children: t('Campaign.Approval.SendEmail') }), (0, jsx_runtime_1.jsxs)(material_1.Table, { sx: {
                     boxShadow: 'none',
                     '.MuiOutlinedInput-notchedOutline': {
                         border: 'none !important',
                     },
                 }, children: [(0, jsx_runtime_1.jsx)(material_1.TableHead, { children: (0, jsx_runtime_1.jsxs)(material_1.TableRow, { style: { height: 57 }, children: [(0, jsx_runtime_1.jsx)(material_1.TableCell, { style: { width: 60, padding: '0 0 0 4px' }, children: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { indeterminate: rowSelected.length > 0 &&
                                             rowSelected.length < dataTable.length, checked: rowSelected.length > 0 &&
-                                            rowSelected.length === dataTable.length, onChange: handleSelectAll, inputProps: { 'aria-label': 'select all ad' }, color: "primary" }) }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Domain') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { style: { maxWidth: 400 }, children: t('Campaign.Approval.LinkPreview') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.SubCampaign') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Status') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Note') })] }) }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: dataTable.map(function (item, index) { return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.TableRow, { children: [(0, jsx_runtime_1.jsx)(material_1.TableCell, { rowSpan: item.detail.length + 1, style: { width: 60, padding: '0 0 0 4px' }, children: (0, jsx_runtime_1.jsx)(material_1.Box, { display: 'flex', children: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: rowSelected.some(function (x) { return x === item.id; }), color: "primary", onChange: function () {
-                                                        return handleRowSelect(item.id);
-                                                    } }) }) }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { rowSpan: item.detail.length + 1, children: item.domain.domainName })] }), item.detail.map(function (detail, index2) {
-                                    var _a;
-                                    return ((0, jsx_runtime_1.jsx)(RowTable_1.RowTable, { row: detail, id: (_a = detail === null || detail === void 0 ? void 0 : detail.id) !== null && _a !== void 0 ? _a : -1, updateRow: updateRow }, index2));
-                                })] }, index)); }) })] })] }));
+                                            rowSelected.length === dataTable.length, onChange: handleSelectAll, inputProps: { 'aria-label': 'select all ad' }, color: "primary" }) }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Domain') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { style: { maxWidth: 400 }, children: t('Campaign.Approval.LinkPreview') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.SubCampaign') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Advertisement') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Status') }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: t('Campaign.Approval.Note') })] }) }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: dataTable.map(function (row) {
+                            return row.detail.map(function (link, linkIndex) {
+                                return link.campaign.map(function (sub, subIndex) { return ((0, jsx_runtime_1.jsx)(RowTable_1.default, { row: row, link: link, sub: sub, linkIndex: linkIndex, subIndex: subIndex, rowSelected: rowSelected, handleRowSelect: handleRowSelect, updateRow: updateRow }, "".concat(row.id, "-").concat(linkIndex, "-").concat(subIndex))); });
+                            });
+                        }) })] })] }));
 }
 exports.default = TabApprove;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/index.test.js

@@ -134,11 +134,10 @@ var initCampaignData = {
                 id: 1,
                 campaignId: '4688923610550546635',
                 name: 'Premium',
-                ticket: 0,
+                status: 0,
                 priority: 1,
                 bookingAmount: 7143,
                 bonusAmount: 357,
-                isReserved: false,
                 billingUnit: 2,
             },
             ads: [
@@ -2668,11 +2667,10 @@ var initCampaignDataFetch = {
                 id: 1,
                 campaignId: '4992385398844444137',
                 name: 'Sub-Campaign 1',
-                ticket: 1,
+                status: 1,
                 priority: 1,
                 bookingAmount: 10,
                 bonusAmount: 0,
-                isReserved: false,
                 billingUnit: 1,
             },
             ads: [

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

@@ -70,7 +70,7 @@ function SubCampaignDetail(props) {
      */
     var translationText = {
         name: t('Campaign.Name'),
-        ticket: t('Campaign.Ticket'),
+        status: t('Campaign.Ticket'),
         BillingUnit: t('Campaign.BillingUnit.Title'),
         priority: t('Campaign.Detail.Priority'),
         booking: t('Campaign.BookingText'),
@@ -84,9 +84,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: Object.values(Enum_1.CampaignStatus).filter(function (item) { return !isNaN(Number(item)); }).map(function (status) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: status, children: t("Campaign.Status.".concat(Enum_1.CampaignStatus[status])) }, status)); }) }) }), (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);
@@ -103,34 +103,31 @@ function SubCampaignDetail(props) {
                                     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), 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: (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 && !subValid.billingUnit, helperText: !!subValid.billingUnit && !subValid.billingUnit
-                                        ? translationText.helperText
-                                        : '', children: Object.values(Enum_2.AnalyticType)
-                                        .filter(function (item) { return !isNaN(Number(item)); })
-                                        .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)); }) }) })] })), (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 } }) })] })] }));
+                            }, 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: (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 && !subValid.billingUnit, helperText: !!subValid.billingUnit && !subValid.billingUnit
+                                    ? translationText.helperText
+                                    : '', children: Object.values(Enum_2.AnalyticType)
+                                    .filter(function (item) { return !isNaN(Number(item)); })
+                                    .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,6 +82,40 @@ 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,
@@ -104,11 +136,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 +159,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' }, children: renderStatus() })] }));
 }
 exports.SubCampaignPreview = SubCampaignPreview;

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

@@ -61,11 +61,10 @@ function TabSubCampaign() {
             campaignGroup: {
                 id: newId,
                 name: 'Sub-Campaign ' + newId,
-                ticket: Enum_1.CampaignTicket.INACTIVE,
+                status: Enum_1.CampaignStatus.Draft,
                 priority: Enum_1.CampaignPriority.ClassB,
                 bookingAmount: 10,
                 bonusAmount: 0,
-                isReserved: false,
                 billingUnit: Enum_2.AnalyticType.Authentication,
             },
             ads: [],

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

@@ -227,8 +227,8 @@ var CreateOrEdit = function (props) {
                                 subCampains[idx].ads[i].cantBeDelete = true;
                             }
                         }
-                        else if (subCamp.campaignGroup.ticket ===
-                            Enum_1.CampaignTicket.ACTIVE) {
+                        else if (subCamp.campaignGroup.status ===
+                            Enum_1.CampaignStatus.Active) {
                             subCampains[idx].campaignGroup.cantBeDelete =
                                 true;
                             for (var i = 0; i < subCamp.ads.length; i++) {
@@ -244,7 +244,7 @@ var CreateOrEdit = function (props) {
                     campaignModel.campaign.name += ' - copy';
                     campaignModel.campaign.createdDate = undefined;
                     campaignModel.campaignGroups.forEach(function (g) {
-                        g.campaignGroup.ticket = Enum_1.CampaignTicket.INACTIVE;
+                        g.campaignGroup.status = Enum_1.CampaignStatus.Draft;
                         if (!service.attributesGetByObjectTypeCode)
                             g.campaignGroup.billingUnit =
                                 Enum_2.AnalyticType.Authentication;