awing-library 2.1.2-beta → 2.1.3

package/lib/ACM-AXN/User/Container.test.js

@@ -0,0 +1,202 @@
+"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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+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");
+require("@testing-library/jest-dom/extend-expect");
+var react_1 = require("@testing-library/react");
+var Router_1 = require("../../AWING/Router");
+var Container_1 = __importDefault(require("./Container"));
+var initUser = { userId: 'mockUserId' };
+var items = [
+    {
+        userId: '5667797591087411902',
+        name: 'isobar',
+        description: '',
+        username: 'isobar',
+        gender: 1,
+        image: null,
+    },
+    {
+        userId: '4703920046752099132',
+        name: 'Kantar',
+        description: null,
+        username: 'kantar',
+        gender: 1,
+        image: null,
+    },
+];
+var clientMethod = {
+    usersPaging: function () {
+        return Promise.resolve({
+            items: items,
+            totalItemCount: items.length,
+        });
+    },
+    usersDelete: function () { return function (_id) { }; },
+};
+// Mock Axios client
+jest.mock('./Hooks', function () { return ({
+    __esModule: true,
+    default: function () { return ({
+        service: {
+            usersPaging: jest.fn(function (_param) {
+                return Promise.resolve(clientMethod.usersPaging());
+            }),
+            usersDelete: jest.fn(function (_id) {
+                return Promise.resolve(clientMethod.usersDelete());
+            }),
+        },
+        currentUser: initUser,
+    }); },
+}); });
+// Mock i18next
+jest.mock('react-i18next', function () { return (__assign(__assign({}, jest.requireActual('react-i18next')), { useTranslation: function () { return ({ t: jest.fn(function (key) { return key; }) }); } })); });
+// Mock PageManagement
+jest.mock('AWING/PageManagement', function () { return ({
+    PageManagement: function (props) {
+        props.onChangeQueryInput({
+            searchString: '',
+            pageIndex: 0,
+            pageSize: 10,
+        });
+        return ((0, jsx_runtime_1.jsxs)("div", { children: [props.columns
+                    .filter(function (item) { return item.valueGetter; })
+                    .map(function (getter, idx) { return ((0, jsx_runtime_1.jsx)("span", { children: getter.valueGetter(items[0], idx) }, idx)); }), (0, jsx_runtime_1.jsx)("span", { "data-testid": "rowid", children: props.getRowId(items[0]) }), (0, jsx_runtime_1.jsx)("button", { "data-testid": "CreateBtn", onClick: props.onCreateButtonClick, children: "CreateBtn" }), (0, jsx_runtime_1.jsx)("button", { onClick: function () {
+                        props.onChangeQueryInput({
+                            pageIndex: 1,
+                            pageSize: 10,
+                        });
+                    }, children: "ChangeInput" }), props.customActions, (0, jsx_runtime_1.jsx)("button", { "data-testid": "onDelete", onClick: function () {
+                        props.onDelete('onDelete');
+                    }, children: "Remove Btn" }), (0, jsx_runtime_1.jsx)("p", { children: JSON.stringify(props.rows) }), (0, jsx_runtime_1.jsxs)("span", { children: ["totalItemCount:", props.totalOfRows] })] }));
+    },
+}); });
+var renderUi = function () {
+    return (0, react_1.render)((0, jsx_runtime_1.jsx)(Router_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Container_1.default, {}) }));
+};
+describe('User Container Component', function () {
+    it('renders without crashing', function () {
+        renderUi();
+    });
+    it('render state', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    expect(react_1.screen.getByTestId('CreateBtn')).toBeInTheDocument();
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(react_1.screen.getByText(JSON.stringify(items))).toBeInTheDocument();
+                        })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(react_1.screen.getByText("totalItemCount:".concat(items.length))).toBeInTheDocument();
+                        })];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('get paging', function () {
+        var usersPagingSpy = jest.spyOn(clientMethod, 'usersPaging');
+        renderUi();
+        expect(usersPagingSpy).toBeCalled();
+    });
+    it('get rowid', function () {
+        renderUi();
+        expect(react_1.screen.getByText(items[0].userId)).toBeInTheDocument();
+    });
+    it('row getter', function () {
+        renderUi();
+        expect(react_1.screen.getByText('Common.Gender.Male')).toBeInTheDocument();
+    });
+    it('Trigger Create user button', function () {
+        var openSpy = jest.spyOn(window, 'open');
+        renderUi();
+        react_1.fireEvent.click(react_1.screen.getByTestId('CreateBtn'));
+        expect(openSpy).toHaveBeenCalledWith("undefined/organization/mockUserId/User", '_blank');
+        openSpy.mockRestore();
+    });
+    it('Trigger Add Existed user button', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    react_1.fireEvent.click(react_1.screen.getByText('User.AddExistedUser'));
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            return expect(window.location.href).toContain('http://localhost/AddExistedUser');
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('Delete user', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var usersDeleteSpy;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    usersDeleteSpy = jest.spyOn(clientMethod, 'usersDelete');
+                    renderUi();
+                    react_1.fireEvent.click(react_1.screen.getByTestId('onDelete'));
+                    return [4 /*yield*/, (0, react_1.waitFor)(function () {
+                            expect(usersDeleteSpy).toBeCalled();
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/lib/ACM-AXN/User/Hook.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { UserProps } from "./Types";
+export declare const userPropsContext: import("react").Context<UserProps>;
+declare const useUserProps: () => UserProps;
+export default useUserProps;

package/lib/ACM-AXN/User/Hook.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.userPropsContext = void 0;
+var react_1 = require("react");
+var react_2 = require("react");
+exports.userPropsContext = (0, react_1.createContext)({});
+var useUserProps = function () {
+    var props = (0, react_2.useContext)(exports.userPropsContext);
+    return (0, react_2.useMemo)(function () {
+        return props;
+    }, [props]);
+};
+exports.default = useUserProps;

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

@@ -0,0 +1,45 @@
+export interface IUserViewModel {
+    userId?: string;
+    name?: string | undefined;
+    username?: string | undefined;
+    gender?: number;
+    status?: boolean;
+    description?: string | undefined;
+    phone?: string | undefined;
+    image?: string | undefined;
+}
+export interface IUser {
+    userId?: string;
+    name?: string | undefined;
+    description?: string | undefined;
+    username?: string | undefined;
+    gender?: number | undefined;
+    image?: string | undefined;
+}
+export interface IUserPagingModel {
+    userId?: string;
+    name?: string;
+    description?: string;
+    username?: string;
+    gender?: number;
+    image?: string;
+}
+export interface IPagedList_1OfUserPagingModel {
+    items?: IUserPagingModel[];
+    pageCount?: number;
+    totalItemCount?: number;
+    pageNumber?: number;
+    pageSize?: number;
+    hasPreviousPage?: boolean;
+    hasNextPage?: boolean;
+}
+export interface IUserService {
+    usersPaging: (searchString: string | undefined, pageIndex: number | undefined, pageSize: number | undefined) => Promise<IPagedList_1OfUserPagingModel>;
+    usersDelete: (id: string) => Promise<void>;
+    usersGetIdByUsername: (username: string | undefined) => Promise<string>;
+    usersAddExisted: (username: string | undefined) => Promise<void>;
+}
+export interface UserProps {
+    service: IUserService;
+    currentUser: IUserViewModel;
+}

package/lib/ACM-AXN/User/Types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/ACM-AXN/User/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import { UserProps } from './Types';
+export declare const UserFeature: React.FC<UserProps>;
+export default UserFeature;

package/lib/ACM-AXN/User/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserFeature = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var Router_1 = require("../../AWING/Router");
+var Container_1 = __importDefault(require("./Container"));
+var Hook_1 = require("./Hook");
+var react_i18next_1 = require("react-i18next");
+var react_helmet_async_1 = require("react-helmet-async");
+var i18n_1 = __importDefault(require("../../i18n"));
+var Constants_1 = require("./Constants");
+var Add_1 = __importDefault(require("./Add"));
+var UserFeature = function (props) { return ((0, jsx_runtime_1.jsx)(react_i18next_1.I18nextProvider, { i18n: i18n_1.default, children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsxs)(Hook_1.userPropsContext.Provider, { value: props, children: [(0, jsx_runtime_1.jsx)(Container_1.default, {}), (0, jsx_runtime_1.jsx)(Router_1.Routes, { children: (0, jsx_runtime_1.jsx)(Router_1.Route, { path: Constants_1.ADD_EXISTED_USER, element: (0, jsx_runtime_1.jsx)(Add_1.default, {}) }, Constants_1.ADD_EXISTED_USER) })] }) }) })); };
+exports.UserFeature = UserFeature;
+exports.default = exports.UserFeature;

package/lib/AWING/AdvancedSearch/component.js

@@ -60,7 +60,7 @@ var AdvancedSearch = function (props) {
                                                             : undefined, onChange: function (val) {
                                                             var _a;
                                                             return onChangeValue(__assign(__assign({}, value), (_a = {}, _a[fieldName] = val, _a)));
-                                                        }, isOutsideRange: fieldDef.isOutsideRange, isDayBlocked: fieldDef.isDayBlocked, children: fieldDef.label }, fieldName));
+                                                        }, isOutsideRange: fieldDef.isOutsideRange, isDayBlocked: fieldDef.isDayBlocked, isShowCalendarInfo: fieldDef.isShowCalendarInfo, children: fieldDef.label }, fieldName));
                                                 case 'directory':
                                                     return ((0, jsx_runtime_1.jsx)(DirectoryTree_1.default, { labelSearch: fieldDef.label, rootDirectoryId: fieldDef.rootId || '', defaultValue: fieldValue, options: options !== null && options !== void 0 ? options : [], onChange: function (val) {
                                                             var _a;

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

@@ -7,6 +7,7 @@ export interface AdvancedSearchFieldDefinition extends BaseTextFieldProps {
     icon?: React.ReactElement;
     label: string;
     type: 'select' | 'date-range' | 'autocomplete' | 'directory';
+    isShowCalendarInfo?: boolean;
     options?: MenuOption[];
     loading?: boolean;
     width?: number;

package/lib/AWING/ButtonDateRangePicker/ButtonDateRangePicker.js

@@ -50,7 +50,7 @@ var DateRangePicker_1 = __importDefault(require("../DateRangePicker"));
 var react_i18next_1 = require("react-i18next");
 var ButtonDateRangePicker = function (props) {
     var t = (0, react_i18next_1.useTranslation)().t;
-    var defaultValue = props.value, onChange = props.onChange, isOutsideRange = props.isOutsideRange, isDayBlocked = props.isDayBlocked, other = __rest(props, ["value", "onChange", "isOutsideRange", "isDayBlocked"]);
+    var defaultValue = props.value, onChange = props.onChange, isOutsideRange = props.isOutsideRange, isDayBlocked = props.isDayBlocked, isShowCalendarInfo = props.isShowCalendarInfo, other = __rest(props, ["value", "onChange", "isOutsideRange", "isDayBlocked", "isShowCalendarInfo"]);
     var _a = react_1.default.useState(false), open = _a[0], setOpen = _a[1];
     var anchorRef = react_1.default.useRef(null);
     var handleToggle = function () {
@@ -105,7 +105,7 @@ var ButtonDateRangePicker = function (props) {
                                                         dateRange.startDate,
                                                         dateRange.endDate,
                                                     ]);
-                                                }, isOutsideRange: isOutsideRange, isDayBlocked: isDayBlocked }) })] }) }) }) })));
+                                                }, isOutsideRange: isOutsideRange, isDayBlocked: isDayBlocked, isShowCalendarInfo: isShowCalendarInfo }) })] }) }) }) })));
                 } })] }));
 };
 exports.ButtonDateRangePicker = ButtonDateRangePicker;

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

