@mediusinc/mng-commons 0.4.6 → 0.6.1

package/lib/api/services/api.abstract.service.d.ts

@@ -7,7 +7,7 @@ export declare abstract class AMngBaseApiService {
     protected readonly objectSerializer: ObjectSerializer;
     protected constructor(http: HttpClient);
     protected abstract getBasePath(): string;
-    protected abstract getServiceBasePath(): string;
+    protected abstract getServiceBasePath(): string | null;
     protected getUrl(...pathSegments: Array<string>): string;
     protected serializeQueryParam(queryParam: MediusQueryParam, type?: string): any;
     protected deserializeQueryResult<QR>(item: any, qrType: ClassType<QR>): QR;

package/lib/api/services/crud-api.abstract.service.d.ts

@@ -1,16 +1,22 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { ClassType } from '../../types';
+import { ClassType, IdType } from '../../types';
 import { MediusQueryResult } from '../models';
 import { AMngGetAllApiService } from './get-all-api.abstract.service';
-export declare abstract class AMngCrudApiService<T, QRT extends MediusQueryResult<any>> extends AMngGetAllApiService<T, QRT> {
+export interface IMngCrudApiService<T> {
+    createPost?(item: T, params?: HttpParams): Observable<T>;
+    getByIdGet?(id: IdType, params?: HttpParams): Observable<T>;
+    updatePut?(id: IdType, item: T, params?: HttpParams): Observable<T>;
+    removeDelete?(id: IdType, item?: T, params?: HttpParams): Observable<T | null>;
+}
+export declare abstract class AMngCrudApiService<T, QRT extends MediusQueryResult<any>> extends AMngGetAllApiService<T, QRT> implements IMngCrudApiService<T> {
     protected constructor(type: ClassType<T>, queryResultType: ClassType<QRT>, http: HttpClient);
     createPost(item: T, params?: HttpParams): Observable<T>;
-    getByIdGet(id: any, params?: HttpParams): Observable<T>;
-    updatePut(id: any, item: T, params?: HttpParams): Observable<T>;
-    removeDelete(id: any, item?: T, params?: HttpParams): Observable<any>;
-    protected getCreatePostPath(): string;
-    protected getUpdatePutPath(id: any, item: T): string;
-    protected getGetByIdGetPath(id: any): string;
-    protected getRemoveDeletePath(id: any, item?: T): string;
+    getByIdGet(id: IdType, params?: HttpParams): Observable<T>;
+    updatePut(id: IdType, item: T, params?: HttpParams): Observable<T>;
+    removeDelete(id: IdType, item?: T, params?: HttpParams): Observable<T | null>;
+    protected getCreatePostPath(item: T): string;
+    protected getUpdatePutPath(id: IdType, item: T): string;
+    protected getGetByIdGetPath(id: IdType): string;
+    protected getRemoveDeletePath(id: IdType, item?: T): string;
 }

package/lib/components/action/action.component.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter, OnInit } from '@angular/core';
+import { EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { ConfirmationService } from 'primeng/api';
@@ -10,7 +10,7 @@ import { MngActionExecutorService, MngViewContainerComponentService } from '../.
 import { IdType } from '../../types';
 import { ActionData, ActionTriggerResult, IActionConfirmationService } from './models';
 import * as i0 from "@angular/core";
-export declare class MngActionComponent<T, S> implements OnInit, IActionConfirmationService {
+export declare class MngActionComponent<T, S> implements OnInit, OnChanges, OnDestroy, IActionConfirmationService {
     private route;
     private translate;
     private actionExecutor;
@@ -37,18 +37,29 @@ export declare class MngActionComponent<T, S> implements OnInit, IActionConfirma
     private loadingSubject;
     $loading: Observable<boolean>;
     cmpId: string;
+    private isVisibleSubject;
+    private isVisibleSubscription?;
     $isVisible: Observable<boolean>;
+    private isEnabledSubject;
+    private isEnabledSubscription?;
     $isEnabled: Observable<boolean>;
+    private labelSubject;
+    private labelSubscription?;
     $label: Observable<string | null>;
+    private tooltipSubject;
+    private tooltipSubscription?;
     $tooltip: Observable<string | null>;
     private viewContainer?;
     actionLink?: ActionLinkDescriptor<T>;
     hasNoTitle: boolean;
     constructor(route: ActivatedRoute, translate: TranslateService, actionExecutor: MngActionExecutorService, confirmationService: ConfirmationService, viewContainerService: MngViewContainerComponentService<T, S> | null);
     ngOnInit(): void;
+    ngOnChanges(changes: SimpleChanges): void;
+    ngOnDestroy(): void;
     triggerAction(event: Event): void;
     getConfirmationService(): ConfirmationService;
     getConfirmationServiceInstanceKey(action: ActionDescriptor<any>): string;
+    private processSubscriptions;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngActionComponent<any, any>, [null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MngActionComponent<any, any>, "mng-action", never, { "action": "action"; "item": "item"; "itemId": "itemId"; "actionData": "actionData"; "dataProvider": "dataProvider"; "inputDisabled": "disabled"; "inputLoading": "loading"; "viewContainerInit": "viewContainer"; }, { "triggerEventEmitter": "trigger"; }, never, never>;
 }

package/lib/components/action/models/action-execution.model.d.ts

@@ -2,9 +2,11 @@ import { Message } from 'primeng/api';
 import { DynamicDialogRef } from 'primeng/dynamicdialog';
 import { Observable } from 'rxjs';
 import { IDataProvider } from '../../../data-providers';
+import { ActionDescriptor } from '../../../descriptors';
 import { IViewContainer } from '../../../models';
 import { IdType } from '../../../types';
 export declare class ActionExecContext<T, S, DP extends IDataProvider<T, S>> {
+    readonly action: ActionDescriptor<T>;
     readonly dataProvider?: DP | undefined;
     readonly serviceInstance?: S | undefined;
     readonly data?: {
@@ -14,7 +16,7 @@ export declare class ActionExecContext<T, S, DP extends IDataProvider<T, S>> {
     } | undefined;
     readonly sourceComponent: any;
     readonly viewContainer: IViewContainer<T, S> | null;
-    constructor(dataProvider?: DP | undefined, serviceInstance?: S | undefined, data?: {
+    constructor(action: ActionDescriptor<T>, dataProvider?: DP | undefined, serviceInstance?: S | undefined, data?: {
         item?: T | undefined;
         itemId?: IdType | undefined;
         actionData?: ActionData | undefined;
@@ -28,10 +30,10 @@ export declare class ActionError {
 }
 export declare class ActionRunResult<T, S, DP extends IDataProvider<T, S>> {
     readonly context?: ActionExecContext<T, S, DP> | undefined;
-    readonly result?: T | undefined;
+    readonly result?: T | null | undefined;
     readonly error?: ActionError | undefined;
     notification?: Message;
-    constructor(context?: ActionExecContext<T, S, DP> | undefined, result?: T | undefined, error?: ActionError | undefined);
+    constructor(context?: ActionExecContext<T, S, DP> | undefined, result?: T | null | undefined, error?: ActionError | undefined);
 }
 export declare class ActionActivationResult<T, S, DP extends IDataProvider<T, S>> {
     readonly runResult?: ActionRunResult<T, S, DP> | undefined;

package/lib/components/form/formly/fields/formly-field-dropdown/formly-field-dropdown.component.d.ts

@@ -1,12 +1,14 @@
-import { OnInit } from '@angular/core';
+import { OnDestroy, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { FieldType } from '@ngx-formly/core';
 import { FieldLookupDescriptor } from '../../../../../descriptors';
 import * as i0 from "@angular/core";
-export declare class MngFormlyFieldDropdownComponent<T> extends FieldType implements OnInit {
+export declare class MngFormlyFieldDropdownComponent<T> extends FieldType implements OnInit, OnDestroy {
     dFormControl: FormControl;
     descriptor: FieldLookupDescriptor<T, any>;
+    private subscriptions;
     ngOnInit(): void;
+    ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngFormlyFieldDropdownComponent<any>, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MngFormlyFieldDropdownComponent<any>, "mng-formly-field-dropdown", never, {}, {}, never, never>;
 }

package/lib/components/form/formly/fields/formly-field-fieldset/formly-field-fieldset.component.d.ts

@@ -1,6 +1,12 @@
+import { OnInit } from '@angular/core';
 import { FieldType } from '@ngx-formly/core';
+import { FieldGroupDescriptor } from '../../../../../descriptors';
 import * as i0 from "@angular/core";
-export declare class MngFormlyFieldFieldsetComponent extends FieldType {
+export declare class MngFormlyFieldFieldsetComponent extends FieldType implements OnInit {
+    readonly typeFieldset = FieldGroupDescriptor.TypeEnum.Fieldset;
+    readonly typeLogical = FieldGroupDescriptor.TypeEnum.Logical;
+    descriptor?: FieldGroupDescriptor<any>;
+    ngOnInit(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngFormlyFieldFieldsetComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MngFormlyFieldFieldsetComponent, "mng-formly-field-fieldset", never, {}, {}, never, never>;
 }

package/lib/components/form/formly/fields/formly-field-input/formly-field-input.component.d.ts

@@ -1,12 +1,14 @@
-import { OnInit } from '@angular/core';
+import { OnDestroy, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { FieldType } from '@ngx-formly/core';
 import { FieldInputDescriptor } from '../../../../../descriptors';
 import * as i0 from "@angular/core";
-export declare class MngFormlyFieldInputComponent extends FieldType implements OnInit {
+export declare class MngFormlyFieldInputComponent extends FieldType implements OnInit, OnDestroy {
     iFormControl: FormControl;
     descriptor: FieldInputDescriptor<any>;
+    private subscriptions;
     ngOnInit(): void;
+    ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngFormlyFieldInputComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MngFormlyFieldInputComponent, "mng-formly-field-input", never, {}, {}, never, never>;
 }

package/lib/components/form/formly/fields/formly-field-label/formly-field-label.component.d.ts

@@ -0,0 +1,6 @@
+import * as i0 from "@angular/core";
+export declare class MngFormlyFieldLabelComponent {
+    className: string;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MngFormlyFieldLabelComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MngFormlyFieldLabelComponent, "mng-formly-field-label", never, {}, {}, never, never>;
+}

package/lib/components/form/formly/fields/index.d.ts

@@ -1,5 +1,6 @@
 export * from './formly-field-autocomplete/formly-field-autocomplete.component';
 export * from './formly-field-input/formly-field-input.component';
+export * from './formly-field-label/formly-field-label.component';
 export * from './formly-field-dropdown/formly-field-dropdown.component';
 export * from './formly-field-lookup-dialog/formly-field-lookup-dialog.component';
 export * from './formly-field-table-dialog-form/formly-field-table-dialog-form.component';

package/lib/components/tableview/table/table.component.d.ts

@@ -48,7 +48,7 @@ export declare class MngTableComponent<T, S> implements OnInit, AfterContentInit
     queryResult$?: Observable<MediusQueryResult<T>>;
     loading$?: Observable<boolean>;
     dataProviderInfiniteScrollItems: Array<T>;
-    readonly rowsPerPageOptions: number[];
+    rowsPerPageOptions: Array<number>;
     rows: number;
     offset: number;
     multiSortMeta: SortMeta[] | null;

package/lib/data-providers/editor.data-provider.d.ts

@@ -6,20 +6,20 @@ export interface IEditorDataProvider<T, S> extends IDataProvider<T, S> {
     fetch: (id: IdType, service?: S) => Observable<T>;
     create?: (item?: T, service?: S) => Observable<T>;
     update?: (id: IdType, item?: T, service?: S) => Observable<T>;
-    delete?: (id: IdType, item?: T, service?: S) => Observable<T>;
+    delete?: (id: IdType, item?: T, service?: S) => Observable<T | null>;
 }
 export declare class EditorDataProvider<T, S> extends DataProvider<T, S> implements IEditorDataProvider<T, S> {
     protected _fetch: (id: IdType, service?: S) => Observable<T>;
     protected _create?: (item?: T, service?: S) => Observable<T>;
     protected _update?: (id: IdType, item?: T, service?: S) => Observable<T>;
-    protected _delete?: (id: IdType, item?: T, service?: S) => Observable<T>;
+    protected _delete?: (id: IdType, item?: T, service?: S) => Observable<T | null>;
     constructor(modelType: ClassType<T>, serviceType?: Type<S>);
     get fetch(): (id: IdType, service?: S | undefined) => Observable<T>;
     get create(): ((item?: T | undefined, service?: S | undefined) => Observable<T>) | undefined;
     get update(): ((id: IdType, item?: T | undefined, service?: S | undefined) => Observable<T>) | undefined;
-    get delete(): ((id: IdType, item?: T | undefined, service?: S | undefined) => Observable<T>) | undefined;
+    get delete(): ((id: IdType, item?: T | undefined, service?: S | undefined) => Observable<T | null>) | undefined;
     withFetch(fetch: (id: IdType, service?: S) => Observable<T>): this;
     withCreate(create: (item?: T, service?: S) => Observable<T>): this;
     withUpdate(update: (id: IdType, item?: T, service?: S) => Observable<T>): this;
-    withDelete(deleteFn: (id: IdType, item?: T, service?: S) => Observable<T>): this;
+    withDelete(deleteFn: (id: IdType, item?: T, service?: S) => Observable<T | null>): this;
 }

package/lib/descriptors/action.descriptor.d.ts

@@ -1,5 +1,6 @@
 import { Type } from '@angular/core';
 import { Params, QueryParamsHandling } from '@angular/router';
+import { Confirmation } from 'primeng/api';
 import { Observable } from 'rxjs';
 import { ActionExecContext } from '../components/action/models';
 import { IDataProvider, IEditorDataProvider } from '../data-providers';
@@ -26,7 +27,7 @@ export declare class ActionDescriptor<T> {
     protected _isStyleOutlined: boolean;
     protected _isStyleRaised: boolean;
     protected _dataProvider?: IDataProvider<T, any>;
-    protected _runFunction?: (ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<T | undefined>;
+    protected _runFunction?: (ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<T | undefined | null>;
     protected _isVisibleFunction?: (ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<boolean>;
     protected _isEnabledFunction?: (ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<boolean>;
     private _hasRunConfirmation;
@@ -35,6 +36,7 @@ export declare class ActionDescriptor<T> {
     private _runConfirmationMessage?;
     private _runConfirmationAcceptTitle?;
     private _runConfirmationRejectTitle?;
+    private _runConfirmationConfigMapFn?;
     protected _hasRunNotificationSuccess: boolean;
     private _runNotificationSuccessTitle?;
     private _runNotificationSuccessMessage?;
@@ -56,7 +58,7 @@ export declare class ActionDescriptor<T> {
     get tooltip(): string | null | undefined;
     get dataProvider(): IDataProvider<T, any> | undefined;
     get hasRunFunction(): boolean;
-    get runFunction(): (ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<T | undefined>;
+    get runFunction(): (ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<T | undefined | null>;
     get isVisibleFunction(): ((ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<boolean>) | undefined;
     get isEnabledFunction(): ((ctx: ActionExecContext<T, any, IDataProvider<T, any>>) => Observable<boolean>) | undefined;
     get actionName(): string;
@@ -75,6 +77,7 @@ export declare class ActionDescriptor<T> {
     get runConfirmationMessage(): string | undefined;
     get runConfirmationAcceptTitle(): string | undefined;
     get runConfirmationRejectTitle(): string | undefined;
+    get runConfirmationConfigMapFn(): ((ctx: ActionExecContext<T, any, IDataProvider<T, any>>, confirmConfig: Confirmation) => Confirmation) | undefined;
     get hasRunNotificationSuccess(): boolean;
     get runNotificationSuccessTitle(): string | undefined;
     get runNotificationSuccessMessage(): string | undefined;
@@ -83,7 +86,7 @@ export declare class ActionDescriptor<T> {
     get runNotificationErrorMessage(): string | undefined;
     withDataProvider(dataProvider: IDataProvider<T, any>): this;
     withServiceType<S>(serviceType: Type<S>): this;
-    withRunFunction<S>(fn: (ctx: ActionExecContext<T, S, IDataProvider<T, S>>) => Observable<T | undefined>): this;
+    withRunFunction<S>(fn: (ctx: ActionExecContext<T, S, IDataProvider<T, S>>) => Observable<T | undefined | null>): this;
     withIsVisibleFunction<S>(fn: (ctx: ActionExecContext<T, S, IDataProvider<T, S>>) => Observable<boolean>): this;
     withIsEnabledFunction<S>(fn: (ctx: ActionExecContext<T, S, IDataProvider<T, S>>) => Observable<boolean>): this;
     withRouteTrigger(routeUrl: string): this;
@@ -103,7 +106,17 @@ export declare class ActionDescriptor<T> {
     withSize(size?: ActionDescriptor.SizeEnum): this;
     withStyle(styleText?: boolean, styleOutlined?: boolean, styleRaised?: boolean): this;
     withPosition(position: ActionPositionEnum): this;
-    withRunConfirmation(icon?: string, title?: string, message?: string, acceptTitle?: string, rejectTitle?: string): this;
+    /**
+     * Add a confirmation dialogue to the action
+     * @param icon the icon to display on the confirmation dialogue
+     * @param title the title of the confirmation dialogue
+     * @param message the message on the confirmation dialogue
+     * @param acceptTitle the title of the accepting button
+     * @param rejectTitle the title of the rejecting button
+     * @param runConfirmationConfigMapFn function used to generate the confirmation dialogue. **WARNING** changing the *accept* and *reject* methods of the *confirmConfig* parameter
+     * may lead to unexpected behaviour
+     */
+    withRunConfirmation(icon?: string, title?: string, message?: string, acceptTitle?: string, rejectTitle?: string, runConfirmationConfigMapFn?: (ctx: ActionExecContext<T, any, IDataProvider<T, any>>, confirmConfig: Confirmation) => Confirmation): this;
     withRunNotificationSuccess(title?: string, message?: string, hasNotification?: boolean): void;
     withRunNotificationError(title?: string, message?: string, hasNotification?: boolean): void;
 }
@@ -126,7 +139,8 @@ export declare class ActionEditorDescriptor<T> extends ActionDescriptor<T> {
     protected _hasFetchNotificationSuccess: boolean;
     protected _fetchNotificationSuccessTitle?: string;
     protected _fetchNotificationSuccessMessage?: string;
-    protected _dialogClassName: string;
+    protected _dialogSize: ActionEditorDescriptor.DialogSizeEnum;
+    protected _dialogClassName?: string;
     protected _dataProvider?: IEditorDataProvider<T, any>;
     protected _fetchFunction?: (ctx: ActionExecContext<T, any, IEditorDataProvider<T, any>>) => Observable<T>;
     protected _submitFunction?: (ctx: ActionExecContext<T, any, IEditorDataProvider<T, any>>) => Observable<T>;
@@ -134,7 +148,8 @@ export declare class ActionEditorDescriptor<T> extends ActionDescriptor<T> {
     constructor(editorDescriptor: EditorDescriptor<T>, actionName: string, parentType?: ClassType<any>, parentProperty?: string);
     get editorTitle(): string | null | undefined;
     get editorDescriptor(): EditorDescriptor<T>;
-    get dialogClassName(): string;
+    get dialogSize(): ActionEditorDescriptor.DialogSizeEnum;
+    get dialogClassName(): string | undefined;
     get hasFetchNotificationSuccess(): boolean;
     get fetchNotificationSuccessTitle(): string | undefined;
     get fetchNotificationSuccessMessage(): string | undefined;
@@ -147,6 +162,7 @@ export declare class ActionEditorDescriptor<T> extends ActionDescriptor<T> {
     withEditorTitle(title: string | null): this;
     withDataProvider(dataProvider: IEditorDataProvider<T, any>): this;
     withServiceType<S>(serviceType: Type<S>): this;
+    withDialogSize(size?: ActionEditorDescriptor.DialogSizeEnum): this;
     withDialogClassName(className: string): this;
     withRunFunction<S>(fn: (ctx: ActionExecContext<T, S, IDataProvider<T, S>>) => Observable<T>): this;
     withFetchFunction<S>(fn: (ctx: ActionExecContext<T, S, IEditorDataProvider<T, S>>) => Observable<T>): this;
@@ -156,6 +172,15 @@ export declare class ActionEditorDescriptor<T> extends ActionDescriptor<T> {
     withEditorActions(actions: ActionDescriptor<T>[]): this;
     withEditorComponent(editorComponent: Type<any>): this;
 }
+export declare namespace ActionEditorDescriptor {
+    enum DialogSizeEnum {
+        ExtraSmall = 0,
+        Small = 1,
+        Normal = 2,
+        Large = 3,
+        ExtraLarge = 4
+    }
+}
 export declare class ActionEditorSubmitDescriptor<T> extends ActionDescriptor<T> {
     private readonly _editorAction;
     private readonly _submitType;

package/lib/descriptors/editor.descriptor.d.ts

@@ -1,5 +1,4 @@
-import { AbstractControl } from '@angular/forms';
-import { ClassType, EnumConstantType, EnumType } from '../types';
+import { ClassType, EnumConstantType, EnumType, MngFieldValidationMessage, MngFieldValidator } from '../types';
 import { AFieldDescriptor, FieldGroupDescriptor, FieldInputDescriptor, FieldLookupDescriptor, FieldLookupEnumDescriptor, FieldManyEditorDescriptor, FieldManyToManyEditorDescriptor, FieldTabGroupDescriptor, ModelDescriptor, TableDescriptor, TableviewDescriptor } from './';
 export declare class EditorDescriptor<T> {
     static readonly defaultGroupName = "_default";
@@ -28,7 +27,7 @@ export declare class EditorDescriptor<T> {
     addFieldManyEditor<FT>(property: string, tableviewDescriptor: TableviewDescriptor<FT>): FieldManyEditorDescriptor<FT, T>;
     addFieldManyToManyEditor<FT>(property: string, mainTableDescriptor: TableDescriptor<FT>, lookupTableDescriptor: TableDescriptor<FT>): FieldManyToManyEditorDescriptor<FT, T>;
     withDisabled(disabled?: boolean): this;
-    addValidator(name: string, expression: (control: AbstractControl) => boolean): void;
+    addValidation(name: string, validator?: MngFieldValidator, message?: MngFieldValidationMessage): void;
     copy(): EditorDescriptor<T>;
     createFieldGroupDescriptor(fieldGroup: FieldGroupDescriptor<T>): this;
     private createTabGroupDescriptor;

package/lib/descriptors/field-validation.descriptor.d.ts

@@ -0,0 +1,18 @@
+import { FormlyFieldConfig } from '@ngx-formly/core';
+import { Observable } from 'rxjs';
+import { MngFieldValidationMessage, MngFieldValidator } from '../types';
+export declare class FieldValidationDescriptor {
+    private readonly _name;
+    private readonly _validator?;
+    private readonly _message?;
+    private readonly _options?;
+    constructor(name: string, validator?: MngFieldValidator, message?: string | ((error: any, field: FormlyFieldConfig) => string | Observable<string>), options?: {
+        errorPath: string;
+    });
+    get name(): string;
+    get validator(): MngFieldValidator | undefined;
+    get message(): MngFieldValidationMessage | undefined;
+    get options(): {
+        errorPath: string;
+    } | undefined;
+}

package/lib/descriptors/field.descriptor.d.ts

@@ -1,13 +1,12 @@
 import { Type } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { Observable, Subject } from 'rxjs';
 import { MediusQueryParam, MediusQueryResult } from '../api/models';
 import { MngFormFieldEvent, MngFormFieldEventData, MngFormFieldEventTypeEnum } from '../components/form/models';
 import { ILookupDataProvider, ITableDataProvider } from '../data-providers';
 import { EnumValue } from '../models';
-import { ClassType, EnumConstantType, EnumType } from '../types';
-import { ActionDescriptor, EditorDescriptor, FieldValidator, ILookupDescriptor, TableDescriptor, TableviewDescriptor } from './';
+import { ClassType, EnumConstantType, EnumType, MngFieldValidationMessage, MngFieldValidator } from '../types';
+import { ActionDescriptor, EditorDescriptor, FieldValidationDescriptor, ILookupDescriptor, TableDescriptor, TableviewDescriptor } from './';
 import { FieldConfig, FieldLookupConfig } from './field.descriptor.interface';
 export declare abstract class AGenericFieldDescriptor<ET> {
     protected readonly _editor: EditorDescriptor<ET>;
@@ -20,7 +19,7 @@ export declare abstract class AGenericFieldDescriptor<ET> {
 export declare abstract class AFieldDescriptor<T, ET> extends AGenericFieldDescriptor<ET> {
     protected readonly _property: string;
     protected _group?: AFieldGroupDescriptor<ET>;
-    protected _label?: string;
+    protected _label?: string | null;
     protected _placeholder?: string;
     protected _helpText?: string;
     protected _required: boolean;
@@ -28,11 +27,12 @@ export declare abstract class AFieldDescriptor<T, ET> extends AGenericFieldDescr
     protected _defaultValue?: T;
     protected _getter?: (item: ET) => T;
     protected _setter?: (item: ET, value: T) => void;
-    protected _validators: Array<FieldValidator>;
+    protected _validations: Array<FieldValidationDescriptor>;
     protected _requiredExpression?: string | ((model: any, formState?: any, field?: FormlyFieldConfig) => boolean) | Observable<boolean>;
     protected _disabledExpression?: string | ((model: any, formState?: any, field?: FormlyFieldConfig) => boolean) | Observable<boolean>;
     protected _hiddenExpression?: string | ((model: any, formState?: any, field?: FormlyFieldConfig) => boolean) | Observable<boolean>;
     protected _className: string;
+    protected _fieldClassName?: string;
     protected _labelClassName: string;
     protected _inputClassName: string;
     protected _size: FieldDescriptor.SizeEnum;
@@ -40,7 +40,7 @@ export declare abstract class AFieldDescriptor<T, ET> extends AGenericFieldDescr
     protected constructor(editor: EditorDescriptor<ET>, property: string);
     get property(): string;
     get group(): AFieldGroupDescriptor<ET> | undefined;
-    get label(): string | undefined;
+    get label(): string | null | undefined;
     get placeholder(): string | undefined;
     get helpText(): string | undefined;
     get required(): boolean;
@@ -48,18 +48,19 @@ export declare abstract class AFieldDescriptor<T, ET> extends AGenericFieldDescr
     get defaultValue(): T | undefined;
     get getter(): ((item: ET) => T) | undefined;
     get setter(): ((item: ET, value: T) => void) | undefined;
-    get validators(): FieldValidator[];
+    get validations(): FieldValidationDescriptor[];
     get requiredExpression(): string | Observable<boolean> | ((model: any, formState?: any, field?: FormlyFieldConfig | undefined) => boolean) | undefined;
     get disabledExpression(): string | Observable<boolean> | ((model: any, formState?: any, field?: FormlyFieldConfig | undefined) => boolean) | undefined;
     get hiddenExpression(): string | Observable<boolean> | ((model: any, formState?: any, field?: FormlyFieldConfig | undefined) => boolean) | undefined;
     get className(): string;
+    get fieldClassName(): string | undefined;
     get labelClassName(): string;
     get inputClassName(): string;
     get size(): FieldDescriptor.SizeEnum;
     get isSizeSmall(): boolean;
     get isSizeLarge(): boolean;
     abstract copy(): AFieldDescriptor<T, ET>;
-    withLabel(label: string): this;
+    withLabel(label: string | null): this;
     withPlaceholder(placeholder: string): this;
     withHelpText(helpText: string): this;
     withRequired(required?: boolean, requiredExpression?: string | ((model: any, formState?: any, field?: FormlyFieldConfig) => boolean) | Observable<boolean>): this;
@@ -68,8 +69,8 @@ export declare abstract class AFieldDescriptor<T, ET> extends AGenericFieldDescr
     withDefaultValue(defaultValue: T): this;
     withGetter(getter: (item: ET) => T): this;
     withSetter(setter: (item: ET, value: T) => void): this;
-    withValidator(name: string, expression: (control: AbstractControl) => boolean, message?: (err: any, field: FormlyFieldConfig) => string): this;
-    withClassName(className: string, labelClassName?: string, inputClassName?: string): this;
+    withValidation(name: string, validator?: MngFieldValidator, message?: MngFieldValidationMessage): this;
+    withClassName(className: string, labelClassName?: string, inputClassName?: string, fieldClassName?: string): this;
     withSize(size?: FieldDescriptor.SizeEnum): this;
     nextEvent(type: MngFormFieldEventTypeEnum, cmpType: Type<any>, cmpInstance: any, data?: MngFormFieldEventData<T, ET>): void;
     get events$(): Observable<MngFormFieldEvent<T, ET>>;
@@ -123,6 +124,7 @@ export declare class FieldInputDescriptor<ET> extends AFieldDescriptor<string |
     get slotChar(): string | undefined;
     get customComponentName(): string | undefined;
     asHidden(): this;
+    asLabel(): this;
     asText(minLength?: number, maxLength?: number, pattern?: string | RegExp, isEmail?: boolean): this;
     asTextarea(rows?: number, minLength?: number, maxLength?: number, pattern?: string | RegExp): this;
     asNumber(step?: number, min?: number, max?: number, minFractionDigits?: number, maxFractionDigits?: number, numberUseGrouping?: boolean): this;
@@ -137,14 +139,15 @@ export declare class FieldInputDescriptor<ET> extends AFieldDescriptor<string |
 export declare namespace FieldInputDescriptor {
     enum TypeEnum {
         Hidden = 0,
-        Text = 1,
-        Textarea = 2,
-        Number = 3,
-        Switch = 4,
-        Radio = 5,
-        Datepicker = 6,
-        Mask = 7,
-        Custom = 8
+        Label = 1,
+        Text = 2,
+        Textarea = 3,
+        Number = 4,
+        Switch = 5,
+        Radio = 6,
+        Datepicker = 7,
+        Mask = 8,
+        Custom = 9
     }
 }
 export declare class FieldLookupDescriptor<T, ET> extends AFieldDescriptor<T, ET> implements ILookupDescriptor<T> {
@@ -200,6 +203,7 @@ export declare class FieldLookupEnumDescriptor<ET> extends FieldLookupDescriptor
     constructor(editor: EditorDescriptor<ET>, property: string, enumType: EnumType, options?: Array<EnumConstantType>, nameAsValue?: boolean, optionsTitlePath?: string | null);
     get enumType(): EnumType;
     withDisabledOptions(...disabledOptions: Array<EnumConstantType>): this;
+    withDefaultValueEnum(defaultValue: EnumConstantType): this;
     asAutocomplete(openOnFocus?: boolean): this;
     copy(): FieldLookupEnumDescriptor<ET>;
 }
@@ -271,11 +275,11 @@ export declare abstract class AFieldGroupDescriptor<ET> extends AGenericFieldDes
     protected readonly _default: boolean;
     protected _title?: string;
     protected _fields: AGenericFieldDescriptor<ET>[];
-    protected _validators: Array<FieldValidator>;
+    protected _validations: Array<FieldValidationDescriptor>;
     protected constructor(editor: EditorDescriptor<ET>, name: string);
     get title(): string | undefined;
     abstract get fields(): AGenericFieldDescriptor<ET>[];
-    get validators(): FieldValidator[];
+    get validations(): FieldValidationDescriptor[];
     get baseName(): string;
     get name(): string;
     get default(): boolean;
@@ -283,7 +287,7 @@ export declare abstract class AFieldGroupDescriptor<ET> extends AGenericFieldDes
     abstract addField(field: AGenericFieldDescriptor<ET>): this;
     abstract copy(): AFieldGroupDescriptor<ET>;
     withTitle(title: string): this;
-    withValidator(name: string, expression: (control: AbstractControl) => boolean): this;
+    withValidation(name: string, validator?: MngFieldValidator, message?: MngFieldValidationMessage): this;
 }
 export declare class FieldTabGroupDescriptor<ET> extends AFieldGroupDescriptor<ET> {
     constructor(editor: EditorDescriptor<ET>, name: string);
@@ -293,9 +297,18 @@ export declare class FieldTabGroupDescriptor<ET> extends AFieldGroupDescriptor<E
     copy(): FieldTabGroupDescriptor<ET>;
 }
 export declare class FieldGroupDescriptor<ET> extends AFieldGroupDescriptor<ET> {
+    private _type;
     constructor(editor: EditorDescriptor<ET>, name: string);
+    get type(): FieldGroupDescriptor.TypeEnum;
     get fields(): Array<AFieldDescriptor<any, ET>>;
     groupName(): string;
     addField(field: AFieldDescriptor<any, ET>): this;
+    asLogical(): this;
     copy(): FieldGroupDescriptor<ET>;
 }
+export declare namespace FieldGroupDescriptor {
+    enum TypeEnum {
+        Fieldset = 0,
+        Logical = 1
+    }
+}

package/lib/descriptors/index.d.ts

@@ -3,7 +3,7 @@ export * from './column.descriptor';
 export * from './editor.descriptor';
 export * from './field.descriptor';
 export * from './field.descriptor.interface';
-export * from './field.validator';
+export * from './field-validation.descriptor';
 export * from './filter.descriptor';
 export * from './lookup.descriptor';
 export * from './model.descriptor';

package/lib/descriptors/table.descriptor.d.ts

@@ -7,6 +7,8 @@ export declare class TableDescriptor<T> {
     private readonly _model;
     private _filterDisplay;
     private _paginationMode;
+    private _rowsPerPageOptions;
+    private _defaultNumRows;
     private _columns;
     private _title?;
     private _hideHeader;
@@ -19,6 +21,8 @@ export declare class TableDescriptor<T> {
     constructor(modelType: ClassType<T>, idProperty?: string, titleProperty?: string);
     get filterDisplay(): TableDescriptor.FilterDisplayEnum;
     get paginationMode(): TableDescriptor.PaginationModeEnum;
+    get rowsPerPageOptions(): number[];
+    get defaultNumRows(): number;
     get columns(): ColumnDescriptor<any, T>[];
     get title(): string | undefined;
     get hideHeader(): boolean;
@@ -38,6 +42,7 @@ export declare class TableDescriptor<T> {
     addColumnCustomComponent(property: string, customComponentType: Type<IColumnValueComponent<T>>): ColumnDescriptor<any, T>;
     withFilterDisplay(filterDisplayType: TableDescriptor.FilterDisplayEnum): this;
     withPaginationMode(paginationMode: TableDescriptor.PaginationModeEnum): this;
+    withRowsPerPage(rows: number, options?: Array<number>): this;
     withTitle(title: string): TableDescriptor<T>;
     withHideHeader(hideHeader?: boolean): this;
     withDataKeyProperty(property: string): TableDescriptor<T>;
@@ -45,7 +50,6 @@ export declare class TableDescriptor<T> {
     withRowHeight(rowHeight: number): TableDescriptor<T>;
     withTableFullHeightOffset(tableFullHeightOffset: number): TableDescriptor<T>;
     copy(): TableDescriptor<T>;
-    private setDataKeyFromColumn;
 }
 export declare namespace TableDescriptor {
     enum PaginationModeEnum {

package/lib/descriptors/tableview.descriptor.d.ts

@@ -1,5 +1,5 @@
 import { Type } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
+import { FieldValidatorFn } from '@ngx-formly/core/lib/models/config';
 import { IColumnValueComponent } from '../models';
 import { ClassType, EnumConstantType, EnumType } from '../types';
 import { AFieldDescriptor, ColumnDescriptor, EditorDescriptor, FieldInputDescriptor, FieldLookupDescriptor, FieldLookupEnumDescriptor, FieldManyEditorDescriptor, FieldManyToManyEditorDescriptor, ModelDescriptor, TableDescriptor } from './';
@@ -22,7 +22,7 @@ export declare class TableviewDescriptor<T> {
     withAddDescriptor(descriptor: EditorDescriptor<T>): this;
     withEditDescriptor(descriptor: EditorDescriptor<T>): this;
     withTableTitle(title: string): this;
-    withValidator(name: string, expression: (control: AbstractControl) => boolean): this;
+    withValidator(name: string, expression: FieldValidatorFn): this;
     addColumnDescriptor<CT>(column: ColumnDescriptor<CT, T>): TableDescriptor<T>;
     addColumn(property: string): ColumnDescriptor<string, T>;
     addColumnNumber(property: string, displayFormat?: string): ColumnDescriptor<number, T>;