awing-library 2.1.124-beta → 2.1.124

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

@@ -0,0 +1,63 @@
+"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 __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)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.usePageCache = void 0;
+var react_1 = __importDefault(require("react"));
+var Context_1 = __importDefault(require("../Context"));
+var recoil_1 = require("recoil");
+var Recoil_1 = require("./Recoil");
+var usePageCache = function () {
+    var _a = (0, recoil_1.useRecoilState)(Recoil_1.pageCacheData), _b = _a[0], directoryTemplate = _b.directoryTemplate, templates = _b.templates, setPageCache = _a[1];
+    var service = (0, Context_1.default)().service;
+    return {
+        getTemplate: react_1.default.useCallback(function (templateId) {
+            return new Promise(function (resolve) {
+                var template = templates.find(function (item) { return item.template.id === templateId; });
+                if (template)
+                    resolve(template);
+                else
+                    service.templatesGet(templateId).then(function (res) {
+                        setPageCache(function (p) { return (__assign(__assign({}, p), { templates: __spreadArray(__spreadArray([], p.templates, true), [res], false) })); });
+                        resolve(res);
+                    });
+            });
+        }, 
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        [templates]),
+        getTemplateList: react_1.default.useCallback(function (directoryId) { return new Promise(function (resolve) {
+            var directory = directoryTemplate.find(function (item) { return item.directoryId === directoryId; });
+            if (directory)
+                resolve(directory.templateList);
+            else {
+                service.templatesGetByDirectoryId(directoryId).then(function (res) {
+                    setPageCache(function (p) { return (__assign(__assign({}, p), { directoryTemplate: __spreadArray(__spreadArray([], p.directoryTemplate, true), [{ directoryId: directoryId, templateList: res }], false) })); });
+                    resolve(res);
+                });
+            }
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+        }); }, [directoryTemplate]),
+    };
+};
+exports.usePageCache = usePageCache;

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

@@ -1,5 +1,6 @@
 import { Directory } from '../../Campaign/Types';
