awing-library 2.1.130 → 2.1.131

package/lib/ACM-AXN/Page/Constant.js

@@ -4,6 +4,7 @@ exports.defaultView = exports.PAGE_LOGIN_DIRECTORY_SELECTED = void 0;
 var enums_1 = require("./enums");
 exports.PAGE_LOGIN_DIRECTORY_SELECTED = 'pageLoginDirectorySelected';
 exports.defaultView = {
+    viewId: crypto.randomUUID(),
     templateId: '',
     directoryId: '',
     templateTypeId: 0,
@@ -16,4 +17,5 @@ exports.defaultView = {
     isChanged: false,
     verifiedStatus: enums_1.VERIFIED_STATUS.NOT_VERIFIED,
     isValidationFields: [],
+    events: [],
 };

package/lib/ACM-AXN/Page/CreateOrEdit/Recoil.d.ts

@@ -1,12 +1,11 @@
 import { Directory } from '../../Campaign/Types';
-import { FormValid, PageModel, PageViewEvent, Template } from '../Types';
+import { FormValid, PageModel, Template } from '../Types';
 import { ITemplateModel, ITemplateType } from '../../../ACM-AXN/Template';
 export declare const pageDirectoriesState: import("recoil").RecoilState<Directory[]>;
 export declare const wiewMounted: import("recoil").RecoilState<boolean>;
 export declare const pageRootDeirectory: import("recoil").RecoilState<string>;
 export declare const pageChangedFormState: import("recoil").RecoilState<Record<keyof PageModel, boolean>>;
 export declare const pageRootState: import("recoil").RecoilState<PageModel>;
-export declare const pageEventState: import("recoil").RecoilState<PageViewEvent[]>;
 export declare const validForm: import("recoil").RecoilState<FormValid>;
 export declare const pageState: (param: keyof PageModel) => import("recoil").RecoilState<PageModel>;
 export declare const hasDeprecated: import("recoil").RecoilState<boolean>;

package/lib/ACM-AXN/Page/CreateOrEdit/Recoil.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.templateDirectoriesState = exports.templateTypeState = exports.pageCacheData = exports.hasDeprecated = exports.pageState = exports.validForm = exports.pageEventState = exports.pageRootState = exports.pageChangedFormState = exports.pageRootDeirectory = exports.wiewMounted = exports.pageDirectoriesState = void 0;
+exports.templateDirectoriesState = exports.templateTypeState = exports.pageCacheData = exports.hasDeprecated = exports.pageState = exports.validForm = exports.pageRootState = exports.pageChangedFormState = exports.pageRootDeirectory = exports.wiewMounted = exports.pageDirectoriesState = void 0;
 var lodash_1 = require("lodash");
 var recoil_1 = require("recoil");
 var Constant_1 = require("../Constant");
@@ -75,17 +75,6 @@ exports.pageRootState = (0, recoil_1.atom)({
         viewEvents: [],
     },
 });