@@ -5,4 +5,5 @@ export interface ButtonDateRangePickerProps extends ButtonProps {
     onChange?(value: any): void;
     isOutsideRange?(date: Moment): boolean;
     isDayBlocked?(date: Moment): boolean;
+    isShowCalendarInfo?: boolean;
 }

package/lib/AWING/DataForm/DataInput.js

@@ -43,14 +43,14 @@ var GeoFencing_1 = __importDefault(require("../../ACM-AXN/GeoFencing"));
 var i18n_1 = __importDefault(require("../../i18n"));
 var omit = require('lodash/omit');
 function DataInput(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var fieldDefinition = props.fieldDefinition, onChange = props.onChange, value = props.value, error = props.error, disableHelperText = props.disableHelperText;
     var fieldName = fieldDefinition.fieldName, type = fieldDefinition.type, onValidate = fieldDefinition.onValidate, min = fieldDefinition.min, max = fieldDefinition.max, other = __rest(fieldDefinition, ["fieldName", "type", "onValidate", "min", "max"]);
-    var _j = react_2.default.useState(t('Common.InvalidData')), errorText = _j[0], setErrorText = _j[1];
+    var _k = react_2.default.useState(t('Common.InvalidData')), errorText = _k[0], setErrorText = _k[1];
     var checkValidationValue = function (fieldDefinition, val) {
         if (!fieldDefinition.required &&
-            (val === undefined || val === null || val === '' || val === []))
+            (val === undefined || val === null || val === '' || (Array.isArray(val) && val.length === 0)))
             return true;
         if (fieldDefinition.onValidate)
             return fieldDefinition.onValidate(val, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.length, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.pattern);
@@ -63,6 +63,8 @@ function DataInput(props) {
                 else
                     return (0, validation_1.notNullValid)(val);
             }
+            case 'multiple-hierarchical':
+                return (0, validation_1.arrayIsNotEmptyValid)(val);
             case 'month':
             case 'date':
                 return (0, validation_1.dateValid)(val);
@@ -108,10 +110,10 @@ function DataInput(props) {
         case 'autocomplete': {
             return ((0, jsx_runtime_1.jsx)(material_1.Autocomplete, { multiple: fieldDefinition.multiple, options: fieldDefinition.options, getOptionLabel: function (option) { var _a, _b; return (_b = (_a = option.label) !== null && _a !== void 0 ? _a : option.text) !== null && _b !== void 0 ? _b : ''; }, isOptionEqualToValue: function (option, value) {
                     return (option === null || option === void 0 ? void 0 : option.value) === (value === null || value === void 0 ? void 0 : value.value);
-                }, onChange: function (e, value) {
+                }, disableclearable: fieldDefinition.disableClearable, onChange: function (e, value) {
                     var newValue = fieldDefinition.multiple
-                        ? value.map(function (x) { return x.value; })
-                        : value.value;
+                        ? value.map(function (x) { return x === null || x === void 0 ? void 0 : x.value; })
+                        : value === null || value === void 0 ? void 0 : value.value;
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, value: fieldDefinition.multiple
                     ? fieldDefinition.options.filter(function (x) {
@@ -155,7 +157,7 @@ function DataInput(props) {
                 }, readOnly: fieldDefinition.readOnly }));
         }
         case 'date-range': {
-            var _k = other, isDayBlocked = _k.isDayBlocked, isOutsideRange = _k.isOutsideRange;
+            var _l = other, isDayBlocked = _l.isDayBlocked, isOutsideRange = _l.isOutsideRange;
             return ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { noBorder: true, variant: "standard", textFieldProps: __assign({ fullWidth: true, style: { margin: '8px 0px' } }, omit(other, ['isDayBlocked', 'isOutsideRange'])), value: {
                     startDate: (value === null || value === void 0 ? void 0 : value[0]) || null,
                     endDate: (value === null || value === void 0 ? void 0 : value[1]) || null,
@@ -208,6 +210,13 @@ function DataInput(props) {
                         }), { children: (_a = item.label) !== null && _a !== void 0 ? _a : item.text }), "".concat(fieldName.toString(), "-opt-").concat(index)));
                     })] })));
         }
