@mediusinc/mng-commons-audit 5.0.0-rc.1 → 5.0.0-rc.3

package/fesm2022/mediusinc-mng-commons-audit.mjs

@@ -1,11 +1,10 @@
-import { TypeName, TypeRegistry, CommonsConfigurationService, dataListParamsToUrlQuery, CommonsInternalError, itemIdToDefined, RouteBuilder, RoutesBuilder } from '@mediusinc/mng-commons/core';
-import { TableviewComponent, TableviewRouteBuilder } from '@mediusinc/mng-commons/tableview';
+import { CommonsConfigurationService, TypeRegistry, dataListParamsToUrlQuery, CommonsInternalError, itemIdToDefined, createRoute, createRouteRedirect, createRoutes } from '@mediusinc/mng-commons/core';
+import { TableviewComponent, createTableviewRoute } from '@mediusinc/mng-commons/tableview';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, Component, ChangeDetectionStrategy, computed, signal, effect, DestroyRef, Input, Injector } from '@angular/core';
 import { shareReplay, throwError, BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ACommonsBaseV1ApiService } from '@mediusinc/mng-commons-data-api-class/v1';
-import { __decorate } from 'tslib';
+import { HttpHeaders, HttpClient, HttpParams } from '@angular/common/http';
 import { RouterOutlet, Router, ActivatedRoute } from '@angular/router';
 import { AsyncPipe, JsonPipe } from '@angular/common';
 import { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -15,51 +14,53 @@ import { FormlyModule } from '@ngx-formly/core';
 import * as i2 from '@ngx-translate/core';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { DropdownComponent } from '@mediusinc/mng-commons/form';
-import { LookupDataProvider } from '@mediusinc/mng-commons/form/api';
-import { TableviewDescriptor, TableviewDataProvider, ActionEditorDetailsDescriptor, AFormlyCustomFieldComponent, EditorDescriptor, TableviewEditorTypeEnum } from '@mediusinc/mng-commons/tableview/api';
-import { HttpParams } from '@angular/common/http';
-import { enumModel, enumModelGeneric, ModelDescriptor } from '@mediusinc/mng-commons/model';
+import { lookupDataProvider, lookupDataProviderWithService } from '@mediusinc/mng-commons/form/api';
+import { tableviewDescriptor, tableviewDataProviderWithService, actionEditorDetails, AFormlyCustomFieldComponent, editorDescriptor, TableviewEditorTypeEnum } from '@mediusinc/mng-commons/tableview/api';
+import { enumModel, enumModelGeneric, model } from '@mediusinc/mng-commons/model';
 import { TableComponent } from '@mediusinc/mng-commons/table';
-import { TableDescriptor, TablePaginationModeEnum } from '@mediusinc/mng-commons/table/api';
+import { tableDescriptor, TablePaginationModeEnum } from '@mediusinc/mng-commons/table/api';
 
 const COMMONS_AUDIT_MODULE_CONFIG_IT = new InjectionToken('CommonsAuditModuleConfig');
 
-var GuiEntityModelDto_1;
-let GuiEntityModelDto = class GuiEntityModelDto {
-    static { GuiEntityModelDto_1 = this; }
-    static { this.attributeTypeMap = [
-        {
-            name: 'entityName',
-            baseName: 'entityName',
-            type: 'string'
-        },
-        {
-            name: 'properties',
-            baseName: 'properties',
-            type: 'Array<GuiPropertyModel>'
-        }
-    ]; }
-    static getAttributeTypeMap() {
-        return GuiEntityModelDto_1.attributeTypeMap;
-    }
-};
-GuiEntityModelDto = GuiEntityModelDto_1 = __decorate([
-    TypeName('MngGuiEntityModelDto')
-], GuiEntityModelDto);
-TypeRegistry.get().registerType(GuiEntityModelDto);
-
-class AuditService extends ACommonsBaseV1ApiService {
+/* eslint-disable */
+class AuditApiService {
     constructor() {
-        super();
-        this.CACHE_SIZE = 1;
+        this.defaultHeaders = new HttpHeaders();
         this.moduleConfig = inject(COMMONS_AUDIT_MODULE_CONFIG_IT);
+        this.http = inject(HttpClient);
         this.configService = CommonsConfigurationService.get();
     }
+    getBasePath() {
+        return `${this.configService.getConfigValue(this.moduleConfig.apiBasePathConfigKey)}`;
+    }
     getServiceBasePath() {
         return this.moduleConfig.apiServiceBasePath ?? '';
     }
-    getBasePath() {
-        return `${this.configService.getConfigValue(this.moduleConfig.apiBasePathConfigKey)}`;
+    getUrl(...pathSegments) {
+        let baseUrl = this.getBasePath();
+        if (baseUrl.endsWith('/')) {
+            baseUrl = baseUrl.substring(0, baseUrl.length - 1);
+        }
+        const serviceBasePath = this.getServiceBasePath();
+        let path = [serviceBasePath, ...pathSegments].filter(s => s && s.length).join('/');
+        // omit first and last '/'
+        if (path.startsWith('/')) {
+            path = path.substring(1);
+        }
+        if (path.endsWith('/')) {
+            path = path.substring(0, path.length - 1);
+        }
+        // replace any double '//' from path that could come from joining paths
+        path = path.replace('//', '/');
+        return `${baseUrl}/${path}`;
+    }
+}
+
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types */
+class AuditService extends AuditApiService {
+    constructor() {
+        super();
+        this.CACHE_SIZE = 1;
     }
     get revModel$() {
         if (!this.revModelObs) {
@@ -74,68 +75,49 @@ class AuditService extends ACommonsBaseV1ApiService {
         return this.auditModelObs;
     }
     requestRevModel() {
-        return this.http.get(this.getUrl('/rev-model'));
+        let localVarHeaders = this.defaultHeaders;
+        localVarHeaders = localVarHeaders.set('Accept', 'application/json');
+        return this.http.get(this.getUrl(`/rev-model`), {
+            headers: localVarHeaders
+        });
     }
     requestAuditModel() {
-        return this.http.get(this.getUrl('/audit-models')).pipe(map(response => this.deserializeClassArray(response, GuiEntityModelDto)));
+        let localVarHeaders = this.defaultHeaders;
+        localVarHeaders = localVarHeaders.set('Accept', 'application/json');
+        return this.http
+            .get(this.getUrl(`/audit-models`), {
+            headers: localVarHeaders
+        })
+            .pipe(map(response => {
+            if (Array.isArray(response)) {
+                return response.map(item => {
+                    return {
+                        entityName: item.entityName,
+                        properties: item.properties
+                    };
+                });
+            }
+            else {
+                return [];
+            }
+        }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 
 class AuditPageComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.2", type: AuditPageComponent, isStandalone: true, selector: "mng-audit-page", ngImport: i0, template: "<router-outlet></router-outlet>\n", dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.4", type: AuditPageComponent, isStandalone: true, selector: "mng-audit-page", ngImport: i0, template: "<router-outlet></router-outlet>\n", dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditPageComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditPageComponent, decorators: [{
             type: Component,
             args: [{ standalone: true, selector: 'mng-audit-page', imports: [RouterOutlet], changeDetection: ChangeDetectionStrategy.OnPush, template: "<router-outlet></router-outlet>\n" }]
         }] });
 
-var RevEntityWithStateDto_1;
-let RevEntityWithStateDto = class RevEntityWithStateDto {
-    static { RevEntityWithStateDto_1 = this; }
-    static { this.attributeTypeMap = [
-        {
-            name: 'revEntity',
-            baseName: 'revEntity',
-            type: '{ [key: string]: any; }'
-        },
-        {
-            name: 'revType',
-            baseName: 'revType',
-            type: 'RevisionType'
-        },
-        {
-            name: 'entityClassName',
-            baseName: 'entityClassName',
-            type: 'string'
-        },
-        {
-            name: 'entityState',
-            baseName: 'entityState',
-            type: '{ [key: string]: any; }'
-        }
-    ]; }
-    static getAttributeTypeMap() {
-        return RevEntityWithStateDto_1.attributeTypeMap;
-    }
-};
-RevEntityWithStateDto = RevEntityWithStateDto_1 = __decorate([
-    TypeName('MngRevEntityWithStateDto')
-], RevEntityWithStateDto);
-TypeRegistry.get().registerType(RevEntityWithStateDto);
-
-let RevEntityWithId = class RevEntityWithId extends RevEntityWithStateDto {
-};
-RevEntityWithId = __decorate([
-    TypeName('MngRevEntityWithId')
-], RevEntityWithId);
-TypeRegistry.get().registerType(RevEntityWithId);
-
 /**
  * Medius quarkus sampler
  * Sampler OPENAPI definition
@@ -179,18 +161,6 @@ var RevisionTypeDto;
 TypeRegistry.get().registerEnum(RevisionTypeDto, 'MngRevisionTypeDto');
 const revisionTypeEnum = enumModel(RevisionTypeDto.Add, RevisionTypeDto, 'MngRevisionTypeDto');
 
-let EntityRevisionChangeState = class EntityRevisionChangeState {
-};
-EntityRevisionChangeState = __decorate([
-    TypeName('MngEntityRevisionChangeState')
-], EntityRevisionChangeState);
-
-let EntityRevisionChanges = class EntityRevisionChanges {
-};
-EntityRevisionChanges = __decorate([
-    TypeName('MngEntityChanges')
-], EntityRevisionChanges);
-
 class AuditUtil {
     static { this._dateRegex = /\d{4}-[01]\d-[0-3]\d/; }
     static addColumnsFromModel(descriptor, properties, modelType = undefined, addFilters = true, addSorts = true) {
@@ -215,7 +185,7 @@ class AuditUtil {
                 else {
                     column = descriptor.addColumnUnsafe(property.resolvedPropertyName);
                     if (addFilters) {
-                        descriptor.addFilterLookupUnsafe(column.property, LookupDataProvider.create().withLookup(() => property.possibleEnumValues ?? []));
+                        descriptor.addFilterLookupUnsafe(column.property, lookupDataProvider().withLookup(() => property.possibleEnumValues ?? []));
                     }
                 }
             }
@@ -372,35 +342,37 @@ class AuditUtil {
     static mapItemsToEntityChangesArray(fieldValue) {
         const entityChanges = [];
         for (const key of Object.keys(fieldValue)) {
-            const ec = new EntityRevisionChanges();
-            ec.entityType = key;
-            ec.items = [];
+            const ec = { entityType: key, items: [] };
             for (const change of fieldValue[key]) {
                 if (change.revType === RevisionTypeDto.Add && change.entityNewState) {
-                    const item = new EntityRevisionChangeState();
-                    item.revType = change.revType;
-                    item.color = 'green';
+                    const item = {
+                        revType: change.revType,
+                        color: 'green'
+                    };
                     Object.entries(change.entityNewState).forEach(([key, value]) => (item[key] = value));
-                    ec.items.push(item);
+                    ec.items?.push(item);
                 }
                 else if (change.revType === RevisionTypeDto.Del && change.entityOldState) {
-                    const item = new EntityRevisionChangeState();
-                    item.revType = change.revType;
-                    item.color = 'red';
+                    const item = {
+                        revType: change.revType,
+                        color: 'red'
+                    };
                     Object.entries(change.entityOldState).forEach(([key, value]) => (item[key] = value));
-                    ec.items.push(item);
+                    ec.items?.push(item);
                 }
                 else if (change.revType === RevisionTypeDto.Mod && change.entityOldState && change.entityNewState) {
-                    const itemOld = new EntityRevisionChangeState();
-                    itemOld.revType = change.revType;
-                    itemOld.color = 'red';
+                    const itemOld = {
+                        revType: change.revType,
+                        color: 'red'
+                    };
                     Object.entries(change.entityOldState).forEach(([key, value]) => (itemOld[key] = value));
-                    const itemNew = new EntityRevisionChangeState();
-                    itemNew.revType = change.revType;
-                    itemNew.color = 'green';
+                    const itemNew = {
+                        revType: change.revType,
+                        color: 'green'
+                    };
                     Object.entries(change.entityNewState).forEach(([key, value]) => (itemNew[key] = value));
-                    ec.items.push(itemOld);
-                    ec.items.push(itemNew);
+                    ec.items?.push(itemOld);
+                    ec.items?.push(itemNew);
                 }
             }
             entityChanges.push(ec);
@@ -409,17 +381,10 @@ class AuditUtil {
     }
 }
 
-class AuditRevisionsApiService extends ACommonsBaseV1ApiService {
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types */
+class AuditRevisionsApiService extends AuditApiService {
     constructor() {
         super();
-        this.moduleConfig = inject(COMMONS_AUDIT_MODULE_CONFIG_IT);
-        this.configService = CommonsConfigurationService.get();
-    }
-    getServiceBasePath() {
-        return this.moduleConfig.apiServiceBasePath ?? '';
-    }
-    getBasePath() {
-        return `${this.configService.getConfigValue(this.moduleConfig.apiBasePathConfigKey)}`;
     }
     getRevisionList(params) {
         return this.http.get(this.getUrl(''), {
@@ -430,19 +395,35 @@ class AuditRevisionsApiService extends ACommonsBaseV1ApiService {
         return this.http.get(this.getUrl(`/changes/${revId}`));
     }
     listRevisionsWithStateForEntityType(params, entityType) {
+        let localVarHeaders = this.defaultHeaders;
+        localVarHeaders = localVarHeaders.set('Accept', 'application/json');
         return this.http
             .get(this.getUrl(`/states/${entityType}`), {
-            params: AuditUtil.paramsToHttpParams(params)
+            params: AuditUtil.paramsToHttpParams(params),
+            headers: localVarHeaders
         })
             .pipe(map(res => {
             return {
-                data: this.deserializeClassArray(res.data, RevEntityWithStateDto),
+                data: res.data.map(item => {
+                    return {
+                        revEntity: item.revEntity,
+                        revType: item.revType,
+                        entityClassName: item.entityClassName,
+                        entityState: item.entityState
+                    };
+                }),
                 totalCount: res.totalCount
             };
         }));
     }
     fetchRevisionsWithStateForEntityType(entityType, revId, itemId) {
-        return this.http.get(this.getUrl(`/states/${entityType}?rev=eq:${revId}&id=eq:${itemId}`)).pipe(map(res => this.deserializeClassArray(res.data, RevEntityWithId).map(i => {
+        let localVarHeaders = this.defaultHeaders;
+        localVarHeaders = localVarHeaders.set('Accept', 'application/json');
+        return this.http
+            .get(this.getUrl(`/states/${entityType}?rev=eq:${revId}&id=eq:${itemId}`), {
+            headers: localVarHeaders
+        })
+            .pipe(map(res => res.data.map(i => {
             i.mergedId = i.revEntity?.['rev'] + '_' + i.entityState?.['id'];
             return i;
         })), map(items => {
@@ -452,19 +433,13 @@ class AuditRevisionsApiService extends ACommonsBaseV1ApiService {
             throw new CommonsInternalError(`Entity revision ${revId} for ${entityType} with id ${itemId} was not found`);
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditRevisionsApiService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditRevisionsApiService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditRevisionsApiService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditRevisionsApiService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditRevisionsApiService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditRevisionsApiService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 
-let GuiEntityModelWithI18n = class GuiEntityModelWithI18n extends GuiEntityModelDto {
-};
-GuiEntityModelWithI18n = __decorate([
-    TypeName('MngGuiEntityModelWithI18n')
-], GuiEntityModelWithI18n);
-
 class AuditEntityRevisionsPageComponent {
     constructor() {
         this.router = inject(Router);
@@ -492,7 +467,7 @@ class AuditEntityRevisionsPageComponent {
             if (!revModel || !selectedRevisionEntity?.entityName) {
                 return undefined;
             }
-            const desc = TableviewDescriptor.fromClass(RevEntityWithId, 'mergedId', undefined, selectedRevisionEntity.entityName);
+            const desc = tableviewDescriptor({ id: 'mergedId', i18nBase: selectedRevisionEntity.entityName });
             AuditUtil.buildDescriptorForEntityRevision(desc, revModel, selectedRevisionEntity);
             desc.table.withColumnsResizable();
             desc.table.withCurrentColumnsReorderable();
@@ -507,16 +482,17 @@ class AuditEntityRevisionsPageComponent {
             }
             const entityName = selectedRevisionEntity.entityName;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            return TableviewDataProvider.fromClassWithService(RevEntityWithId, AuditRevisionsApiService).withGetAll((params, service) => selectedRevisionEntity.entityName
+            return tableviewDataProviderWithService(AuditRevisionsApiService).withGetAll((params, service) => selectedRevisionEntity.entityName
                 ? service.listRevisionsWithStateForEntityType(params, entityName).pipe(map(res => {
                     const revEntityWithStateAndIdList = [];
                     for (const revEntityWithState of res.data) {
-                        const revEntityWithStateAndId = new RevEntityWithId();
-                        revEntityWithStateAndId.mergedId = revEntityWithState.revEntity?.['rev'] + '_' + revEntityWithState.entityState?.['id'];
-                        revEntityWithStateAndId.revType = revEntityWithState.revType;
-                        revEntityWithStateAndId.revEntity = revEntityWithState.revEntity;
-                        revEntityWithStateAndId.entityState = revEntityWithState.entityState;
-                        revEntityWithStateAndId.entityClassName = revEntityWithState.entityClassName;
+                        const revEntityWithStateAndId = {
+                            mergedId: revEntityWithState.revEntity?.['rev'] + '_' + revEntityWithState.entityState?.['id'],
+                            revType: revEntityWithState.revType,
+                            revEntity: revEntityWithState.revEntity,
+                            entityState: revEntityWithState.entityState,
+                            entityClassName: revEntityWithState.entityClassName
+                        };
                         revEntityWithStateAndIdList.push(revEntityWithStateAndId);
                     }
                     return { data: revEntityWithStateAndIdList, totalCount: res.totalCount };
@@ -530,7 +506,7 @@ class AuditEntityRevisionsPageComponent {
                 return [];
             }
             const entityName = selectedRevisionEntity.entityName;
-            const detailsAction = ActionEditorDetailsDescriptor.createWithProvider(descriptor.detailsEditor, AuditRevisionsApiService)
+            const detailsAction = actionEditorDetails(descriptor.detailsEditor, AuditRevisionsApiService)
                 .withFetchFunction(ctx => {
                 if (!entityName) {
                     return throwError(() => new CommonsInternalError('No revision entity is provided for details.'));
@@ -545,7 +521,7 @@ class AuditEntityRevisionsPageComponent {
                 .withEditorTitle('pages.entityRevisions.actions.details.editor.title');
             return [detailsAction];
         });
-        this.revisionEntitiesLookupProvider = LookupDataProvider.fromClass(GuiEntityModelWithI18n).withLookup(() => this.auditService.auditModel$.pipe(map(model => {
+        this.revisionEntitiesLookupProvider = lookupDataProviderWithService(AuditService).withLookup(() => this.auditService.auditModel$.pipe(map(model => {
             const modelI18n = model;
             modelI18n.sort((m1, m2) => {
                 if (m1.entityName && m2.entityName) {
@@ -583,50 +559,14 @@ class AuditEntityRevisionsPageComponent {
             this.router.navigate(['/audit/entity-revisions/']);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditEntityRevisionsPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.2", type: AuditEntityRevisionsPageComponent, isStandalone: true, selector: "mng-audit-entity-revisions-page", providers: [AuditRevisionsApiService], ngImport: i0, template: "<div class=\"card\">\n    <div class=\"field mb-0\">\n        <mng-dropdown\n            id=\"revisionEntityDropdown\"\n            [placeholder]=\"'pages.entityRevisions.dropdown.placeholder' | translate\"\n            optionsLabelProperty=\"entityNameI18n\"\n            [ngModel]=\"selectedRevisionEntity()\"\n            (valueChange)=\"onRevisionEntityChange($event)\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"\n            [showClear]=\"true\"></mng-dropdown>\n        @if (!selectedRevisionEntity()) {\n            <small class=\"block\">\n                {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n            </small>\n        }\n    </div>\n</div>\n@if (showTableview() && descriptor()) {\n    <mng-tableview [descriptor]=\"descriptor()!\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n", dependencies: [{ kind: "component", type: DropdownComponent, selector: "mng-dropdown", inputs: ["dataProvider", "options", "optionsTrackProperty", "optionsLabelProperty", "optionsLabelTranslate", "optionsValueProperty", "optionsDisabledProperty", "multiselect", "placeholder", "showClear", "selectFirstItem", "className", "dropdownClassName", "changeValueOnBlur"], outputs: ["valueChange"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: TranslateModule }, { kind: "pipe", type: i2.TranslatePipe, name: "translate" }, { kind: "ngmodule", type: FormlyModule }, { kind: "component", type: TableviewComponent, selector: "mng-tableview", inputs: ["descriptor", "dataProvider", "actions"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditEntityRevisionsPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.4", type: AuditEntityRevisionsPageComponent, isStandalone: true, selector: "mng-audit-entity-revisions-page", providers: [AuditRevisionsApiService], ngImport: i0, template: "<div class=\"card\">\n    <div class=\"field mb-0\">\n        <mng-dropdown\n            id=\"revisionEntityDropdown\"\n            [placeholder]=\"'pages.entityRevisions.dropdown.placeholder' | translate\"\n            optionsLabelProperty=\"entityNameI18n\"\n            [ngModel]=\"selectedRevisionEntity()\"\n            (valueChange)=\"onRevisionEntityChange($event)\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"\n            [showClear]=\"true\"></mng-dropdown>\n        @if (!selectedRevisionEntity()) {\n            <small class=\"block\">\n                {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n            </small>\n        }\n    </div>\n</div>\n@if (showTableview() && descriptor()) {\n    <mng-tableview [descriptor]=\"descriptor()!\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n", dependencies: [{ kind: "component", type: DropdownComponent, selector: "mng-dropdown", inputs: ["dataProvider", "options", "optionsTrackProperty", "optionsLabelProperty", "optionsLabelTranslate", "optionsValueProperty", "optionsDisabledProperty", "multiselect", "placeholder", "showClear", "selectFirstItem", "className", "dropdownClassName", "changeValueOnBlur", "loading", "disabled"], outputs: ["valueChange", "blur"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: TranslateModule }, { kind: "pipe", type: i2.TranslatePipe, name: "translate" }, { kind: "ngmodule", type: FormlyModule }, { kind: "component", type: TableviewComponent, selector: "mng-tableview", inputs: ["descriptor", "dataProvider", "actions"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditEntityRevisionsPageComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditEntityRevisionsPageComponent, decorators: [{
             type: Component,
             args: [{ standalone: true, selector: 'mng-audit-entity-revisions-page', imports: [DropdownComponent, FormsModule, AsyncPipe, TranslateModule, FormlyModule, TableviewComponent], providers: [AuditRevisionsApiService], changeDetection: ChangeDetectionStrategy.OnPush, template: "<div class=\"card\">\n    <div class=\"field mb-0\">\n        <mng-dropdown\n            id=\"revisionEntityDropdown\"\n            [placeholder]=\"'pages.entityRevisions.dropdown.placeholder' | translate\"\n            optionsLabelProperty=\"entityNameI18n\"\n            [ngModel]=\"selectedRevisionEntity()\"\n            (valueChange)=\"onRevisionEntityChange($event)\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"\n            [showClear]=\"true\"></mng-dropdown>\n        @if (!selectedRevisionEntity()) {\n            <small class=\"block\">\n                {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n            </small>\n        }\n    </div>\n</div>\n@if (showTableview() && descriptor()) {\n    <mng-tableview [descriptor]=\"descriptor()!\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n" }]
         }], ctorParameters: () => [] });
 
-var RevEntityWithChangesDto_1;
-let RevEntityWithChangesDto = class RevEntityWithChangesDto {
-    static { RevEntityWithChangesDto_1 = this; }
-    static { this.attributeTypeMap = [
-        {
-            name: 'revEntity',
-            baseName: 'revEntity',
-            type: '{ [key: string]: any; }'
-        },
-        {
-            name: 'entityNameChangesMap',
-            baseName: 'entityNameChangesMap',
-            type: '{ [key: string]: Array<EntityChange>; }'
-        }
-    ]; }
-    static getAttributeTypeMap() {
-        return RevEntityWithChangesDto_1.attributeTypeMap;
-    }
-};
-RevEntityWithChangesDto = RevEntityWithChangesDto_1 = __decorate([
-    TypeName('MngRevEntityWithChangesDto')
-], RevEntityWithChangesDto);
-TypeRegistry.get().registerType(RevEntityWithChangesDto);
-
-let RevEntity = class RevEntity {
-};
-RevEntity = __decorate([
-    TypeName('MngRevEntity')
-], RevEntity);
-
-let RevEntityDetailed = class RevEntityDetailed extends RevEntity {
-};
-RevEntityDetailed = __decorate([
-    TypeName('MngRevEntityDetailed')
-], RevEntityDetailed);
-
 class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
     constructor() {
         super(...arguments);
@@ -663,7 +603,7 @@ class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
             }
         }
         const guiEntityModel = this.auditModel.filter(m => m.entityName === entityChanges.entityType)[0];
-        const desc = TableDescriptor.fromClass(EntityRevisionChangeState, undefined, undefined, guiEntityModel.entityName).withClassName('py-2');
+        const desc = tableDescriptor({ i18nBase: guiEntityModel.entityName }).withClassName('py-2');
         if (guiEntityModel.entityName) {
             desc.withTitle(guiEntityModel.entityName);
         }
@@ -683,10 +623,10 @@ class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
         desc.withTrackProperty(`EntityChangeField_${entityChanges.entityType ?? 'default'}`);
         return desc;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: EntityChangesFieldComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.2", type: EntityChangesFieldComponent, isStandalone: true, selector: "mng-entity-changes-field", inputs: { injector: "injector" }, usesInheritance: true, ngImport: i0, template: "@if (modelFetched | async) {\n    <div>\n        @for (ec of entityChanges; track ec) {\n            <mng-table [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n        }\n    </div>\n} @else {\n    <div class=\"text-center\">\n        <i class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\n    </div>\n}\n", styles: ["::ng-deep tr.audit-row-deleted{background:#ff3d331a!important}::ng-deep tr.audit-row-deleted .audit-cell{background:#f6544c4d!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:#1bc5624d!important}\n"], dependencies: [{ kind: "component", type: TableComponent, selector: "mng-table", inputs: ["descriptor", "items", "result", "loading", "dataProvider", "useQueryParams", "selectionMode", "selectionEnabled", "columnLastMinWidth", "captionComponent", "columnCustomLastComponent", "globalFilterFields"], outputs: ["tableLoad", "cellClick", "selectionChange", "captionComponentInstance", "columnCustomLastComponentInstance"] }, { kind: "pipe", type: AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: EntityChangesFieldComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.4", type: EntityChangesFieldComponent, isStandalone: true, selector: "mng-entity-changes-field", inputs: { injector: "injector" }, usesInheritance: true, ngImport: i0, template: "@if (modelFetched | async) {\n    <div>\n        @for (ec of entityChanges; track ec) {\n            <mng-table [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n        }\n    </div>\n} @else {\n    <div class=\"text-center\">\n        <i class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\n    </div>\n}\n", styles: ["::ng-deep tr.audit-row-deleted{background:#ff3d331a!important}::ng-deep tr.audit-row-deleted .audit-cell{background:#f6544c4d!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:#1bc5624d!important}\n"], dependencies: [{ kind: "component", type: TableComponent, selector: "mng-table", inputs: ["descriptor", "items", "result", "loading", "dataProvider", "useQueryParams", "selectionMode", "selectionEnabled", "columnLastMinWidth", "captionComponent", "columnCustomLastComponent", "globalFilterFields"], outputs: ["tableLoad", "cellClick", "selectionChange", "captionComponentInstance", "columnCustomLastComponentInstance"] }, { kind: "pipe", type: AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: EntityChangesFieldComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: EntityChangesFieldComponent, decorators: [{
             type: Component,
             args: [{ standalone: true, selector: 'mng-entity-changes-field', imports: [TableComponent, AsyncPipe], changeDetection: ChangeDetectionStrategy.OnPush, template: "@if (modelFetched | async) {\n    <div>\n        @for (ec of entityChanges; track ec) {\n            <mng-table [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n        }\n    </div>\n} @else {\n    <div class=\"text-center\">\n        <i class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\n    </div>\n}\n", styles: ["::ng-deep tr.audit-row-deleted{background:#ff3d331a!important}::ng-deep tr.audit-row-deleted .audit-cell{background:#f6544c4d!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:#1bc5624d!important}\n"] }]
         }], propDecorators: { injector: [{
@@ -703,13 +643,13 @@ class AuditRevisionsPageComponent {
             const revModel = this.revModel();
             if (revModel) {
                 const idProperty = revModel.properties?.filter(prop => prop.isId).map(prop => prop.resolvedPropertyName)[0];
-                const model = ModelDescriptor.fromClass(RevEntity);
+                const revEntModel = model({ id: 'rev', title: 'rev', i18nBase: 'MngRevEntity' });
                 if (revModel.entityName)
-                    model.withI18nBase(revModel.entityName);
+                    revEntModel.withI18nBase(revModel.entityName);
                 if (idProperty)
-                    model.withIdPropertyUnsafe(idProperty);
-                const desc = TableviewDescriptor.fromModel(model);
-                const detailsDescriptor = EditorDescriptor.fromClass(RevEntityWithChangesDto, undefined, undefined, undefined, TableviewEditorTypeEnum.Details);
+                    revEntModel.withIdPropertyUnsafe(idProperty);
+                const desc = tableviewDescriptor(revEntModel);
+                const detailsDescriptor = editorDescriptor({ i18nBase: 'MngRevEntity', tableviewEditorType: TableviewEditorTypeEnum.Details });
                 detailsDescriptor.model.withIdPropertyUnsafe('revEntity.' + idProperty);
                 if (revModel.properties) {
                     AuditUtil.addColumnsFromModel(desc.table, revModel.properties);
@@ -725,28 +665,27 @@ class AuditRevisionsPageComponent {
                 desc.withDetailsDescriptor(detailsDescriptor); // MngRevEntity is extended by MngRevEntityWithChangesDto, so no real harm here
                 return desc;
             }
-            return TableviewDescriptor.fromClass(RevEntity);
+            return tableviewDescriptor();
         });
-        this.dataProvider = signal(TableviewDataProvider.fromClassWithService(RevEntity, AuditRevisionsApiService).withGetAll((params, service) => service.getRevisionList(params).pipe(map(res => ({ data: res.data, totalCount: res.totalCount })))));
+        this.dataProvider = signal(tableviewDataProviderWithService(AuditRevisionsApiService).withGetAll((params, service) => service.getRevisionList(params).pipe(map(res => ({ data: res.data, totalCount: res.totalCount })))));
         this.actions = computed(() => {
-            console.log(this.descriptor());
-            const detailsAction = ActionEditorDetailsDescriptor.createWithProvider(this.descriptor().detailsEditor, AuditRevisionsApiService).withFetchFunction(ctx => {
-                console.log(ctx);
+            const detailsAction = actionEditorDetails(this.descriptor().detailsEditor, AuditRevisionsApiService).withFetchFunction(ctx => {
                 return ctx.serviceInstance.getAllChangesForRevision(itemIdToDefined(ctx.parameters.itemId)).pipe(map(item => {
-                    const revEntityWithChanges = new RevEntityDetailed();
-                    revEntityWithChanges.rev = ctx.parameters.itemId;
-                    revEntityWithChanges.revEntity = item.revEntity;
-                    revEntityWithChanges.entityNameChangesMap = item.entityNameChangesMap;
+                    const revEntityWithChanges = {
+                        rev: ctx.parameters.itemId,
+                        revEntity: item.revEntity,
+                        entityNameChangesMap: item.entityNameChangesMap
+                    };
                     return revEntityWithChanges;
                 }));
             });
             return [detailsAction];
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditRevisionsPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.2", type: AuditRevisionsPageComponent, isStandalone: true, selector: "mng-audit-revisions-page", providers: [AuditRevisionsApiService], ngImport: i0, template: "@if (showTableview()) {\n    <mng-tableview [descriptor]=\"descriptor()\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n", dependencies: [{ kind: "component", type: TableviewComponent, selector: "mng-tableview", inputs: ["descriptor", "dataProvider", "actions"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditRevisionsPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.4", type: AuditRevisionsPageComponent, isStandalone: true, selector: "mng-audit-revisions-page", providers: [AuditRevisionsApiService], ngImport: i0, template: "@if (showTableview()) {\n    <mng-tableview [descriptor]=\"descriptor()\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n", dependencies: [{ kind: "component", type: TableviewComponent, selector: "mng-tableview", inputs: ["descriptor", "dataProvider", "actions"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImport: i0, type: AuditRevisionsPageComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuditRevisionsPageComponent, decorators: [{
             type: Component,
             args: [{ standalone: true, selector: 'mng-audit-revisions-page', imports: [TableviewComponent, AsyncPipe, RouterOutlet, JsonPipe], providers: [AuditRevisionsApiService], changeDetection: ChangeDetectionStrategy.OnPush, template: "@if (showTableview()) {\n    <mng-tableview [descriptor]=\"descriptor()\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n" }]
         }] });
@@ -757,30 +696,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.2", ngImpor
  * @param routeConfig Optionally provide route configs.
  */
 function provideAuditRoutes(config, routeConfig) {
-    const routeBuilder = RouteBuilder.create('', config.rootPageComponent ?? AuditPageComponent)
+    const routeBuilder = createRoute('', config.rootPageComponent ?? AuditPageComponent)
         .withProvider(AuditService)
         .withProvider({
         provide: COMMONS_AUDIT_MODULE_CONFIG_IT,
         useValue: config
     })
-        .addChildBuilder(RouteBuilder.createRedirect('', routeConfig?.defaultRedirect ?? 'revisions', 'full'));
+        .addChildBuilder(createRouteRedirect('', routeConfig?.defaultRedirect ?? 'revisions', 'full'));
     if (routeConfig?.preRevisionRoutes?.length) {
         routeConfig.preRevisionRoutes.forEach(r => routeBuilder.addChildBuilder(r));
     }
-    const revisionsRouteBuilder = TableviewRouteBuilder.fromComponent('revisions', config.revisionsPageComponent ?? AuditRevisionsPageComponent)
+    const revisionsRouteBuilder = createTableviewRoute('revisions', config.revisionsPageComponent ?? AuditRevisionsPageComponent)
         .withTitle('pages.revisions.title')
         .withAdd(false)
         .withDelete(false)
         .withEdit(false);
     if (routeConfig?.revisionsMenuItem) {
-        revisionsRouteBuilder.withCommonsMenuItem(routeConfig.revisionsMenuItem);
+        revisionsRouteBuilder.withMenuItemOpts(routeConfig.revisionsMenuItem);
     }
     else {
         revisionsRouteBuilder.withMenuItem('pi pi-book', 'pages.revisions.title');
     }
-    const entityRevisionsRouteBuilder = RouteBuilder.create('entity-revisions', config.entityRevisionsPageComponent ?? AuditEntityRevisionsPageComponent).withTitle('pages.entityRevisions.title');
+    const entityRevisionsRouteBuilder = createRoute('entity-revisions', config.entityRevisionsPageComponent ?? AuditEntityRevisionsPageComponent).withTitle('pages.entityRevisions.title');
     if (routeConfig?.entityRevisionsMenuItem) {
-        entityRevisionsRouteBuilder.withCommonsMenuItem(routeConfig.entityRevisionsMenuItem);
+        entityRevisionsRouteBuilder.withMenuItemOpts(routeConfig.entityRevisionsMenuItem);
     }
     else {
         entityRevisionsRouteBuilder.withMenuItem('pi pi-building', 'pages.entityRevisions.title');
@@ -788,11 +727,11 @@ function provideAuditRoutes(config, routeConfig) {
     routeBuilder
         .addChildBuilder(revisionsRouteBuilder)
         .addChildBuilder(entityRevisionsRouteBuilder)
-        .addChildBuilder(TableviewRouteBuilder.fromComponent('entity-revisions/:entityClass', config.entityRevisionsPageComponent ?? AuditEntityRevisionsPageComponent).withTitle('pages.entityRevisions.title'));
+        .addChildBuilder(createTableviewRoute('entity-revisions/:entityClass', config.entityRevisionsPageComponent ?? AuditEntityRevisionsPageComponent).withTitle('pages.entityRevisions.title'));
     if (routeConfig?.postRevisionRoutes?.length) {
         routeConfig.postRevisionRoutes.forEach(r => routeBuilder.addChildBuilder(r));
     }
-    return RoutesBuilder.create().addRouteBuilder(routeBuilder).build();
+    return createRoutes().add(routeBuilder).build();
 }
 
 /**