-exports.pageEventState = (0, recoil_1.selector)({
-    key: 'pageEventState',
-    get: function (_a) {
-        var get = _a.get;
-        return get(exports.pageRootState).viewEvents;
-    },
-    set: function (_a, newValue) {
-        var set = _a.set;
-        set(exports.pageRootState, function (prev) { return (__assign(__assign({}, prev), { viewEvents: newValue })); });
-    },
-});
 exports.validForm = (0, recoil_1.atom)({
     key: 'validFormState',
     default: (0, recoil_1.selector)({

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewContent.js

@@ -1,15 +1,4 @@
 "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);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -63,7 +52,6 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var AWING_1 = require("../../../../AWING");
 var Context_1 = require("../../../../Context");
-var lodash_1 = require("lodash");
 var react_1 = __importDefault(require("react"));
 var recoil_1 = require("recoil");
 var ViewTemplate_1 = __importDefault(require("../../../ViewTemplate"));
@@ -82,9 +70,8 @@ var ViewContent = function (_a) {
     var _h = react_1.default.useState(''), scriptValidationTemplate = _h[0], setScriptValidationTemplate = _h[1];
     var _j = react_1.default.useState(''), scriptAutoField = _j[0], setScriptAutoField = _j[1];
     var _k = react_1.default.useState(false), loading = _k[0], setLoading = _k[1];
-    var isUniq = react_1.default.useRef(false);
     var rootDirectory = (0, recoil_1.useRecoilValue)(Recoil_1.pageRootDeirectory);
-    var _l = (0, recoil_1.useRecoilState)(Recoil_1.pageEventState), events = _l[0], setEvent = _l[1];
+    // const [events, setEvent] = useRecoilState(pageEventState)
     react_1.default.useEffect(function () {
         onChange(['viewDatas'], []);
         if (viewInfoData === null || viewInfoData === void 0 ? void 0 : viewInfoData.templateId) {
@@ -97,25 +84,10 @@ var ViewContent = function (_a) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [viewInfoData.templateId]);
-    react_1.default.useEffect(function () {
-        if (!isUniq.current) {
-            setEvent(function (prev) {
-                return (0, lodash_1.uniqBy)(prev, function (a) {
-                    return JSON.stringify({
-                        event: a.event,
-                        viewNumber: a.viewNumber,
-                        pageId: a.pageId,
-                    });
-                });
-            });
-            isUniq.current = true;
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [events]);
     var handleResData = function (res) {
+        var _a;
         onChange(['viewDatas'], (0, Utils_1.getTemplateDatas)(res.templateParameters, viewInfoData, pageId, viewNumber));
-        setEvent(function (prev) { var _a; return __spreadArray(__spreadArray([], (_a = res === null || res === void 0 ? void 0 : res.templateEvents) === null || _a === void 0 ? void 0 : _a.map(function (item) { return ({ id: item.id, event: item.event, viewNumber: viewNumber + 1, pageId: pageId, protected: true }); }), true), prev, true); });
-        isUniq.current = false;
+        onChange(['events'], __spreadArray(__spreadArray([], (_a = res === null || res === void 0 ? void 0 : res.templateEvents) === null || _a === void 0 ? void 0 : _a.map(function (item) { return ({ id: item.id, event: item.event, pageId: pageId, protected: true }); }), true), viewInfoData.events, true));
         onChange(['templateValidation'], res.template.validation);
         onChange(['templateHandleEvent'], res.template.autoField);
         setScriptValidationTemplate(res.template.validation || '');
@@ -172,17 +144,14 @@ var ViewContent = function (_a) {
                             ? 'lgn'
                             : 'wlc', "/").concat((_d = (_c = viewInfoData.viewDatas) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.pageId), enablePreview: pageCode === enums_1.PageCode.Lgn, advanceFields: (_f = (_e = viewInfoData.viewDatas) === null || _e === void 0 ? void 0 : _e.filter(function (item) { return item === null || item === void 0 ? void 0 : item.isAdvanced; })) === null || _f === void 0 ? void 0 : _f.map(function (field) { return field.fieldName; }), scriptValidate: scriptValidationTemplate, scriptAutoField: scriptAutoField, domainId: domainId, configs: CONFIGS, 
                         // validStatus={validStatus}
-                        validStatus: viewInfoData.validStatus, viewEvents: events === null || events === void 0 ? void 0 : events.filter(function (item) { return item.viewNumber === viewNumber + 1; }), onChange: handleOnChange, onChangeViewValid: function (status) {
+                        validStatus: viewInfoData.validStatus, viewEvents: viewInfoData.events, onChange: handleOnChange, onChangeViewValid: function (status) {
                             onChange(['isValidationFields'], [status]);
                         }, onChangeValidateProcess: function (processValue) {
                             onChange(['validProcessStatus'], processValue);
                         }, onNotifyError: function (errorMessage) {
                             appHelper.snackbar('error', errorMessage);
                         }, onUploadFile: onUploadFile, onChangeEvent: function (values) {
-                            setEvent(function (prev) {
-                                return prev.filter(function (item) { return item.viewNumber !== viewNumber + 1; }).concat(values.map(function (value) { return (__assign(__assign({}, value), { viewNumber: viewNumber + 1, pageId: pageId })); }));
-                            });
-                            isUniq.current = false;
+                            onChange(['events'], values);
                         } }) }) })) })) }));
 };
 exports.default = ViewContent;

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewInfo.js

@@ -36,7 +36,6 @@ var ViewInfo = function (_a) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var directories = (0, recoil_1.useRecoilValue)(Recoil_1.templateDirectoriesState);
     var _c = (0, recoil_1.useRecoilState)(Recoil_1.wiewMounted), isMounted = _c[0], setIsMounted = _c[1];