-import { FormValid, PageModel, PageViewEvent } from '../Types';
+import { FormValid, PageModel, PageViewEvent, 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>;
@@ -9,3 +10,12 @@ 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>;
+export declare const pageCacheData: import("recoil").RecoilState<{
+    directoryTemplate: {
+        directoryId: string;
+        templateList: Template[];
+    }[];
+    templates: ITemplateModel[];
+}>;
+export declare const templateTypeState: import("recoil").RecoilState<ITemplateType[]>;
+export declare const templateDirectoriesState: import("recoil").RecoilState<Directory[]>;

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.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.pageEventState = 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");
@@ -130,3 +130,18 @@ exports.hasDeprecated = (0, recoil_1.atom)({
     key: 'hasDeprecated',
     default: false,
 });
+exports.pageCacheData = (0, recoil_1.atom)({
+    key: 'pageCacheData',
+    default: {
+        directoryTemplate: [],
+        templates: [],
+    },
+});
+exports.templateTypeState = (0, recoil_1.atom)({
+    key: 'templateTypeState',
+    default: [],
+});
+exports.templateDirectoriesState = (0, recoil_1.atom)({
+    key: 'templateDirectoriesState',
+    default: [],
+});

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

@@ -79,5 +79,5 @@ var addTrackingCode = function (trackingValid, commonHtml, trackingCode) {
     return commonHtml;
 };
 exports.addTrackingCode = addTrackingCode;
-var validTabInfo = function (infoData) { return !!infoData.directoryId && (0, validation_1.textValidation)(infoData.title, 200).valid; };
+var validTabInfo = function (infoData) { return !!infoData.directoryId && (0, validation_1.textValidation)(infoData.title, 200, true, false).valid; };
 exports.validTabInfo = validTabInfo;

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

@@ -47,6 +47,7 @@ var TabInfomation = function () {
                     {
                         required: true,
                         fieldName: 'title',
+                        pattern: false,
                         type: 'text',
                         length: 200,
                         label: t('Common.Name'),

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/Components/Panel.d.ts

@@ -1,10 +1,2 @@
-import PropTypes from 'prop-types';
-declare const PageTabPanel: {
-    (props: any): import("react/jsx-runtime").JSX.Element;
-    propTypes: {
-        children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-        index: PropTypes.Validator<any>;
-        value: PropTypes.Validator<any>;
-    };
-};
+declare const PageTabPanel: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default PageTabPanel;

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/Components/Panel.js

@@ -21,20 +21,11 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-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 prop_types_1 = __importDefault(require("prop-types"));
 var PageTabPanel = function (props) {
     var children = props.children, value = props.value, index = props.index, other = __rest(props, ["children", "value", "index"]);
     return ((0, jsx_runtime_1.jsx)(material_1.Box, __assign({ component: "div", role: "tabpanel", hidden: value !== index, id: "full-width-tabpanel-".concat(index), "aria-labelledby": "full-width-tab-".concat(index) }, other, { children: value === index && (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { '& > div:first-of-type': { padding: function (theme) { return theme.spacing(1); } }, p: 2 }, children: children }) })));
 };
-PageTabPanel.propTypes = {
-    children: prop_types_1.default.node,
-    index: prop_types_1.default.any.isRequired,
-    value: prop_types_1.default.any.isRequired,
-};
 exports.default = PageTabPanel;

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

@@ -72,11 +72,13 @@ var enums_1 = require("../../enums");
 var Recoil_1 = require("../Recoil");
 var Utils_1 = require("../Utils");
 var Styles_1 = require("./Styles");
+var ListenTemplate_1 = require("../ListenTemplate");
 var ViewContent = function (_a) {
     var _b, _c, _d, _e, _f;
     var viewInfoData = _a.viewInfoData, pageId = _a.pageId, viewNumber = _a.viewNumber, onChange = _a.onChange, isCreate = _a.isCreate;
     var _g = (0, Context_2.default)(), service = _g.service, pageCode = _g.pageCode, domainId = _g.domainId, CONFIGS = _g.configs;
     var appHelper = (0, Context_1.useAwing)().appHelper;
+    var getTemplate = (0, ListenTemplate_1.usePageCache)().getTemplate;
     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];
@@ -84,20 +86,17 @@ var ViewContent = function (_a) {
     var rootDirectory = (0, recoil_1.useRecoilValue)(Recoil_1.pageRootDeirectory);
     var _l = (0, recoil_1.useRecoilState)(Recoil_1.pageEventState), events = _l[0], setEvent = _l[1];
     react_1.default.useEffect(function () {
+        onChange(['viewDatas'], []);
         if (viewInfoData === null || viewInfoData === void 0 ? void 0 : viewInfoData.templateId) {
             setLoading(true);
-            service
-                .templatesGet(viewInfoData.templateId)
+            getTemplate(viewInfoData.templateId)
                 .then(handleResData)
                 .finally(function () {
                 setLoading(false);
             });
         }
-        else {
-            onChange(['viewDatas'], []);
-        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [viewInfoData.templateId, viewInfoData.viewDatas.length]);
+    }, [viewInfoData.templateId]);
     react_1.default.useEffect(function () {
         if (!isUniq.current) {
             setEvent(function (prev) {
@@ -123,9 +122,7 @@ var ViewContent = function (_a) {
         setScriptAutoField(res.template.autoField || '');
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    var setChanged = react_1.default.useCallback((0, lodash_1.debounce)(function () {
-        onChange(['isChanged'], true);
-    }, 300), []);
+    var setChanged = function () { onChange(['isChanged'], true); };
     var handleOnChange = function (fieldPath, templateDatasUpdated) {
         var _a;
         var keys = fieldPath.split('.');

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewInfo.d.ts

@@ -1,12 +1,11 @@
+import { ITemplateType } from '../../../../ACM-AXN/Template/Types';
 import React from 'react';
-import { Directory } from '../../../Campaign/Types';
 import { ViewModel } from '../../Types';
-import { ITemplateType } from '../../../../ACM-AXN/Template/Types';
 interface ViewInfoProps {
     templateTypes: ITemplateType[];
-    directories: Directory[];
     onChange: (keys: string[], value: unknown) => void;
     viewInfoData: ViewModel;
+    viewNumber: number;
 }
 declare const ViewInfo: React.FC<ViewInfoProps>;
 export default ViewInfo;

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

@@ -10,64 +10,37 @@ 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 = __importStar(require("react"));
-var AWING_1 = require("../../../../AWING");
-var react_i18next_1 = require("react-i18next");
-var Context_1 = __importDefault(require("../../Context"));
+var Constant_1 = require("../../../../ACM-AXN/Common/Constant");
+var Constant_2 = require("../../../../ACM-AXN/Page/Constant");
 var lodash_1 = require("lodash");
-var enums_1 = require("../../enums");
-var Utils_1 = require("../Utils");
-var Constant_1 = require("../../../../ACM-AXN/Page/Constant");
+var react_1 = __importDefault(require("react"));
+var react_i18next_1 = require("react-i18next");
 var react_router_dom_1 = require("react-router-dom");
 var recoil_1 = require("recoil");
+var AWING_1 = require("../../../../AWING");
+var Context_1 = __importDefault(require("../../Context"));
+var enums_1 = require("../../enums");
+var ListenTemplate_1 = require("../ListenTemplate");
 var Recoil_1 = require("../Recoil");
+var Utils_1 = require("../Utils");
 var ViewInfo = function (_a) {
-    var directories = _a.directories, templateTypes = _a.templateTypes, onChange = _a.onChange, viewInfoData = _a.viewInfoData;
+    var templateTypes = _a.templateTypes, onChange = _a.onChange, viewInfoData = _a.viewInfoData, viewNumber = _a.viewNumber;
     var pageId = (0, react_router_dom_1.useParams)().pageId;
-    var defaultDirectory = react_1.default.useMemo(function () { return directories.find(function (item) { return item.parentDirectoryId === '99'; }); }, [directories]);
-    var cacheDirectoryId = react_1.default.useRef('');
-    var _b = react_1.default.useState([]), templates = _b[0], setTemplates = _b[1];
-    var _c = react_1.default.useState(false), loadingTemplate = _c[0], setLoadingTemplate = _c[1];
-    var _d = (0, recoil_1.useRecoilState)(Recoil_1.wiewMounted), isMounted = _d[0], setIsMounted = _d[1];
-    var setDeprecated = (0, recoil_1.useSetRecoilState)(Recoil_1.hasDeprecated);
-    var _e = (0, Context_1.default)(), service = _e.service, pageCode = _e.pageCode, domainId = _e.domainId;
+    var _b = (0, Context_1.default)(), pageCode = _b.pageCode, domainId = _b.domainId;
+    var getTemplateList = (0, ListenTemplate_1.usePageCache)().getTemplateList;
     var t = (0, react_i18next_1.useTranslation)().t;
-    (0, react_1.useEffect)(function () {
-        var savedDirectoryId = JSON.parse(localStorage.getItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED) || '{}')[Array.isArray(domainId) ? 'awingPge' : domainId];
-        if (savedDirectoryId && !pageId && !isMounted) {
-            setIsMounted(true);
-            handleChangeForm({ directoryId: savedDirectoryId }, true, 'directoryId');
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    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];
+    var defaultDirectory = react_1.default.useMemo(function () { return directories.find(function (item) { return item.parentDirectoryId === '99'; }); }, [directories]);
     var overWriteOnChange = function (keys, value) {
         if (keys.includes('templateId')) {
             setDeprecated(false);
@@ -80,14 +53,23 @@ var ViewInfo = function (_a) {
             return;
         if (['templateTypeId', 'directoryId'].includes(keyUpdate)) {
             if (keyUpdate === 'directoryId') {
-                localStorage.setItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
+                localStorage.setItem(Constant_2.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
             }
-            overWriteOnChange(['templateId'], null);
+            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
     []);
+    react_1.default.useEffect(function () {
+        var savedDirectoryId = JSON.parse(localStorage.getItem(Constant_2.PAGE_LOGIN_DIRECTORY_SELECTED) || '{}')[Array.isArray(domainId) ? 'awingPge' : domainId];
+        if (savedDirectoryId && !pageId && !isMounted) {
+            setIsMounted(true);
+            handleChangeForm({ directoryId: savedDirectoryId }, true, 'directoryId');
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     react_1.default.useEffect(function () {
         var fieldsRequireStatus = !(0, Utils_1.getFieldsValid)(viewInfoData.viewDatas).includes(false);
         onChange(['fieldsRequireStatus'], fieldsRequireStatus);
@@ -98,6 +80,10 @@ var ViewInfo = function (_a) {
         var validStatus = !(isValidationFields === null || isValidationFields === void 0 ? void 0 : isValidationFields.includes(false)) &&
             fieldsRequireStatus &&
             validProcessStatus === enums_1.VALID_PROCESS_CODE.VALIDATED;
+        var directoryId = viewInfoData.directoryId;
+        if (directoryId) {
+            getTemplates(directoryId, viewInfoData.templateId);
+        }
         onChange(['validStatus'], validStatus);
         // onChangeCompletedTab("1", validStatus);
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -108,24 +94,17 @@ var ViewInfo = function (_a) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [viewInfoData, defaultDirectory]);
-    react_1.default.useEffect(function () {
-        var directoryId = viewInfoData.directoryId;
-        if (directoryId && cacheDirectoryId.current !== directoryId) {
-            cacheDirectoryId.current = directoryId;
-            getTemplates(directoryId);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [viewInfoData]);
-    var getTemplates = function (directoryId) {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var getTemplates = react_1.default.useCallback((0, lodash_1.debounce)(function (directoryId, templateId) {
+        if (templateId === void 0) { templateId = ''; }
         setLoadingTemplate(true);
-        service
-            .templatesGetByDirectoryId(directoryId)
+        getTemplateList(directoryId)
             .then(function (res) {
-            var viewDeprecate = res.find(function (x) { return x.id === viewInfoData.templateId && x.isDeprecated; });
+            var viewDeprecate = res.find(function (x) { return x.id === templateId && x.isDeprecated; });
             setTemplates(res.filter(function (x) { return !x.isDeprecated; }).concat(viewDeprecate ? [viewDeprecate] : []));
         })
             .finally(function () { return setLoadingTemplate(false); });
-    };
+    }, Constant_1.Constants.DEBOUNCE_TIME_300), []);
     var templateOptions = react_1.default.useMemo(function () {
         var result = [];
         if (viewInfoData.templateTypeId) {

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

@@ -38,12 +38,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-var immer_1 = __importDefault(require("immer"));
+var Helpers_1 = require("../../../../Utils/Helpers");
+var immer_1 = require("immer");
+var lodash_1 = require("lodash");
 var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
+var Context_1 = require("../../../../Context");
 var Constant_1 = require("../../Constant");
-var Context_1 = __importDefault(require("../../Context"));
+var Context_2 = __importDefault(require("../../Context"));
 var enums_1 = require("../../enums");
 var Recoil_1 = require("../Recoil");
 var Utils_1 = require("../Utils");
@@ -51,39 +54,30 @@ var Panel_1 = __importDefault(require("./Components/Panel"));
 var ViewList_1 = __importDefault(require("./Components/ViewList"));
 var ViewContent_1 = __importDefault(require("./ViewContent"));
 var ViewInfo_1 = __importDefault(require("./ViewInfo"));
-var Context_2 = require("../../../../Context");
-var Helpers_1 = require("../../../../Utils/Helpers");
 var TabView = function (_a) {
     var isCreate = _a.isCreate;
     var _b = (0, recoil_1.useRecoilState)((0, Recoil_1.pageState)('views')), _c = _b[0], views = _c.views, page = _c.page, setView = _b[1];
     var _d = react_1.default.useState(0), activeViewIndex = _d[0], setActiveViewIndex = _d[1];
-    var _e = react_1.default.useState([]), directories = _e[0], setDirectories = _e[1];
-    var _f = react_1.default.useState([]), templateTypes = _f[0], setTemplateTypes = _f[1];
-    var _g = (0, Context_1.default)(), service = _g.service, pageCode = _g.pageCode;
-    var appHelper = (0, Context_2.useAwing)().appHelper;
+    var _e = (0, recoil_1.useRecoilState)(Recoil_1.templateDirectoriesState), directories = _e[0], setDirectories = _e[1];
+    var _f = (0, recoil_1.useRecoilState)(Recoil_1.templateTypeState), templateTypes = _f[0], setTemplateTypes = _f[1];
+    var _g = (0, Context_2.default)(), service = _g.service, pageCode = _g.pageCode;
+    var appHelper = (0, Context_1.useAwing)().appHelper;
     var t = (0, react_i18next_1.useTranslation)().t;
     react_1.default.useEffect(function () {
         fetchData();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    // React.useLayoutEffect(() => {
-    //     const tempId = setTimeout(() => {
-    //         setTempLoading(false)
-    //     }, 0)
-    //     return () => {
-    //         clearTimeout(tempId)
-    //         setTempLoading(true)
-    //     }
-    // }, [activeViewIndex])
     var fetchData = function () {
         Promise.all([
-            service.templatesGetDirectories(),
-            service.templateTypesGet(),
+            !directories.length ? service.templatesGetDirectories() : Promise.resolve(directories),
+            !templateTypes.length ? service.templateTypesGet() : Promise.resolve(templateTypes),
         ]).then(function (_a) {
-            var directories = _a[0], templateTypes = _a[1];
-            setDirectories(directories);
-            setTemplateTypes(function () {
-                var result = templateTypes.filter(function (item) {
+            var resDir = _a[0], resTemplateTypes = _a[1];
+            setDirectories(function (prev) { return (0, lodash_1.isEqual)(prev, resDir) ? prev : resDir; });
+            setTemplateTypes(function (prev) {
+                if ((0, lodash_1.isEqual)(prev, resTemplateTypes))
+                    return prev;
+                var result = resTemplateTypes.filter(function (item) {
                     return item.templateTypeCode ===
                         (pageCode === enums_1.PageCode.Lgn ? 'lgn' : 'wlc');
                 });
@@ -97,7 +91,7 @@ var TabView = function (_a) {
         });
     };
     var addPageView = function () {
-        setView((0, immer_1.default)(function (draft) {
+        setView((0, immer_1.produce)(function (draft) {
             var viewsValid = !views
                 .map(function (viewStatus) { return viewStatus.validStatus; })
                 .includes(false);
@@ -115,7 +109,7 @@ var TabView = function (_a) {
         }));
     };
     var deletePageView = function (tabID) {
-        setView((0, immer_1.default)(function (draft) {
+        setView((0, immer_1.produce)(function (draft) {
             if (draft.views.length === 1)
                 return;
             draft.views = draft.views
@@ -125,21 +119,23 @@ var TabView = function (_a) {
         }));
     };
     var onChange = function (keys, value) {
+        // console.log("keys", keys, "value", value, views, activeViewIndex)
         if (keys.includes('activeViewIndex')) {
             setActiveViewIndex(Number(value));
             return;
         }
-        setView((0, immer_1.default)(function (draf) {
-            (0, Helpers_1.setObject)(draf, keys, value);
+        setView((0, immer_1.produce)(function (draft) {
+            if (draft.views.length < Number(keys[1] || 0) + 1)
+                return;
+            (0, Helpers_1.setObject)(draft, keys, value);
         }));
     };
     var handleChange = function (key) {
         if (key === void 0) { key = []; }
         return (0, Utils_1.composeKey)(onChange, (0, Utils_1.concatKey)(key));
     };
-    var handleChangeView = react_1.default.useMemo(function () { return handleChange(['views', String(activeViewIndex)]); }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [activeViewIndex]);
-    return ((0, jsx_runtime_1.jsx)(ViewList_1.default, { isDisableTabHeader: false, activeViewIndex: activeViewIndex, viewCount: views.length, onChangeView: handleChange(), addView: addPageView, deleteView: deletePageView, children: (0, jsx_runtime_1.jsx)(Panel_1.default, { value: activeViewIndex, index: activeViewIndex, children: views.map(function (view, index) { return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: activeViewIndex === index && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ViewInfo_1.default, { onChange: handleChangeView, directories: directories, templateTypes: templateTypes, viewInfoData: view }), (0, jsx_runtime_1.jsx)(ViewContent_1.default, { viewInfoData: view, pageId: page.pageId, viewNumber: index, onChange: handleChangeView, isCreate: Boolean(isCreate) })] })) }, index)); }) }) }));
+    var handleChangeView = react_1.default.useMemo(function () { return handleChange(['views', String(activeViewIndex)]); }, [activeViewIndex]);
+    return ((0, jsx_runtime_1.jsx)(ViewList_1.default, { isDisableTabHeader: false, activeViewIndex: activeViewIndex, viewCount: views.length, onChangeView: handleChange(), addView: addPageView, deleteView: deletePageView, children: (0, jsx_runtime_1.jsx)(Panel_1.default, { value: activeViewIndex, index: activeViewIndex, children: views.map(function (view, index) { return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: activeViewIndex === index && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ViewInfo_1.default, { onChange: handleChangeView, templateTypes: templateTypes, viewInfoData: view, viewNumber: index + 1 }), (0, jsx_runtime_1.jsx)(ViewContent_1.default, { viewInfoData: view, pageId: page.pageId, viewNumber: index, onChange: handleChangeView, isCreate: Boolean(isCreate) })] })) }, index)); }) }) }));
 };
 exports.default = TabView;

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

@@ -11,14 +11,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTemplateDatas = exports.updateStateByPageModel = exports.getFieldsValid = exports.convertValueByType = exports.convertTreeArrayToFlatArray = exports.concatKey = exports.composeKey = exports.isObject = exports.isObjectType = void 0;
 var Enum_1 = require("../../ViewTemplate/Enum");
 var lodash_1 = require("lodash");
-var immer_1 = __importDefault(require("immer"));
+var immer_1 = require("immer");
 var common_1 = require("../../ViewTemplate/common");
 var enums_1 = require("../enums");
 var Helpers_1 = require("../../../Utils/Helpers");
@@ -86,13 +83,14 @@ var convertValueByType = function (type, val) {
         if (typeof val === 'string')
             val = val === 'true';
     }
-    else if (type === Enum_1.TYPE_FIELD_TEMPLATE.TEXT_FIELD_NUMBER) {
-        val = parseInt(val);
-    }
     else if (type === Enum_1.TYPE_FIELD_TEMPLATE.DROPDOWN_LIST) {
         var spl = val.split('\\n');
         val = spl[0].trim();
     }
+    // Không parse số, trong trường hợp số có thể float
+    // else if (type === TYPE_FIELD_TEMPLATE.TEXT_FIELD_NUMBER) {
+    //     // val = parseInt(val)
+    // }
     return val;
 };
 exports.convertValueByType = convertValueByType;
@@ -204,7 +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;
-    this.setPageRoot((0, immer_1.default)(function (draft) {
+    this.setPageRoot((0, immer_1.produce)(function (draft) {
         draft.views = views.map(function (view) { return ({
             templateId: view.templateId,
             viewDatas: view.viewDatas,

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

@@ -63,7 +63,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-var immer_1 = __importDefault(require("immer"));
+var immer_1 = require("immer");
 var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var react_router_dom_1 = require("react-router-dom");
@@ -81,12 +81,14 @@ var Helpers_1 = require("../../../Utils/Helpers");
 var lodash_1 = require("lodash");
 var Wrapper_1 = __importDefault(require("../../../AWING/HOC/Wrapper"));
 var Context_2 = require("../../../Context");
+var ListenTemplate_1 = require("./ListenTemplate");
 var CreateOrEdit = function (_a) {
     var type = _a.type;
     var t = (0, react_i18next_1.useTranslation)().t;
     var pageId = (0, react_router_dom_1.useParams)().pageId;
     var na = (0, react_router_dom_1.useNavigate)();
     var appHelper = (0, Context_2.useAwing)().appHelper;
+    var getTemplate = (0, ListenTemplate_1.usePageCache)().getTemplate;
     var _b = (0, Context_1.default)(), service = _b.service, pageCode = _b.pageCode;
     var _c = react_1.default.useState(false), loading = _c[0], setLoading = _c[1];
     var _d = (0, recoil_1.useRecoilState)(Recoil_1.hasDeprecated), isDeprecated = _d[0], setDeprecated = _d[1];
@@ -102,7 +104,7 @@ var CreateOrEdit = function (_a) {
                     case 0:
                         if (!(type === enums_1.PathType.CREATE)) return [3 /*break*/, 2];
                         return [4 /*yield*/, service.pagesGenerateId().then(function (res) {
-                                setPageRoot((0, immer_1.default)(function (draf) {
+                                setPageRoot((0, immer_1.produce)(function (draf) {
                                     var _a;
                                     draf.page.createdDate = (0, Helpers_1.convertDateTimeToTimestamp)(new Date());
                                     draf.page.directoryId = ((_a = (0, lodash_1.minBy)(directories, 'level')) === null || _a === void 0 ? void 0 : _a.directoryId) || '';
@@ -143,7 +145,7 @@ var CreateOrEdit = function (_a) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var checkDeprecated = function (templateIds) {
-        return Promise.all(templateIds.map(function (id) { return service.templatesGet(id); })).then(function (res) { return res.some(function (x) { return x.template.isDeprecated; }); });
+        return Promise.all(templateIds.map(function (id) { return getTemplate(id); })).then(function (res) { return res.some(function (x) { return x.template.isDeprecated; }); });
     };
     var fetchDirectories = function () {
         return service

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
 import { ITemplateFileService } from '../../ACM-AXN/Template/Types';
 import { DirectoryRoot } from '../../ACM-AXN/Campaign/Enum';
-import { Directory, Timestamp } from '../../ACM-AXN/Campaign/Types';
+import { Directory } from '../../ACM-AXN/Campaign/Types';
+import { Timestamp } from '../../ACM-AXN/Common/Types';
 import { PageCode, VALID_PROCESS_CODE, VERIFIED_STATUS } from './enums';
 export type PageTab = {
     label: string;

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

@@ -26,3 +26,8 @@ export declare enum VERIFIED_STATUS {
     NOT_VERIFIED = 0,
     VERIFIED_ERROR = 1
 }
+export declare enum AdministrativeUnitType {
+    Province = 0,
+    District = 1,
+    Commune = 2
+}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VERIFIED_STATUS = exports.VALID_PROCESS_CODE = exports.TrackingType = exports.PathType = exports.FileTypeCode = exports.PageCode = void 0;
+exports.AdministrativeUnitType = exports.VERIFIED_STATUS = exports.VALID_PROCESS_CODE = exports.TrackingType = exports.PathType = exports.FileTypeCode = exports.PageCode = void 0;
 var PageCode;
 (function (PageCode) {
     PageCode[PageCode["Wlc"] = 0] = "Wlc";
@@ -36,3 +36,9 @@ var VERIFIED_STATUS;
     VERIFIED_STATUS[VERIFIED_STATUS["NOT_VERIFIED"] = 0] = "NOT_VERIFIED";
     VERIFIED_STATUS[VERIFIED_STATUS["VERIFIED_ERROR"] = 1] = "VERIFIED_ERROR";
 })(VERIFIED_STATUS || (exports.VERIFIED_STATUS = VERIFIED_STATUS = {}));
+var AdministrativeUnitType;
+(function (AdministrativeUnitType) {
+    AdministrativeUnitType[AdministrativeUnitType["Province"] = 0] = "Province";
+    AdministrativeUnitType[AdministrativeUnitType["District"] = 1] = "District";
+    AdministrativeUnitType[AdministrativeUnitType["Commune"] = 2] = "Commune";
+})(AdministrativeUnitType || (exports.AdministrativeUnitType = AdministrativeUnitType = {}));

package/lib/ACM-AXN/Permission/Components/Styles.d.ts

@@ -1,3 +1,2 @@
-import { SxProps } from '@mui/material';
-import { Theme } from '@mui/system';
+import { SxProps, Theme } from '@mui/material';
 export declare const styles: Record<string, SxProps<Theme>>;