+        case 'multiple-hierarchical': {
+            return ((0, jsx_runtime_1.jsx)(AWING_1.MultipleHierarchicalChoice, __assign({}, fieldDefinition, { variant: "standard", value: value, onChange: function (value) {
+                    onChange(value, checkValidationValue(fieldDefinition, value));
+                }, error: error, helperText: !disableHelperText && error
+                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    : '' })));
+        }
         case 'geo-fencing': {
             var configs = fieldDefinition.configs, label = fieldDefinition.label, initValue = fieldDefinition.initValue, value_1 = fieldDefinition.value, limit = fieldDefinition.limit, isOnlyMap = fieldDefinition.isOnlyMap;
             return ((0, jsx_runtime_1.jsx)("div", { style: { marginTop: '16px' }, children: (0, jsx_runtime_1.jsx)(GeoFencing_1.default, { configs: configs, label: label, initValue: initValue, value: value_1, limit: limit, isOnlyMap: isOnlyMap, onChange: function (newValue) {
@@ -218,7 +227,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: fieldDefinition.type, fullWidth: true, variant: "standard" }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : t('Common.InvalidData')
                     : '' })));
         }
     }

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

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { BaseTextFieldProps } from '@mui/material/TextField';
-import { DataObject, MenuOption } from '../../AWING';
+import { DataObject, IMultipleHierarchicalChoiceProps, MenuOption } from '../../AWING';
 import { IMainObj, IListFunctions } from '../../AWING/LogicExpression/interface';
 import { GeoFencingValue, IConfig } from '../../ACM-AXN/GeoFencing/interface';
 import { Moment } from 'moment';
