awing-library 2.1.117-beta → 2.1.118-beta

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

@@ -95,58 +95,59 @@ var CreateOrEdit = function (_a) {
     var pageChangedForm = (0, recoil_1.useRecoilValue)(Recoil_1.pageChangedFormState);
     var _e = (0, recoil_1.useRecoilState)(Recoil_1.pageRootState), pageRoot = _e[0], setPageRoot = _e[1];
     (0, react_1.useEffect)(function () {
-        fetchDirectories();
-        setPageRoot((0, immer_1.default)(function (draf) {
-            draf.page.createdDate = (0, Helpers_1.convertDateTimeToTimestamp)(new Date());
-        }));
-        if (type === enums_1.PathType.CREATE) {
-            service.pagesGenerateId().then(function (res) {
-                setPageRoot((0, immer_1.default)(function (draf) {
-                    draf.page.pageId = res;
-                    draf.page.pageCode =
-                        pageCode === enums_1.PageCode.Lgn ? 'lgn' : 'wlc';
-                }));
+        setLoading(true);
+        fetchDirectories().then(function (directories) { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    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) {
+                                    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) || '';
+                                    draf.page.pageId = res;
+                                    draf.page.pageCode = pageCode === enums_1.PageCode.Lgn ? 'lgn' : 'wlc';
+                                }));
+                            })];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, service[type === enums_1.PathType.CLONE ? 'pagesClone' : 'pagesGet'](pageId).then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
+                            var isDeprecated;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, checkDeprecated(res.views.map(function (x) { return x.templateId; }))];
+                                    case 1:
+                                        isDeprecated = _a.sent();
+                                        setDeprecated(isDeprecated);
+                                        if (isDeprecated && type === enums_1.PathType.CLONE) {
+                                            na('..', { replace: true });
+                                            appHelper.snackbar('error', t('Page.DeprecatedTemplate'));
+                                            throw new Error(t('Page.DeprecatedTemplate'));
+                                        }
+                                        Utils_1.updateStateByPageModel.call({ setPageRoot: setPageRoot }, res);
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4:
+                        setDirectories(directories);
+                        return [2 /*return*/];
+                }
             });
