awing-library 2.1.142-beta → 2.1.142

package/lib/ACM-AXN/Statistics/ControlPanel.js

@@ -93,7 +93,7 @@ function ControlPanel(_a) {
     var handleElementInput = function (initialFilters) {
         var updatedElementInputs = [];
         initialFilters.map(function (item, idx) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             switch (item === null || item === void 0 ? void 0 : item.type) {
                 case Enums_1.TYPE_FILTERS.VIEW_BY: {
                     var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: t('Common.ViewBy'), size: "small", onChange: function (e) {
@@ -123,8 +123,20 @@ function ControlPanel(_a) {
                     updatedElementInputs.push(element);
                     break;
                 }
+                case Enums_1.TYPE_FILTERS.SEARCH_BY_PLACE: {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: t('Common.TitleTypeView'), size: "small", onChange: function (e) {
+                                return handleChangeQueryInput &&
+                                    handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, e.target.value);
+                            }, SelectProps: {
+                                native: true,
+                            }, variant: "outlined", style: { minWidth: 150 }, disabled: false, children: (_a = item === null || item === void 0 ? void 0 : item.initialData) === null || _a === void 0 ? void 0 : _a.map(function (data, index) {
+                                return ((0, jsx_runtime_1.jsx)("option", { value: data.value, children: data.label }, item.value));
+                            }) }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'SearchByPlace' }, item);
+                    updatedElementInputs.push(element);
+                    break;
+                }
                 case Enums_1.TYPE_FILTERS.DATE_RANGE_PICKER: {
-                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, __assign({ isShowCalendarInfo: (_a = item === null || item === void 0 ? void 0 : item.isShowCalendarInfo) !== null && _a !== void 0 ? _a : true, isFutureDate: (_b = item === null || item === void 0 ? void 0 : item.isFutureDate) !== null && _b !== void 0 ? _b : false, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), initialStartDate: (_c = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _c === void 0 ? void 0 : _c.startDate, initialEndDate: (_d = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _d === void 0 ? void 0 : _d.endDate, variant: "outlined", textFieldProps: {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, __assign({ isShowCalendarInfo: (_b = item === null || item === void 0 ? void 0 : item.isShowCalendarInfo) !== null && _b !== void 0 ? _b : true, isFutureDate: (_c = item === null || item === void 0 ? void 0 : item.isFutureDate) !== null && _c !== void 0 ? _c : false, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), initialStartDate: (_d = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _d === void 0 ? void 0 : _d.startDate, initialEndDate: (_e = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _e === void 0 ? void 0 : _e.endDate, variant: "outlined", textFieldProps: {
                                 fullWidth: true,
                                 className: classes.outlinedInput,
                             }, callback: handleChangeDateRange }, ((item === null || item === void 0 ? void 0 : item.isDayBlocked) && {
@@ -167,7 +179,7 @@ function ControlPanel(_a) {
                     break;
                 }
                 case Enums_1.TYPE_FILTERS.NETWORK: {
-                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_e = queryInput === null || queryInput === void 0 ? void 0 : queryInput.isCampaignNetwork) !== null && _e !== void 0 ? _e : true }), label: t('Statistic.Network.Title'), labelPlacement: "start", onChange: function (e) {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_f = queryInput === null || queryInput === void 0 ? void 0 : queryInput.isCampaignNetwork) !== null && _f !== void 0 ? _f : true }), label: t('Statistic.Network.Title'), labelPlacement: "start", onChange: function (e) {
                                 handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, e.target.checked);
                             } }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'isCampaignNetwork' }, item);
                     updatedElementInputs.push(element);
@@ -181,7 +193,7 @@ function ControlPanel(_a) {
                     break;
                 }
                 case Enums_1.TYPE_FILTERS.INCLUDE_RESERVED: {
-                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_f = queryInput === null || queryInput === void 0 ? void 0 : queryInput.includeReserved) !== null && _f !== void 0 ? _f : true }), label: t('StatisticSchedulePlan.IncludeCampaignReserved'), labelPlacement: "start", onChange: function (e) {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_g = queryInput === null || queryInput === void 0 ? void 0 : queryInput.includeReserved) !== null && _g !== void 0 ? _g : true }), label: t('StatisticSchedulePlan.IncludeCampaignReserved'), labelPlacement: "start", onChange: function (e) {
                                 handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, e.target.checked);
                             } }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'includeReserved' }, item);
                     updatedElementInputs.push(element);
