awing-library 2.1.77-beta → 2.1.79-beta

package/lib/ACM-AXN/PlaceGroup/ContentCreateOrEdit.d.ts

@@ -1,7 +0,0 @@
-/**
- *
- * @author dauquan1108@gmail.com on 01/26/2024.
- *
- **/
-declare function ContentCreateOrEdit(): import("react/jsx-runtime").JSX.Element;
-export default ContentCreateOrEdit;

package/lib/ACM-AXN/PlaceGroup/ContentCreateOrEdit.js

@@ -1,136 +1 @@
 "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 __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");
-/**
- *
- * @author dauquan1108@gmail.com on 01/26/2024.
- *
- **/
-var react_1 = require("react");
-var react_router_dom_1 = require("react-router-dom");
-var react_i18next_1 = require("react-i18next");
-var Types_1 = require("./Types");
-var AWING_1 = require("../../AWING");
-var Hooks_1 = __importDefault(require("./Hooks"));
-var PlaceListInfo_1 = __importDefault(require("./PlaceListInfo"));
-function ContentCreateOrEdit() {
-    var t = (0, react_i18next_1.useTranslation)().t;
-    var id = (0, react_router_dom_1.useParams)().id;
-    var _a = (0, Hooks_1.default)(), service = _a.service, snackbar = _a.appHelper.snackbar;
-    var _b = (0, AWING_1.useDrawer)(), drawerState = _b.drawerState, setDrawerState = _b.setDrawerState, setDrawerTitle = _b.setDrawerTitle, setConfirmExit = _b.setConfirmExit;
-    var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
-    var _d = (0, react_1.useState)(false), loadingTable = _d[0], setLoadingTable = _d[1];
-    var _e = (0, react_1.useState)(), placeGroup = _e[0], setPlaceGroup = _e[1];
-    var _f = (0, react_1.useState)(), placeFilter = _f[0], setPlaceFilter = _f[1];
-    var _g = (0, react_1.useState)([]), places = _g[0], setPlaces = _g[1];
-    // Update DrawerNavigate
-    (0, react_1.useEffect)(function () {
-        var _a;
-        setDrawerTitle(id
-            ? "".concat(t('PlaceGroup.TitleEdit'), ": ").concat(placeGroup ? placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name : 'Loading...')
-            : t('PlaceGroup.TitleCreate'));
-        !(placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name) || !((_a = placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name) === null || _a === void 0 ? void 0 : _a.trim())
-            ? setDrawerState(AWING_1.DrawerStateEnum.INVALID)
-            : setDrawerState(AWING_1.DrawerStateEnum.VALID);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name]);
-    (0, react_1.useEffect)(function () {
-        if (drawerState === AWING_1.DrawerStateEnum.IN_PROGRESS) {
-            handleSubmit();
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [drawerState]);
-    // End update DrawerNavigate
-    (0, react_1.useEffect)(function () {
-        if (!placeGroup && id) {
-            setLoading(true);
-            service
-                .placeGroupsGet(id)
-                .then(function (placeGroupData) {
-                setPlaceGroup(placeGroupData);
-                setPlaceFilter(placeGroupData.placeFilter);
-            })
-                .finally(function () {
-                setLoading(false);
-            });
-        }
-    }, [placeGroup, service, id]);
-    (0, react_1.useEffect)(function () {
-        if (id) {
-            setLoadingTable(true);
-            service
-                .placesQuery({ groupIds: [id] })
-                .then(setPlaces)
-                .finally(function () {
-                setLoadingTable(false);
-            });
-        }
-    }, [service, id]);
-    var handleDetailSubmit = (0, react_1.useCallback)(function (placesSelected, placeFilter) {
-        setConfirmExit(true);
-        setPlaces(placesSelected);
-        setPlaceFilter(placeFilter);
-    }, []);
-    var handleSubmit = function () {
-        var newPlaceGroup = __assign(__assign({}, placeGroup), { placeIds: places.map(function (place) { return place.placeId; }), placeFilter: placeFilter !== null && placeFilter !== void 0 ? placeFilter : {
-                operandGroups: [
-                    {
-                        operands: [
-                            {
-                                operator: Types_1.LogicalOperator.In,
-                                type: Types_1.PlaceFilterOperandType.PlaceId,
-                                value: '[]',
-                            },
-                        ],
-                    },
-                ],
-            } });
-        var handleServiceCall = function (promise) {
-            return promise
-                .then(function () {
-                snackbar('success');
-                setDrawerState(AWING_1.DrawerStateEnum.SUBMIT_SUCCESS);
-            })
-                .catch(function () {
-                snackbar('error');
-                setDrawerState(AWING_1.DrawerStateEnum.VALID);
-            });
-        };
-        return id
-            ? handleServiceCall(service.placeGroupsPut(newPlaceGroup))
-            : handleServiceCall(service.placeGroupsPost(newPlaceGroup));
-    };
-    return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { 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)(AWING_1.BasicDataForm, { caption: t('PlaceGroup.TitlePlaceGroupInfo'), fields: [
-                        {
-                            fieldName: 'name',
-                            type: 'text',
-                            label: t('Common.GroupName'),
-                            required: true,
-                        },
-                        {
-                            fieldName: 'description',
-                            type: 'text',
-                            label: t('PlaceGroup.Description'),
-                        },
-                    ], oldValue: placeGroup, onUpdate: function (validState, valueForm) {
-                        setConfirmExit(true);
-                        setPlaceGroup(function (oldPlaceGroup) {
-                            return (__assign(__assign({}, oldPlaceGroup), valueForm));
-                        });
-                    } }), (0, jsx_runtime_1.jsx)(PlaceListInfo_1.default, { rows: places, loading: loadingTable, onDetailSubmit: handleDetailSubmit, placeFilter: placeFilter })] })) }));
-}
-exports.default = ContentCreateOrEdit;

