awing-library 2.1.21 → 2.1.22-stage

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

@@ -0,0 +1,47 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var jsx_runtime_1 = require("react/jsx-runtime");
+var material_1 = require("@mui/material");
+var react_i18next_1 = require("react-i18next");
+var Enum_1 = require("../../../../Enum");
+var LimitAuthencation = function (props) {
+    var rule = props.rule, valids = props.valids, onChange = props.onChange;
+    var t = (0, react_i18next_1.useTranslation)().t;
+    var handleChange = function (fieldName, fieldValue) {
+        var _a;
+        onChange(__assign(__assign({}, rule), (_a = {}, _a[fieldName] = fieldValue, _a)));
+    };
+    var handleChangeParameter = function (fieldName, fieldValue) {
+        var _a;
+        handleChange('parameter', __assign(__assign({}, rule.parameter), (_a = {}, _a[fieldName] = fieldValue, _a)));
+    };
+    var translationText = {
+        operator: t('Campaign.Operator'),
+        period: t('Campaign.Period'),
+        value: t('Campaign.Detail.Value'),
+        periodHelperText: t('Campaign.PeriodHelperText'),
+        helperText: t('Common.Required'),
+    };
+    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: 'operator', variant: "standard", name: 'operator', select: true, fullWidth: true, label: translationText.operator, value: rule.operator, onChange: function (e) { return handleChange('operator', e.target.value); }, children: Object.entries(Enum_1.EnumOperator).map(function (_a) {
+                        var key = _a[0], val = _a[1];
+                        return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: val.id, children: val.text }, val.id));
+                    }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "value", name: "value", variant: "standard", type: "number", fullWidth: true, label: translationText.value, value: rule.value, onChange: function (e) { return handleChange('value', e.target.value); }, error: valids && !valids.value, helperText: valids && !valids.value
+                        ? translationText.helperText
+                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "period", variant: "standard", name: "period", type: "number", fullWidth: true, label: translationText.period, value: rule.parameter.period, onChange: function (e) {
+                        return handleChangeParameter('period', e.target.value);
+                    }, error: valids && !valids.period, helperText: valids && !valids.period
+                        ? translationText.helperText
+                        : translationText.periodHelperText }) })] }));
+};
+exports.default = LimitAuthencation;

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

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var LimitClick_1 = __importDefault(require("./LimitClick"));
 var Utils_1 = require("../../../../Utils");