@@ -196,7 +208,7 @@ function ControlPanel(_a) {
     }, []);
     (0, react_1.useEffect)(function () {
         handleElementInput(initialFilters);
-    }, [initialFilters, queryInput]);
+    }, [initialFilters, queryInput, t]);
     (0, react_1.useEffect)(function () {
         var tmpQueryInput = queryInput;
         if (!tmpQueryInput) {

package/lib/ACM-AXN/Statistics/Enums.d.ts

@@ -9,7 +9,8 @@ export declare enum TYPE_FILTERS {
     NETWORK = "NetWork",
     CAMPAIGN_DEFAULT = "CampaignDefault",
     INCLUDE_RESERVED = "IncludeReserved",
-    DATE_RANGE_PICKER = "DateRangePicker"
+    DATE_RANGE_PICKER = "DateRangePicker",
+    SEARCH_BY_PLACE = "SearchByPlace"
 }
 export declare enum TYPE_CHART {
     PIE = "Pie",

package/lib/ACM-AXN/Statistics/Enums.js

@@ -14,6 +14,7 @@ var TYPE_FILTERS;
     TYPE_FILTERS["CAMPAIGN_DEFAULT"] = "CampaignDefault";
     TYPE_FILTERS["INCLUDE_RESERVED"] = "IncludeReserved";
     TYPE_FILTERS["DATE_RANGE_PICKER"] = "DateRangePicker";
+    TYPE_FILTERS["SEARCH_BY_PLACE"] = "SearchByPlace";
 })(TYPE_FILTERS || (exports.TYPE_FILTERS = TYPE_FILTERS = {}));
 var TYPE_CHART;
 (function (TYPE_CHART) {

package/lib/ACM-AXN/StatisticsAudienceDemographic/Tabs/AgeRange.js

@@ -62,6 +62,7 @@ var AgeRangeTabs = function (_a) {
                 fill: true,
                 borderWidth: 2,
                 yAxisID: 'y',
+                variant: '3',
             },
         ];
     };

package/lib/ACM-AXN/StatisticsByProvince/DataTable.js

@@ -105,7 +105,7 @@ var DataTable = function (props) {
                                                 : row[headCellItem
                                                     .id] }));
                                     }) }));
