awing-library 2.1.2-dev.6 → 2.1.2-dev.60

package/dist/index.d.ts

@@ -22,7 +22,8 @@ import { IMonacoEditorProps as IMonacoEditorProps$1 } from 'AWING/MonacoEditor';
 import { IMultipleHierarchicalChoiceInput as IMultipleHierarchicalChoiceInput$1, IMultipleHierarchicalChoiceProps as IMultipleHierarchicalChoiceProps$1 } from 'AWING/MultipleHierarchicalChoice';
 import { DataGridSortType as DataGridSortType$1 } from 'Commons/Enums';
 import { DatePickerProps as DatePickerProps$1 } from '@mui/x-date-pickers/DatePicker';
-import { ObjectInputType, PagingQueryInput, EnumTypeConvert, DateTime, ObjectTypeCode, PagingType } from 'Features/types';
+import { Dayjs } from 'dayjs';
+import { ObjectInputType, CustomPagingRequestInput, PagingQueryInput, EnumTypeConvert, DateTime, ObjectTypeCode, PagingType } from 'Features/types';
 export { ObjectTypeCode, PagingQueryInput } from 'Features/types';
 import { SchemaServices as SchemaServices$1 } from 'Features/SYSTEM/Schema';
 import { CurrentWorkspace as CurrentWorkspace$1, Workspace as Workspace$4 } from 'Features/SYSTEM/types';
@@ -41,7 +42,7 @@ import * as i18next from 'i18next';
 import { i18n as i18n$1 } from 'i18next';
 import { Timestamp as Timestamp$1 } from 'Commons/Types';
 import { ChannelType as ChannelType$1, ObjectConfigType, ContentType } from 'Features/NOTIFICATION/enums';
-import { OutputFieldPermission as OutputFieldPermission$3 } from 'Features/NOTIFICATION/SubscriptionConfig';
+import { OutputFieldPermission as OutputFieldPermission$4 } from 'Features/NOTIFICATION/SubscriptionConfig';
 import { Atom } from 'jotai';
 import { Directory as Directory$3 } from 'AWING/index';
 import { DirectoryAddOrEditServices as DirectoryAddOrEditServices$1 } from 'AWING/DirectoryForm';
@@ -724,7 +725,7 @@ interface RowActionDefinition<T> {
     /**
      * Hành động thực hiện khi nhấn nút
      */
-    action(id: string | number): void;
+    action(id: string | number, row?: T): void;
     isShouldHideActions?: (row: T) => boolean;
     sx?: SxProps<Theme>;
 }