package/lib/ACM-AXN/PlaceGroup/ContentCreateOrEdit.test.js

@@ -59,7 +59,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  **/
 var react_1 = require("@testing-library/react");
 var react_router_dom_1 = require("react-router-dom");
-var ContentCreateOrEdit_1 = __importDefault(require("./ContentCreateOrEdit"));
+var CreateOrEdit_1 = __importDefault(require("./CreateOrEdit"));
 var AWING_1 = require("../../AWING");
 require("@testing-library/jest-dom");
 var mockPlaceGroup = {
@@ -281,7 +281,7 @@ describe('ContentCreateOrEdit component(PlaceGroup).', function () {
         });
     });
     var renderUi = function () {
-        return (0, react_1.render)((0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(ContentCreateOrEdit_1.default, {}) }));
+        return (0, react_1.render)((0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(CreateOrEdit_1.default, {}) }));
     };
     it('Render component', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {

package/lib/ACM-AXN/PlaceGroup/CreateOrEdit.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,9 +20,93 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  * @author dauquan1108@gmail.com on 01/26/2024.
  *
  **/
-var DrawerNavigate_1 = __importDefault(require("../../AWING/DrawerNavigate"));
-var ContentCreateOrEdit_1 = __importDefault(require("./ContentCreateOrEdit"));
+var react_1 = require("react");
+var react_router_dom_1 = require("react-router-dom");
+var react_i18next_1 = require("react-i18next");
+var Types_1 = require("./Types");
+var AWING_1 = require("../../AWING");
+var Hooks_1 = __importDefault(require("./Hooks"));
+var PlaceListInfo_1 = __importDefault(require("./PlaceListInfo"));
+var ClassicDrawer_1 = __importDefault(require("../../Commons/Components/ClassicDrawer"));
 function CreateOrEdit() {
-    return ((0, jsx_runtime_1.jsx)(DrawerNavigate_1.default, { childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(ContentCreateOrEdit_1.default, {}) }));
+    var t = (0, react_i18next_1.useTranslation)().t;
+    var id = (0, react_router_dom_1.useParams)().id;
+    var service = (0, Hooks_1.default)().service;
+    var _a = (0, react_1.useState)(false), confirmExit = _a[0], setConfirmExit = _a[1];
+    var _b = (0, react_1.useState)(false), validState = _b[0], setValidState = _b[1];
+    var _c = (0, react_1.useState)(true), loading = _c[0], setLoading = _c[1];
+    var _d = (0, react_1.useState)(false), loadingTable = _d[0], setLoadingTable = _d[1];
+    var _e = (0, react_1.useState)(), placeGroup = _e[0], setPlaceGroup = _e[1];
+    var _f = (0, react_1.useState)(), placeFilter = _f[0], setPlaceFilter = _f[1];
+    var _g = (0, react_1.useState)([]), places = _g[0], setPlaces = _g[1];
+    (0, react_1.useEffect)(function () {
+        if (!placeGroup && id) {
+            setLoading(true);
+            service
+                .placeGroupsGet(id)
+                .then(function (placeGroupData) {
+                setPlaceGroup(placeGroupData);
+                setPlaceFilter(placeGroupData.placeFilter);
+            })
+                .finally(function () {
+                setLoading(false);
+            });
+        }
+    }, [placeGroup, service, id]);
+    (0, react_1.useEffect)(function () {
+        if (id) {
+            setLoadingTable(true);
+            service
+                .placesQuery({ groupIds: [id] })
+                .then(setPlaces)
+                .finally(function () {
+                setLoadingTable(false);
+            });
+        }
+    }, [service, id]);
+    var handleDetailSubmit = (0, react_1.useCallback)(function (placesSelected, placeFilter) {
+        setConfirmExit(true);
+        setPlaces(placesSelected);
+        setPlaceFilter(placeFilter);
+    }, []);
+    var handleSubmit = function () {
+        var newPlaceGroup = __assign(__assign({}, placeGroup), { placeIds: places.map(function (place) { return place.placeId; }), placeFilter: placeFilter !== null && placeFilter !== void 0 ? placeFilter : {
+                operandGroups: [
+                    {
+                        operands: [
+                            {
+                                operator: Types_1.LogicalOperator.In,
+                                type: Types_1.PlaceFilterOperandType.PlaceId,
+                                value: '[]',
+                            },
+                        ],
+                    },
+                ],
+            } });
+        return service[id ? 'placeGroupsPut' : 'placeGroupsPost'](newPlaceGroup);
+    };
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: id
+            ? "".concat(t('PlaceGroup.TitleEdit'), ": ").concat(placeGroup ? placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name : 'Loading...')
+            : t('PlaceGroup.TitleCreate'), onSubmit: handleSubmit, confirmExit: confirmExit, disableButtonSubmit: !validState, 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)(AWING_1.BasicDataForm, { caption: t('PlaceGroup.TitlePlaceGroupInfo'), fields: [
+                        {
+                            fieldName: 'name',
+                            type: 'text',
+                            label: t('Common.GroupName'),
+                            required: true,
+                        },
+                        {
+                            fieldName: 'description',
+                            type: 'text',
+                            length: 200,
+                            pattern: false,
+                            label: t('PlaceGroup.Description'),
+                        },
+                    ], oldValue: placeGroup, onUpdate: function (validState, valueForm) {
+                        setConfirmExit(true);
+                        setValidState(validState);
+                        setPlaceGroup(function (oldPlaceGroup) {
+                            return (__assign(__assign({}, oldPlaceGroup), valueForm));
+                        });
+                    } }), (0, jsx_runtime_1.jsx)(PlaceListInfo_1.default, { rows: places, loading: loadingTable, onDetailSubmit: handleDetailSubmit, placeFilter: placeFilter })] })) }));
 }
 exports.default = CreateOrEdit;