-                            })) })) : ((0, jsx_runtime_1.jsx)(NoDataTable_1.default, { colSpan: (headCells === null || headCells === void 0 ? void 0 : headCells.length) + 1 }))] }), rowsData && (rowsData === null || rowsData === void 0 ? void 0 : rowsData.length) > 0 && isPagination && ((0, jsx_runtime_1.jsx)(material_1.TablePagination, { rowsPerPageOptions: [
+                            })) })) : ((0, jsx_runtime_1.jsx)(NoDataTable_1.default, { colSpan: (headCells === null || headCells === void 0 ? void 0 : headCells.length) + 1 }))] }), rowsData && (rowsData === null || rowsData === void 0 ? void 0 : rowsData.length) > 0 && isPagination && ((0, jsx_runtime_1.jsx)(AWING_1.Pagination, { rowsPerPageOptions: [
                         AWING_1.PAGE_SIZE_DEFAULT,
                         AWING_1.PAGE_SIZE_DEFAULT + 10,
                         AWING_1.PAGE_SIZE_DEFAULT + 20,

package/lib/ACM-AXN/TaskScheduler/CreateOrEdit.js

@@ -41,7 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var icons_material_1 = require("@mui/icons-material");
 var material_1 = require("@mui/material");
-var immer_1 = __importDefault(require("immer"));
+var immer_1 = require("immer");
 var react_1 = __importDefault(require("react"));
 var react_i18next_1 = require("react-i18next");
 var react_router_dom_1 = require("react-router-dom");
@@ -119,13 +119,13 @@ var CreateOrEdit = function () {
     var handleInputParamChange = function (path, value) {
         setConfirmExit(true);
         var keys = path.split('.');
-        setJobModel((0, immer_1.default)(function (draft) {
+        setJobModel((0, immer_1.produce)(function (draft) {
             (0, Helpers_1.setObject)(draft, keys, value);
             // draft.inputParameters[index] = item
         }));
     };
     var handleJobActionChange = function (jobAction) {
-        setJobModel((0, immer_1.default)(function (draf) {
+        setJobModel((0, immer_1.produce)(function (draf) {
             draf.inputParameters = jobAction.parameters.map(function (x) { return ({
                 key: x.name,
                 operator: x.operators[0],
@@ -145,7 +145,7 @@ var CreateOrEdit = function () {
             ? { cronTime: '* * * * *' }
             : { triggerTopic: '', triggerEvent: '' }))); });
     };
-    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: t("Common.".concat(taskId ? 'Edit' : 'Create')), onSubmit: handleSubmit, disableButtonSubmit: !enableSubmit, confirmExit: confirmExit, childrenWrapperStyle: { padding: function (theme) { return theme.spacing(3); } }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, component: material_1.Paper, sx: { p: 2 }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { name: "name", label: t('Common.Name'), fullWidth: true, variant: "standard", checkValid: validation_1.textValidation, value: jobModel.name, onChange: handleChange }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { marginTop: '20px', marginBottom: '20px' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, select: true, required: false, name: "jobType", variant: "standard", label: t('TaskScheduler.JobType'), onChange: handleChangeJobType, value: jobModel.jobType, children: Utils_1.JobTypes.map(function (item) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: item.name, children: item.name }, item.name)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 8, children: (0, jsx_runtime_1.jsx)(material_1.Box, { component: JobInput[jobModel.jobType], jobModel: jobModel, handleChange: handleChange }) })] }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, select: true, name: "jobAction", label: t('TaskScheduler.JobAction'), 
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: t("Common.".concat(taskId ? 'Edit' : 'Create')), onSubmit: handleSubmit, disableButtonSubmit: !enableSubmit, confirmExit: confirmExit, childrenWrapperStyle: { padding: function (theme) { return theme.spacing(3); } }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, component: material_1.Paper, sx: { p: 2 }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { name: "name", label: t('Common.Name'), fullWidth: true, variant: "standard", checkValid: validation_1.textValidation, value: jobModel.name, onChange: handleChange }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { marginTop: '20px', marginBottom: '20px' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, select: true, required: false, name: "jobType", variant: "standard", label: t('TaskScheduler.JobType'), onChange: handleChangeJobType, value: jobModel.jobType, children: Utils_1.JobTypes.map(function (item) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: item.name, children: t("TaskScheduler.Type.".concat(item.name)) }, item.name)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 8, children: (0, jsx_runtime_1.jsx)(material_1.Box, { component: JobInput[jobModel.jobType], jobModel: jobModel, handleChange: handleChange }) })] }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, select: true, name: "jobAction", label: t('TaskScheduler.JobAction'), 
                                     // isError={Boolean(jobValid?.jobActionValid)}
                                     onChange: function (_k, name) {
                                         handleJobActionChange(jobActions.filter(function (x) { return x.name === name; })[0]);

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

@@ -56,9 +56,9 @@ var TemplateContainer = function () {
                 },
                 {
                     field: 'PageCode',
-                    headerName: 'PageCode',
+                    headerName: t('Common.TypePage'),
                     valueGetter: function (row) {
-                        return t("TemplateManagement.Page_".concat(row.pageCode));
+                        return t("TemplateManagement.Page_".concat(['wlc', 'lgn'].includes(row.pageCode) ? row.pageCode : row.pageCode === '0' ? 'wlc' : 'lgn'));
                     },
                 },
             ], loading: loading, rows: (templates === null || templates === void 0 ? void 0 : templates.templates) || [], onCreateButtonClick: handleNavigate, customActions: (0, jsx_runtime_1.jsx)(material_1.Button, { component: Router_1.Link, to: Constant_1.Constants.IMPORT_PATH, variant: "outlined", size: "medium", sx: { marginLeft: '16px', fontWeight: 'bold' }, children: t('Common.Import') }), rowActions: [

package/lib/ACM-AXN/Template/CreateOrEdit/Recoils.d.ts

@@ -4,3 +4,4 @@ export declare const templateInfoState: import("recoil").RecoilState<ITemplate>;
 export declare const templateEventState: import("recoil").RecoilState<ITemplateEvent[]>;
 export declare const templateParametersState: import("recoil").RecoilState<ITemplateParameter[]>;
 export declare const isEditState: import("recoil").RecoilState<boolean>;
+export declare const isErrorParameterState: import("recoil").RecoilState<boolean>;

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

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEditState = exports.templateParametersState = exports.templateEventState = exports.templateInfoState = exports.templateState = void 0;
+exports.isErrorParameterState = exports.isEditState = exports.templateParametersState = exports.templateEventState = exports.templateInfoState = exports.templateState = void 0;
 var recoil_1 = require("recoil");
 var defaultValidation = "<!-- return function(fields) {\n    // Parameter fields: [{fieldName, fieldValue}]\n    // VALID_CODE: 200, NOT_VALID_CODE: 100\n    // Return array include field name, error message and check code of them\n    // Eg: Check field \"text\" must have equal or more than 10 character\n    return new Promise((resolve, reject) => {\n        const needCheckField = fields.find(field => field.fieldName === \"text\")\n        const isOk = needCheckField.fieldValue.length >= 10\n        resolve([\n            {\n                fieldName: needCheckField.fieldName,\n                code: isOk ? 200 : 100,\n                errorMessage: \"Text has less than 10 character\"\n            }\n        ])\n    })\n} -->";
 var defaultHandleEvent = "<!-- return function(fields, fieldChange) {\n    // Parameter fields: [{fieldName, fieldValue}], fieldChange: field which change\n    // Return array of field need update with new value\n    // In case no update, return empty array\n    // Eg: Auto update value of \"textUpperCase\" field when value of \"text\" field changed\n    return new Promise((resolve, reject) => {\n        if(fieldChange.fieldName === \"text\") {\n            resolve([\n                {\n                    fieldName: \"textUpperCase\",\n                    newValue: fieldChange.fieldValue.toUpperCase()\n                }\n            ])\n        }else resolve([])\n    })\n} -->";
@@ -77,3 +77,7 @@ exports.isEditState = (0, recoil_1.atom)({
     key: "isEditState",
     default: false,
 });
+exports.isErrorParameterState = (0, recoil_1.atom)({
+    key: "isErrorParameterState",
+    default: false,
+});

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Parameter.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 interface ParameterProps {
     templateId: string;
 }
@@ -17,5 +17,5 @@ export declare const OmitListType: {
     COLOR: string;
     URL: string;
 };
-declare const _default: import("react").NamedExoticComponent<ParameterProps>;
+declare const _default: React.NamedExoticComponent<ParameterProps>;
 export default _default;

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Parameter.js

@@ -10,6 +10,29 @@ 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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -28,10 +51,10 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var icons_material_1 = require("@mui/icons-material");
 var Add_1 = __importDefault(require("@mui/icons-material/Add"));
 var material_1 = require("@mui/material");
-var immer_1 = __importDefault(require("immer"));
 var Enum_1 = require("../../../../ACM-AXN/ViewTemplate/Enum");
 var AWING_1 = require("../../../../AWING");
-var react_1 = require("react");
+var immer_1 = require("immer");
+var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var Recoils_1 = require("../Recoils");
@@ -41,6 +64,7 @@ delete exports.OmitListType.LIST;
 var Parameter = function (_a) {
     var templateId = _a.templateId;
     var _b = (0, recoil_1.useRecoilState)(Recoils_1.templateParametersState), rows = _b[0], handleSetParameter = _b[1];
+    var setErrors = (0, recoil_1.useSetRecoilState)(Recoils_1.isErrorParameterState);
     var t = (0, react_i18next_1.useTranslation)().t;
     var defaultParam = {
         id: String(Date.now()),
@@ -50,50 +74,48 @@ var Parameter = function (_a) {
         defaultValue: undefined,
         labelName: undefined,
         isRequired: false,
+        isAdvanced: false,
         childrens: [],
     };
+    var tableRow = react_1.default.useMemo(function () { return (0, Utils_1.flattenParameter)(rows); }, [rows]);
+    react_1.default.useEffect(function () {
+        setErrors(tableRow.some(function (item) { return item.errField; }));
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [tableRow]);
     var handleAddParameter = function () {
         handleSetParameter(function (prev) { return __spreadArray(__spreadArray([], prev, true), [defaultParam], false); });
     };
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var handleChange = function (event) {
-        var _a = event.target, name = _a.name, value = _a.value, checked = _a.checked;
-        var _b = name.split('-').filter(Boolean), field = _b[0], ids = _b.slice(1);
-        handleSetParameter((0, immer_1.default)(function (rows) {
-            (0, Utils_1.enhancedUpdate)(rows, ids, field, [Utils_1.CUSTOM_FIELD_NAME.IS_REQUIRED, Utils_1.CUSTOM_FIELD_NAME.IS_ADVANCED].includes(field) ? checked : value, defaultParam);
+        var _a, _b;
+        var _c = event.target, name = _c.name, value = _c.value, checked = _c.checked;
+        var _d = name.split('-').filter(Boolean), field = _d[0], ids = _d.slice(1);
+        var handleValue = [
+            Utils_1.FIELDS.IS_REQUIRED,
+            Utils_1.FIELDS.IS_ADVANCED,
+        ].includes(field)
+            ? checked
+            : field === Utils_1.FIELDS.FIELD_NAME ? ((_b = (_a = value === null || value === void 0 ? void 0 : value.split('.')) === null || _a === void 0 ? void 0 : _a.at(ids.length - 1)) !== null && _b !== void 0 ? _b : '').trim() : value;
+        handleSetParameter((0, immer_1.produce)(function (rows) {
+            (0, Utils_1.enhancedUpdate)(rows, ids, field, handleValue, defaultParam);
         }));
     };
     var handleRemoveRow = function (id) {
         handleChange({
             target: {
-                name: [Utils_1.CUSTOM_FIELD_NAME.REMOVE, id].join('-'),
+                name: [Utils_1.FIELDS.REMOVE, id].join('-'),
                 value: defaultParam,
             },
         });
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    // const handleChangeParameter = useCallback(
-    //     debounce(handleChange, DEBOUNCE_TIME),
-    //     []
-    // )
     var handleAddChildren = function (id) {
         handleChange({
             target: {
-                name: [Utils_1.CUSTOM_FIELD_NAME.CHILDRENS, id].join('-'),
+                name: [Utils_1.FIELDS.CHILDRENS, id].join('-'),
                 value: defaultParam,
             },
         });
     };
-    var tableRow = (0, Utils_1.flattenParameter)(rows).map(function (row) {
-        Object.keys(row).forEach(function (key) {
-            if (Array.isArray(row[key])) {
-                row[key] = row[key].filter(function (item) { return item !== ''; });
-                console.log(key, row[key]);
-            }
-        });
-        return row;
-    });
-    console.log("tableRow", tableRow);
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Box, { mt: 3, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, justifyContent: "space-between", alignItems: "center", children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "subtitle1", sx: {
                                 fontWeight: 'bold',
                                 color: '#000000',
@@ -104,7 +126,7 @@ var Parameter = function (_a) {
                 }, component: 'form', onChange: handleChange, children: (0, jsx_runtime_1.jsx)(AWING_1.DataGrid, { getRowId: function (obj) { return [obj.parentId, obj.id].flat().join('-'); }, columns: [
                         {
                             // width: '150px',
-                            field: 'fieldType',
+                            field: Utils_1.FIELDS.FIELD_TYPE,
                             headerName: t('TemplateManagement.fieldType'),
                             dynamicTableCellProps: function (row) {
                                 return {
@@ -143,7 +165,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'fieldName',
+                            field: Utils_1.FIELDS.FIELD_NAME,
                             headerName: t('TemplateManagement.FieldName'),
                             TableCellProps: {
                                 sx: {
@@ -155,22 +177,17 @@ var Parameter = function (_a) {
                                 // inputProps={{}}
                                 , { 
                                     // inputProps={{}}
-                                    error: row.errField, InputProps: {
-                                        startAdornment: ((0, jsx_runtime_1.jsx)(material_1.Box, { component: 'span', sx: {
-                                                padding: '4px 0 5px',
-                                            }, children: row.parentFieldName.length ? (row.parentFieldName.push(''), row.parentFieldName).join('.')
-                                                : null })),
-                                    }, required: true, fullWidth: true, name: [
+                                    error: row.errField, required: true, fullWidth: true, name: [
                                         'fieldName',
                                         row.parentId,
                                         row.id,
                                     ]
                                         .flat()
-                                        .join('-'), variant: "standard", defaultValue: row.fieldName }, idx));
+                                        .join('-'), variant: "standard", value: (0, Utils_1.getFieldName)(row) }, idx));
                             },
                         },
                         {
-                            field: 'labelName',
+                            field: Utils_1.FIELDS.LABEL_NAME,
                             headerName: t('Common.Label'),
                             TableCellProps: {
                                 sx: {
@@ -179,7 +196,7 @@ var Parameter = function (_a) {
                             },
                             valueGetter: function (row, idx) {
                                 return ((0, jsx_runtime_1.jsx)(material_1.TextField, { fullWidth: true, name: [
-                                        'labelName',
+                                        Utils_1.FIELDS.LABEL_NAME,
                                         row.parentId,
                                         row.id,
                                     ]
@@ -188,7 +205,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'defaultValue',
+                            field: Utils_1.FIELDS.DEFAULT_VALUE,
                             headerName: t('Common.DefaultValue'),
                             TableCellProps: {
                                 sx: {
@@ -209,7 +226,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'isRequired',
+                            field: Utils_1.FIELDS.IS_REQUIRED,
                             width: '85px',
                             headerName: t('Common.Require'),
                             TableCellProps: {
@@ -233,7 +250,7 @@ var Parameter = function (_a) {
                             },
                             valueGetter: function (row, idx) {
                                 return ((0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: [
-                                        'isRequired',
+                                        Utils_1.FIELDS.IS_REQUIRED,
                                         row.parentId,
                                         row.id,
                                     ]
@@ -242,7 +259,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'isAdvanced',
+                            field: Utils_1.FIELDS.IS_ADVANCED,
                             width: '85px',
                             headerName: t('Common.Advance'),
                             TableCellProps: {
@@ -286,6 +303,6 @@ var Parameter = function (_a) {
                                 return !(Enum_1.TYPE_FIELD_TEMPLATE.OBJECT === row.fieldType);
                             },
                         },
-                    ] }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { mt: 3, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "space-between", alignItems: "center", children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { xs: 6, container: true, item: true, children: (0, jsx_runtime_1.jsx)(material_1.Button, { "aria-label": "button-add", variant: "contained", onClick: handleAddParameter, disabled: false, title: t('Common.Add'), children: (0, jsx_runtime_1.jsx)(Add_1.default, {}) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { xs: 6, container: true, item: true, justifyContent: "flex-end", children: (0, jsx_runtime_1.jsx)(material_1.Typography, { sx: { padding: '8px' }, children: t('TemplateManagement.NamingFieldNotice') }) })] }) })] }));
+                    ] }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { mt: 3, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "space-between", alignItems: "center", children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { xs: 6, container: true, item: true, children: (0, jsx_runtime_1.jsx)(material_1.Button, { name: "master-add-parameter", "aria-label": "button-add", variant: "contained", onClick: handleAddParameter, disabled: false, title: t('Common.Add'), children: (0, jsx_runtime_1.jsx)(Add_1.default, {}) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { xs: 6, container: true, item: true, justifyContent: "flex-end", children: (0, jsx_runtime_1.jsx)(material_1.Typography, { sx: { padding: '8px' }, children: t('TemplateManagement.NamingFieldNotice') }) })] }) })] }));
 };
 exports.default = (0, react_1.memo)(Parameter);

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Parameter.test.d.ts

@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+export {};

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Parameter.test.js

@@ -77,7 +77,6 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 /* eslint-disable testing-library/no-node-access */
 /* eslint-disable testing-library/no-container */
 /* eslint-disable testing-library/no-wait-for-side-effects */
-require("@testing-library/jest-dom/extend-expect");
 var react_1 = require("@testing-library/react");
 var Parameter_1 = __importDefault(require("./Parameter"));
 var Utils = __importStar(require("./Utils"));
@@ -111,27 +110,6 @@ var rows = [
         isRequired: true,
         childrens: [],
     },
-    {
-        id: '14896',
-        templateId: '4671435926616395650',
-        fieldName: 'video_inbanner_2',
-        fieldType: 'object',
-        defaultValue: null,
-        labelName: 'File banner nền video',
-        isRequired: true,
-        childrens: [
-            {
-                id: '148967',
-                templateId: '4671435926616395650',
-                fieldName: 'video_inbanner_2',
-                fieldType: 'image',
-                defaultValue: null,
-                labelName: 'File banner nền video',
-                isRequired: true,
-                childrens: [],
-            },
-        ],
-    },
     {
         id: '148961',
         templateId: '4671435926616395650',
@@ -154,13 +132,11 @@ var rows = [
         ],
     },
 ];
-var props = {
-    handleSetParameter: function (fn) {
-        return fn(rows);
-    },
-};
 describe('Template Infomation Tab Component', function () {
-    beforeAll(function () { });
+    beforeAll(function () {
+        ;
+        Utils.enhancedUpdate.mockImplementation(utils.enhancedUpdate);
+    });
     var renderUi = function () {
         return (0, react_1.render)((0, jsx_runtime_1.jsx)(recoil_1.RecoilRoot, { initializeState: function (_a) {
                 var set = _a.set;
@@ -170,33 +146,62 @@ describe('Template Infomation Tab Component', function () {
     it('renders without crashing', function () {
         renderUi();
     });
-    it('trigger add rows', function () {
-        var updateSpy = jest.spyOn(props, 'handleSetParameter');
-        renderUi();
-        var addBtn = react_1.screen.getByRole('button', { name: /button-add/i });
-        react_1.fireEvent.click(addBtn);
-        expect(updateSpy).toBeCalled();
-        // expect(addBtn).toBeInTheDocument()
-    });
+    it('trigger add rows', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var addBtn;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    addBtn = react_1.screen.getByRole('button', { name: /button-add/i });
+                    react_1.fireEvent.click(addBtn);
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(react_1.screen.getAllByText('image')[0]).toBeInTheDocument();
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('trigger add Object Children', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var addBtn;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    addBtn = react_1.screen.getAllByTitle('Common.Add');
+                    addBtn.forEach(function (btn) {
+                        react_1.fireEvent.click(btn);
+                    });
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(react_1.screen.getAllByText('image')[0]).toBeInTheDocument();
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('trigger edit cell', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var updateSpy, container, labelNameInput, fieldTypeInput;
+        var container, labelNameInput, fieldTypeInput;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    updateSpy = jest.spyOn(props, 'handleSetParameter');
                     container = renderUi().container;
-                    labelNameInput = container.querySelector("input[name=\"labelName--148961-148967s\"]");
-                    fieldTypeInput = container.querySelector("input[name=\"fieldType--148961-148967s\"]");
+                    labelNameInput = container.querySelector("input[name=\"labelName-148961-148967s\"]");
+                    fieldTypeInput = container.querySelector("input[name=\"fieldType-148961-148967s\"]");
                     react_1.fireEvent.change(labelNameInput, {
                         target: { value: 'fieldInput-change' },
                     });
                     react_1.fireEvent.change(fieldTypeInput, {
                         target: { value: 'video' },
                     });
+                    // expect(screen.getAllByText('color')[0]).toBeInTheDocument()
                     return [4 /*yield*/, (0, react_1.waitFor)(function () {
-                            expect(updateSpy).toBeCalledTimes(1);
+                            expect(Utils.enhancedUpdate).toBeCalledTimes(3);
                         })];
                 case 1:
+                    // expect(screen.getAllByText('color')[0]).toBeInTheDocument()
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -205,16 +210,22 @@ describe('Template Infomation Tab Component', function () {
     it('Remove row', function () { return __awaiter(void 0, void 0, void 0, function () {
         var removeBtn;
         return __generator(this, function (_a) {
-            ;
-            Utils.enhancedUpdate.mockImplementation(utils.enhancedUpdate);
-            renderUi();
-            removeBtn = react_1.screen.getAllByRole('button', {
-                name: /Common.Delete/i,
-            });
-            removeBtn.forEach(function (btn) {
-                react_1.fireEvent.click(btn);
-            });
-            return [2 /*return*/];
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    removeBtn = react_1.screen.getAllByRole('button', {
+                        name: /Common.Delete/i,
+                    });
+                    removeBtn.forEach(function (btn) {
+                        react_1.fireEvent.click(btn);
+                    });
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(Utils.enhancedUpdate).toBeCalledTimes(2);
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
         });
     }); });
 });

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Utils.d.ts

@@ -1,15 +1,36 @@
+/// <reference types="lodash" />
 import { ITemplateParameter } from '../../Types';
 import { DataObject } from '../../../../AWING';
-export declare const CUSTOM_FIELD_NAME: {
+export interface IFlatParameter {
+    parentFieldType: string | undefined;
+    parentId: string[];
+    parentFieldName: string[];
+    errField: boolean;
+    shouldRemove: boolean;
+    id: string;
+    templateId: string;
+    fieldName: string;
+    fieldType: string;
+    defaultValue: string | number | boolean | null;
+    labelName: string;
+    isRequired: boolean;
+    childrens: IFlatParameter[];
+    isAdvanced: boolean;
+}
+export declare const FIELDS: {
     CHILDRENS: string;
     REMOVE: string;
     FIELD_TYPE: string;
+    FIELD_NAME: string;
     IS_REQUIRED: string;
     IS_ADVANCED: string;
+    LABEL_NAME: string;
+    DEFAULT_VALUE: string;
+    PARENT_ID: string;
 };
 export declare const removeFiledName: (templateParameters: ITemplateParameter[]) => ITemplateParameter[];
-export declare const flattenParameter4Parent: (rows: DataObject[], parentFieldName?: string[]) => DataObject[];
-export declare const flattenParameter: (parameters: DataObject[], parentId?: string[], parentFieldType?: string, parentFieldName?: string[]) => DataObject[];
+export declare const flattenParameter4Parent: ((rows: DataObject[], parentFieldName?: string[]) => DataObject[]) & import("lodash").MemoizedFunction;
+export declare const flattenParameter: ((parameters: DataObject[], parentId?: string[], parentFieldType?: string, parentFieldName?: string[]) => IFlatParameter[]) & import("lodash").MemoizedFunction;
 export declare const enhancedFindIndex: (rows: DataObject[], ids: string[]) => number[];
 /**
  * function enhancedUpdate
@@ -22,4 +43,7 @@ export declare const enhancedFindIndex: (rows: DataObject[], ids: string[]) => n
  * @param defaultParam
  */
 export declare const enhancedUpdate: (rows: DataObject[], ids: string[], field: string, value: any, defaultParam: ITemplateParameter) => void;
-export declare const enhancedRemove: (ids: string[]) => void;
+/**
+ * viết type là DataObject thôi nhưng type của nó là:
+ */
+export declare const getFieldName: ((row: IFlatParameter) => string) & import("lodash").MemoizedFunction;