awing-library 2.1.159-dev → 2.1.161-dev

package/lib/ACM-AXN/ViewTemplate/Preview.js

@@ -43,17 +43,15 @@ var Preview = function (props) {
     var _a;
     var classes = useStyles();
     var t = (0, react_i18next_1.useTranslation)().t;
-    var validStatus = props.validStatus, pagePath = props.pagePath, templateDatas = props.templateDatas, 
-    // domainId,
-    configs = props.configs;
+    var validStatus = props.validStatus, pagePath = props.pagePath, templateDatas = props.templateDatas, domainId = props.domainId, configs = props.configs;
     var viewIndex = ((_a = templateDatas[0]) === null || _a === void 0 ? void 0 : _a.viewNumber) || -1;
     var formRef = react_1.default.useRef(null);
     var iframeSrc = (0, react_1.useMemo)(function () {
-        var result = "".concat(configs.CAPTIVE_DOMAIN, "/").concat(configs.TEMPLATE_PREVIEW);
+        var result = "".concat(configs.CAPTIVE_DOMAIN, "/").concat(configs.TEMPLATE_PREVIEW, "?domainId=").concat(domainId);
         if (result.startsWith("http://"))
             result = result.replace("http://", "https://");
         return result;
-    }, [configs.CAPTIVE_DOMAIN, configs.TEMPLATE_PREVIEW]);
+    }, [configs.CAPTIVE_DOMAIN, configs.TEMPLATE_PREVIEW, domainId]);
     (0, react_1.useEffect)(function () {
         var handleFormdata = function (_a) {
             var formData = _a.formData;

package/lib/ACM-AXN/Wizard/CreateOrEdit/PageTemplate.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
-import { IWizardTemplate } from '../Types';
+import { Directory, TemplateType, IWizardTemplate } from '../Types';
 interface PropsPageTemplate {
     pageCodeValue: number;
+    directories: Directory[];
+    templateTypes: TemplateType[];
     wizardTemplates: IWizardTemplate[];
     onConfirmExit: () => void;
     onChange: (wizardNew: object) => void;

package/lib/ACM-AXN/Wizard/CreateOrEdit/PageTemplate.js

@@ -19,55 +19,45 @@ var react_1 = require("react");
 var react_i18next_1 = require("react-i18next");
 var Add_1 = __importDefault(require("@mui/icons-material/Add"));
 var material_1 = require("@mui/material");
-var Hooks_1 = __importDefault(require("../Hooks"));
 var RowTemplate_1 = __importDefault(require("./RowTemplate"));
 var AWING_1 = require("../../../AWING");
 var enums_1 = require("../../../ACM-AXN/Page/enums");
 var Utils_1 = require("../Utils");
 function PageTemplate(props) {
-    var pageCodeValue = props.pageCodeValue, wizardTemplates = props.wizardTemplates, onChange = props.onChange, onConfirmExit = props.onConfirmExit, _a = props.onUpdateWizardLogin, onUpdateWizardLogin = _a === void 0 ? function () { return null; } : _a;
+    var pageCodeValue = props.pageCodeValue, wizardTemplates = props.wizardTemplates, templateTypes = props.templateTypes, directories = props.directories, onChange = props.onChange, onConfirmExit = props.onConfirmExit, _a = props.onUpdateWizardLogin, onUpdateWizardLogin = _a === void 0 ? function () { return null; } : _a;
     var t = (0, react_i18next_1.useTranslation)().t;
-    var service = (0, Hooks_1.default)().service;
     var isPageCodeLogin = pageCodeValue === enums_1.PageCode.Lgn;
     var pageCode = pageCodeValue === enums_1.PageCode.Lgn ? Utils_1.CPageCode.LGN : Utils_1.CPageCode.WLC;
     var _b = (0, react_1.useState)(true), loadingDirectory = _b[0], setLoadingDirectories = _b[1];
     var _c = (0, react_1.useState)(true), loadingtemplateTypes = _c[0], setLoadingTemplateTypes = _c[1];
     // DATA => Tên Thư Mục
-    var _d = (0, react_1.useState)([]), directories = _d[0], setDirectories = _d[1];
+    var _d = (0, react_1.useState)([]), pageDirectories = _d[0], setPageDirectories = _d[1];
     // DATA => Kiểu template
-    var _e = (0, react_1.useState)([]), templateTypes = _e[0], setTemplateTypes = _e[1];
-    (0, react_1.useEffect)(function () {
-        service
-            .templatesGetDirectories()
-            .then(function (directories_) {
+    var _e = (0, react_1.useState)([]), pageTemplateTypes = _e[0], setPageTemplateTypes = _e[1];
+    (0, react_1.useLayoutEffect)(function () {
+        if (directories.length > 0) {
             // CALL API => DATA => Tên Thư Mục
-            var systemDirectoryIndex = directories_ === null || directories_ === void 0 ? void 0 : directories_.findIndex(function (directory) {
+            var systemDirectoryIndex = directories === null || directories === void 0 ? void 0 : directories.findIndex(function (directory) {
                 return directory.parentDirectoryId ===
                     Utils_1.ROOT_DIRECTORY.SYSTEM_DIRECTORY.toString();
             });
             if (systemDirectoryIndex !== -1) {
-                directories_[systemDirectoryIndex].name = 'SYSTEM TEMPLATE';
+                directories[systemDirectoryIndex].name = 'SYSTEM TEMPLATE';
             }
-            setDirectories(directories_);
-        })
-            .finally(function () {
-            setLoadingDirectories(false);
-        });
+            setPageDirectories(directories);
+            loadingDirectory && setLoadingDirectories(false);
+        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-    (0, react_1.useEffect)(function () {
-        service
-            .templateTypesGet()
-            .then(function (templateTypes_) {
-            setTemplateTypes(templateTypes_.filter(function (itemTemplate) {
+    }, [directories.length]);
+    (0, react_1.useLayoutEffect)(function () {
+        if (templateTypes.length > 0) {
+            setPageTemplateTypes(templateTypes.filter(function (itemTemplate) {
                 return itemTemplate.templateTypeCode === pageCode;
             }));
-        })
-            .finally(function () {
-            setLoadingTemplateTypes(false);
-        });
+            loadingtemplateTypes && setLoadingTemplateTypes(false);
+        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [pageCodeValue]);
+    }, [templateTypes.length]);
     var handleChangeRowTemplate = function (fieldValue, sortOrder) {
         var _a;
         onConfirmExit();
@@ -93,6 +83,6 @@ function PageTemplate(props) {
                             ? t('Wizard.LoginTemplate')
                             : t('Wizard.WelcomeTemplate') }), isPageCodeLogin && ((0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", "aria-label": "button-add", title: t('Common.Add'), "data-testid": "button-add", onClick: function () {
                             return onUpdateWizardLogin(Utils_1.TYPE_LOGIN_TEMPLATE.ADD);
-                        }, children: (0, jsx_runtime_1.jsx)(Add_1.default, {}) }))] }), loadingDirectory || loadingtemplateTypes ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: wizardTemplates.map(function (template, idx) { return ((0, jsx_runtime_1.jsx)(RowTemplate_1.default, { template: template, pageCode: pageCode, directories: directories, templateTypes: templateTypes, onChangeRow: handleChangeRowTemplate, onUpdateWizardLogin: onUpdateWizardLogin, disabledIconDelete: wizardTemplates.length === 1 }, idx)); }) }))] }));
+                        }, children: (0, jsx_runtime_1.jsx)(Add_1.default, {}) }))] }), loadingDirectory || loadingtemplateTypes ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: wizardTemplates.map(function (template, idx) { return ((0, jsx_runtime_1.jsx)(RowTemplate_1.default, { template: template, pageCode: pageCode, directories: pageDirectories, templateTypes: pageTemplateTypes, onChangeRow: handleChangeRowTemplate, onUpdateWizardLogin: onUpdateWizardLogin, disabledIconDelete: wizardTemplates.length === 1 }, idx)); }) }))] }));
 }
 exports.default = (0, react_1.memo)(PageTemplate);

