@mediusinc/mng-commons 0.5.0 → 0.6.0

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/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>;
@@ -28,7 +27,7 @@ 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>;
@@ -49,7 +48,7 @@ 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;
@@ -70,7 +69,7 @@ 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;
+    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;
@@ -276,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;
@@ -288,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);

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

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

package/lib/types/type.model.d.ts

@@ -1,3 +1,6 @@
+import { AbstractControl, ValidationErrors } from '@angular/forms';
+import { FormlyFieldConfig } from '@ngx-formly/core/lib/models/fieldconfig';
+import { Observable } from 'rxjs';
 export interface ClassType<T> extends Function {
     new (...args: any[]): T;
 }
@@ -8,3 +11,7 @@ export declare type EnumConstantType = string | number;
 export declare type IdType = number | string;
 export declare type PrimitiveType = string | boolean | number;
 export declare type PropertyType = PrimitiveType | Date | EnumType;
+export declare type MngFieldValidator = (control: AbstractControl, field: FormlyFieldConfig, options?: {
+    [id: string]: any;
+}) => ValidationErrors | boolean | null;
+export declare type MngFieldValidationMessage = string | ((error: any, field: FormlyFieldConfig) => string | Observable<string>);

package/lib/utils/editor-formly.util.d.ts

@@ -1,9 +1,10 @@
 import { FormlyFieldConfig } from '@ngx-formly/core';
-import { AFieldDescriptor, EditorDescriptor, FieldGroupDescriptor, FieldTabGroupDescriptor } from '../descriptors';
+import { AFieldDescriptor, EditorDescriptor, FieldGroupDescriptor, FieldTabGroupDescriptor, FieldValidationDescriptor } from '../descriptors';
 export declare class EditorFormlyUtil {
     static createFormlyConfigFromDescriptor(descriptor: EditorDescriptor<any>): FormlyFieldConfig[];
     static createFormlyTabType(tabGroups: FieldTabGroupDescriptor<any>[]): FormlyFieldConfig[];
     static createFormlyGroupType(groups: FieldGroupDescriptor<any>[]): FormlyFieldConfig[];
     static createFormlyFields(descriptor: FieldGroupDescriptor<any>): FormlyFieldConfig[];
     static createFormlyField(descriptor: AFieldDescriptor<any, any>): FormlyFieldConfig;
+    static addValidationsToFormlyField(config: FormlyFieldConfig, validations: Array<FieldValidationDescriptor>): void;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@mediusinc/mng-commons",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "peerDependencies": {
-    "@angular/common": "^13.1.0",
-    "@angular/core": "^13.1.0",
-    "@angular/forms": "^13.1.0",
-    "@angular/router": "^13.1.0",
-    "@ngx-formly/core": "^6.0.0-next.6",
+    "@angular/common": "^13.2.0",
+    "@angular/core": "^13.2.0",
+    "@angular/forms": "^13.2.0",
+    "@angular/router": "^13.2.0",
+    "@ngx-formly/core": "6.0.0-next.9",
     "@ngx-translate/core": "^14.0.0",
     "primeng": "^13.0.0"
   },

package/esm2020/lib/descriptors/field.validator.mjs