-    var setEvent = (0, recoil_1.useSetRecoilState)(Recoil_1.pageEventState);
     var setDeprecated = (0, recoil_1.useSetRecoilState)(Recoil_1.hasDeprecated);
     var _d = react_1.default.useState([]), templates = _d[0], setTemplates = _d[1];
     var _e = react_1.default.useState(false), loadingTemplate = _e[0], setLoadingTemplate = _e[1];
@@ -44,6 +43,7 @@ var ViewInfo = function (_a) {
     var overWriteOnChange = function (keys, value) {
         if (keys.includes('templateId')) {
             setDeprecated(false);
+            onChange(['viewDatas'], []);
         }
         onChange(keys, value);
     };
@@ -57,7 +57,6 @@ var ViewInfo = function (_a) {
             }
             overWriteOnChange(['templateId'], '');
         }
-        setEvent(function (res) { return res.filter(function (x) { return x.viewNumber !== viewNumber; }); });
         overWriteOnChange([keyUpdate], obj[keyUpdate]);
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/index.js

@@ -92,11 +92,12 @@ var TabView = function (_a) {
     };
     var addPageView = function () {
         setView((0, immer_1.produce)(function (draft) {
+            var _a;
             var viewsValid = !views
                 .map(function (viewStatus) { return viewStatus.validStatus; })
                 .includes(false);
             if (viewsValid) {
-                draft.views.push(__assign(__assign({}, Constant_1.defaultView), { isChanged: true }));
+                draft.views.push(__assign(__assign({}, Constant_1.defaultView), { viewId: crypto.randomUUID(), isChanged: true, viewNumber: (((_a = (0, lodash_1.maxBy)(draft.views, 'viewNumber')) === null || _a === void 0 ? void 0 : _a.viewNumber) || 0) + 1 }));
                 setActiveViewIndex(draft.views.length - 1);
             }
             else {
@@ -114,7 +115,7 @@ var TabView = function (_a) {
                 return;
             draft.views = draft.views
                 .filter(function (value, index) { return (index !== tabID ? value : ''); })
-                .map(function (x) { return (__assign(__assign({}, x), { isChanged: true })); });
+                .map(function (x, idx) { return (__assign(__assign({}, x), { viewNumber: idx + 1, isChanged: true })); });
             setActiveViewIndex(draft.views.length - 1);
         }));
     };

package/lib/ACM-AXN/Page/CreateOrEdit/Utils.js

@@ -202,6 +202,7 @@ var objectFieldValid = function (fieldDatas, indexOfField, fieldValue, isSubFiel
 };
 function updateStateByPageModel(pageModel) {
     var page = pageModel.page, commonHtml = pageModel.commonHtml, views = pageModel.views, viewEvents = pageModel.viewEvents;
+    var randomUUID = crypto.randomUUID();
     this.setPageRoot((0, immer_1.produce)(function (draft) {
         draft.views = views.map(function (view) { return ({
             templateId: view.templateId,
@@ -216,10 +217,12 @@ function updateStateByPageModel(pageModel) {
             fieldsRequireStatus: false,
             isChanged: false,
             verifiedStatus: enums_1.VERIFIED_STATUS.NOT_VERIFIED,
+            events: view.events || viewEvents.filter(function (event) { return event.viewNumber === view.viewDatas[0].viewNumber; }),
+            viewId: randomUUID,
+            viewNumber: view.viewNumber || view.viewDatas[0].viewNumber,
         }); }).sort(function (view1, view2) { return view1.viewDatas.at(-1).viewNumber - view2.viewDatas.at(-1).viewNumber; });
         draft.page = page;
         draft.commonHtml = commonHtml;
-        draft.viewEvents = viewEvents;
     }));
 }
 exports.updateStateByPageModel = updateStateByPageModel;

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

@@ -1,4 +1,15 @@
 "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);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -156,7 +167,7 @@ var CreateOrEdit = function (_a) {
             appHelper.snackbar('error', t('Page.DeprecatedTemplate'));
             return;
         }
-        var params = [pageRoot];
+        var params = [__assign(__assign({}, pageRoot), { viewEvents: pageRoot.views.map(function (x) { return x.events.map(function (e) { return (__assign(__assign({}, e), { viewNumber: x.viewNumber, pageId: pageRoot.page.pageId })); }); }).flat() })];
         if (type === enums_1.PathType.EDIT)
             params.unshift(pageId);
         return service[type === enums_1.PathType.EDIT ? 'pagesPut' : 'pagesPost'].apply(service, params);

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

@@ -32,6 +32,7 @@ export interface IPage {
     createdDate: Timestamp;
 }
 export interface ViewModel {
+    viewId: string;
     templateId: string;
     templateTypeId: number;
     directoryId: string;
@@ -44,6 +45,8 @@ export interface ViewModel {
     isValidationFields: any[];
     validProcessStatus: VALID_PROCESS_CODE;
     viewDatas: TemplateData[];
+    events: PageViewEvent[];
+    viewNumber?: number;
 }
 export interface PageViewEvent {
     id?: number;

package/lib/ACM-AXN/ViewTemplate/TemplateField/Event.js

@@ -27,22 +27,32 @@ var Events = function (_a) {
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var _b = react_1.default.useState(''), tempValue = _b[0], setTempValue = _b[1];
     var _c = react_1.default.useState(''), error = _c[0], setError = _c[1];
+    var handleValue = function () {
+        if (tempValue.trim() === '') {
+            return;
+        }
+        var _a = (0, validation_1.textValidation)(tempValue, 50, false, /^[a-zA-Z0-9đĐ_.()\u0080-\uFFFF]+$/g), valid = _a.valid, message = _a.message;
+        var isStartWithNumber = tempValue.match(/^\d/);
+        if (viewEvents.map(function (item) { return item.event; }).includes((0, Helpers_1.changeToAlias)(tempValue)) || !valid || isStartWithNumber) {
+            setError(!valid ? message : isStartWithNumber ? t('Common.InvalidData') : t('Common.Existed').replace('{0}', tempValue));
+            return;
+        }
+        onChangeEvent((0, lodash_1.uniqBy)(viewEvents.concat({ event: tempValue, id: 0 }), function (item) { return (0, Helpers_1.changeToAlias)(item.event); }));
+        setTempValue('');
+    };
     return ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
             marginBottom: 2,
             width: '100%',
         }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ error: !!error, helperText: error, fullWidth: true, variant: "standard", placeholder: "".concat(t('Common.Events'), "...") }, (!disabledLabel && { label: t('Common.Events') }), { inputProps: {
                 autoComplete: 'off',
             }, value: tempValue, onKeyDown: function (e) {
-                if (e.key === 'Enter') {
-                    var _a = (0, validation_1.textValidation)(tempValue, 50, false, /^[a-zA-Z0-9đĐ_.()\u0080-\uFFFF]+$/g), valid = _a.valid, message = _a.message;
-                    var isStartWithNumber = tempValue.match(/^\d/);
-                    if (viewEvents.map(function (item) { return item.event; }).includes((0, Helpers_1.changeToAlias)(tempValue)) || !valid || isStartWithNumber) {
-                        setError(!valid ? message : isStartWithNumber ? t('Common.InvalidData') : t('Common.Existed').replace('{0}', tempValue));
-                        return;
-                    }
-                    onChangeEvent((0, lodash_1.uniqBy)(viewEvents.concat({ event: tempValue, id: 0 }), function (item) { return (0, Helpers_1.changeToAlias)(item.event); }));
-                    setTempValue('');
+                if (e.key === 'Enter' || e.key === 'Tab' || e.key === ',') {
+                    e.preventDefault();
+                    handleValue();
                 }
+            }, onBlur: function (e) {
+                e.preventDefault();
+                handleValue();
             }, onChange: function (event) {
                 setTempValue(event.target.value);
                 setError('');
@@ -62,8 +72,10 @@ var Events = function (_a) {
                         marginRight: 1,
                         marginBottom: 0.5,
                     }, label: option.event, title: option.event, disabled: option === null || option === void 0 ? void 0 : option.protected, onDelete: function () {
-                        onChangeEvent(viewEvents.filter(function (item) { return item.event !== option.event; }));
-                    } }, option.event)); }),
+                        var res = viewEvents.filter(function (item) { return item.event !== option.event; });
+                        console.log("res", res);
+                        onChangeEvent(res);
+                    } }, JSON.stringify(option))); }),
             } })) }));
 };
 exports.default = Events;

package/package.json

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