@@ -44,6 +44,7 @@ export type AutocompleteFieldDefinition<T extends DataObject> = BaseFieldDefinit
     type: 'autocomplete';
     options: Array<MenuOption>;
     loading?: boolean;
+    disableClearable?: boolean;
 };
 export interface CheckBoxFieldDefinition<T extends DataObject> extends BaseFieldDefinition<T> {
     type: 'checkbox';
@@ -122,5 +123,8 @@ export type SelectFieldDefinition<T extends DataObject> = BaseFieldDefinition<T>
     row?: Partial<T>;
     onDisabledSelectItem?: (value: any, row?: Partial<T>) => boolean;
 };
-export type FieldDefinition<T extends DataObject> = AsyncAutocompleteFieldDefinition<T> | AutocompleteFieldDefinition<T> | LogicExpressionDefinition<T> | CheckBoxFieldDefinition<T> | DateTimeFieldDefinition<T> | DateRangeFieldDefinition<T> | NumberFieldDefinition<T> | RadioFieldDefinition<T> | SelectFieldDefinition<T> | TextFieldDefinition<T> | GeoFencingDefinition<T>;
+export type MultipleHierarchicalDefinition<T extends DataObject> = BaseFieldDefinition<T> & Omit<IMultipleHierarchicalChoiceProps, 'defaultValue' | 'onChange'> & {
+    type: 'multiple-hierarchical';
+};
+export type FieldDefinition<T extends DataObject> = AsyncAutocompleteFieldDefinition<T> | AutocompleteFieldDefinition<T> | LogicExpressionDefinition<T> | CheckBoxFieldDefinition<T> | DateTimeFieldDefinition<T> | DateRangeFieldDefinition<T> | NumberFieldDefinition<T> | RadioFieldDefinition<T> | SelectFieldDefinition<T> | TextFieldDefinition<T> | GeoFencingDefinition<T> | MultipleHierarchicalDefinition<T>;
 export {};