@@ -848,8 +849,9 @@ interface DateRangePickerOldProps {
 
 declare function Container$3(props: DateRangePickerOldProps): react_jsx_runtime.JSX.Element;
 
-interface DatePickerProps extends DatePickerProps$1 {
-    label?: string;
+interface DatePickerProps extends Omit<DatePickerProps$1, 'value' | 'onChange'> {
+    value?: Dayjs | null;
+    onChange?: (value: Dayjs | null) => void;
 }
 
 declare const Container$2: (props: DatePickerProps) => react_jsx_runtime.JSX.Element;
@@ -872,7 +874,7 @@ interface DateRangePickerProps {
         endDate: Date;
     };
     onChange: (dateRange: DateRange) => void;
-    textFieldProps?: Pick<TextFieldProps, 'size' | 'fullWidth' | 'classes' | 'className' | 'sx'>;
+    textFieldProps?: Pick<TextFieldProps, 'size' | 'fullWidth' | 'classes' | 'className' | 'sx' | 'required' | 'error' | 'helperText' | 'disabled'>;
     options?: OptionsDateRangePickerProps;
     variant?: 'standard' | 'outlined' | 'filled';
 }
@@ -981,7 +983,7 @@ type DirectoryInput = ObjectInputType<{
 
 declare const CreateDirectory: (props: DirectoryProps) => react_jsx_runtime.JSX.Element;
 
-type ObjectDefinition$4 = {
+type ObjectDefinition$5 = {
     id?: number;
     objectTypeCode?: string;
     fieldName?: string;
@@ -994,34 +996,31 @@ type SchemaObjectDefinition = {
     clone?: SchemaObjectDefinition;
     id?: number;
     isReadOnly?: boolean;
-    objectDefinition?: ObjectDefinition$4;
+    objectDefinition?: ObjectDefinition$5;
     objectDefinitionId?: number;
     schemaId?: number;
 };
-type Schema$1 = {
+type Schema = {
     id?: number;
     name?: string;
     objectTypeCode?: string;
     schemaObjectDefinitions?: Array<SchemaObjectDefinition>;
     workspaceId?: number;
     isRoot?: boolean;
+    versionId?: number;
 };
-type SchemaInput = ObjectInputType<Schema$1>;
+type SchemaInput = ObjectInputType<Schema>;
 
 type SchemaServices = {
-    /** Get Schemas
-     * @param p - PagingQueryInput<Schema> - Không truyền param sẽ lấy tất cả Schema
-     */
-    getSchemas: (p?: PagingQueryInput<Schema$1>) => Promise<{
-        items: Schema$1[];
+    getSchemas: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
+        items: Schema[];
         total: number;
     }>;
-    /** Get Schemas
-     * @param p - PagingQueryInput<Schema> - Không truyền param sẽ lấy tất cả Schema
-     */
     getSchemaById: (p: {
         id: number;
-    }) => Promise<Schema$1>;
+    }) => Promise<Schema>;
     /** Delete Schema */
     deleteSchema: (p: {
         id: number;
@@ -1029,8 +1028,8 @@ type SchemaServices = {
     /** Get Object Definition
      * @param p - PagingQueryInput<ObjectDefinition> - Không truyền param sẽ lấy tất cả ObjectDefinition
      */
-    getObjectDefinitions: (p?: PagingQueryInput<ObjectDefinition$4>) => Promise<{
-        items: ObjectDefinition$4[];
+    getObjectDefinitions: (p?: PagingQueryInput<ObjectDefinition$5>) => Promise<{
+        items: ObjectDefinition$5[];
         total: number;
     }>;
     /** Creat new Schema */
@@ -1041,6 +1040,7 @@ type SchemaServices = {
     updateSchema: (p: {
         input: SchemaInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
 };
 
@@ -1054,12 +1054,12 @@ type CurrentWorkspace = {
     name?: string;
     type?: string;
     url?: string;
-    defaultSchemas?: Schema$1[];
+    defaultSchemas?: Schema[];
 };
 type Workspace$3 = {
     customerId?: number;
     customerType?: string;
-    defaultSchemas?: Array<Schema$1>;
+    defaultSchemas?: Array<Schema>;
     description?: string;
     id?: number;
     isJoinNetwork?: boolean;
@@ -1540,7 +1540,7 @@ interface PageManagementProps<T> extends CombinedProps<T> {
     loading: boolean;
     onCreateButtonClick?: () => void;
     onCreateFolderButtonClick?: () => void;
-    onDelete?: (id: ReturnType<NonNullable<this['getRowId']>>) => Promise<void>;
+    onDelete?: (id: ReturnType<NonNullable<this['getRowId']>>, row?: T) => Promise<void>;
     showNotificationSuccess?: () => void;
     confirmDelete?: (f: () => void) => void;
     customActions?: ReactNode;
@@ -1745,7 +1745,7 @@ interface ColumnDefinition<T extends object> {
 type TableEditableProps<T> = {
     columnDefinitions: Array<ColumnDefinition<Partial<T>>>;
     items: Array<Partial<T>>;
-    onChange(newData: Array<Partial<T>>, dataValid: boolean): void;
+    onChange(newData: Array<Partial<T>>, dataValid: boolean, fieldName?: keyof T): void;
     getRowId?(obj: Partial<T>): number;
     selected?: number[];
     onSelectedChange?(ids: number[]): void;
@@ -1755,6 +1755,10 @@ type TableEditableProps<T> = {
     spanningRows?: ReactNode[];
     selectionActions?: SelectionActionDefinition[];
     mergeRowsBy?: string;
+    observation?: {
+        objObserve: Array<keyof T>;
+        callback: (fieldName?: keyof T, columnValue?: unknown, index?: number) => void;
+    }[];
 };
 interface TopBarActionsProps {
     selected: number[];
@@ -1838,13 +1842,20 @@ interface ModalDrawerProps extends Omit<DrawerBaseProps, 'open'> {
     onSubmit?: () => Promise<any> | void;
     onClose?: () => void;
 }
+interface DrawerHandle {
+    handleClose: () => void;
+    handleSubmit: () => void;
+    closeDrawer: (action?: string) => void;
+}
 declare const enum CloseAction {
     Reload = "Reload",
     Close = "Close",
     ReloadDirectory = "ReloadDirectory"
 }
 
-declare const DrawerWrapper: (props: ModalDrawerProps) => react_jsx_runtime.JSX.Element;
+declare const DrawerWrapper: (props: ModalDrawerProps & {
+    ref?: React__default.Ref<DrawerHandle>;
+}) => react_jsx_runtime.JSX.Element;
 
 interface EnhancedDialogProps {
     title?: string;
@@ -1929,7 +1940,7 @@ type Timestamp = {
     seconds: number;
     nanos?: number;
 };
-type ObjectDefinition$3 = {
+type ObjectDefinition$4 = {
     id: number;
     objectTypeCode?: string;
     fieldName?: string;
@@ -2080,7 +2091,7 @@ interface PagedList_1OfNotificationMessage {
 
 declare const Notifications: (props: LayoutNotificationProps) => react_jsx_runtime.JSX.Element;
 
-type NotificationConfigDetail$2 = {
+type NotificationConfigDetail$1 = {
     channelType?: string;
     email?: string;
     objectFilterId?: number;
@@ -2095,7 +2106,7 @@ type SubscriptionConfig$1 = {
     id: number;
     name?: string;
     objectType: string;
-    outputFieldPermission?: OutputFieldPermission$3;
+    outputFieldPermission?: OutputFieldPermission$4;
     scheduleExpression: string;
     scheduleIntervalDaysOfMonth?: string;
     scheduleIntervalDaysOfWeek?: string;
@@ -2142,7 +2153,7 @@ type UserGroup = {
     description?: string;
     id: number;
     name?: string;
-    notificationConfigDetails: Array<NotificationConfigDetail$2>;
+    notificationConfigDetails: Array<NotificationConfigDetail$1>;
     roleAuthens: Array<RoleAuthen>;
     subscriptionConfigDetails: Array<SubscriptionConfigDetail$3>;
     userGroupDetails: Array<UserGroupDetail>;
@@ -2155,8 +2166,8 @@ type ObjectFilter$2 = {
     logicalExpression?: string;
     objectTypeCode?: string;
     name?: string;
-    notificationConfigDetails?: Array<NotificationConfigDetail$2>;
-    outputFieldPermission?: OutputFieldPermission$3;
+    notificationConfigDetails?: Array<NotificationConfigDetail$1>;
+    outputFieldPermission?: OutputFieldPermission$4;
     subscriptionConfigDetails?: Array<SubscriptionConfigDetail$3>;
     workspaceSharings?: Array<WorkspaceSharing$1>;
 };
@@ -2177,18 +2188,18 @@ type WorkflowState$1 = {
     value?: number;
     workflowId?: number;
 };
-type ObjectDefinition$2 = {
+type ObjectDefinition$3 = {
     fieldName?: string;
     fieldPath?: string;
-    objectTypeCode?: string;
+    baseObjectTypeCode?: string;
 };
-type ObjectDefinitionWithPermission$2 = {
+type ObjectDefinitionWithPermission$3 = {
     permission?: number;
-    objectDefinition?: ObjectDefinition$2;
+    objectDefinition?: ObjectDefinition$3;
 };
-type OutputFieldPermission$2 = {
+type OutputFieldPermission$3 = {
     currentWorkflowState?: WorkflowState$1;
-    objectDefinitionWithPermissions?: Array<ObjectDefinitionWithPermission$2>;
+    objectDefinitionWithPermissions?: Array<ObjectDefinitionWithPermission$3>;
     targetWorkflowStates?: Array<WorkflowState$1>;
 };
 type SubscriptionConfigDetail$2 = {
@@ -2205,7 +2216,7 @@ type SubscriptionConfigDetail$2 = {
 type SubscriptionConfigsType = {
     id?: number;
     name?: string;
-    objectType?: string;
+    baseObjectType?: string;
     scheduleExpression?: string;
     scheduleIntervalDaysOfMonth?: string;
     scheduleIntervalDaysOfWeek?: string;
@@ -2216,7 +2227,8 @@ type SubscriptionConfigsType = {
     status?: boolean;
     scheduleType?: ScheduleType;
     details?: Array<SubscriptionConfigDetail$2>;
-    outputFieldPermission?: OutputFieldPermission$2;
+    outputFieldPermission?: OutputFieldPermission$3;
+    versionId?: number;
 };
 type SubscriptionConfigDetailRequestGqlInput = {
     channelType?: string;
@@ -2233,7 +2245,7 @@ type KeyValueSubscriptionConfigDetailRequestGqlInput = {
 };
 type SubscriptionConfigRequestGqlInput = {
     name?: string;
-    objectType?: string;
+    baseObjectType?: string;
     scheduleExpression?: string;
     scheduleIntervalDaysOfMonth?: string;
     scheduleIntervalDaysOfWeek?: string;
@@ -2249,7 +2261,9 @@ type SubscriptionConfigRequestGqlInput = {
 };
 
 type SubscriptionConfigServices = {
-    getSubscriptionConfigs: (p?: PagingQueryInput<SubscriptionConfigsType>) => Promise<{
+    getSubscriptionConfigs: (p: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         items: SubscriptionConfigsType[];
         total: number;
     }>;
@@ -2265,6 +2279,7 @@ type SubscriptionConfigServices = {
     updateSubscriptionConfig: (p: {
         input: SubscriptionConfigRequestGqlInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
     getObjectFilter: () => Promise<{
         items: ObjectFilter$2[];
@@ -2289,15 +2304,6 @@ declare function SubscriptionConfig(props: {
     objectTypeCodes: ObjectTypeCode[];
 }): react_jsx_runtime.JSX.Element;
 
-type NotificationConfig$1 = {
-    id?: number;
-    name?: string;
-    baseObjectType?: string;
-    transactionType?: string;
-    status?: boolean;
-    details?: Array<NotificationConfigDetail$2>;
-    outputFieldPermission?: OutputFieldPermission$2;
-};
 declare enum ChannelType {
     Email = "EMAIL",
     InApp = "IN_APP",
@@ -2332,12 +2338,15 @@ type NotificationConfigType = {
     baseObjectType?: string;
     transactionType?: string;
     status?: boolean;
-    details?: NotificationConfigDetail$2[];
-    outputFieldPermission?: OutputFieldPermission$2;
+    details?: NotificationConfigDetail$1[];
+    outputFieldPermission?: OutputFieldPermission$3;
+    versionId?: number;
 };
 
 type NotificationConfigServices = {
-    getNotificationConfigs: (p?: PagingQueryInput<NotificationConfig$1>) => Promise<{
+    getNotificationConfigs: (p: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         items: NotificationConfigType[];
         total: number;
     }>;
@@ -2369,6 +2378,7 @@ type NotificationConfigServices = {
     updateNotificationConfig: (p: {
         notificationConfig: NotificationConfigInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
 };
 
@@ -2378,21 +2388,21 @@ type NotificationConfigProps = NotificationConfigServices & {
 };
 declare function NotificationConfig(props: NotificationConfigProps): react_jsx_runtime.JSX.Element;
 
-type NotificationConfigDetail$1 = {
+type NotificationConfigDetail = {
     id?: number;
 };
-type ObjectDefinition$1 = {
+type ObjectDefinition$2 = {
     fieldName?: string;
     fieldPath?: string;
     id?: number;
     objectTypeCode?: string;
 };
-type ObjectDefinitionWithPermission$1 = {
-    objectDefinition?: ObjectDefinition$1;
+type ObjectDefinitionWithPermission$2 = {
+    objectDefinition?: ObjectDefinition$2;
     permission?: number;
 };
-type OutputFieldPermission$1 = {
-    objectDefinitionWithPermissions?: Array<ObjectDefinitionWithPermission$1>;
+type OutputFieldPermission$2 = {
+    objectDefinitionWithPermissions?: Array<ObjectDefinitionWithPermission$2>;
 };
 type SubscriptionConfigDetail$1 = {
     id?: number;
@@ -2407,10 +2417,11 @@ type ObjectFilter$1 = {
     logicalExpression?: string;
     name?: string;
     objectTypeCode?: string;
-    outputFieldPermission?: OutputFieldPermission$1;
-    notificationConfigDetails?: Array<NotificationConfigDetail$1>;
+    outputFieldPermission?: OutputFieldPermission$2;
+    notificationConfigDetails?: Array<NotificationConfigDetail>;
     subscriptionConfigDetails?: Array<SubscriptionConfigDetail$1>;
     workspaceSharings?: Array<WorkspaceSharing>;
+    versionId?: number;
 };
 type ObjectFilterInput = {
     configType?: string;
@@ -2418,7 +2429,7 @@ type ObjectFilterInput = {
     name?: string;
     objectTypeCode?: string;
 };
-type LogicExpressionsStructure = {
+type LogicExpressionsStructure$1 = {
     objectStructures?: {
         [key: string]: ObjectStructure$1[];
     };
@@ -2426,10 +2437,9 @@ type LogicExpressionsStructure = {
 };
 
 type ObjectFilterServices = {
-    /** Get Paging ObjectFilter
-     * @param p - PagingQueryInput<ObjectFilter>
-     */
-    getObjectFilters: (p: PagingQueryInput<ObjectFilter$1>) => Promise<{
+    getObjectFilters: (p: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         items: ObjectFilter$1[];
         totalCount: number;
     }>;
@@ -2451,18 +2461,104 @@ type ObjectFilterServices = {
     updateObjectFilter: (p: {
         input: ObjectFilterInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
 };
 
-declare const NotificationFilter: (props: ObjectFilterServices & {
+declare const NotificationFilter$1: (props: ObjectFilterServices & {
     objectTyeCodes: EnumTypeConvert[];
-    objectConfigTypes: EnumTypeConvert[];
-    logicExpressionsStructure: LogicExpressionsStructure;
+    logicExpressionsStructure: LogicExpressionsStructure$1;
 }) => react_jsx_runtime.JSX.Element;
 
-type NotificationConfigDetail = {
+type GraphQLQuery = {
     id?: number;
+    name?: string;
+    baseObjectType?: string;
+    directoryPath?: string;
+    queryString?: string;
+    resultExpression?: string;
+    graphqlVariables?: {
+        id?: string;
+        name?: string;
+        type?: string;
+        value?: string;
+    };
+};
+
+type ObjectDefinition$1 = {
+    fieldName?: string;
+    fieldPath?: string;
+    id?: number;
+    objectTypeCode?: string;
+};
+type ObjectDefinitionWithPermission$1 = {
+    objectDefinition?: ObjectDefinition$1;
+    permission?: number;
+};
+type OutputFieldPermission$1 = {
+    objectDefinitionWithPermissions?: Array<ObjectDefinitionWithPermission$1>;
+};
+type NotificationFilter = {
+    directoryPath?: string;
+    id?: number;
+    graphQLQuery?: GraphQLQuery;
+    logicalExpression?: string;
+    name?: string;
+    outputFieldPermission?: OutputFieldPermission$1;
+    versionId?: number;
+};
+type NotificationFilterInput = {
+    graphqlQueryId?: number;
+    id?: number;
+    logicalExpression?: string;
+    name?: string;
+    parentDirectoryPath?: string;
+    sagaTransactionId?: number;
 };
+type LogicExpressionsStructure = {
+    objectStructures?: {
+        [key: string]: ObjectStructure$1[];
+    };
+    functionStructures?: FunctionStructure$1[];
+};
+
+type NotificationFilterServices = {
+    getNotificationFilters: (p: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
+        items: NotificationFilter[];
+        totalCount: number;
+    }>;
+    /** Delete */
+    deleteNotificationFilter: (p: {
+        id: number;
+    }) => Promise<void>;
+    /** Get by Id */
+    getNotificationFilterById: (p: {
+        id: number;
+    }) => Promise<{
+        notificationFilter?: NotificationFilter;
+    }>;
+    /** Create */
+    createNotificationFilter: (p: {
+        input: NotificationFilterInput;
+    }) => Promise<void>;
+    /** Update */
+    updateNotificationFilter: (p: {
+        input: NotificationFilterInput;
+        id: number;
+        versionId?: number;
+    }) => Promise<void>;
+    getGraphQLQueries: (p: CustomPagingRequestInput) => Promise<{
+        items: GraphQLQuery[];
+        totalCount: number;
+    }>;
+};
+
+declare const FilterNotification: (props: NotificationFilterServices & {
+    logicExpressionsStructure: LogicExpressionsStructure;
+}) => react_jsx_runtime.JSX.Element;
+
 type SchemaDetail = {
     id?: number;
 };
@@ -2483,9 +2579,6 @@ type ObjectDefinitionWithPermission = {
 type OutputFieldPermission = {
     objectDefinitionWithPermissions?: Array<ObjectDefinitionWithPermission>;
 };
-type Schema = {
-    id?: number;
-};
 type SubscriptionConfigDetail = {
     id?: number;
 };
@@ -2496,13 +2589,12 @@ type Template$1 = {
     contentType?: string;
     id?: number;
     name?: string;
-    notificationConfigDetails?: Array<NotificationConfigDetail>;
-    objectType?: string;
+    graphQLQuery?: GraphQLQuery;
+    graphqlQueryId?: number;
     outputFieldPermission?: OutputFieldPermission;
-    schema?: Schema;
-    schemaId?: number;
     subscriptionConfigDetails?: Array<SubscriptionConfigDetail>;
     title?: string;
+    versionId?: number;
 };
 type TemplateInput = {
     channelType?: string;
@@ -2510,7 +2602,7 @@ type TemplateInput = {
     content?: string;
     contentType?: string;
     name?: string;
-    objectType?: string;
+    graphqlQueryId?: number;
     schemaId?: number;
     title?: string;
 };
@@ -2526,7 +2618,9 @@ type TemplateServices = {
     /** Get Roles
      * @param p - PagingQueryInput<Role> - Không truyền param sẽ lấy tất cả Role
      */
-    getTemplates: (p?: PagingQueryInput<Template$1>) => Promise<{
+    getTemplates: (p: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         items: Template$1[];
         totalCount: number;
     }>;
@@ -2542,8 +2636,7 @@ type TemplateServices = {
         id: number;
     }) => Promise<Template$1>;
     getObjectDefinitions: (p?: PagingQueryInput<ObjectDefinition>) => Promise<{
-        items: ObjectDefinition[];
-        totalCount: number;
+        data: ObjectDefinition[];
     }>;
     createTemplate: (p: {
         input: TemplateInput;
@@ -2551,12 +2644,16 @@ type TemplateServices = {
     updateTemplate: (p: {
         input: TemplateInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
+    getGraphQLQueries: (p: CustomPagingRequestInput) => Promise<{
+        items: GraphQLQuery[];
+        totalCount: number;
+    }>;
 };
 
 type TemplateProps = {
     services: TemplateServices;
-    objectTypeCodes: ObjectTypeCode[];
 };
 declare function Template(props: TemplateProps): react_jsx_runtime.JSX.Element;
 
@@ -2565,6 +2662,7 @@ type RoleTag$3 = {
     id?: number;
     name?: string;
     workspaceId?: number;
+    versionId?: number;
 };
 type Role$1 = Role;
 type RoleTagInput = {
@@ -2577,17 +2675,15 @@ type RoleTagInput = {
 };
 
 type RoleTagServices = {
-    /** Get Roles
-     * @param p - PagingQueryInput<Role> - Không truyền param sẽ lấy tất cả Role
-     */
-    getRoles: (p?: PagingQueryInput<Role$1>) => Promise<{
+    getRoles: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         roles: Role$1[];
         total: number;
     }>;
-    /** Get RoleTags
-     * @param p - PagingQueryInput<RoleTag> - Không truyền param sẽ lấy tất cả RoleTag
-     */
-    getRoleTags: (p?: PagingQueryInput<RoleTag$3>) => Promise<{
+    getRoleTags: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         roleTags: RoleTag$3[];
         total: number;
     }>;
@@ -2606,6 +2702,7 @@ type RoleTagServices = {
     updateRoleTag: (p: {
         input: RoleTagInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
 };
 
@@ -2618,6 +2715,7 @@ type Role = {
     name?: string;
     roleTags?: Array<RoleTag$2>;
     workspaceId?: number;
+    versionId?: number;
 };
 type RoleTag$2 = RoleTag$3;
 type RoleInput = {
@@ -2627,17 +2725,15 @@ type RoleInput = {
 };
 
 type RoleServices = {
-    /** Get Roles
-     * @param p - PagingQueryInput<Role> - Không truyền param sẽ lấy tất cả Role
-     */
-    getRoles: (p?: PagingQueryInput<Role>) => Promise<{
+    getRoles: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         roles: Role[];
         total: number;
     }>;
-    /** Get RoleTags
-     * @param p - PagingQueryInput<RoleTag> - Không truyền param sẽ lấy tất cả RoleTag
-     */
-    getRoleTags: (p?: PagingQueryInput<RoleTag$2>) => Promise<{
+    getRoleTags: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         roleTags: RoleTag$2[];
         total: number;
     }>;
@@ -2656,6 +2752,7 @@ type RoleServices = {
     updateRole: (p: {
         input: RoleInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
 };
 
@@ -2673,13 +2770,13 @@ type Sharing$1 = {
     name?: string;
     objectFilter?: ObjectFilter;
     objectFilterId: number;
-    schema?: Schema$1;
+    schema?: Schema;
     schemaId?: number;
-    sharingWorkspaces: Array<SharingWorkspace>;
-    totalTargetWorkspace: number;
+    sharingWorkspaces?: Array<SharingWorkspace>;
     workspaceId: number;
     folderSourceDirectoryId?: number;
     key?: string;
+    versionId?: number;
 };
 type ObjectFilter = {
     configType?: string;
@@ -2734,13 +2831,7 @@ type SharingInput = {
     folderSourceDirectoryId?: number;
     targetWorkspaceId?: number;
     sharingWorkspaces?: Array<ObjectDataInputOfSharingWorkspaceInput>;
-};
-type GetPagingInWorkspaceRequestGqlInput = {
-    objectTypeCode?: string;
-    pageIndex?: number;
-    pageSize?: number;
-    search?: string;
-    workspaceId?: number;
+    versionId?: number;
 };
 interface SharingProps {
     getSharingById: (p: {
@@ -2752,14 +2843,16 @@ interface SharingProps {
     updateWorkspaceSharing: (p: {
         id: number;
         input: SharingInput;
+        versionId?: number;
     }) => Promise<void>;
     getSharings: (p?: {
-        GetPagingInWorkspaceRequestGqlInput: GetPagingInWorkspaceRequestGqlInput;
+        input: CustomPagingRequestInput;
+        objectTypeCode?: string;
     }) => Promise<{
         sharings: Sharing$1[];
         total: number;
     }>;
-    getSchemas: () => Promise<Schema$1[]>;
+    getSchemas: () => Promise<Schema[]>;
     getWorkspaces: () => Promise<Workspace$3[]>;
     getWorkspaceById: (p: {
         id: number;
@@ -2768,7 +2861,8 @@ interface SharingProps {
         id: number;
     }) => Promise<void>;
     getObjectFilters: () => Promise<ObjectFilter[]>;
-    getDirectories: (params?: PagingQueryInput<Directory$3> & {
+    getDirectories: (params?: {
+        input?: CustomPagingRequestInput;
         parentDirectoryId?: number;
         workspaceId?: number;
         depthFromRoot?: number;
@@ -2797,6 +2891,7 @@ type Group$1 = {
     roleAuthens?: RoleAuthens$1[];
     workspaceId?: number;
     isSystem?: boolean;
+    versionId?: number;
 };
 type GroupInput = {
     description?: string;
@@ -2866,13 +2961,16 @@ type User$1 = {
     groups?: number[];
     roleAuthens?: Array<RoleAuthens>;
     username?: string;
+    versionId?: number;
 };
 
 type GroupServices = {
     /** Get RoleTags
      * @param p - PagingQueryInput<RoleTag> - Không truyền param sẽ lấy tất cả RoleTag
      */
-    getRoleTags: (p?: PagingQueryInput<RoleTag$1>) => Promise<{
+    getRoleTags: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         roleTags: RoleTag$1[];
         total: number;
     }>;
@@ -2883,10 +2981,9 @@ type GroupServices = {
         users: User$1[];
         total: number;
     }>;
-    /** Get Groups
-     * @param p - PagingQueryInput<Group> - Không truyền param sẽ lấy tất cả Group
-     */
-    getGroups: (p?: PagingQueryInput<Group$1>) => Promise<{
+    getGroups: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         groups: Group$1[];
         total: number;
     }>;
@@ -2905,6 +3002,7 @@ type GroupServices = {
     updateGroup: (p: {
         input: GroupInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
     /** Loading khi lấy dữ liệu */
     isLoading: boolean;
@@ -2926,7 +3024,9 @@ type UserServices = {
     /** Get Users
      * @param p - PagingQueryInput<Users> - Không truyền param sẽ lấy tất cả Users
      */
-    getUsers: (p?: PagingQueryInput<User$1>) => Promise<{
+    getUsers: (p?: {
+        input: CustomPagingRequestInput;
+    }) => Promise<{
         users: User$1[];
         total: number;
     }>;
@@ -2941,6 +3041,7 @@ type UserServices = {
     updateUser: (p: {
         user: UserInput;
         id: number;
+        versionId?: number;
     }) => Promise<void>;
     /** Delete User by ID */
     deleteUser: (p: {
@@ -2977,6 +3078,7 @@ type Workflow = {
     description?: string;
     workflowMatrices: Array<WorkflowMatrix>;
     workflowStates: Array<WorkflowState>;
+    versionId?: number;
 };
 type WorkflowMatrix = {
     id: number;
@@ -2999,9 +3101,11 @@ type WorkflowState = {
 
 type WorkflowFeatureProps = {
     getById: (id: number) => Promise<Workflow>;
-    getPaging: (queryInput: PagingQueryInput<Workflow>) => Promise<PagingType<Workflow>>;
+    getPaging: (queryInput: {
+        input: CustomPagingRequestInput;
+    }) => Promise<PagingType<Workflow>>;
     create: (workflow: ObjectInputType<Workflow>) => Promise<void>;
-    update: (id: number, workflow: ObjectInputType<Workflow>) => Promise<void>;
+    update: (id: number, workflow: ObjectInputType<Workflow>, versionId?: number) => Promise<void>;
     remove: (id: number) => Promise<void>;
     objectTypeCodeMap: {
         value: string;
@@ -3017,7 +3121,8 @@ type DirectoryServices = DirectoryAddOrEditServices$1 & DirectoryPermissionServi
     /** Get Directories
      * @params PagingQueryInput<Directory> - Không truyền param sẽ lấy tất cả
      */
-    getDirectories: (params?: PagingQueryInput<Directory> & {
+    getDirectories: (params?: {
+        input?: CustomPagingRequestInput;
         parentDirectoryId?: number;
         workspaceId?: number;
         depthFromRoot?: number;
@@ -3036,7 +3141,7 @@ type DirectorySystemProps = DirectoryServices & {
     currentWorkspace?: CurrentWorkspace;
     objectTypeCodes?: ObjectTypeCode[];
 };
-declare const DirectorySystem: (props: DirectorySystemProps) => react_jsx_runtime.JSX.Element;
+declare const DirectorySystem: (props: DirectorySystemProps) => react_jsx_runtime.JSX.Element | null;
 
 declare function Sharing(props: SharingProps): react_jsx_runtime.JSX.Element;
 
@@ -3104,7 +3209,8 @@ declare function parseJSON(str: string): any;
  * Xử lý các thao tác số học và toán học một cách tiện lợi.
  * Hỗ trợ các phép toán phức tạp hoặc tối ưu hóa các logic tính toán thường dùng.
  */
-declare function formatNumber(num: number | bigint | string | undefined): string;
+type Locale = 'vi' | 'en' | 'ja' | 'th' | 'id';
+declare function formatNumberByLocale(value?: number | bigint, lang?: string, locale?: string): string;
 declare function roundDecimalNumber(number: any): string | null;
 declare function WMAPEcalculator(data: any): number | "∞";
 
@@ -3130,6 +3236,73 @@ declare function checkValidMacAddress(string?: string): boolean;
 declare function checkValidUrl(url: string | undefined): boolean;
 declare function validateNumber(value?: string | number): boolean;
 
+/**
+ * Available filter operation types
+ */
+declare enum FilterOperationType {
+    EQ = "eq",// Equal
+    CONTAINS = "contains",// Contains substring
+    STARTSWITH = "startswith",// Starts with
+    ENDSWITH = "endswith",// Ends with
+    GT = "gt",// Greater than
+    GTE = "gte",// Greater than or equal
+    LT = "lt",// Less than
+    LTE = "lte",// Less than or equal
+    IN = "in",// In array
+    BETWEEN = "between",// Between two values
+    NE = "ne",// Not equal
+    NOTCONTAINS = "notcontains",// Does not contain substring
+    NOTIN = "notin",// Not in array
+    CUSTOM = "custom"
+}
+/**
+ * Logical operators for combining filter conditions
+ */
+declare enum LogicalOperatorType {
+    AND = "and",
+    OR = "or",
+    NOT = "not"
+}
+/**
+ * Structure for a single filter item
+ */
+interface FilterItem {
+    key: string;
+    value: any;
+    type: FilterOperationType | string;
+    isArray?: boolean;
+}
+/**
+ * Structure for a filter group that can contain nested conditions
+ */
+interface FilterGroup {
+    operator: LogicalOperatorType;
+    filters: Array<FilterItem | FilterGroup>;
+}
+/**
+ * Filter expression can be either a single item or a group
+ */
+type FilterExpression = FilterItem | FilterGroup;
+/**
+ * Converts an array of filter objects to a string condition
+ * @param filters - Array of objects with key, value, and type properties
+ * @param defaultOperator - Default logical operator to use when combining filters (AND or OR)
+ * @returns Object with a 'condition' property containing the string condition and optional 'params' array
+ */
+declare function convertArrayFiltersToCondition(filters: Array<FilterItem>, defaultOperator?: LogicalOperatorType): {
+    condition: string;
+    params?: string[];
+} | null;
+/**
+ * Converts a complex filter expression to a string condition
+ * @param filterExpression - Filter expression (can be nested with logical operators)
+ * @returns Object with a 'condition' property containing the string condition and optional 'params' array
+ */
+declare function convertFilterExpressionToCondition(filterExpression: FilterExpression): {
+    condition: string;
+    params?: string[];
+} | null;
+
 type Workspace$1 = {
     customerId?: number;
     contactPhoneNumber?: string;
@@ -3246,4 +3419,4 @@ declare function ThemeProvider(props: {
     };
 }): react_jsx_runtime.JSX.Element;
 
-export { Container$4 as Action, type ActionsProps, AdvancedSearch, type AdvancedSearchField, type AdvancedSearchProps, type AnalyticDataProviderModel, AppContext, AppProvider, AsyncAutocomplete, type AsyncAutocompleteProps, type AsynchronousAutocompleteProps, AwingContext, BarLineChart, type BaseDirectoryPermission, type BaseFieldDefinition, type BaseFieldRender, type BinaryTreeNode, BoxResizableSplit, type BoxResizableSplitProps, ButtonDateRangePicker, type ButtonDateRangePickerProps, ButtonSelect, type ButtonSelectProps, type Cell, type CellDefinition, type ChartContentProps, CircularProgress, DrawerBase as ClassicBaseDrawer, DrawerWrapper as ClassicDrawer, CloseAction, type ColumnDefinition, type CombinedProps, ContentHeader, type OwnProps as ContentHeaderProps, ControlPanels, CopyButton, type CopyButtonProps, CronTab, type CronTabProps, type CronTabValue, type DataExportEntity, DataForm, type DataFormProps, DataGrid, type DataGridColumnDefinitionBase, DataGridGroup, type DataGridProps, DataGridSortType, InputFactory as DataInput, type DataSet, DateAutoFormat, type DateAutoFormatProps, Container$2 as DatePicker, type DatePickerProps, type DateRange, DateRangePicker, Container$3 as DateRangePickerOld, type DateRangePickerOldProps, type DateRangePickerProps, type DayInterval, type DayIntervalPickerProps, EnhancedDialog as DeprecatedEnhancedDialog, type Directory$2 as Directory, CreateDirectory as DirectoryForm, PermissionWarpper as DirectoryPermission, type DirectoryPermissionServices, type DirectoryProps, DirectoryRoot, DirectorySystem, DirectoryTree, type DirectoryTreeProps, DrawerWrapper$1 as Drawer, type DrawerBaseProps, DrawerNavigate, type DrawerNavigateProps, type DrawerProps, DrawerStateEnum, Container$1 as EnhancedAutoComplete, type EnhancedAutoCompleteProps, type EnhancedDialogProps, EnumFieldInputType, EnumSelectedPlaceType, FIELD_TYPE, type FieldDefinitionProps, type FileResponse, FilterTreeView, type FilterTreeViewProps, type FiltersType, FooterContainer as Footer, type FunctionStructure, GoogleMap, type GridSortDirection, type GridSortModel, type GroupComponentProps, type GroupFilter, GroupSystem, GroupTable, type GroupTableProps, type HeadCell, HierarchyTree, I18nProvider, type IChartJsContainer, type ICircularProgress, type IConfigChart, type IControlPanel, type DataGridGroupsProps as IDataGridGroups, type IDirectoryTreeViewProps, type IFilterField, type IGoogleMapProps, type IMenu, type IMonacoEditorProps, type IMultipleChoiceComponentProps, type IMultipleChoiceProps, type IMultipleHierarchicalChoice, type IMultipleHierarchicalChoiceInput, type IMultipleHierarchicalChoiceProps, type IMultipleSelect, INT_NUMBER_LIMIT, type IOption, type IPieContainer, type IStatisticsProps, type ITag, Container as Layout, Notifications as LayoutNotifications, LogicExpressionInput as LogicExpression, type LogicExpressionInputProps, MemoWrap, type MemoWrapProps, type MenuOption, type ModalDrawerProps, MonacoEditor, MultipleChoice, type MultipleHierarChicalChoiceComponentProps, MultipleHierarchicalChoice, NoData, NotificationConfig, NotificationFilter as NotificationObjectFilter, NumberFormat, type ObjectDefinition$3 as ObjectDefinition, type ObjectStructure, AsynchronousAutocomplete as OldAsyncAutoComplete, Page, PageManagement, type PageManagementProps, type PageProps, Pagination, type PermissionContainerProps, PieChart, PlaceFilter, type PlaceFilterProps, type QueryInput, type QueryInputStatistics, type Role, type RoleServices, RoleSystem, type RoleTag$3 as RoleTag, type RoleTagServices, RoleTagSystem, type Row, type RowActionDefinition, type RowId, type RowProps, type SchedulePermission, SchemaSystem, SearchBox, type SearchBoxProps, type SearchType, type SharingProps, Sharing as SharingSystem, ShowTreeItem, SimpleTreeItemWrapper, SortEnumType, Sortable, SortableTree, type SortableTreeProps, StatisticsCommon as Statistics, SubscriptionConfig, TIMELINE_TYPE, TYPE_CHART, TYPE_FILTERS, TabLabel, TableCellEditable, type TableCellEditableProps, TableEditable, TableEditableBody, type TableEditableBodyProps, type TableEditableProps, type TableGridProps, TableHeader, type TableHeaderProps, type TableLabelProps, TablePaginationActions, type TablePaginationActionsProps, Template as TemplateConfig, ThemeProvider, type Timestamp, ToolbarLayout as Toolbar, TopBarActions, type TopBarActionsProps, type TreeItem, type TreeItemOption, TreeItemWithAction, type TreeItemWithActionProps, type TreeItems, User as UserSystem, type Value, type ValueBase, WMAPEcalculator, WorkflowFeature as WorkflowSystem, WorkspaceType, Wrapper, arrayIsNotEmptyValid, calculateValue, calculatorDirectoryIdRoot, changeToAlias, checkValidMacAddress, checkValidStringListAP, checkValidUrl, colorValid, containsOnlyDigits, convertArrayToObject, convertDataSetPattern, convertDateTimeToTimestamp, convertFormulaToBinaryTree, convertTimeLine, convertTimelineToDateTime, convertTimestampToDateTime, convertToPostfix, darkTheme, dateRangeValid, dateTimeToString, dateToString, dateToStringDDMMYYYY, dateValid, download, downloadWithDataSet, emailValid, fillMissingDates, flattenTree, formatChartNumber, formatJSON, formatNumber, formatNumberWithLanguage, generateUUID, getCookie, getGUID, getPrecedence, getQueryVariable, getRandomKey, getRoutePath, getStartOfDay, getToday, handleExportExcel, i18n as i18nLib, isOperand, isOperator, lightTheme, nameExportStandard, notNullValid, numberNotNullValid, numberOnlyValid, numberPercentageNotNullValid, off, offlinePaginate, parseJSON, passwordValid, positiveNumberNotNullValid, pub, replaceFieldsValue, roundDecimalNumber, setObject, stringNotNullValid, stringNullableValid, sub, textValidation, timestampToStringDDMMYYYY, toCapitalize, tokenize, updateGUID, updateObjectFields, urlValid, useAppHelper, useAwing, useDrawer, useGetContext, useGetData, usePath, validateNumber };
+export { Container$4 as Action, type ActionsProps, AdvancedSearch, type AdvancedSearchField, type AdvancedSearchProps, type AnalyticDataProviderModel, AppContext, AppProvider, AsyncAutocomplete, type AsyncAutocompleteProps, type AsynchronousAutocompleteProps, AwingContext, BarLineChart, type BaseDirectoryPermission, type BaseFieldDefinition, type BaseFieldRender, type BinaryTreeNode, BoxResizableSplit, type BoxResizableSplitProps, ButtonDateRangePicker, type ButtonDateRangePickerProps, ButtonSelect, type ButtonSelectProps, type Cell, type CellDefinition, type ChartContentProps, CircularProgress, DrawerBase as ClassicBaseDrawer, DrawerWrapper as ClassicDrawer, CloseAction, type ColumnDefinition, type CombinedProps, ContentHeader, type OwnProps as ContentHeaderProps, ControlPanels, CopyButton, type CopyButtonProps, CronTab, type CronTabProps, type CronTabValue, type DataExportEntity, DataForm, type DataFormProps, DataGrid, type DataGridColumnDefinitionBase, DataGridGroup, type DataGridProps, DataGridSortType, InputFactory as DataInput, type DataSet, DateAutoFormat, type DateAutoFormatProps, Container$2 as DatePicker, type DatePickerProps, type DateRange, DateRangePicker, Container$3 as DateRangePickerOld, type DateRangePickerOldProps, type DateRangePickerProps, type DayInterval, type DayIntervalPickerProps, EnhancedDialog as DeprecatedEnhancedDialog, type Directory$2 as Directory, CreateDirectory as DirectoryForm, PermissionWarpper as DirectoryPermission, type DirectoryPermissionServices, type DirectoryProps, DirectoryRoot, DirectorySystem, DirectoryTree, type DirectoryTreeProps, DrawerWrapper$1 as Drawer, type DrawerBaseProps, type DrawerHandle, DrawerNavigate, type DrawerNavigateProps, type DrawerProps, DrawerStateEnum, Container$1 as EnhancedAutoComplete, type EnhancedAutoCompleteProps, type EnhancedDialogProps, EnumFieldInputType, EnumSelectedPlaceType, FIELD_TYPE, type FieldDefinitionProps, type FileResponse, type FilterExpression, type FilterGroup, type FilterItem, FilterNotification, FilterOperationType, FilterTreeView, type FilterTreeViewProps, type FiltersType, FooterContainer as Footer, type FunctionStructure, GoogleMap, type GridSortDirection, type GridSortModel, type GroupComponentProps, type GroupFilter, GroupSystem, GroupTable, type GroupTableProps, type HeadCell, HierarchyTree, I18nProvider, type IChartJsContainer, type ICircularProgress, type IConfigChart, type IControlPanel, type DataGridGroupsProps as IDataGridGroups, type IDirectoryTreeViewProps, type IFilterField, type IGoogleMapProps, type IMenu, type IMonacoEditorProps, type IMultipleChoiceComponentProps, type IMultipleChoiceProps, type IMultipleHierarchicalChoice, type IMultipleHierarchicalChoiceInput, type IMultipleHierarchicalChoiceProps, type IMultipleSelect, INT_NUMBER_LIMIT, type IOption, type IPieContainer, type IStatisticsProps, type ITag, Container as Layout, Notifications as LayoutNotifications, type Locale, LogicExpressionInput as LogicExpression, type LogicExpressionInputProps, LogicalOperatorType, MemoWrap, type MemoWrapProps, type MenuOption, type ModalDrawerProps, MonacoEditor, MultipleChoice, type MultipleHierarChicalChoiceComponentProps, MultipleHierarchicalChoice, NoData, NotificationConfig, NotificationFilter$1 as NotificationObjectFilter, NumberFormat, type ObjectDefinition$4 as ObjectDefinition, type ObjectStructure, AsynchronousAutocomplete as OldAsyncAutoComplete, Page, PageManagement, type PageManagementProps, type PageProps, Pagination, type PermissionContainerProps, PieChart, PlaceFilter, type PlaceFilterProps, type QueryInput, type QueryInputStatistics, type Role, type RoleServices, RoleSystem, type RoleTag$3 as RoleTag, type RoleTagServices, RoleTagSystem, type Row, type RowActionDefinition, type RowId, type RowProps, type SchedulePermission, SchemaSystem, SearchBox, type SearchBoxProps, type SearchType, type SharingProps, Sharing as SharingSystem, ShowTreeItem, SimpleTreeItemWrapper, SortEnumType, Sortable, SortableTree, type SortableTreeProps, StatisticsCommon as Statistics, SubscriptionConfig, TIMELINE_TYPE, TYPE_CHART, TYPE_FILTERS, TabLabel, TableCellEditable, type TableCellEditableProps, TableEditable, TableEditableBody, type TableEditableBodyProps, type TableEditableProps, type TableGridProps, TableHeader, type TableHeaderProps, type TableLabelProps, TablePaginationActions, type TablePaginationActionsProps, Template as TemplateConfig, ThemeProvider, type Timestamp, ToolbarLayout as Toolbar, TopBarActions, type TopBarActionsProps, type TreeItem, type TreeItemOption, TreeItemWithAction, type TreeItemWithActionProps, type TreeItems, User as UserSystem, type Value, type ValueBase, WMAPEcalculator, WorkflowFeature as WorkflowSystem, WorkspaceType, Wrapper, arrayIsNotEmptyValid, calculateValue, calculatorDirectoryIdRoot, changeToAlias, checkValidMacAddress, checkValidStringListAP, checkValidUrl, colorValid, containsOnlyDigits, convertArrayFiltersToCondition, convertArrayToObject, convertDataSetPattern, convertDateTimeToTimestamp, convertFilterExpressionToCondition, convertFormulaToBinaryTree, convertTimeLine, convertTimelineToDateTime, convertTimestampToDateTime, convertToPostfix, darkTheme, dateRangeValid, dateTimeToString, dateToString, dateToStringDDMMYYYY, dateValid, download, downloadWithDataSet, emailValid, fillMissingDates, flattenTree, formatChartNumber, formatJSON, formatNumberByLocale, formatNumberWithLanguage, generateUUID, getCookie, getGUID, getPrecedence, getQueryVariable, getRandomKey, getRoutePath, getStartOfDay, getToday, handleExportExcel, i18n as i18nLib, isOperand, isOperator, lightTheme, nameExportStandard, notNullValid, numberNotNullValid, numberOnlyValid, numberPercentageNotNullValid, off, offlinePaginate, parseJSON, passwordValid, positiveNumberNotNullValid, pub, replaceFieldsValue, roundDecimalNumber, setObject, stringNotNullValid, stringNullableValid, sub, textValidation, timestampToStringDDMMYYYY, toCapitalize, tokenize, updateGUID, updateObjectFields, urlValid, useAppHelper, useAwing, useDrawer, useGetContext, useGetData, usePath, validateNumber };