awing-library 2.1.221-dev → 2.1.223-dev

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

@@ -63,7 +63,7 @@ var CampaignContainer = function () {
     var getCampaign = (0, react_1.useCallback)(function (params) {
         var advancedObject = params.advancedObject, id = params.id, searchString = params.searchString, pageIndex = params.pageIndex, pageSize = params.pageSize;
         setCollapseId([]);
-        var _a = advancedObject || {}, directoryId = _a.directoryId, isReserved = _a.isReserved, priority = _a.priority, status = _a.status, type = _a.type;
+        var _a = advancedObject || {}, directoryId = _a.directoryId, priority = _a.priority, status = _a.status, type = _a.type;
         var startDate = '';
         var endDate = '';
         if (advancedObject === null || advancedObject === void 0 ? void 0 : advancedObject.date) {
@@ -80,10 +80,9 @@ var CampaignContainer = function () {
             endDate: endDate,
             pageIndex: pageIndex,
             pageSize: pageSize,
-            isReserved: isReserved,
             // placeIds: ,
             priorities: priority && [priority],
-            status: status && [status],
+            status: status !== undefined ? [status] : undefined,
             types: type && [type],
         })
             .then(setListCampaign)
@@ -135,11 +134,11 @@ var CampaignContainer = function () {
                     label: t('Campaign.AdvanceSearchStatus'),
                     type: 'autocomplete',
                     icon: (0, jsx_runtime_1.jsx)(icons_material_1.Place, { fontSize: "small" }),
-                    options: Object.entries(Enum_1.CAMPAIGN_STATUS).map(function (_a) {
+                    options: Object.entries(Enum_1.CampaignStatus).filter(function (item) { return !isNaN(Number(item[1])); }).map(function (_a) {
                         var key = _a[0], value = _a[1];
                         return ({
                             value: value,
-                            text: t(['Campaign', key].join('.')),
+                            text: t(['Campaign.Status', key].join('.')),
                         });
                     }),
                 },
@@ -169,22 +168,6 @@ var CampaignContainer = function () {
                         });
                     }),
                 },
-                {
-                    fieldName: 'isReserved',
-                    label: t('Campaign.AdvanceSearchType'),
-                    type: 'autocomplete',
-                    icon: (0, jsx_runtime_1.jsx)(icons_material_1.BookmarkBorder, { fontSize: "small" }),
-                    options: [
-                        {
-                            value: true,
-                            text: t('Campaign.Reserved'),
-                        },
-                        {
-                            value: false,
-                            text: t('Campaign.NoneReserved'),
-                        },
-                    ],
-                },
                 {
                     fieldName: 'directoryId',
                     label: t('Common.Directory'),
@@ -225,7 +208,7 @@ var CampaignContainer = function () {
                                                 : icons_material_1.KeyboardArrowDown }) })] }));
                         }
                         else {
-                            return ((0, jsx_runtime_1.jsxs)(material_1.Box, { style: { paddingLeft: '32px' }, children: [(0, jsx_runtime_1.jsx)("span", { children: row === null || row === void 0 ? void 0 : row.campaignGroup.name }), (row === null || row === void 0 ? void 0 : row.campaignGroup.ticket) ===
+                            return ((0, jsx_runtime_1.jsxs)(material_1.Box, { style: { paddingLeft: '32px' }, children: [(0, jsx_runtime_1.jsx)("span", { children: row === null || row === void 0 ? void 0 : row.campaignGroup.name }), (row === null || row === void 0 ? void 0 : row.campaignGroup.status) ===
                                         Enum_1.ACTIVE_CAMPAIGN_TICKET ? ((0, jsx_runtime_1.jsx)(icons_material_1.CheckCircle, { fontSize: 'small', sx: {
                                             paddingLeft: '4px',
                                             marginBottom: '-4px',
@@ -243,7 +226,7 @@ var CampaignContainer = function () {
                                             fontFamily: '"Segoe UI Symbol", "Apple Symbols", "Noto Sans Symbols 2" !important',
                                         }, children: (0, Utils_1.getCampaignPriority)(row === null || row === void 0 ? void 0 : row.campaignGroup.priority) }), 
                                     //Check trong ads có bất kỳ ad nào isReverved
-                                    (row === null || row === void 0 ? void 0 : row.campaignGroup.isReserved) && ((0, jsx_runtime_1.jsx)(material_1.Chip, { sx: {
+                                    (row === null || row === void 0 ? void 0 : row.campaignGroup.status) === Enum_1.CampaignStatus.Reserved && ((0, jsx_runtime_1.jsx)(material_1.Chip, { sx: {
                                             backgroundColor: '#c49f47',
                                             color: '#fff',
                                             height: '18px',

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

@@ -85,11 +85,10 @@ var resData = {
                         id: 1,
                         campaignId: '5111120384159200990',
                         name: 'Lotusa',
-                        ticket: 1,
+                        status: 1,
                         priority: 0,
                         bookingAmount: 0,
                         bonusAmount: 0,
-                        isReserved: false,
                     },
                     ads: [
                         {
@@ -250,7 +249,6 @@ jest.mock('AWING/PageManagement', function () { return ({
                         props.onChangeQueryInput({
                             advancedObject: {
                                 status: '0',
-                                isReserved: true,
                                 priority: '0',
                                 type: '1',
                                 directoryId: '4684432198852342857',

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

@@ -52,10 +52,9 @@ exports.campaignModelState = (0, recoil_1.atom)({
                     id: 1,
                     name: 'Sub-Campaign 1',
                     priority: (0, Utils_1.getIndexPriority)(Enum_1.CampaignPriority.ClassB),
-                    ticket: Enum_1.CampaignTicket.INACTIVE,
+                    status: Enum_1.CampaignStatus.Draft,
                     bookingAmount: 10,
                     bonusAmount: 0,
-                    isReserved: false,
                     billingUnit: 1,
                 },
                 ads: [],

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

@@ -18,6 +18,9 @@ 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 WatchLater_1 = __importDefault(require("@mui/icons-material/WatchLater"));
+var HourglassBottom_1 = __importDefault(require("@mui/icons-material/HourglassBottom"));
+var HighlightOff_1 = __importDefault(require("@mui/icons-material/HighlightOff"));
 var RemoveCircle_1 = __importDefault(require("@mui/icons-material/RemoveCircle"));
 var material_1 = require("@mui/material");
 var react_i18next_1 = require("react-i18next");
@@ -70,7 +73,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 +87,23 @@ function SubCampaignPreview(_a) {
         numberHasRunText: t('Campaign.NumberHasRunText'),
         reserved: t('Campaign.Reserved'),
     };
+    var renderIcon = function () {
+        switch (subCampaign.campaignGroup.status) {
+            case Enum_1.CampaignStatus.Active:
+                return ((0, jsx_runtime_1.jsx)(CheckCircle_1.default, { fontSize: "small", style: {
+                        fontSize: '14px',
+                        color: isActive ? '#008000' : '#8D8D8D',
+                    } }));
+            case Enum_1.CampaignStatus.Reserved:
+                return ((0, jsx_runtime_1.jsx)(WatchLater_1.default, { fontSize: "small", style: { fontSize: '14px' }, color: "primary" }));
+            case Enum_1.CampaignStatus.Pending:
+                return ((0, jsx_runtime_1.jsx)(HourglassBottom_1.default, { fontSize: "small", style: { fontSize: '14px' }, color: "primary" }));
+            case Enum_1.CampaignStatus.Done:
+                return ((0, jsx_runtime_1.jsx)(HighlightOff_1.default, { fontSize: "small", style: { fontSize: '14px' }, color: "primary" }));
+            default:
+                return ((0, jsx_runtime_1.jsx)(RemoveCircle_1.default, { fontSize: "small", style: { fontSize: '14px' }, color: "primary" }));
+        }
+    };
     return ((0, jsx_runtime_1.jsxs)(material_1.Card, { sx: {
             width: 214,
             height: 124,
@@ -104,11 +124,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, renderIcon(), (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,7 +147,8 @@ 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: {
+                                : '' }) })] }), (0, jsx_runtime_1.jsx)(material_1.CardActions, { style: { padding: '0 8px' }, children: subCampaign.campaignGroup.status ===
+                    Enum_1.CampaignStatus.Reserved && ((0, jsx_runtime_1.jsx)(material_1.Chip, { label: translationText.reserved, style: {
                         height: 18,
                         backgroundColor: '#c49f47',
                         color: 'white',

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;

package/lib/ACM-AXN/Campaign/Enum.d.ts

@@ -1,4 +1,3 @@
-export declare const ACTIVE_CAMPAIGN_TICKET = 0;
 export declare const EnumOperator: {
     Equality: {
         id: number;
@@ -113,10 +112,14 @@ export declare const BaseEvent: {
     readonly 1: "Authentication";
     readonly 4: "AuthenticationSuccess";
 };
-export declare enum CampaignTicket {
-    ACTIVE = 0,
-    INACTIVE = 1
+export declare enum CampaignStatus {
+    Draft = 0,
+    Reserved = 1,
+    Pending = 2,
+    Active = 3,
+    Done = 4
 }
+export declare const ACTIVE_CAMPAIGN_TICKET = CampaignStatus.Active;
 export declare enum AdType {
     BANNER_STATIC = 1,
     BANNER_EFFECT = 2,

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

@@ -1,9 +1,8 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CampaignApprovalStatus = exports.Operator = exports.CampaignRuleType = exports.AdType = exports.CampaignTicket = exports.BaseEvent = exports.CampaignPriority = exports.DATE_FORMAT = exports.PlaceFilterOperandType = exports.DirectoryRoot = exports.CAMPAIGN_ANALYTIC_TYPE = exports.CAMPAIGN_STATUS = exports.EnumOperator = exports.ACTIVE_CAMPAIGN_TICKET = void 0;
+exports.CampaignApprovalStatus = exports.Operator = exports.CampaignRuleType = exports.AdType = exports.ACTIVE_CAMPAIGN_TICKET = exports.CampaignStatus = exports.BaseEvent = exports.CampaignPriority = exports.DATE_FORMAT = exports.PlaceFilterOperandType = exports.DirectoryRoot = exports.CAMPAIGN_ANALYTIC_TYPE = exports.CAMPAIGN_STATUS = exports.EnumOperator = void 0;
 var Enum_1 = require("../../ACM-AXN/Common/Enum");
-exports.ACTIVE_CAMPAIGN_TICKET = 0;
 exports.EnumOperator = {
     Equality: { id: 0, text: "=", value: "Equality", type: "Comparison" },
     NotEqual: { id: 1, text: "≠", value: "NotEqual", type: "Comparison" },
@@ -96,11 +95,15 @@ exports.BaseEvent = (_a = {},
     _a[Enum_1.AnalyticType.Authentication] = 'Authentication',
     _a[Enum_1.AnalyticType.AuthenticationSuccess] = 'AuthenticationSuccess',
     _a);
-var CampaignTicket;
-(function (CampaignTicket) {
-    CampaignTicket[CampaignTicket["ACTIVE"] = 0] = "ACTIVE";
-    CampaignTicket[CampaignTicket["INACTIVE"] = 1] = "INACTIVE";
-})(CampaignTicket || (exports.CampaignTicket = CampaignTicket = {}));
+var CampaignStatus;
+(function (CampaignStatus) {
+    CampaignStatus[CampaignStatus["Draft"] = 0] = "Draft";
+    CampaignStatus[CampaignStatus["Reserved"] = 1] = "Reserved";
+    CampaignStatus[CampaignStatus["Pending"] = 2] = "Pending";
+    CampaignStatus[CampaignStatus["Active"] = 3] = "Active";
+    CampaignStatus[CampaignStatus["Done"] = 4] = "Done";
+})(CampaignStatus || (exports.CampaignStatus = CampaignStatus = {}));
+exports.ACTIVE_CAMPAIGN_TICKET = CampaignStatus.Active;
 var AdType;
 (function (AdType) {
     // DEFAULT = 0,

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { AlertColor } from '@mui/material';
 import { CampaignType } from './Utils';
-import { AdType, CampaignPriority, CampaignRuleType, CampaignTicket, DirectoryRoot, Operator } from './Enum';
+import { AdType, CampaignPriority, CampaignRuleType, CampaignStatus, DirectoryRoot, Operator } from './Enum';
 import { PrmissionService } from '../Permission/Types';
 import { PageService, PageViewEvent } from '../Page/Types';
 import { BaseChartComponent } from 'react-chartjs-2/dist/types';
@@ -66,7 +66,7 @@ export type CampaignGroup = {
     id: number;
     campaignId?: string;
     name: string;
-    ticket: CampaignTicket;
+    status: CampaignStatus;
     /**
      * Mức độ ưu tiên (A, B, C)
      */
@@ -76,7 +76,6 @@ export type CampaignGroup = {
     /**
      * Đặt chỗ
      */
-    isReserved: boolean;
     /**
      * Số lượng đã chạy (nếu có)
      */
@@ -248,7 +247,6 @@ export interface CampaignFilter {
     endDate?: string;
     pageIndex?: number;
     pageSize?: number;
-    isReserved?: boolean;
     placeIds?: string[];
     priorities?: CampaignPriority[];
     status?: number[];

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

@@ -66,7 +66,7 @@ var checkCampaignIsRunning = function (campaignGroupModel) {
     var localTime = (0, moment_1.default)().format('YYYY-MM-DD');
     var dateTimeNow = Number((0, moment_1.default)(localTime).format('X'));
     //Check chỉ cần trong ad có chứa ngày hiện tại là được
-    var campaignTicket = campaignGroupModel.campaignGroup.ticket === Enum_1.ACTIVE_CAMPAIGN_TICKET;
+    var campaignTicket = campaignGroupModel.campaignGroup.status === Enum_1.ACTIVE_CAMPAIGN_TICKET;
     var campaignContainsCurrentDate = ((_a = campaignGroupModel.ads.filter(function (y) {
         var _a, _b;
         return dateTimeNow >= Number((_a = y.startDate) === null || _a === void 0 ? void 0 : _a.seconds) &&

package/lib/AWING/DataForm/DataInput.js

@@ -128,13 +128,11 @@ function DataInput(props) {
     }, [type, value]);
     var handleParamValueChange = function () {
         var newValue = Number(numberValue);
-        onChange(newValue, checkValidationValue(fieldDefinition, newValue));
+        setNumberValue(newValue);
+        if (type === 'number' && Number(value) !== newValue) {
+            onChange(newValue, checkValidationValue(fieldDefinition, newValue));
+        }
     };
-    (0, react_2.useEffect)(function () {
-        if (type === 'number' && Number(value) !== Number(numberValue))
-            handleParamValueChange();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [numberValue, type]);
     switch (type) {
         case 'logic-expression': {
             return ((0, jsx_runtime_1.jsx)(LogicExpression_1.default, __assign({ cf: function (newValue, valid) {
@@ -216,7 +214,8 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(AWING_1.NumberFormat, __assign({ id: fieldName.toString(), name: fieldName.toString(), fullWidth: true, variant: "standard" }, other, { value: numberValue !== null && numberValue !== void 0 ? numberValue : '', onChange: function (event) {
                     var newValue = event.target.value;
                     setNumberValue(newValue);
-                }, error: error, helperText: !disableHelperText && error
+                    onChange(Number(newValue), checkValidationValue(fieldDefinition, Number(newValue)));
+                }, onBlur: handleParamValueChange, error: error, helperText: !disableHelperText && error
                     ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
                     : '' })));
         }

package/lib/AWING/DataForm/interface.d.ts

@@ -68,7 +68,6 @@ export interface NumberFieldDefinition<T extends DataObject> extends BaseFieldDe
     onValidate?(value?: number): boolean;
     defaultValue?: number;
     autoFormula?: string;
-    isFloat?: boolean;
     min?: number;
     max?: number;
 }

package/lib/translate/en/translation.json

@@ -492,7 +492,12 @@
         "Status": {
             "Title": "Status",
             "Status_0": "Active",
-            "Status_1": "Inactive"
+            "Status_1": "Inactive",
+            "Draft": "Draft",
+            "Reserved": "Reserved",
+            "Pending": "Under Approval",
+            "Active": "Active",
+            "Done": "Done"
         },
         "CreateForm": {
             "GroupWizard": "Group Wizard",

package/lib/translate/id/translation.json

@@ -492,7 +492,12 @@
         "Status": {
             "Title": "Status",
             "Status_0": "Aktif",
-            "Status_1": "Tidak Aktif"
+            "Status_1": "Tidak Aktif",
+            "Draft": "Draf",
+            "Reserved": "Dipesan",
+            "Pending": "Menunggu",
+            "Active": "Aktif",
+            "Done": "Selesai"
         },
         "CreateForm": {
             "GroupWizard": "Wizard Grup",

package/lib/translate/vi/translation.json

@@ -476,7 +476,12 @@
         "Status": {
             "Title": "Trạng thái",
             "Status_0": "Đang hoạt động",
-            "Status_1": "Ngưng hoạt động"
+            "Status_1": "Ngưng hoạt động",
+            "Draft": "Khởi tạo",
+            "Reserved": "Đặt chỗ",
+            "Pending": "Phê duyệt",
+            "Active": "Hoạt động",
+            "Done": "Kết thúc"
         },
         "CreateForm": {
             "GroupWizard": "Nhóm Wizard",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.221-dev",
+    "version": "2.1.223-dev",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",