package/lib/AWING/BasicDataForm/interface.d.ts

@@ -21,14 +21,14 @@ export interface BasicFieldDefinition extends BaseTextFieldProps {
     /**
      * Định dạng regex cho hàm textValid
     */
-    pattern?: RegExp;
+    pattern?: RegExp | false;
     /**
     *
     * @param value
     * @param length - Độ dài byte, only type text và text-area
     * @param pattern - Định dạng regex, only type text và text-area
     */
-    checkValid?(value: any, length?: number, pattern?: RegExp): boolean;
+    checkValid?(value: any, length?: number, pattern?: RegExp | false): boolean;
     options?: MenuOption[];
     loading?: boolean;
     readOnly?: boolean;

package/lib/AWING/Chart/PieComponent.js

@@ -8,7 +8,7 @@ var chartColorDefaults = [
     '#dd040c',
     '#aed6dc',
     '#ff9a8d',
-    '#4a536b'
+    '#4a536b',
 ];
 var PieComponent = function (_a) {
     var chart = _a.chart, data = _a.data, _b = _a.dataConvert, dataConvert = _b === void 0 ? {
@@ -21,7 +21,23 @@ var PieComponent = function (_a) {
                 borderWidth: 2,
             },
         ],
-    } : _b, _c = _a.widthChart, widthChart = _c === void 0 ? 300 : _c, _d = _a.heightChart, heightChart = _d === void 0 ? 300 : _d, _e = _a.optionCustom, optionCustom = _e === void 0 ? {} : _e, _f = _a.options, options = _f === void 0 ? {
+    } : _b, _c = _a.widthChart, widthChart = _c === void 0 ? 300 : _c, _d = _a.heightChart, heightChart = _d === void 0 ? 300 : _d, _e = _a.optionCustom, optionCustom = _e === void 0 ? {
+        plugins: {
+            datalabels: {
+                anchor: 'end',
+                align: 'right',
+                formatter: function (value, ctx) {
+                    var totalSum = ctx.dataset.data.reduce(function (acc, curr) {
+                        return acc + curr;
+                    }, 0);
+                    console.log('totalSum', totalSum);
+                    var percentage = (value / totalSum) * 100;
+                    console.log('percentage', percentage);
+                    return "(".concat(percentage.toFixed(1), "%)");
+                },
+            },
+        },
+    } : _e, _f = _a.options, options = _f === void 0 ? {
         responsive: true,
         elements: {
             arc: {

package/lib/AWING/DataForm/interface.d.ts

@@ -87,14 +87,14 @@ export interface TextFieldDefinition<T extends DataObject> extends BaseFieldDefi
     /**
      * Định dạng regex cho hàm textValid
      */
-    pattern?: RegExp;
+    pattern?: RegExp | false;
     /**
      *
      * @param value
      * @param length - Độ dài byte, only type text và text-area
      * @param pattern - Định dạng regex, only type text và text-area
      */
-    onValidate?(value?: string, length?: number, pattern?: RegExp): boolean;
+    onValidate?(value?: string, length?: number, pattern?: RegExp | false): boolean;
     defaultValue?: string;
     autoFormula?: string;
 }

package/lib/AWING/PageManagement/PageManagement.js

@@ -59,9 +59,9 @@ var PageManagement = function (props) {
     // }, [queryInput, onChangeQueryInput, window.location.pathname]);
     (0, react_1.useEffect)(function () {
         var _a;
-        if (((_a = location.state) === null || _a === void 0 ? void 0 : _a.pageAction) === ClassicDrawer_1.CloseAction.Reload ||
+        if (((_a = location.state) === null || _a === void 0 ? void 0 : _a.action) === ClassicDrawer_1.CloseAction.Reload ||
             !(0, lodash_1.isEqual)(queryInput, cachedQueryInput.current)) {
-            handleChangeQueryInput(queryInput);
+            handleChangeQueryInput((0, lodash_1.cloneDeep)(queryInput));
             cachedQueryInput.current = (0, lodash_1.cloneDeep)(queryInput);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/lib/AWING/ultis/validation.d.ts

@@ -23,7 +23,7 @@ export declare function logicExpressionValid(value: string | null | undefined):
  * @param invertRegex - The inverted regular expression pattern to match against the text string. Default is undefined.
  * @returns An object containing the validation result and a message describing any validation errors.
  */
-export declare const textValidation: (str: string, length?: number, required?: boolean, pattern?: RegExp, invertRegex?: RegExp | false) => {
+export declare const textValidation: (str: string, length?: number, required?: boolean, pattern?: RegExp | false, invertRegex?: RegExp | false) => {
     valid: boolean;
     message: string;
 };

package/lib/Commons/Components/ClassicDrawer.js

@@ -67,7 +67,7 @@ var Drawer = function (props) {
             var _a;
             ((_a = location.state) === null || _a === void 0 ? void 0 : _a.type) === 'history'
                 ? navigate(-1)
-                : navigate('..', { state: __assign(__assign({}, location.state), { pageAction: action }) });
+                : navigate('..', { state: __assign(__assign({}, location.state), { action: action }) });
         }, 100);
     };
     var doPromise = function () {
@@ -80,7 +80,7 @@ var Drawer = function (props) {
                     snackbar('success');
                     console.log('success');
                 }, 700);
-                closeDrawer(typeof state === 'string' ? state : CloseAction.Reload);
+                closeDrawer((typeof state === 'string' && state) ? state : CloseAction.Reload);
             })
                 .catch(function () {
                 snackbar('error');

package/lib/Utils/Helpers.js

@@ -515,6 +515,9 @@ var updateObjectFields = function (originalObj, changedValues) {
                     obj[key] = value;
                 }
             }
+            else {
+                obj[key] = value;
+            }
         }
     };
     // Update nested fields

package/package.json

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