package/lib/ACM-AXN/Wizard/CreateOrEdit/PageTemplate.test.js

@@ -76,6 +76,8 @@ describe('PageTemplate component', function () {
     var mockData = {
         pageCodeValue: 1,
         wizardTemplates: [],
+        directories: [],
+        templateTypes: [],
         onConfirmExit: jest.fn(),
         onChange: jest.fn(),
         onUpdateWizardLogin: jest.fn(),

package/lib/ACM-AXN/Wizard/CreateOrEdit/RowTemplate.js

@@ -47,7 +47,7 @@ function RowTemplate(props) {
     }, [template]);
     (0, react_1.useEffect)(function () {
         if (wizardTemplate === null || wizardTemplate === void 0 ? void 0 : wizardTemplate.directoryId) {
-            setIsLoadingParameter(true);
+            !isLoadingParameter && setIsLoadingParameter(true);
             service
                 .templatesGetByDirectoryId(wizardTemplate.directoryId)
                 .then(function (template_) {

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

@@ -49,6 +49,22 @@ function CreateOrEdit() {
     }), wizardData = _c[0], setWizardData = _c[1];
     // Nhóm Wizard
     var _d = (0, react_1.useState)([]), wizardGroup = _d[0], setWizardGroup = _d[1];
+    // DATA => Kiểu template
+    var _e = (0, react_1.useState)([]), templateTypes = _e[0], setTemplateTypes = _e[1];
+    // DATA => Tên Thư Mục
+    var _f = (0, react_1.useState)([]), directories = _f[0], setDirectories = _f[1];
+    (0, react_1.useEffect)(function () {
+        if (!templateTypes.length) {
+            service.templateTypesGet().then(setTemplateTypes);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [templateTypes.length]);
+    (0, react_1.useEffect)(function () {
+        if (!directories.length) {
+            service.templatesGetDirectories().then(setDirectories);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [directories.length]);
     (0, react_1.useEffect)(function () {
         if (id) {
             setLoading(true);
@@ -125,7 +141,7 @@ function CreateOrEdit() {
             hasValidData((wizardData === null || wizardData === void 0 ? void 0 : wizardData.wizardWelcomeTemplates) || []));
     };
     return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: id ? t('Common.Edit') : t('Common.Create'), onSubmit: handleSubmit, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, disableButtonSubmit: !(isDisable() && confirmExit), children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(FormInformationBasic_1.default, { wizardData: wizardData, wizardGroup: wizardGroup, onChange: handleChange, onConfirmExit: handleConfirmExit }), TEMPLATES.map(function (value) {
-                    return ((0, jsx_runtime_1.jsx)(PageTemplate_1.default, { pageCodeValue: value, onChange: handleChange, onConfirmExit: handleConfirmExit, wizardTemplates: value === enums_1.PageCode.Lgn
+                    return ((0, jsx_runtime_1.jsx)(PageTemplate_1.default, { pageCodeValue: value, onChange: handleChange, directories: directories, templateTypes: templateTypes, onConfirmExit: handleConfirmExit, wizardTemplates: value === enums_1.PageCode.Lgn
                             ? (wizardData === null || wizardData === void 0 ? void 0 : wizardData.wizardLoginTemplates) || []
                             : (wizardData === null || wizardData === void 0 ? void 0 : wizardData.wizardWelcomeTemplates) ||
                                 [], onUpdateWizardLogin: handleUpdateWizardLoginTemplate }, value));

package/package.json

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