-var Types_1 = require("../../../../Types");
 var material_1 = require("@mui/material");
 var Enum_1 = require("../../../../Enum");
 describe('LimitClick', function () {
@@ -35,7 +34,7 @@ describe('LimitClick', function () {
         value: true,
     };
     var rule = {
-        name: "name1", parameter: {}, value: [], type: Utils_1.RuleType.LimitClick, operator: Types_1.Operator.Equality
+        name: "name1", parameter: {}, value: [], type: Utils_1.RuleType.LimitClick, operator: Enum_1.Operator.Equality
     };
     it('should render without errors', function () {
         var wrapper = shallow((0, jsx_runtime_1.jsx)(LimitClick_1.default, { rule: rule, valids: [], onChange: mockOnChange }));

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

@@ -10,41 +10,87 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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 material_1 = require("@mui/material");
+var Hooks_1 = __importDefault(require("../../../../../../ACM-AXN/Campaign/Hooks"));
+var AWING_1 = require("../../../../../../AWING");
+var Hooks_2 = require("../../../../../../AWING/Hooks");
+var lodash_1 = __importDefault(require("lodash"));
+var react_1 = __importDefault(require("react"));
 var react_i18next_1 = require("react-i18next");
+var recoil_1 = require("recoil");
 var Enum_1 = require("../../../../Enum");
+var atoms_1 = require("../../atoms");
 var LimitEvent = function (props) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f;
     var rule = props.rule, valids = props.valids, onChange = props.onChange;
     var t = (0, react_i18next_1.useTranslation)().t;
+    var loginPageIds = (0, recoil_1.useRecoilValue)(atoms_1.campaignLoginIdState);
+    var service = (0, Hooks_1.default)().service;
     var handleChange = function (fieldName, fieldValue) {
         var _a;
         onChange(__assign(__assign({}, rule), (_a = {}, _a[fieldName] = fieldValue, _a)));
     };
+    var _g = (0, Hooks_2.useGetData)([loginPageIds], service.pagesGetPageViewEventByPageIds), data = _g.data, isLoading = _g.isLoading;
+    var eventSelected = react_1.default.useMemo(function () {
+        return (0, lodash_1.default)(data)
+            .groupBy(function (d) { return "".concat(d.viewNumber, "_").concat(d.event); })
+            .filter(function (value) {
+            return !lodash_1.default.difference(loginPageIds, value.map(function (v) { return v.pageId; })).length;
+        }).flatten()
+            .uniqBy(function (d) { return "".concat(d.viewNumber, "_").concat(d.event); })
+            .groupBy('event')
+            .value();
+    }, [data, loginPageIds]);
+    var viewNumberSelected = react_1.default.useMemo(function () {
+        var _a, _b, _c;
+        return ((_a = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _a === void 0 ? void 0 : _a.eventLabel)
+            ? (_c = eventSelected[(_b = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _b === void 0 ? void 0 : _b.eventLabel]) === null || _c === void 0 ? void 0 : _c.sort(function (a, b) { return a.viewNumber - b.viewNumber; })
+            : [];
+    }, [eventSelected, (_a = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _a === void 0 ? void 0 : _a.eventLabel]);
     var handleChangeParameter = function (fieldName, fieldValue) {
-        var _a;
-        handleChange('parameter', __assign(__assign({}, rule.parameter), (_a = {}, _a[fieldName] = fieldValue, _a)));
+        var _a, _b;
+        var _c, _d;
+        if (fieldName === 'eventLabel') {
+            var viewNumber = undefined;
+            if (((_c = eventSelected[fieldValue]) === null || _c === void 0 ? void 0 : _c.length) === 1) {
+                viewNumber = (_d = eventSelected[fieldValue]) === null || _d === void 0 ? void 0 : _d.at(-1).viewNumber;
+            }
+            handleChange('parameter', __assign(__assign({}, rule.parameter), (_a = { viewNumber: viewNumber }, _a[fieldName] = fieldValue, _a)));
+            return;
+        }
+        handleChange('parameter', __assign(__assign({}, rule.parameter), (_b = {}, _b[fieldName] = fieldValue, _b)));
     };
     var translationText = {
         eventLabel: t('Campaign.Detail.EventLabel'),
+        viewNumber: t('Campaign.Detail.ViewNumber'),
         operator: t('Campaign.Operator'),
         period: t('Campaign.Period'),
         value: t('Campaign.Detail.Value'),
         periodHelperText: t('Campaign.PeriodHelperText'),
         helperText: t('Common.Required'),
     };
-    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "eventLabel", name: "eventLabel", variant: "standard", fullWidth: true, label: translationText.eventLabel, value: (_a = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _a === void 0 ? void 0 : _a.eventLabel, onChange: function (e) {
+    return isLoading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "eventLabel", name: "eventLabel", variant: "standard", fullWidth: true, select: true, label: translationText.eventLabel, value: (_b = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _b === void 0 ? void 0 : _b.eventLabel, onChange: function (e) {
                         return handleChangeParameter('eventLabel', e.target.value);
                     }, error: valids && !valids.eventLabel, helperText: valids && !valids.eventLabel
                         ? translationText.helperText
-                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: 'operator', variant: "standard", name: 'operator', select: true, fullWidth: true, label: translationText.operator, value: rule === null || rule === void 0 ? void 0 : rule.operator, onChange: function (e) { return handleChange('operator', e.target.value); }, children: Object.entries(Enum_1.EnumOperator).map(function (_a) {
+                        : '', children: Object.keys(eventSelected).map(function (event, index) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: event, children: event }, index)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "viewNumber", name: "viewNumber", variant: "standard", disabled: !((_c = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _c === void 0 ? void 0 : _c.eventLabel), required: true, select: true, fullWidth: true, label: translationText.viewNumber, value: (_e = (_d = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _d === void 0 ? void 0 : _d.viewNumber) !== null && _e !== void 0 ? _e : "", onChange: function (e) {
+                        return handleChangeParameter('viewNumber', e.target.value);
+                    }, error: valids && !valids.viewNumber, helperText: valids && !valids.viewNumber
+                        ? translationText.helperText
+                        : '', children: viewNumberSelected.map(function (_a) {
+                        var viewNumber = _a.viewNumber;
+                        return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: viewNumber, children: viewNumber }, viewNumber));
+                    }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: 'operator', variant: "standard", name: 'operator', select: true, fullWidth: true, label: translationText.operator, value: rule === null || rule === void 0 ? void 0 : rule.operator, onChange: function (e) { return handleChange('operator', e.target.value); }, children: Object.entries(Enum_1.EnumOperator).map(function (_a) {
                         var key = _a[0], val = _a[1];
                         return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: val.id, children: val.text }, val.id));
                     }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "value", name: "value", variant: "standard", type: "number", fullWidth: true, label: translationText.value, value: rule === null || rule === void 0 ? void 0 : rule.value, onChange: function (e) { return handleChange('value', e.target.value); }, error: valids && !valids.value, helperText: valids && !valids.value
                         ? translationText.helperText
-                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { variant: "standard", id: "period", name: "period", type: "number", fullWidth: true, label: translationText.period, value: (_b = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _b === void 0 ? void 0 : _b.period, onChange: function (e) {
+                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { variant: "standard", id: "period", name: "period", type: "number", fullWidth: true, label: translationText.period, value: (_f = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _f === void 0 ? void 0 : _f.period, onChange: function (e) {
                         return handleChangeParameter('period', e.target.value);
                     }, error: valids && !valids.period, helperText: translationText.periodHelperText }) })] }));
 };

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

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var LimitEvent_1 = __importDefault(require("./LimitEvent"));
 var Utils_1 = require("../../../../Utils");
-var Types_1 = require("../../../../Types");
 var Enum_1 = require("../../../../Enum");
 var material_1 = require("@mui/material");
 describe("LimitEvent", function () {
@@ -47,7 +46,7 @@ describe("LimitEvent", function () {
         };
     });
     var rule = {
-        name: "name1", parameter: { eventLabel: "Test Event" }, value: [], type: Utils_1.RuleType.LimitClick, operator: Types_1.Operator.Equality
+        name: "name1", parameter: { eventLabel: "Test Event" }, value: [], type: Utils_1.RuleType.LimitClick, operator: Enum_1.Operator.Equality
     };
     it("should render without errors", function () {
         var wrapper = shallow((0, jsx_runtime_1.jsx)(LimitEvent_1.default, { rule: rule, onChange: onChangeMock, valids: [] }));

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

@@ -18,13 +18,12 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var LimitView_1 = __importDefault(require("./LimitView"));
 var Utils_1 = require("../../../../Utils");
-var Types_1 = require("../../../../Types");
 var Enum_1 = require("../../../../Enum");
 describe('LimitView', function () {
     var mockOnChange = jest.fn();
     var shallow;
     var rule = {
-        name: "name1", parameter: { period: 1 }, value: [], type: Utils_1.RuleType.LimitClick, operator: Types_1.Operator.Equality
+        name: "name1", parameter: { period: 1 }, value: [], type: Utils_1.RuleType.LimitClick, operator: Enum_1.Operator.Equality
     };
     beforeAll(function () {
         // shallow = createShallow();

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

@@ -7,7 +7,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var TargetAge_1 = __importDefault(require("./TargetAge"));
 var Utils_1 = require("../../../../Utils");
 var material_1 = require("@mui/material");
-var Types_1 = require("../../../../Types");
+var Enum_1 = require("../../../../../../ACM-AXN/Campaign/Enum");
 describe('TargetAge', function () {
     var shallow;
     beforeAll(function () {
@@ -15,7 +15,7 @@ describe('TargetAge', function () {
         // shallow = createShallow();
     });
     var rule = {
-        name: "name1", parameter: { period: 1 }, value: [], type: Utils_1.RuleType.LimitClick, operator: Types_1.Operator.Equality
+        name: "name1", parameter: { period: 1 }, value: [], type: Utils_1.RuleType.LimitClick, operator: Enum_1.Operator.Equality
     };
     var valids = { value: false };
     var onChange = jest.fn();
@@ -40,7 +40,7 @@ describe('TargetAge', function () {
     });
     it('should display the selected age range as text using ageRangeValueToText function', function () {
         var mockRule = {
-            name: "name1", parameter: { period: 1 }, value: ['0-18'], type: Utils_1.RuleType.LimitClick, operator: Types_1.Operator.Equality
+            name: "name1", parameter: { period: 1 }, value: ['0-18'], type: Utils_1.RuleType.LimitClick, operator: Enum_1.Operator.Equality
         };
         var wrapper = shallow((0, jsx_runtime_1.jsx)(TargetAge_1.default, { rule: mockRule, valids: valids, onChange: onChange }));
         var selectedValue = wrapper.find("#value").prop('renderValue')(mockRule.value);

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

@@ -18,7 +18,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var TargetGender_1 = __importDefault(require("./TargetGender"));
 var Utils_1 = require("../../../../Utils");
-var Types_1 = require("../../../../Types");
+var Enum_1 = require("../../../../../../ACM-AXN/Campaign/Enum");
 describe('TargetGender', function () {
     var shallow;
     beforeAll(function () {
@@ -26,7 +26,7 @@ describe('TargetGender', function () {
         // shallow = createShallow();
     });
     var rule = {
-        name: "name1", parameter: { period: 1 }, value: "0", type: Utils_1.RuleType.LimitClick, operator: Types_1.Operator.Equality
+        name: "name1", parameter: { period: 1 }, value: "0", type: Utils_1.RuleType.LimitClick, operator: Enum_1.Operator.Equality
     };
     var defaultProps = {
         rule: rule,

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

@@ -6,3 +6,4 @@ export { default as TargetAge } from './TargetAge';
 export { default as TargetOS } from './TargetOS';
 export { default as TargetDevice } from './TargetDevice';
 export { default as RetargetMacAddress } from './RetargetMacAddress';
+export { default as AuthenCation } from './Authentication';

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RetargetMacAddress = exports.TargetDevice = exports.TargetOS = exports.TargetAge = exports.TargetGender = exports.LimitEvent = exports.LimitClick = exports.LimitView = void 0;
+exports.AuthenCation = exports.RetargetMacAddress = exports.TargetDevice = exports.TargetOS = exports.TargetAge = exports.TargetGender = exports.LimitEvent = exports.LimitClick = exports.LimitView = void 0;
 var LimitClick_1 = require("./LimitClick");
 Object.defineProperty(exports, "LimitView", { enumerable: true, get: function () { return __importDefault(LimitClick_1).default; } });
 var LimitClick_2 = require("./LimitClick");
@@ -20,3 +20,5 @@ var TargetDevice_1 = require("./TargetDevice");
 Object.defineProperty(exports, "TargetDevice", { enumerable: true, get: function () { return __importDefault(TargetDevice_1).default; } });
 var RetargetMacAddress_1 = require("./RetargetMacAddress");
 Object.defineProperty(exports, "RetargetMacAddress", { enumerable: true, get: function () { return __importDefault(RetargetMacAddress_1).default; } });
+var Authentication_1 = require("./Authentication");
+Object.defineProperty(exports, "AuthenCation", { enumerable: true, get: function () { return __importDefault(Authentication_1).default; } });

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

@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from 'react';
+import React, { Dispatch, SetStateAction } from 'react';
 import { CampaignAdAdvanced } from '../../Types';
 type Props = {
     /**
@@ -18,6 +18,7 @@ type Props = {
      */
     initialCampaignAdAdvanced?: CampaignAdAdvanced;
     service: any;
+    loginIds: string[];
 };
-declare const Advanced: (props: Props) => import("react/jsx-runtime").JSX.Element;
-export default Advanced;
+declare const _default: React.FC<Props>;
+export default _default;

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

@@ -49,15 +49,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-var react_1 = __importStar(require("react"));
-var material_1 = require("@mui/material");
 var icons_material_1 = require("@mui/icons-material");
-var Utils_1 = require("../../Utils");
+var material_1 = require("@mui/material");
+var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
-var AddOrEditRule_1 = require("./AddOrEditRule");
 var ClassicBaseDrawer_1 = __importDefault(require("../../../../Commons/Components/ClassicBaseDrawer"));
 var Context_1 = require("../../../../Context");
 var i18n_1 = __importDefault(require("../../../../i18n"));
+var Utils_1 = require("../../Utils");
+var AddOrEditRule_1 = require("./AddOrEditRule");
+var Wrapper_1 = __importDefault(require("../../../../AWING/HOC/Wrapper"));
+var recoil_1 = require("recoil");
+var atoms_1 = require("./atoms");
 var classes = {
     paper: {
         padding: function (theme) { return theme.spacing(2); },
@@ -107,6 +110,7 @@ var Advanced = function (props) {
         editRule: false,
         editExpression: false,
     }), drawerRule = _b[0], setDrawerRule = _b[1];
+    var setLoginIds = (0, recoil_1.useSetRecoilState)(atoms_1.campaignLoginIdState);
     var _c = react_1.default.useState(null), anchorElRule = _c[0], setAnchorElRule = _c[1];
     var _d = react_1.default.useState({
         type: '',
@@ -115,6 +119,7 @@ var Advanced = function (props) {
     var _e = react_1.default.useState(defaultCampaignAdAdvanced), campaignAdAdvanced = _e[0], setCampaignAdAdvanced = _e[1];
     var _f = react_1.default.useState(false), isConfirm = _f[0], setIsConfirm = _f[1];
     (0, react_1.useEffect)(function () {
+        setLoginIds(props.loginIds);
         if (initialCampaignAdAdvanced)
             setCampaignAdAdvanced(initialCampaignAdAdvanced);
     }, [initialCampaignAdAdvanced]);
@@ -134,7 +139,7 @@ var Advanced = function (props) {
             alert(t('Campaign.MaximumNumberOfRule'));
             return;
         }
-        setRule(__assign(__assign({}, rule), { type: type }));
+        setRule(function (prev) { return (__assign(__assign({}, prev), { type: type })); });
         handleButtonMenuClose();
         setDrawerRule(function (prev) { return (__assign(__assign({}, prev), { addRule: true })); });
         // navigate(Constants.CAMPAIGN_ADD_RULE)
@@ -144,7 +149,7 @@ var Advanced = function (props) {
         // navigate(Constants.CAMPAIGN_UPDATE_EXPRESSION)
     };
     var handleEditRule = function (ruleName) {
-        setRule(__assign(__assign({}, rule), { name: ruleName }));
+        setRule(function (prev) { return (__assign(__assign({}, prev), { name: ruleName })); });
         setDrawerRule(function (prev) { return (__assign(__assign({}, prev), { editRule: true })); });
         // navigate(Constants.CAMPAIGN_EDIT_RULE)
     };
@@ -175,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'),
@@ -230,4 +236,4 @@ var Advanced = function (props) {
                     setCampaignAdAdvanced(__assign(__assign({}, campaignAdAdvanced), { ruleLogicalExpression: ruleLogicalExpression }));
                 } }))] }));
 };
-exports.default = Advanced;
+exports.default = (0, Wrapper_1.default)(Advanced, { component: recoil_1.RecoilRoot });

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

@@ -113,28 +113,28 @@ function EditAds(props) {
     var convertAd = function (inputObj) {
         var result = {};
         selectedFields.forEach(function (f) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             switch (f) {
                 case 'time':
-                    result.startDate = (0, Helpers_1.convertDateTimeToTimestamp)((_b = (_a = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time) === null || _a === void 0 ? void 0 : _a.startDate) === null || _b === void 0 ? void 0 : _b.toDate());
-                    result.endDate = (0, Helpers_1.convertDateTimeToTimestamp)((_d = (_c = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time) === null || _c === void 0 ? void 0 : _c.endDate) === null || _d === void 0 ? void 0 : _d.toDate());
+                    result.startDate = (0, Helpers_1.convertDateTimeToTimestamp)((_a = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time[0]) === null || _a === void 0 ? void 0 : _a.toDate());
+                    result.endDate = (0, Helpers_1.convertDateTimeToTimestamp)((_b = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time[1]) === null || _b === void 0 ? void 0 : _b.toDate());
                     break;
                 case 'placeFilter':
                     result.placeFilter = placeFilterValue;
                     result.places = selectedPlaces;
                     break;
                 case 'loginId':
-                    result.loginId = (_e = inputObj[f]) === null || _e === void 0 ? void 0 : _e.value;
+                    result.loginId = (_c = inputObj[f]) === null || _c === void 0 ? void 0 : _c.value;
                     result.loginPage = {
-                        pageId: (_f = inputObj[f]) === null || _f === void 0 ? void 0 : _f.value,
-                        title: (_g = inputObj[f]) === null || _g === void 0 ? void 0 : _g.text,
+                        pageId: (_d = inputObj[f]) === null || _d === void 0 ? void 0 : _d.value,
+                        title: (_e = inputObj[f]) === null || _e === void 0 ? void 0 : _e.text,
                     };
                     break;
                 case 'welcomeId':
-                    result.welcomeId = (_h = inputObj[f]) === null || _h === void 0 ? void 0 : _h.value;
+                    result.welcomeId = (_f = inputObj[f]) === null || _f === void 0 ? void 0 : _f.value;
                     result.welcomePage = {
-                        pageId: (_j = inputObj[f]) === null || _j === void 0 ? void 0 : _j.value,
-                        title: (_k = inputObj[f]) === null || _k === void 0 ? void 0 : _k.text,
+                        pageId: (_g = inputObj[f]) === null || _g === void 0 ? void 0 : _g.value,
+                        title: (_h = inputObj[f]) === null || _h === void 0 ? void 0 : _h.text,
                     };
                     break;
                 default:

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

@@ -1,4 +1,4 @@
-import { SetStateAction, Dispatch } from 'react';
+import { Dispatch, SetStateAction } from 'react';
 import { CampaignGroup } from '../../Types';
 type SubCampaignDetailProps = {
     /**

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

@@ -10,99 +10,133 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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_1 = require("react");
-var recoil_1 = require("recoil");
+var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
-var material_1 = require("@mui/material");
-// import { CampaignGroup, CampaignTicket } from '../../types'
+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 Types_1 = require("../../Types");
 var Utils_1 = require("../../Utils");
 var Recoils_1 = require("../Recoils");
+var material_1 = require("@mui/material");
 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 getFormValid = function () { return (__assign(__assign(__assign({}, ((0, Utils_1.nameValid)(subCampaign.name) && {
-        name: true,
-    })), ((!(0, Utils_1.checkPriority)(subCampaign.priority, Types_1.CampaignPriority.ClassB) ||
-        (0, Utils_1.bookingValid)(subCampaign.bookingAmount)) && {
-        bookingAmount: true,
-    })), ((0, Utils_1.bonusValid)(subCampaign.bonusAmount) && {
-        bonusAmount: true,
-    }))); };
-    var _a = (0, react_1.useState)(getFormValid), subValid = _a[0], setSubValid = _a[1];
+    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),
+        bonusAmount: (0, Utils_1.bonusValid)(subCampaign.bonusAmount),
+        billingUnit: subCampaign.billingUnit !== null,
+    }); };
+    var _a = react_1.default.useState(getFormValid), subValid = _a[0], setSubValid = _a[1];
     var isCreate = (0, recoil_1.useRecoilValue)(Recoils_1.isCreateState);
     (0, react_1.useEffect)(function () {
-        setSubValid(getFormValid());
         onSubCampaignChange(function (prev) { return (0, lodash_1.cloneDeep)(prev); });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [subCampaign.id]);
+    }, [onSubCampaignChange]);
     (0, react_1.useEffect)(function () {
-        onChangeSubCampaignStatus(Boolean(subValid.name && subValid.bookingAmount && subValid.bonusAmount));
+        onChangeSubCampaignStatus(Object.values(getFormValid()).every(Boolean));
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [subValid.name, subValid.bookingAmount, subValid.bonusAmount]);
+    }, [subCampaign]);
     /**
      * Hàm cập nhật trạng thái các trường của chiến dịch con
      * @param fieldName Tên trường cần cập nhật
      * @param status Trạng thái mới
      */
-    var handleChangeStatus = function (fieldName, status) {
-        if (subValid[fieldName] !== status)
-            setSubValid(function (pre) {
-                var _a;
-                return (__assign(__assign({}, pre), (_a = {}, _a[fieldName] = status, _a)));
-            });
-    };
     var translationText = {
         name: t('Campaign.Name'),
         ticket: t('Campaign.Ticket'),
+        BillingUnit: t('Campaign.BillingUnit.Title'),
         priority: t('Campaign.Detail.Priority'),
         booking: t('Campaign.BookingText'),
         bonus: t('Campaign.BonusText'),
         reserved: t('Campaign.Reserved'),
         none: t('Common.None'),
         helperText: t('Common.Required'),
+        notNegative: t('Common.NotNegative'),
     };
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingBottom: 0 }, children: [(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: "name", name: "name", variant: "standard", required: true, fullWidth: true, label: translationText.name, value: subCampaign.name, onChange: function (e) {
-                                var value = e.target.value;
-                                handleChangeStatus('name', (0, Utils_1.nameValid)(value));
-                                onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { name: value })); });
+                                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: Types_1.CampaignTicket.ACTIVE, children: t('Campaign.Active') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_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.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 } }) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: [(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: "priority", select: true, required: true, variant: "standard", fullWidth: true, label: translationText.priority, value: isNaN(Number(subCampaign.priority))
+                            }, 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))
                                 ? subCampaign.priority
-                                : Object.values(Types_1.CampaignPriority)[subCampaign.priority], onChange: function (e) {
-                                var newPriority = Object.values(Types_1.CampaignPriority).indexOf(e.target.value);
+                                : Object.values(Enum_1.CampaignPriority)[subCampaign.priority], onChange: function (e) {
+                                var newPriority = Object.values(Enum_1.CampaignPriority).indexOf(e.target.value);
                                 onSubCampaignChange(function (pre) {
-                                    var newSubCamp = __assign(__assign({}, pre), { priority: newPriority, bookingAmount: (0, Utils_1.checkPriority)(newPriority, Types_1.CampaignPriority.ClassB)
-                                            ? 10
-                                            : 0, bonusAmount: 0 });
+                                    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,
+                                        }
+                                        : {
+                                            bookingAmount: 0,
+                                            billingUnit: Enum_2.AnalyticType.AUTHENTICATION,
+                                        })), { bonusAmount: 0 });
                                     setSubValid(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: true, bonusAmount: true })); });
                                     return newSubCamp;
                                 });
-                            }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignPriority.ClassA, children: t('Campaign.ClassA') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignPriority.ClassB, children: t('Campaign.ClassB') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Types_1.CampaignPriority.ClassC, children: t('Campaign.ClassC') })] }) }), (0, Utils_1.checkPriority)(subCampaign.priority, Types_1.CampaignPriority.ClassB) && ((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: "bookingAmount", required: true, fullWidth: true, variant: "standard", type: "number", label: translationText.booking, value: subCampaign.bookingAmount, onChange: function (e) {
-                                var value = Number(e.target.value);
-                                handleChangeStatus('bookingAmount', (0, Utils_1.bookingValid)(value));
-                                onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: value })); });
-                            }, onFocus: function (event) { return event.target.select(); }, error: subValid.bookingAmount !== undefined &&
-                                !subValid.bookingAmount, helperText: subValid.bookingAmount !== undefined &&
-                                !subValid.bookingAmount
-                                ? translationText.helperText
-                                : '' }) })), (0, Utils_1.checkPriority)(subCampaign.priority, Types_1.CampaignPriority.ClassB) && ((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: "bonusAmount", variant: "standard", fullWidth: true, type: "number", label: translationText.bonus, value: subCampaign.bonusAmount, onChange: function (e) {
-                                var value = Number(e.target.value);
-                                handleChangeStatus('bonusAmount', (0, Utils_1.bonusValid)(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
-                                ? translationText.helperText
-                                : '' }) }))] })] }));
+                            }, 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
+                                        : '' }) }), (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 !== undefined &&
+                                        !subValid.billingUnit, helperText: subValid.billingUnit !== undefined &&
+                                        !subValid.billingUnit
+                                        ? translationText.helperText
+                                        : '', children: Object.values(Enum_2.AnalyticType)
+                                        .filter(function (item) { return !isNaN(Number(item)); })
+                                        .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 } }) })] })] }));
 }
 exports.default = SubCampaignDetail;