package/lib/AWING/DataGrid/index.js

@@ -254,7 +254,10 @@ var DataGrid = function (props) {
                                                                     opacity: isShouldHide
                                                                         ? 0
                                                                         : 1,
-                                                                }, sx: actionDef.sx, children: actionDef.icon }) }, "".concat(id, "-").concat(actIdx)));
+                                                                }, sx: __assign(__assign({}, actionDef.sx), { borderRadius: '15%' }), children: typeof actionDef.icon ===
+                                                                    'function'
+                                                                    ? actionDef.icon({ id: id, row: row, idx: idx, order: calcOrder(idx) })
+                                                                    : actionDef.icon }) }, "".concat(id, "-").concat(actIdx)));
                                                     }) }))] }), id));
                                     }), spanningRowsPosition == 'bottom' && spanningRows] })] }), !rows.length && (0, jsx_runtime_1.jsx)(NoData_1.default, {})] }), onPageIndexChange && onPageSizeChange && ((0, jsx_runtime_1.jsx)(Pagination_1.default, { rowsPerPageOptions: rowsPerPageOptions, colSpan: 3, count: totalOfRows, rowsPerPage: pageSize, page: pageIndex, SelectProps: {
                     inputProps: { 'aria-label': 'rows per page' },

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

@@ -49,7 +49,12 @@ export interface RowActionDefinition {
     /**
      * Icon của button action
      */
-    icon: ReactNode;
+    icon: ReactNode | React.FunctionComponent<{
+        id: string;
+        row: DataObject;
+        idx: number;
+        order: number;
+    }>;
     /**
      * Nội dung hiển thị trên tooltip
      */

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

@@ -19,7 +19,7 @@ export declare function logicExpressionValid(value: string | null | undefined):
  * @param str - The text string to be validated.
  * @param length - The maximum length of the text string. Default is 50.
  * @param required - validField required.
- * @param pattern - The regular expression pattern to match against the text string. Default is /^[a-zA-Z0-9\/\-_()\[\] ]+$/g.
+ * @param pattern - The regular expression pattern to match against the text string. Default is /^[a-zA-Z0-9\/\-_.()\[\] ]+$/g.
  * @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.
  */

package/lib/AWING/ultis/validation.js

@@ -89,14 +89,14 @@ exports.logicExpressionValid = logicExpressionValid;
  * @param str - The text string to be validated.
  * @param length - The maximum length of the text string. Default is 50.
  * @param required - validField required.
- * @param pattern - The regular expression pattern to match against the text string. Default is /^[a-zA-Z0-9\/\-_()\[\] ]+$/g.
+ * @param pattern - The regular expression pattern to match against the text string. Default is /^[a-zA-Z0-9\/\-_.()\[\] ]+$/g.
  * @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.
  */
 var textValidation = function (str, length, required, pattern, invertRegex) {
     if (length === void 0) { length = 50; }
     if (required === void 0) { required = true; }
-    if (pattern === void 0) { pattern = /^[a-zA-Z0-9\/\-_()\[\] ]+$/g; }
+    if (pattern === void 0) { pattern = /^[a-zA-Z0-9\/\-_.()\[\] ]+$/g; }
     var validRes = {
         valid: true,
         message: [],
@@ -113,7 +113,7 @@ var textValidation = function (str, length, required, pattern, invertRegex) {
         .replace(/[\u0300-\u036f]/g, '')
         .replace(/đ/g, 'd')
         .trim();
-    var invertedRegex = invertRegex || new RegExp("[^".concat(pattern.source.replace(/[.*+?^${}|]/g, ''), "]").replace(/\[\[|\]\]/g, ']'), 'g');
+    var invertedRegex = invertRegex || new RegExp("[^".concat(pattern.source.replace(/[*+?^${}|]/g, ''), "]").replace(/\[\[|\]\]/g, ']'), 'g');
     if (textTransform && pattern && !pattern.test(textTransform)) {
         validRes.valid = false;
         validRes.message.push("".concat(i18n_1.default.t('Common.InvalidChars'), ": ").concat(Array.from(new Set(textTransform.match(invertedRegex))).join(' ')));

package/lib/translate/en/translation.json

@@ -115,7 +115,17 @@
     },
     "User": {
         "Username": "Username",
-        "Password": "Password"
+        "Password": "Password",
+        "Title": "User Management",
+        "AddExistedUser": "Add Existed User"
+    },
+    "UserGroup": {
+        "Title": "User Group Management",
+        "Create": "Create User Group",
+        "Edit": "Edit User Group",
+        "TitleUserGroupInfo": "Infomation User Group",
+        "TitleUserGroup": "List User In Group",
+        "AddUserGroupButton": "Add User To Group"
     },
     "PlaceMultiSelect": {
         "All": "All",
@@ -168,6 +178,7 @@
         "Time": "Time",
         "Estimate": "Estimate",
         "Reality": "Reality",
+        "Domain": "Domain",
         "Campaign": "Campaign",
         "Rate": "Rate",
         "Date": "Day",
@@ -626,5 +637,21 @@
         "Date": "Date",
         "Place": "Place",
         "CampaignDefault": "Campaign Root"
+    },
+    "TransactionLog": {
+        "Title": "Transaction Log Management",
+        "TransactionType": "Transaction Type",
+        "ObjectID": "Object ID",
+        "Username": "User",
+        "Date": "Date",
+        "Status": "Status",
+        "SearchPlaceholder": "Search by ID Object",
+        "Old": "Old",
+        "New": "New",
+        "TitleDetail": "Transaction Log Detail"
+    },
+    "Filter": {
+        "AllCampaign": "All Campaign",
+        "CampaignDefault": "Campaign Default"
     }
 }

package/lib/translate/vi/translation.json

@@ -120,7 +120,17 @@
     },
     "User": {
         "Username": "Tài khoản",
-        "Password": "Mật khẩu"
+        "Password": "Mật khẩu",
+        "Title": "Quản trị người dùng",
+        "AddExistedUser": "Thêm tài khoản đã tồn tại"
+    },
+    "UserGroup": {
+        "Title": "Quản trị nhóm người dùng",
+        "Create": "Tạo mới nhóm người dùng",
+        "Edit": "Sửa nhóm người dùng",
+        "TitleUserGroupInfo": "Thông tin nhóm người dùng",
+        "TitleUserGroup": "Danh sách người dùng trong nhóm",
+        "AddUserGroupButton": "Thêm người dùng vào nhóm"
     },
     "PlaceMultiSelect": {
         "All": "Tất cả",
@@ -172,6 +182,7 @@
         "Place": "Địa điểm",
         "Time": "Thời gian",
         "Estimate": "Ước tính",
+        "Domain": "Domain",
         "Reality": "Thực tế",
         "Campaign": "Chiến dịch",
         "Rate": "Tỉ lệ",
@@ -628,5 +639,21 @@
         "Date": "Ngày",
         "Place": "Địa điểm",
         "CampaignDefault": "Chiến dịch mặc định"
+    },
+    "TransactionLog": {
+        "Title": "Quản trị Log",
+        "TransactionType": "Loại giao dịch",
+        "ObjectID": "ID của đối tượng",
+        "Username": "Tài khoản",
+        "Date": "Thời gian",
+        "Status": "Trạng thái",
+        "SearchPlaceholder": "Nhập ID đối tượng",
+        "Old": "Cũ",
+        "New": "Mới",
+        "TitleDetail": "Chi tiết Log"
+    },
+    "Filter": {
+        "AllCampaign": "Tất cả chiến dịch",
+        "CampaignDefault": "Chiến dịch mặc định"
     }
 }