-        }
-        else {
-            setLoading(true);
-            service[type === enums_1.PathType.CLONE ? 'pagesClone' : 'pagesGet'](pageId)
-                .then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
-                var isDeprecated;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, checkDeprecated(res.views.map(function (x) { return x.templateId; }))];
-                        case 1:
-                            isDeprecated = _a.sent();
-                            setDeprecated(isDeprecated);
-                            if (isDeprecated && type === enums_1.PathType.CLONE) {
-                                na('..', { replace: true });
-                                appHelper.snackbar('error', t('Page.DeprecatedTemplate'));
-                                throw new Error(t('Page.DeprecatedTemplate'));
-                            }
-                            Utils_1.updateStateByPageModel.call({ setPageRoot: setPageRoot }, res);
-                            return [2 /*return*/];
-                    }
-                });
-            }); })
-                .finally(function () { return setLoading(false); });
-        }
+        }); }).finally(function () { return setLoading(false); });
         // 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; }); });
     };
     var fetchDirectories = function () {
-        service
-            .directoriesGetByObjectTypeCode(Enum_1.DirectoryRoot[pageCode === enums_1.PageCode.Lgn ? 'PageLogin' : 'PageWelcome'])
-            .then(function (res) {
-            setDirectories(res);
-            if (!pageRoot.page.directoryId && !pageRoot.page.pageId)
-                setPageRoot((0, immer_1.default)(function (draf) {
-                    var _a;
-                    draf.page.directoryId = ((_a = (0, lodash_1.minBy)(res, 'level')) === null || _a === void 0 ? void 0 : _a.directoryId) || '';
-                }));
-        });
+        return service
+            .directoriesGetByObjectTypeCode(Enum_1.DirectoryRoot[pageCode === enums_1.PageCode.Lgn ? 'PageLogin' : 'PageWelcome']);
     };
     var handleSubmit = function () {
         if (isDeprecated) {

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

@@ -23,6 +23,9 @@ var Infomation = function (props) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var _a = (0, recoil_1.useRecoilState)(Recoils_1.templateInfoState), templateInfo = _a[0], handleTemplateData = _a[1];
     var handleUpdate = (0, react_1.useCallback)(function (obj, formValid, fieldUpdate) {
+        if (fieldUpdate === 'pageCode') {
+            handleTemplateData(function (prev) { return (__assign(__assign({}, prev), { templateTypeId: null })); });
+        }
         if (fieldUpdate) {
             handleTemplateData(function (prev) { return (__assign(__assign({}, prev), obj)); });
         }
@@ -44,7 +47,9 @@ var Infomation = function (props) {
                 type: 'select',
                 label: t('Common.TypePage'),
                 required: true,
-                options: Object.values(enums_1.PageCode).filter(function (item) { return !isNaN(Number(item)); }).map(function (value) { return ({
+                options: Object.values(enums_1.PageCode)
+                    .filter(function (item) { return !isNaN(Number(item)); })
+                    .map(function (value) { return ({
                     value: enums_1.PageCode[value].toLowerCase(),
                     text: enums_1.PageCode[value],
                 }); }),
@@ -54,7 +59,13 @@ var Infomation = function (props) {
                 type: 'select',
                 label: t('Common.TypeTemplate'),
                 required: true,
-                options: templateTypes.map(function (type) { return ({
+                options: templateTypes
+                    .filter(function (type) {
+                    var _a;
+                    return !((_a = type.templateTypeCode) === null || _a === void 0 ? void 0 : _a.localeCompare(templateInfo.pageCode || 'lgn'));
+                })
+                    .sort(function (a, b) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.localeCompare((b === null || b === void 0 ? void 0 : b.name) || '')) || -1; })
+                    .map(function (type) { return ({
                     value: type.id,
                     text: type.name,
                 }); }),

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

@@ -15,6 +15,7 @@ export declare const OmitListType: {
     LIST: string;
     OBJECT: string;
     COLOR: string;
+    URL: string;
 };
 declare const _default: import("react").NamedExoticComponent<ParameterProps>;
 export default _default;

package/lib/ACM-AXN/ViewTemplate/Enum.d.ts

@@ -11,6 +11,7 @@ export declare const TYPE_FIELD_TEMPLATE: {
     LIST: string;
     OBJECT: string;
     COLOR: string;
+    URL: string;
 };
 export declare const PAGE_CODES: {
     PageCodeLogin: string;

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

@@ -14,6 +14,7 @@ exports.TYPE_FIELD_TEMPLATE = {
     LIST: "list",
     OBJECT: "object",
     COLOR: "color",
+    URL: "url",
 };
 exports.PAGE_CODES = {
     PageCodeLogin: "lgn",

package/lib/ACM-AXN/ViewTemplate/TemplateField/Fields/BasicField/index.js

@@ -25,6 +25,7 @@ var constant_1 = require("../../../constant");
 var Enum_1 = require("../../../Enum");
 var react_1 = require("react");
 var react_i18next_1 = require("react-i18next");
+var validation_1 = require("../../../../../AWING/ultis/validation");
 var debounce = require('lodash/debounce');
 var useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
     paper: {
@@ -101,11 +102,14 @@ function BasicField(props) {
     var renderField = function () {
         // const isError = !!getValueByPath(/*errors*/ {}, fieldPath)
         var isError = errors.includes(fieldPath);
-        var field = register(fieldPath, { required: isRequired });
+        var field = register(fieldPath, __assign({ required: isRequired }, fieldType === Enum_1.TYPE_FIELD_TEMPLATE.URL && {
+            onValidate: function (value) { return (0, validation_1.urlValid)(value); }
+        }));
         switch (fieldType) {
             case Enum_1.TYPE_FIELD_TEMPLATE.TEXT_FIELD_NUMBER:
                 return renderTextField(field, isError);
             case Enum_1.TYPE_FIELD_TEMPLATE.TEXT_FIELD:
+            case Enum_1.TYPE_FIELD_TEMPLATE.URL:
                 return renderTextField(field, isError);
             case Enum_1.TYPE_FIELD_TEMPLATE.TEXTAREA:
                 return renderTextField(field, isError);
@@ -164,7 +168,12 @@ function BasicField(props) {
             ? { multiline: true, rows: 4 }
             : {}), { variant: "standard", label: labelName || fieldName, onChange: function (e) {
                 handleChange(e.target.value);
-            }, error: isError, helperText: isError ? t('Common.Required') : '' })));
+            }, error: isError, helperText: isError
+                ? fieldType === Enum_1.TYPE_FIELD_TEMPLATE.URL &&
+                    !(0, validation_1.urlValid)(field.value)
+                    ? t('Common.InvalidData')
+                    : t('Common.Required')
+                : '' })));
     };
     var renderDropdownListField = function (field, isError) {
         var opts = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.split('\\n');

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

@@ -58,11 +58,12 @@ var runScript = function (params, script) {
 };
 exports.runScript = runScript;
 var convertRelativeLink = function (link, pagePath, templateId, configs) {
-    var isTemplatePath = link === null || link === void 0 ? void 0 : link.includes(constant_1.ACM_TEMPLATE_PATH);
+    var isTemplatePath = (link === null || link === void 0 ? void 0 : link.includes(constant_1.ACM_TEMPLATE_PATH)) || (link === null || link === void 0 ? void 0 : link.includes(constant_1.ACM_PAGE_PATH));
     if (isTemplatePath) {
         return "".concat(configs.TEMPLATE_FILE_PATH, "/").concat(templateId, "/").concat(link.split("/")[link.split("/").length - 1]);
     }
-    return "".concat(pagePath, "/").concat(link.split("/")[link.split("/").length - 1]) || "";
+    return link;
+    // return `${pagePath}/${link.split("/")[link.split("/").length - 1]}` || "";
 };
 exports.convertRelativeLink = convertRelativeLink;
 var generateRandomInteger = function (max) {

package/lib/ACM-AXN/ViewTemplate/constant.d.ts

@@ -1,2 +1,3 @@
 export declare const ACM_TEMPLATE_PATH = "{acmTemplatePath}";
+export declare const ACM_PAGE_PATH = "{acmPagePath}";
 export declare const DELAY_TIME_RUN_SCRIPT = 1500;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DELAY_TIME_RUN_SCRIPT = exports.ACM_TEMPLATE_PATH = void 0;
+exports.DELAY_TIME_RUN_SCRIPT = exports.ACM_PAGE_PATH = exports.ACM_TEMPLATE_PATH = void 0;
 exports.ACM_TEMPLATE_PATH = "{acmTemplatePath}";
+exports.ACM_PAGE_PATH = "{acmPagePath}";
 exports.DELAY_TIME_RUN_SCRIPT = 1500;

package/lib/ACM-AXN/ViewTemplate/interface.d.ts

@@ -11,7 +11,7 @@ export interface FieldInfo {
     id?: string;
     defaultValue?: string;
     fieldName: string;
-    fieldType: "image" | "textfield" | "video" | "textfield_number" | "html" | "checkbox" | "textarea" | "dropdownlist" | "checkboxlist" | "list" | "object" | "color";
+    fieldType: "image" | "textfield" | "video" | "textfield_number" | "html" | "checkbox" | "textarea" | "dropdownlist" | "checkboxlist" | "list" | "object" | "color" | "url";
     fieldValue?: any;
     isRequired: boolean;
     labelName?: string;

package/lib/AWING/Form/Utils/Types.d.ts

@@ -1 +1,5 @@
 export type FieldValues = Record<string, any>;
+export type FieldOptions = {
+    required: boolean;
+    onValidate: (value: any) => boolean;
+};

package/lib/AWING/Form/useForm.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FieldOptions } from './Utils/Types';
 export declare const useForm: (props: {
     defaultValue: Record<string, any>;
 }) => {
@@ -9,9 +10,7 @@ export declare const useForm: (props: {
         watch: boolean;
     };
     formValue: Record<string, any>;
-    register: (fieldPath: string, options?: {
-        required: boolean;
-    }) => {
+    register: (fieldPath: string, options?: FieldOptions) => {
         required: boolean | undefined;
         name: string;
         value: any;

package/lib/AWING/Form/useForm.js

@@ -64,13 +64,14 @@ var useForm = function (props) {
     };
     var register = function (fieldPath, options) {
         var isRequired = options === null || options === void 0 ? void 0 : options.required;
+        var onValidate = options === null || options === void 0 ? void 0 : options.onValidate;
         return {
             required: isRequired,
             name: fieldPath,
             value: getValues(fieldPath),
             onBlur: function (e) {
-                if (isRequired) {
-                    if (!getValues(fieldPath)) {
+                if (isRequired || onValidate) {
+                    if (!getValues(fieldPath) || (onValidate && !onValidate(getValues(fieldPath)))) {
                         _formError.current.push(fieldPath);
                     }
                     else {

package/package.json

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