npm - awing-library - Versions diffs - 2.1.149-beta → 2.1.151-beta - Mend

awing-library 2.1.149-beta → 2.1.151-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 = __importDefault(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()),
@@ -52,46 +76,45 @@ var Parameter = function (_a) {
         isRequired: 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);
+        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.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);
+            (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 !== ''; });
-            }
-        });
-        return row;
-    });
     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',
@@ -102,7 +125,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 {
@@ -141,7 +164,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'fieldName',
+                            field: Utils_1.FIELDS.FIELD_NAME,
                             headerName: t('TemplateManagement.FieldName'),
                             TableCellProps: {
                                 sx: {
@@ -153,22 +176,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: {
@@ -177,7 +195,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,
                                     ]
@@ -186,7 +204,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'defaultValue',
+                            field: Utils_1.FIELDS.DEFAULT_VALUE,
                             headerName: t('Common.DefaultValue'),
                             TableCellProps: {
                                 sx: {
@@ -207,7 +225,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'isRequired',
+                            field: Utils_1.FIELDS.IS_REQUIRED,
                             width: '85px',
                             headerName: t('Common.Require'),
                             TableCellProps: {
@@ -231,7 +249,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,
                                     ]
@@ -240,7 +258,7 @@ var Parameter = function (_a) {
                             },
                         },
                         {
-                            field: 'isAdvanced',
+                            field: Utils_1.FIELDS.IS_ADVANCED,
                             width: '85px',
                             headerName: t('Common.Advance'),
                             TableCellProps: {
@@ -284,6 +302,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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

@@ -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;

package/lib/ACM-AXN/Template/CreateOrEdit/Template/Utils.js CHANGED Viewed

@@ -20,22 +20,26 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enhancedRemove = exports.enhancedUpdate = exports.enhancedFindIndex = exports.flattenParameter = exports.flattenParameter4Parent = exports.removeFiledName = exports.CUSTOM_FIELD_NAME = void 0;
+exports.getFieldName = exports.enhancedUpdate = exports.enhancedFindIndex = exports.flattenParameter = exports.flattenParameter4Parent = exports.removeFiledName = exports.FIELDS = void 0;
 var Enum_1 = require("../../../../ACM-AXN/ViewTemplate/Enum");
 var lodash_1 = require("lodash");
-exports.CUSTOM_FIELD_NAME = {
+exports.FIELDS = {
     CHILDRENS: 'childrens',
     REMOVE: 'remove',
     FIELD_TYPE: 'fieldType',
+    FIELD_NAME: 'fieldName',
     IS_REQUIRED: 'isRequired',
     IS_ADVANCED: 'isAdvanced',
+    LABEL_NAME: 'labelName',
+    DEFAULT_VALUE: 'defaultValue',
+    PARENT_ID: 'parentId',
 };
 var removeFiledName = function (templateParameters) { return templateParameters.map(function (item) {
     var _a;
     return (__assign(__assign({}, item), { childrens: (0, exports.removeFiledName)(item.childrens), fieldName: (_a = item === null || item === void 0 ? void 0 : item.fieldName) === null || _a === void 0 ? void 0 : _a.split('.').at(-1) }));
 }); };
 exports.removeFiledName = removeFiledName;
-var flattenParameter4Parent = function (rows, parentFieldName) {
+exports.flattenParameter4Parent = (0, lodash_1.memoize)(function (rows, parentFieldName) {
     if (parentFieldName === void 0) { parentFieldName = []; }
     parentFieldName = parentFieldName.filter(Boolean);
     return rows
@@ -50,15 +54,14 @@ var flattenParameter4Parent = function (rows, parentFieldName) {
         ], false).flat()), true);
     })
         .flat();
-};
-exports.flattenParameter4Parent = flattenParameter4Parent;
-var flattenParameter = function (parameters, parentId, parentFieldType, parentFieldName) {
+});
+exports.flattenParameter = (0, lodash_1.memoize)(function (parameters, parentId, parentFieldType, parentFieldName) {
     if (parentId === void 0) { parentId = []; }
     if (parentFieldName === void 0) { parentFieldName = []; }
     var shouldRemove = parameters.length > 1;
     return parameters
         .map(function (item) {
-        var errField = !!parameters.find(function (el) { return el.id !== item.id && el.fieldName === item.fieldName; });
+        var errField = !!parameters.find(function (el) { return el.id !== item.id && el.fieldName === item.fieldName; }) || item.fieldName === '';
         var childrens = __spreadArray([], item.childrens, true);
         parentFieldName = parentFieldName.filter(function (field) { return field !== undefined; });
         // delete item.childrens
@@ -69,9 +72,17 @@ var flattenParameter = function (parameters, parentId, parentFieldType, parentFi
             item.fieldName,
         ], false).flat()), true);
     })
-        .flat();
-};
-exports.flattenParameter = flattenParameter;
+        .flat().map(function (item) {
+        Object.keys(item).forEach(function (key) {
+            var value = item[key];
+            if (Array.isArray(value)) {
+                ;
+                item[key] = value.filter(Boolean);
+            }
+        });
+        return item;
+    });
+});
 var enhancedFindIndex = function (rows, ids) {
     var indexs = [];
     var index = (0, lodash_1.findIndex)(rows, { id: ids[0] });
@@ -102,14 +113,14 @@ var enhancedUpdate = function (rows, ids, field, value, defaultParam) {
         }
         else {
             switch (field) {
-                case exports.CUSTOM_FIELD_NAME.CHILDRENS:
+                case exports.FIELDS.CHILDRENS:
                     rowsUpdate[indexs[turn]].childrens.push(value);
                     break;
-                case exports.CUSTOM_FIELD_NAME.REMOVE: {
+                case exports.FIELDS.REMOVE: {
                     rowsUpdate.splice(indexs[turn], 1);
                     break;
                 }
-                case exports.CUSTOM_FIELD_NAME.FIELD_TYPE: {
+                case exports.FIELDS.FIELD_TYPE: {
                     ;
                     rowsUpdate[indexs[turn]][field] = value;
                     rowsUpdate[indexs[turn]].childrens = [];
@@ -134,5 +145,22 @@ var enhancedUpdate = function (rows, ids, field, value, defaultParam) {
     }
 };
 exports.enhancedUpdate = enhancedUpdate;
-var enhancedRemove = function (ids) { };
-exports.enhancedRemove = enhancedRemove;
+/**
+ * viết type là DataObject thôi nhưng type của nó là:
+ */
+exports.getFieldName = (0, lodash_1.memoize)(function (row) {
+    var value = '';
+    var parentName = row.parentFieldName.length
+        ? __spreadArray(__spreadArray([], row.parentFieldName, true), [''], false).join('.')
+        : '';
+    if (parentName.split('.').length === row.parentId.length) {
+        parentName += '.';
+    }
+    if (row.fieldName) {
+        value += parentName + row.fieldName;
+    }
+    if (row.parentId.length && !value.split('.').at(row.parentId.length)) {
+        value = parentName;
+    }
+    return value;
+});

package/lib/ACM-AXN/Template/CreateOrEdit/index.js CHANGED Viewed

@@ -90,6 +90,7 @@ var CreateOrEdit = function () {
     var _e = (0, react_1.useState)([]), templateTypes = _e[0], setTemplateTypes = _e[1];
     var _f = (0, recoil_1.useRecoilState)(Recoils_1.templateState), templateData = _f[0], setTemplateData = _f[1];
     var confirmExit = (0, recoil_1.useRecoilValue)(Recoils_1.isEditState);
+    var isError = (0, recoil_1.useRecoilValue)(Recoils_1.isErrorParameterState);
     var _g = (0, react_1.useState)('0'), value = _g[0], setValue = _g[1];
     (0, react_1.useEffect)(function () {
         setLoading(true);
@@ -205,7 +206,10 @@ var CreateOrEdit = function () {
         }
         return service.templatesPost(data4Update);
     };
-    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['TemplateManagement', templateId ? 'Edit' : 'Create'].join('.'))).concat(templateId ? ": ".concat((_a = templateData === null || templateData === void 0 ? void 0 : templateData.template) === null || _a === void 0 ? void 0 : _a.description) : '', "\n               "), onSubmit: handleSubmit, disableButtonSubmit: !((_b = templateData.template) === null || _b === void 0 ? void 0 : _b.templateTypeId) || !descriptionValid.valid || !confirmExit, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['TemplateManagement', templateId ? 'Edit' : 'Create'].join('.'))).concat(templateId ? ": ".concat((_a = templateData === null || templateData === void 0 ? void 0 : templateData.template) === null || _a === void 0 ? void 0 : _a.description) : '', "\n               "), onSubmit: handleSubmit, disableButtonSubmit: !((_b = templateData.template) === null || _b === void 0 ? void 0 : _b.templateTypeId) ||
+            !descriptionValid.valid ||
+            !confirmExit ||
+            isError, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {
                 display: 'flex',
                 flexDirection: 'column',
                 flexGrow: 1,

package/lib/ACM-AXN/TransactionLog/Detail.js CHANGED Viewed

@@ -92,7 +92,7 @@ var newStyles = {
             removedGutterBackground: '#ececec',
         },
         titleBlock: {
-            fontFamily: "'AW-Roboto', sans-serif",
+            fontFamily: "'Roboto', sans-serif",
             fontSize: '12px',
             fontWeight: 'bold',
         },

package/lib/AWING/Chart/BarLineComponent.js CHANGED Viewed

@@ -87,7 +87,7 @@ var BarLineComponent = function (props) {
                 titleColor: '#212121',
                 bodyFont: {
                     size: 14,
-                    family: "'AW-Roboto', sans-serif",
+                    family: "'Roboto', sans-serif",
                     lineHeight: 1.5,
                 },
             },
@@ -106,7 +106,7 @@ var BarLineComponent = function (props) {
                     boxPadding: 50,
                     font: {
                         size: 15,
-                        family: "'AW-Roboto', sans-serif",
+                        family: "'Roboto', sans-serif",
                         lineHeight: 1.5,
                     },
                 },
@@ -141,7 +141,7 @@ var BarLineComponent = function (props) {
                     title: {
                         font: {
                             size: 14,
-                            family: "'AW-Roboto', sans-serif",
+                            family: "'Roboto', sans-serif",
                         },
                     },
                 },
@@ -164,7 +164,7 @@ var BarLineComponent = function (props) {
                     font: {
                         size: 14,
                         weight: 'bold',
-                        family: "'AW-Roboto', sans-serif",
+                        family: "'Roboto', sans-serif",
                     },
                 },
             },
@@ -183,7 +183,7 @@ var BarLineComponent = function (props) {
                     font: {
                         size: 14,
                         weight: 'bold',
-                        family: "'AW-Roboto', sans-serif",
+                        family: "'Roboto', sans-serif",
                     },
                 },
             },

package/lib/AWING/Chart/PieComponent.js CHANGED Viewed

@@ -38,7 +38,7 @@ var PieComponent = function (_a) {
                     pointStyle: 'circle',
                     font: {
                         size: 14,
-                        family: "'AW-Roboto', sans-serif",
+                        family: "'Roboto', sans-serif",
                         lineHeight: 1.5,
                     },
                 },
@@ -54,7 +54,7 @@ var PieComponent = function (_a) {
                 bodySpacing: 8,
                 bodyFont: {
                     size: 14,
-                    family: "'AW-Roboto', sans-serif",
+                    family: "'Roboto', sans-serif",
                     lineHeight: 1.5,
                 },
                 callbacks: {

package/package.json CHANGED Viewed

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