@@ -1,21 +0,0 @@
-export class FieldValidator {
-    constructor(name, expression, message, options) {
-        this._name = name;
-        this._expression = expression;
-        this._message = message;
-        this._options = options;
-    }
-    get name() {
-        return this._name;
-    }
-    get expression() {
-        return this._expression;
-    }
-    get message() {
-        return this._message;
-    }
-    get options() {
-        return this._options;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmllbGQudmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9kZXNjcmlwdG9ycy9maWVsZC52YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsTUFBTSxPQUFPLGNBQWM7SUFNdkIsWUFDSSxJQUFZLEVBQ1osVUFBa0QsRUFDbEQsT0FBNkUsRUFDN0UsT0FBNkI7UUFFN0IsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7UUFDbEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxVQUFVLENBQUM7UUFDOUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7SUFDNUIsQ0FBQztJQUVELElBQVcsSUFBSTtRQUNYLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQztJQUN0QixDQUFDO0lBRUQsSUFBVyxVQUFVO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUM1QixDQUFDO0lBRUQsSUFBVyxPQUFPO1FBQ2QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3pCLENBQUM7SUFFRCxJQUFXLE9BQU87UUFDZCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDekIsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtBYnN0cmFjdENvbnRyb2x9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcblxuaW1wb3J0IHtGb3JtbHlGaWVsZENvbmZpZ30gZnJvbSAnQG5neC1mb3JtbHkvY29yZSc7XG5pbXBvcnQge09ic2VydmFibGV9IGZyb20gJ3J4anMnO1xuXG5leHBvcnQgY2xhc3MgRmllbGRWYWxpZGF0b3Ige1xuICAgIHByaXZhdGUgcmVhZG9ubHkgX25hbWU6IHN0cmluZztcbiAgICBwcml2YXRlIHJlYWRvbmx5IF9leHByZXNzaW9uPzogKGNvbnRyb2w6IEFic3RyYWN0Q29udHJvbCkgPT4gYm9vbGVhbjtcbiAgICBwcml2YXRlIHJlYWRvbmx5IF9tZXNzYWdlPzogKGVycjogYW55LCBmaWVsZDogRm9ybWx5RmllbGRDb25maWcpID0+IHN0cmluZyB8IE9ic2VydmFibGU8c3RyaW5nPjtcbiAgICBwcml2YXRlIHJlYWRvbmx5IF9vcHRpb25zPzoge2Vycm9yUGF0aDogc3RyaW5nfTtcblxuICAgIGNvbnN0cnVjdG9yKFxuICAgICAgICBuYW1lOiBzdHJpbmcsXG4gICAgICAgIGV4cHJlc3Npb24/OiAoY29udHJvbDogQWJzdHJhY3RDb250cm9sKSA9PiBib29sZWFuLFxuICAgICAgICBtZXNzYWdlPzogKGVycjogYW55LCBmaWVsZDogRm9ybWx5RmllbGRDb25maWcpID0+IHN0cmluZyB8IE9ic2VydmFibGU8c3RyaW5nPixcbiAgICAgICAgb3B0aW9ucz86IHtlcnJvclBhdGg6IHN0cmluZ31cbiAgICApIHtcbiAgICAgICAgdGhpcy5fbmFtZSA9IG5hbWU7XG4gICAgICAgIHRoaXMuX2V4cHJlc3Npb24gPSBleHByZXNzaW9uO1xuICAgICAgICB0aGlzLl9tZXNzYWdlID0gbWVzc2FnZTtcbiAgICAgICAgdGhpcy5fb3B0aW9ucyA9IG9wdGlvbnM7XG4gICAgfVxuXG4gICAgcHVibGljIGdldCBuYW1lKCk6IHN0cmluZyB7XG4gICAgICAgIHJldHVybiB0aGlzLl9uYW1lO1xuICAgIH1cblxuICAgIHB1YmxpYyBnZXQgZXhwcmVzc2lvbigpIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuX2V4cHJlc3Npb247XG4gICAgfVxuXG4gICAgcHVibGljIGdldCBtZXNzYWdlKCkge1xuICAgICAgICByZXR1cm4gdGhpcy5fbWVzc2FnZTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0IG9wdGlvbnMoKSB7XG4gICAgICAgIHJldHVybiB0aGlzLl9vcHRpb25zO1xuICAgIH1cbn1cbiJdfQ==

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

@@ -1,18 +0,0 @@
-import { AbstractControl } from '@angular/forms';
-import { FormlyFieldConfig } from '@ngx-formly/core';
-import { Observable } from 'rxjs';
-export declare class FieldValidator {
-    private readonly _name;
-    private readonly _expression?;
-    private readonly _message?;
-    private readonly _options?;
-    constructor(name: string, expression?: (control: AbstractControl) => boolean, message?: (err: any, field: FormlyFieldConfig) => string | Observable<string>, options?: {
-        errorPath: string;
-    });
-    get name(): string;
-    get expression(): ((control: AbstractControl) => boolean) | undefined;
-    get message(): ((err: any, field: FormlyFieldConfig) => string | Observable<string>) | undefined;
-    get options(): {
-        errorPath: string;
-    } | undefined;
-}