@mediusinc/mng-commons-audit 3.0.0-rc.1 → 3.0.0-rc.4

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

@@ -1,124 +1,61 @@
-import { TypeName, ObjectSerializer, MediusFilterMatchType, AMngBaseApiService, MngConfigurationService, AMngTableviewRouteComponent, LookupDataProvider, TableviewDescriptor, TableFilterDisplayEnum, TableviewDataProvider, MediusQueryResult, ActionEditorDescriptor, ActionPositionEnum, ActionDataProviderUtil, TableviewActionDefaultCategories, ActionEditorSubmitDescriptor, ActionEditorSubmitTypeEnum, MngDropdownComponent, MngTableviewRouteComponent, AMngFormlyCustomFieldComponent, TableDescriptor, TablePaginationModeEnum, MngTableComponent, EditorDescriptor, TableviewEditorTypeEnum, MngTableviewComponent, RoutesBuilder, RouteBuilder, TableviewRouteBuilder } from '@mediusinc/mng-commons';
+import { TypeName, ObjectSerializer, MediusFilterMatchType, AMngBaseApiService, MngConfigurationService, MngErrorInternal, AMngTableviewRouteComponent, LookupDataProvider, TableviewDescriptor, TableviewDataProvider, MediusQueryResult, ActionEditorDescriptor, ActionPositionEnum, ActionDataProviderUtil, TableviewActionDefaultCategories, ActionEditorSubmitDescriptor, ActionEditorSubmitTypeEnum, MngDropdownComponent, MngTableviewRouteComponent, AMngFormlyCustomFieldComponent, TableDescriptor, TablePaginationModeEnum, MngTableComponent, EditorDescriptor, TableviewEditorTypeEnum, TableFilterDisplayEnum, MngTableviewComponent, RoutesBuilder, RouteBuilder, TableviewRouteBuilder } from '@mediusinc/mng-commons';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, Component, signal, Input, Injector, ChangeDetectionStrategy } from '@angular/core';
+import { InjectionToken, inject, Injectable, Component, DestroyRef, signal, Input, Injector, ChangeDetectionStrategy } from '@angular/core';
 import { map } from 'rxjs/operators';
 import { __decorate } from 'tslib';
-import { shareReplay, switchMap, BehaviorSubject } from 'rxjs';
+import { of, shareReplay, combineLatest, throwError, BehaviorSubject } from 'rxjs';
 import * as i1 from '@angular/router';
 import { RouterOutlet } from '@angular/router';
 import { NgIf, AsyncPipe, NgForOf, JsonPipe } from '@angular/common';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import * as i2 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import { FormlyModule } from '@ngx-formly/core';
 import * as i3 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-var EntityChange_1;
-let EntityChange = class EntityChange {
-    static { EntityChange_1 = this; }
+var MngRevEntityWithStateDto_1;
+let MngRevEntityWithStateDto = class MngRevEntityWithStateDto {
+    static { MngRevEntityWithStateDto_1 = this; }
     static { this.attributeTypeMap = [
+        {
+            name: 'revEntity',
+            baseName: 'revEntity',
+            type: '{ [key: string]: any; }'
+        },
         {
             name: 'revType',
             baseName: 'revType',
             type: 'RevisionType'
         },
         {
-            name: 'entityOldState',
-            baseName: 'entityOldState',
-            type: '{ [key: string]: any; }'
+            name: 'entityClassName',
+            baseName: 'entityClassName',
+            type: 'string'
         },
         {
-            name: 'entityNewState',
-            baseName: 'entityNewState',
+            name: 'entityState',
+            baseName: 'entityState',
             type: '{ [key: string]: any; }'
         }
     ]; }
     static getAttributeTypeMap() {
-        return EntityChange_1.attributeTypeMap;
+        return MngRevEntityWithStateDto_1.attributeTypeMap;
     }
 };
-EntityChange = EntityChange_1 = __decorate([
-    TypeName('EntityChange')
-], EntityChange);
-ObjectSerializer.get().registerType(EntityChange);
+MngRevEntityWithStateDto = MngRevEntityWithStateDto_1 = __decorate([
+    TypeName('MngRevEntityWithStateDto')
+], MngRevEntityWithStateDto);
+ObjectSerializer.get().registerType(MngRevEntityWithStateDto);
 
-var GuiEntityModel_1;
-let GuiEntityModel = class GuiEntityModel {
-    static { GuiEntityModel_1 = this; }
-    static { this.attributeTypeMap = [
-        {
-            name: 'entityName',
-            baseName: 'entityName',
-            type: 'string'
-        },
-        {
-            name: 'properties',
-            baseName: 'properties',
-            type: 'Array<GuiPropertyModel>'
-        }
-    ]; }
-    static getAttributeTypeMap() {
-        return GuiEntityModel_1.attributeTypeMap;
-    }
+let MngRevEntityWithId = class MngRevEntityWithId extends MngRevEntityWithStateDto {
 };
-GuiEntityModel = GuiEntityModel_1 = __decorate([
-    TypeName('GuiEntityModel')
-], GuiEntityModel);
-ObjectSerializer.get().registerType(GuiEntityModel);
+MngRevEntityWithId = __decorate([
+    TypeName('MngRevEntityWithId')
+], MngRevEntityWithId);
+ObjectSerializer.get().registerType(MngRevEntityWithId);
 
-var GuiPropertyModel_1;
-let GuiPropertyModel = class GuiPropertyModel {
-    static { GuiPropertyModel_1 = this; }
-    static { this.attributeTypeMap = [
-        {
-            name: 'propertyName',
-            baseName: 'propertyName',
-            type: 'string'
-        },
-        {
-            name: 'resolvedPropertyName',
-            baseName: 'resolvedPropertyName',
-            type: 'string'
-        },
-        {
-            name: 'enumClassSimpleName',
-            baseName: 'enumClassSimpleName',
-            type: 'string'
-        },
-        {
-            name: 'possibleEnumValues',
-            baseName: 'possibleEnumValues',
-            type: 'Array<string>'
-        },
-        {
-            name: 'isId',
-            baseName: 'isId',
-            type: 'boolean'
-        },
-        {
-            name: 'propertyType',
-            baseName: 'propertyType',
-            type: 'GuiPropertyType'
-        },
-        {
-            name: 'relationModel',
-            baseName: 'relationModel',
-            type: 'GuiRelationModel'
-        },
-        {
-            name: 'id',
-            baseName: 'id',
-            type: 'boolean'
-        }
-    ]; }
-    static getAttributeTypeMap() {
-        return GuiPropertyModel_1.attributeTypeMap;
-    }
-};
-GuiPropertyModel = GuiPropertyModel_1 = __decorate([
-    TypeName('GuiPropertyModel')
-], GuiPropertyModel);
-ObjectSerializer.get().registerType(GuiPropertyModel);
+const MNG_AUDIT_MODULE_CONFIG_IT = new InjectionToken('MngAuditModuleConfig');
 
 /**
  * Medius quarkus sampler
@@ -131,104 +68,17 @@ ObjectSerializer.get().registerType(GuiPropertyModel);
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-var GuiPropertyType;
-(function (GuiPropertyType) {
-    GuiPropertyType["LocalDate"] = "LOCAL_DATE";
-    GuiPropertyType["OffsetDateTime"] = "OFFSET_DATE_TIME";
-    GuiPropertyType["String"] = "STRING";
-    GuiPropertyType["Number"] = "NUMBER";
-    GuiPropertyType["Boolean"] = "BOOLEAN";
-    GuiPropertyType["Enum"] = "ENUM";
-    GuiPropertyType["Wildcard"] = "WILDCARD";
-})(GuiPropertyType || (GuiPropertyType = {}));
-ObjectSerializer.get().registerEnum(GuiPropertyType, 'GuiPropertyType');
-
-var GuiRelationModel_1;
-let GuiRelationModel = class GuiRelationModel {
-    static { GuiRelationModel_1 = this; }
-    static { this.attributeTypeMap = [
-        {
-            name: 'idPropertyName',
-            baseName: 'idPropertyName',
-            type: 'string'
-        },
-        {
-            name: 'isAudited',
-            baseName: 'isAudited',
-            type: 'boolean'
-        },
-        {
-            name: 'audited',
-            baseName: 'audited',
-            type: 'boolean'
-        }
-    ]; }
-    static getAttributeTypeMap() {
-        return GuiRelationModel_1.attributeTypeMap;
-    }
-};
-GuiRelationModel = GuiRelationModel_1 = __decorate([
-    TypeName('GuiRelationModel')
-], GuiRelationModel);
-ObjectSerializer.get().registerType(GuiRelationModel);
-
-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('RevEntityWithChangesDto')
-], RevEntityWithChangesDto);
-ObjectSerializer.get().registerType(RevEntityWithChangesDto);
-
-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('RevEntityWithStateDto')
-], RevEntityWithStateDto);
-ObjectSerializer.get().registerType(RevEntityWithStateDto);
+var MngGuiPropertyTypeDto;
+(function (MngGuiPropertyTypeDto) {
+    MngGuiPropertyTypeDto["LocalDate"] = "LOCAL_DATE";
+    MngGuiPropertyTypeDto["OffsetDateTime"] = "OFFSET_DATE_TIME";
+    MngGuiPropertyTypeDto["String"] = "STRING";
+    MngGuiPropertyTypeDto["Number"] = "NUMBER";
+    MngGuiPropertyTypeDto["Boolean"] = "BOOLEAN";
+    MngGuiPropertyTypeDto["Enum"] = "ENUM";
+    MngGuiPropertyTypeDto["Wildcard"] = "WILDCARD";
+})(MngGuiPropertyTypeDto || (MngGuiPropertyTypeDto = {}));
+ObjectSerializer.get().registerEnum(MngGuiPropertyTypeDto, 'MngGuiPropertyTypeDto');
 
 /**
  * Medius quarkus sampler
@@ -241,19 +91,13 @@ ObjectSerializer.get().registerType(RevEntityWithStateDto);
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-var RevisionType;
-(function (RevisionType) {
-    RevisionType["Add"] = "ADD";
-    RevisionType["Mod"] = "MOD";
-    RevisionType["Del"] = "DEL";
-})(RevisionType || (RevisionType = {}));
-ObjectSerializer.get().registerEnum(RevisionType, 'RevisionType');
-
-let RevEntityWithId = class RevEntityWithId extends RevEntityWithStateDto {
-};
-RevEntityWithId = __decorate([
-    TypeName('RevEntityWithId')
-], RevEntityWithId);
+var MngRevisionTypeDto;
+(function (MngRevisionTypeDto) {
+    MngRevisionTypeDto["Add"] = "ADD";
+    MngRevisionTypeDto["Mod"] = "MOD";
+    MngRevisionTypeDto["Del"] = "DEL";
+})(MngRevisionTypeDto || (MngRevisionTypeDto = {}));
+ObjectSerializer.get().registerEnum(MngRevisionTypeDto, 'MngRevisionTypeDto');
 
 var NewMediusFilterMatchType;
 (function (NewMediusFilterMatchType) {
@@ -275,225 +119,142 @@ var NewMediusFilterMatchType;
 })(NewMediusFilterMatchType || (NewMediusFilterMatchType = {}));
 
 class AuditUtil {
-    static addColumnsFromModel(descriptor, propertyList) {
-        for (const property of propertyList) {
-            if (property.propertyType === GuiPropertyType.Enum) {
-                // TODO is there a nicer way than appending "Dto" at the end of the simple name to match
-                descriptor
-                    .addColumn(property.resolvedPropertyName)
-                    .withSort()
-                    .asEnum(ObjectSerializer.get().findEnum(property.enumClassSimpleName + 'Dto'))
-                    .withFilterLookupEnum(property.possibleEnumValues);
+    static addColumnsFromModel(descriptor, properties, modelType = undefined, addFilters = true, addSorts = true) {
+        for (const property of properties) {
+            if (!property.resolvedPropertyName) {
+                continue;
+            }
+            const columnPrepend = modelType ? `${modelType}.` : '';
+            const isEnum = property.propertyType === MngGuiPropertyTypeDto.Enum;
+            let column = null;
+            if (isEnum) {
+                if (!property.possibleEnumValues) {
+                    continue;
+                }
+                const enumType = AuditUtil.findEnumType(property);
+                if (enumType) {
+                    column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName).asEnum(enumType);
+                    if (addFilters) {
+                        column.withFilterLookupEnum(property.possibleEnumValues);
+                    }
+                }
+                else {
+                    column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName);
+                    if (addFilters) {
+                        (column?.withFilterLookup()).withLookup(() => of(property.possibleEnumValues ?? []));
+                    }
+                }
             }
-            else if (property.propertyType === GuiPropertyType.Number) {
-                descriptor.addColumn(property.resolvedPropertyName).withSort().asNumber().withFilter();
+            else if (property.propertyType === MngGuiPropertyTypeDto.Number) {
+                column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName).asNumber();
             }
-            else if (property.propertyType === GuiPropertyType.Boolean) {
-                descriptor.addColumn(property.resolvedPropertyName).withSort().asBoolean().withFilter();
+            else if (property.propertyType === MngGuiPropertyTypeDto.Boolean) {
+                column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName).asBoolean();
             }
-            else if (property.propertyType === GuiPropertyType.LocalDate) {
-                descriptor.addColumn(property.resolvedPropertyName).withSort().asDate('dd. MMM yyyy').withFilter();
+            else if (property.propertyType === MngGuiPropertyTypeDto.LocalDate) {
+                column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName).asDate('dd. MM yyyy');
             }
-            else if (property.propertyType === GuiPropertyType.OffsetDateTime) {
-                descriptor.addColumn(property.resolvedPropertyName).withSort().asDate('dd. MMM yyyy HH:mm').withFilter();
+            else if (property.propertyType === MngGuiPropertyTypeDto.OffsetDateTime) {
+                column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName).asDate('dd. MM yyyy HH:mm');
             }
             else {
                 // string / wildcard
-                descriptor.addColumn(property.resolvedPropertyName).withSort().withFilter();
+                column = descriptor.addColumn(columnPrepend + property.resolvedPropertyName).withTitle(AuditUtil.getPropertyTitleKey(property, modelType));
+            }
+            column.withTitle(AuditUtil.getPropertyTitleKey(property, modelType));
+            if (!isEnum && addFilters) {
+                column?.withFilter();
+            }
+            if (addSorts) {
+                column?.withSort();
             }
         }
         return descriptor;
     }
-    static addFieldsFromModel(descriptor, revModel) {
-        for (const property of revModel.properties) {
-            if (property.propertyType === GuiPropertyType.Enum) {
-                descriptor
-                    .addFieldLookupEnum('revEntity.' + property.resolvedPropertyName, ObjectSerializer.get().findEnum(property.enumClassSimpleName), property.possibleEnumValues)
-                    .withLabel(property.resolvedPropertyName)
-                    .withDisabled();
+    static getPropertyTitleKey(property, modelType = undefined) {
+        if (modelType === 'revEntity') {
+            return 'MngRevEntity.properties.' + property.resolvedPropertyName;
+        }
+        return property.resolvedPropertyName ?? '';
+    }
+    static addFieldsFromModel(descriptor, properties, modelType = 'revEntity') {
+        for (const property of properties) {
+            if (!property.resolvedPropertyName) {
+                continue;
+            }
+            const fieldPrepend = `${modelType}.`;
+            if (property.propertyType === MngGuiPropertyTypeDto.Enum) {
+                const enumType = AuditUtil.findEnumType(property);
+                if (enumType) {
+                    if (!property.possibleEnumValues) {
+                        continue;
+                    }
+                    descriptor.addFieldLookupEnum(fieldPrepend + property.resolvedPropertyName, enumType, property.possibleEnumValues).withDisabled();
+                }
+                else {
+                    descriptor.addField(fieldPrepend + property.resolvedPropertyName).withLabel(AuditUtil.getPropertyTitleKey(property, modelType));
+                }
             }
-            else if (property.propertyType === GuiPropertyType.Number) {
+            else if (property.propertyType === MngGuiPropertyTypeDto.Number) {
                 descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
+                    .addField(fieldPrepend + property.resolvedPropertyName)
+                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
                     .asNumber()
                     .withDisabled();
             }
-            else if (property.propertyType === GuiPropertyType.Boolean) {
+            else if (property.propertyType === MngGuiPropertyTypeDto.Boolean) {
                 descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
+                    .addField(fieldPrepend + property.resolvedPropertyName)
+                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
                     .withDisabled();
             }
-            else if (property.propertyType === GuiPropertyType.LocalDate) {
+            else if (property.propertyType === MngGuiPropertyTypeDto.LocalDate) {
                 descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
+                    .addField(fieldPrepend + property.resolvedPropertyName)
+                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
                     .asDatePicker('dd. MMM yyyy')
                     .withDisabled();
             }
-            else if (property.propertyType === GuiPropertyType.OffsetDateTime) {
+            else if (property.propertyType === MngGuiPropertyTypeDto.OffsetDateTime) {
                 descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
+                    .addField(fieldPrepend + property.resolvedPropertyName)
+                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
                     .asDatePicker('dd. MM yy', undefined, undefined, true, false)
                     .withDisabled();
             }
             else {
                 // string / wildcard
                 descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
+                    .addField(fieldPrepend + property.resolvedPropertyName)
+                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
                     .withDisabled();
             }
         }
         return descriptor;
     }
     static buildDescriptorForEntityRevision(descriptor, revModel, entityModel) {
-        descriptor
-            .addColumn('revType')
-            .withTitle('revType')
-            .asEnum(ObjectSerializer.get().findEnum('RevisionType'))
-            .withFilterLookupEnum([RevisionType.Add, RevisionType.Mod, RevisionType.Del]);
-        descriptor.addFieldLookupEnum('revType', ObjectSerializer.get().findEnum('RevisionType'), [RevisionType.Add, RevisionType.Mod, RevisionType.Del]).withLabel('revType');
-        for (const property of revModel.properties) {
-            if (property.propertyType === GuiPropertyType.Enum) {
-                // TODO is there a nicer way than appending "Dto" at the end of the simple name to match
-                descriptor
-                    .addColumn('revEntity.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asEnum(ObjectSerializer.get().findEnum(property.enumClassSimpleName + 'Dto'))
-                    .withSort()
-                    .withFilterLookupEnum(property.possibleEnumValues);
-                descriptor
-                    .addFieldLookupEnum('revEntity.' + property.resolvedPropertyName, ObjectSerializer.get().findEnum(property.enumClassSimpleName + 'Dto'), property.possibleEnumValues)
-                    .withLabel(property.resolvedPropertyName);
-            }
-            else if (property.propertyType === GuiPropertyType.Number) {
-                descriptor
-                    .addColumn('revEntity.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asNumber()
-                    .withSort()
-                    .withFilter();
-                descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
-                    .asNumber();
-            }
-            else if (property.propertyType === GuiPropertyType.Boolean) {
-                descriptor
-                    .addColumn('revEntity.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asBoolean()
-                    .withSort()
-                    .withFilter();
-                descriptor.addField('revEntity.' + property.resolvedPropertyName).withLabel(property.resolvedPropertyName);
-            }
-            else if (property.propertyType === GuiPropertyType.LocalDate) {
-                descriptor
-                    .addColumn('revEntity.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asDate('dd. MMM yyyy')
-                    .withSort()
-                    .withFilter();
-                descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
-                    .asDatePicker('dd. MMM yyyy');
-            }
-            else if (property.propertyType === GuiPropertyType.OffsetDateTime) {
-                descriptor
-                    .addColumn('revEntity.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asDate('dd. MMM yyyy HH:mm')
-                    .withSort()
-                    .withFilter();
-                descriptor
-                    .addField('revEntity.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
-                    .asDatePicker('dd. MM yy', undefined, undefined, true, false);
-            }
-            else {
-                // string / wildcard
-                descriptor
-                    .addColumn('revEntity.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .withSort()
-                    .withFilter();
-                descriptor.addField('revEntity.' + property.resolvedPropertyName).withLabel(property.resolvedPropertyName);
-            }
+        descriptor.addColumn('revType').withTitle('MngEntityRevisionChangeState.properties.revType').asEnum(MngRevisionTypeDto).withFilter();
+        descriptor.addFieldLookupEnum('revType', MngRevisionTypeDto).withLabel('MngEntityRevisionChangeState.properties.revType');
+        if (revModel.properties) {
+            AuditUtil.addColumnsFromModel(descriptor.table, revModel.properties, 'revEntity');
+            AuditUtil.addFieldsFromModel(descriptor.detailsEditor, revModel.properties, 'revEntity');
         }
-        for (const property of entityModel.properties) {
-            if (property.propertyType === GuiPropertyType.Enum) {
-                // TODO is there a nicer way than appending "Dto" at the end of the simple name to match
-                descriptor
-                    .addColumn('entityState.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asEnum(ObjectSerializer.get().findEnum(property.enumClassSimpleName + 'Dto'))
-                    .withSort()
-                    .withFilterLookupEnum(property.possibleEnumValues);
-                descriptor
-                    .addFieldLookupEnum('entityState.' + property.resolvedPropertyName, ObjectSerializer.get().findEnum(property.enumClassSimpleName + 'Dto'), property.possibleEnumValues)
-                    .withLabel(property.resolvedPropertyName);
-            }
-            else if (property.propertyType === GuiPropertyType.Number) {
-                descriptor
-                    .addColumn('entityState.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asNumber()
-                    .withSort()
-                    .withFilter();
-                descriptor
-                    .addField('entityState.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
-                    .asNumber();
-            }
-            else if (property.propertyType === GuiPropertyType.Boolean) {
-                descriptor
-                    .addColumn('entityState.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asBoolean()
-                    .withSort()
-                    .withFilter();
-                descriptor.addField('entityState.' + property.resolvedPropertyName).withLabel(property.resolvedPropertyName);
-            }
-            else if (property.propertyType === GuiPropertyType.LocalDate) {
-                descriptor
-                    .addColumn('entityState.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asDate('dd. MMM yyyy')
-                    .withSort()
-                    .withFilter();
-                descriptor
-                    .addField('entityState.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
-                    .asDatePicker('dd. MMM yyyy');
-            }
-            else if (property.propertyType === GuiPropertyType.OffsetDateTime) {
-                descriptor
-                    .addColumn('entityState.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .asDate('dd. MMM yyyy HH:mm')
-                    .withSort()
-                    .withFilter();
-                descriptor
-                    .addField('entityState.' + property.resolvedPropertyName)
-                    .withLabel(property.resolvedPropertyName)
-                    .asDatePicker('dd. MM yy', undefined, undefined, true, false);
-            }
-            else {
-                // string / wildcard
-                descriptor
-                    .addColumn('entityState.' + property.resolvedPropertyName)
-                    .withTitle(property.resolvedPropertyName)
-                    .withSort()
-                    .withFilter();
-                descriptor.addField('entityState.' + property.resolvedPropertyName).withLabel(property.resolvedPropertyName);
-            }
+        if (entityModel.properties) {
+            AuditUtil.addColumnsFromModel(descriptor.table, entityModel.properties, 'entityState');
+            AuditUtil.addFieldsFromModel(descriptor.detailsEditor, entityModel.properties, 'entityState');
         }
         return descriptor;
     }
+    static findEnumType(property) {
+        if (!property.enumClassSimpleName) {
+            return undefined;
+        }
+        let enumType = ObjectSerializer.get().findEnum(property.enumClassSimpleName);
+        if (!enumType) {
+            enumType = ObjectSerializer.get().findEnum(property.enumClassSimpleName + 'Dto');
+        }
+        return enumType;
+    }
     static extractPropertyName(fullPropertyName) {
         if (fullPropertyName?.includes('entityState.')) {
             return fullPropertyName.replace('entityState.', '');
@@ -509,12 +270,7 @@ class AuditUtil {
             url += '&sorts=';
             const sortingQPs = [];
             for (let i = 0; i < queryParams.sortProperty.length; i++) {
-                if (queryParams.sortAsc[i]) {
-                    sortingQPs.push(`asc:${this.extractPropertyName(queryParams.sortProperty[i])}`);
-                }
-                else {
-                    sortingQPs.push(`desc:${this.extractPropertyName(queryParams.sortProperty[i])}`);
-                }
+                sortingQPs.push(`${queryParams.sortAsc?.[i] ?? true ? 'asc' : 'desc'}:${this.extractPropertyName(queryParams.sortProperty[i])}`);
             }
             url += sortingQPs.join(',');
         }
@@ -571,8 +327,6 @@ class AuditUtil {
     }
 }
 
-const MNG_AUDIT_MODULE_CONFIG_IT = new InjectionToken('MngAuditModuleConfig');
-
 class MngAuditRevisionsApiService extends AMngBaseApiService {
     constructor() {
         super();
@@ -597,13 +351,17 @@ class MngAuditRevisionsApiService extends AMngBaseApiService {
     listRevisionsWithStateForEntityType(queryParams, entityType) {
         return this.http
             .get(this.getUrl(`/states/${entityType}`, AuditUtil.appendMediusQueryParamsToUrl(queryParams)))
-            .pipe(map(response => this.deserializeClassArray(response, RevEntityWithStateDto)));
+            .pipe(map(response => this.deserializeClassArray(response, MngRevEntityWithStateDto)));
     }
     fetchRevisionsWithStateForEntityType(entityType, revId, itemId) {
-        return this.http.get(this.getUrl(`/states/${entityType}?rev=eq:${revId}&id=eq:${itemId}`)).pipe(map(response => {
-            const item = this.deserializeClass(response[0], RevEntityWithId);
-            item.mergedId = response[0].revEntity['rev'] + '_' + response[0].entityState['id'];
-            return item;
+        return this.http.get(this.getUrl(`/states/${entityType}?rev=eq:${revId}&id=eq:${itemId}`)).pipe(map(response => this.deserializeClassArray(response, MngRevEntityWithId).map(i => {
+            i.mergedId = i.revEntity?.['rev'] + '_' + i.entityState?.['id'];
+            return i;
+        })), map(items => {
+            if (items.length > 0) {
+                return items[0];
+            }
+            throw new MngErrorInternal(`Entity revision ${revId} for ${entityType} with id ${itemId} was not found`);
         }));
     }
     countRevisionsWithStateForEntityType(queryParams, entityType) {
@@ -616,6 +374,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.7", ngImpor
             type: Injectable
         }], ctorParameters: function () { return []; } });
 
+var MngGuiEntityModelDto_1;
+let MngGuiEntityModelDto = class MngGuiEntityModelDto {
+    static { MngGuiEntityModelDto_1 = this; }
+    static { this.attributeTypeMap = [
+        {
+            name: 'entityName',
+            baseName: 'entityName',
+            type: 'string'
+        },
+        {
+            name: 'properties',
+            baseName: 'properties',
+            type: 'Array<GuiPropertyModel>'
+        }
+    ]; }
+    static getAttributeTypeMap() {
+        return MngGuiEntityModelDto_1.attributeTypeMap;
+    }
+};
+MngGuiEntityModelDto = MngGuiEntityModelDto_1 = __decorate([
+    TypeName('MngGuiEntityModelDto')
+], MngGuiEntityModelDto);
+ObjectSerializer.get().registerType(MngGuiEntityModelDto);
+
 class MngAuditService extends AMngBaseApiService {
     constructor() {
         super();
@@ -645,7 +427,7 @@ class MngAuditService extends AMngBaseApiService {
         return this.http.get(this.getUrl('/rev-model'));
     }
     requestAuditModel() {
-        return this.http.get(this.getUrl('/audit-models')).pipe(map(response => this.deserializeClassArray(response, GuiEntityModel)));
+        return this.http.get(this.getUrl('/audit-models')).pipe(map(response => this.deserializeClassArray(response, MngGuiEntityModelDto)));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: MngAuditService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: MngAuditService }); }
@@ -667,24 +449,33 @@ class MngAuditEntityRevisionsPageComponent extends AMngTableviewRouteComponent {
     constructor(router) {
         super();
         this.router = router;
+        this.destroyRef = inject(DestroyRef);
         this.auditService = inject(MngAuditService);
         this.revisisonsApiService = inject(MngAuditRevisionsApiService);
-        this.showTable = signal(false);
-        this.revisionEntitiesLookupProvider = new LookupDataProvider(GuiEntityModel).withLookup(() => this.auditService.auditModel$);
-        this.auditService.revModel$.subscribe({
-            next: model => (this.revModel = model)
-        });
+        this.showTableview = signal(false);
+        this.revisionEntitiesLookupProvider = new LookupDataProvider(MngGuiEntityModelDto).withLookup(() => this.auditService.auditModel$.pipe(map(model => model.sort((m1, m2) => {
+            if (m1.entityName && m2.entityName) {
+                return m1.entityName.localeCompare(m2.entityName);
+            }
+            else if (m1.entityName && !m2.entityName) {
+                return 1;
+            }
+            else {
+                return -1;
+            }
+        }))));
     }
     ngOnInit() {
-        this.route.paramMap.subscribe(params => {
+        this.route.paramMap.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(params => {
             const entityClass = params.get('entityClass');
             if (entityClass) {
-                this.auditService.auditModel$.subscribe(entities => {
+                combineLatest([this.auditService.auditModel$, this.auditService.revModel$]).subscribe(([entities, revModel]) => {
+                    this.revModel = revModel;
                     for (const e of entities) {
                         if (e.entityName === entityClass) {
                             this.selectedRevisionEntity = e;
                             super.ngOnInit();
-                            setTimeout(() => this.showTable.set(true));
+                            setTimeout(() => this.showTableview.set(true));
                         }
                     }
                 });
@@ -692,7 +483,7 @@ class MngAuditEntityRevisionsPageComponent extends AMngTableviewRouteComponent {
         });
     }
     onRevisionEntityChange() {
-        this.showTable.set(false);
+        this.showTableview.set(false);
         if (this.selectedRevisionEntity) {
             this.router.navigate(['/audit/entity-revisions/' + this.selectedRevisionEntity.entityName]);
         }
@@ -701,82 +492,168 @@ class MngAuditEntityRevisionsPageComponent extends AMngTableviewRouteComponent {
         }
     }
     createTableviewDescriptor() {
-        const desc = new TableviewDescriptor(RevEntityWithId, 'mergedId', undefined, this.selectedRevisionEntity.entityName);
-        desc.table.withFilterDisplay(TableFilterDisplayEnum.Row);
-        return AuditUtil.buildDescriptorForEntityRevision(desc, this.revModel, this.selectedRevisionEntity);
+        if (!this.revModel || !this.selectedRevisionEntity?.entityName) {
+            throw new MngErrorInternal('No revision model or revision entity is provided for tableview.');
+        }
+        const desc = new TableviewDescriptor(MngRevEntityWithId, 'mergedId', undefined, this.selectedRevisionEntity.entityName);
+        AuditUtil.buildDescriptorForEntityRevision(desc, this.revModel, this.selectedRevisionEntity);
+        desc.table.withColumnsResizable();
+        desc.table.withCurrentColumnsReorderable();
+        desc.table.withCurrentColumnsToggleable();
+        desc.table.withDataKey(`EntityRevisionsPage_${this.selectedRevisionEntity.entityName}`);
+        return desc;
     }
     createTableviewDataProvider() {
-        let allDataCount = 0;
-        return new TableviewDataProvider(RevEntityWithId).withGetAll(qp => this.revisisonsApiService.countRevisionsWithStateForEntityType(qp, this.selectedRevisionEntity.entityName).pipe(switchMap(revisionCount => {
-            allDataCount = revisionCount;
-            return this.revisisonsApiService.listRevisionsWithStateForEntityType(qp, this.selectedRevisionEntity.entityName);
-        }), map(values => {
-            const revEntityWithStateAndIdList = [];
-            for (const revEntityWithState of values) {
-                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;
-                revEntityWithStateAndIdList.push(revEntityWithStateAndId);
-            }
-            return MediusQueryResult.fromArray(revEntityWithStateAndIdList, allDataCount);
-        })));
+        if (!this.revModel || !this.selectedRevisionEntity?.entityName) {
+            throw new MngErrorInternal('No revision model or revision entity is provided for tableview.');
+        }
+        const entityName = this.selectedRevisionEntity.entityName;
+        return new TableviewDataProvider(MngRevEntityWithId).withGetAll(qp => this.selectedRevisionEntity?.entityName
+            ? combineLatest([
+                this.revisisonsApiService.countRevisionsWithStateForEntityType(qp, entityName),
+                this.revisisonsApiService.listRevisionsWithStateForEntityType(qp, entityName)
+            ]).pipe(map(([count, values]) => {
+                const revEntityWithStateAndIdList = [];
+                for (const revEntityWithState of values) {
+                    const revEntityWithStateAndId = new MngRevEntityWithId();
+                    revEntityWithStateAndId.mergedId = revEntityWithState.revEntity?.['rev'] + '_' + revEntityWithState.entityState?.['id'];
+                    revEntityWithStateAndId.revType = revEntityWithState.revType;
+                    revEntityWithStateAndId.revEntity = revEntityWithState.revEntity;
+                    revEntityWithStateAndId.entityState = revEntityWithState.entityState;
+                    revEntityWithStateAndId.entityClassName = revEntityWithState.entityClassName;
+                    revEntityWithStateAndIdList.push(revEntityWithStateAndId);
+                }
+                return MediusQueryResult.fromArray(revEntityWithStateAndIdList, count);
+            }))
+            : throwError(() => new MngErrorInternal('No revision entity is provided for list.')));
     }
     createActionDescriptors() {
+        if (!this.revModel || !this.selectedRevisionEntity?.entityName) {
+            throw new MngErrorInternal('No revision model or revision entity is provided for tableview.');
+        }
+        const entityName = this.selectedRevisionEntity.entityName;
         const detailsAction = new ActionEditorDescriptor(this.descriptor.detailsEditor, 'entity-revision-details')
             .withPosition(ActionPositionEnum.RowClick)
             .withRouteTrigger(':itemId')
             .withFetchFunction(ActionDataProviderUtil.runFetchOrFail)
             .withTableviewCategory(TableviewActionDefaultCategories.DETAILS)
             .withFetchFunction(ctx => {
+            if (!entityName) {
+                return throwError(() => new MngErrorInternal('No revision entity is provided for details.'));
+            }
+            if (!ctx.parameters.itemId) {
+                return throwError(() => new MngErrorInternal('No item id for revision entity details is provided.'));
+            }
             const revId = ctx.parameters.itemId.toString().split('_')[0];
             const itemId = ctx.parameters.itemId.toString().split('_')[1];
-            return this.revisisonsApiService.fetchRevisionsWithStateForEntityType(this.selectedRevisionEntity.entityName, revId, itemId);
+            return this.revisisonsApiService.fetchRevisionsWithStateForEntityType(entityName, revId, itemId);
         });
         detailsAction.withEditorActions([new ActionEditorSubmitDescriptor(detailsAction, ActionEditorSubmitTypeEnum.Cancel)]);
         return [detailsAction];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: MngAuditEntityRevisionsPageComponent, deps: [{ token: i1.Router }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.7", type: MngAuditEntityRevisionsPageComponent, isStandalone: true, selector: "mng-audit-entity-revisions-page", usesInheritance: true, 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            [itemsLabelProperty]=\"'entityName'\"\n            [(ngModel)]=\"selectedRevisionEntity\"\n            (valueChange)=\"onRevisionEntityChange()\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"></mng-dropdown>\n        <small *ngIf=\"!selectedRevisionEntity\" class=\"block\">\n            {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n        </small>\n    </div>\n</div>\n<div *ngIf=\"showTable()\">\n    <mng-tableview-route [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n</div>\n", dependencies: [{ kind: "component", type: MngDropdownComponent, selector: "mng-dropdown", inputs: ["dataProvider", "dataKeyProperty", "itemsLabelProperty", "itemsLabelTranslate", "itemsValueProperty", "itemsDisabledProperty", "multiselect", "placeholder", "showClear", "selectFirstItem", "className", "dropdownClassName", "changeValueOnBlur"], outputs: ["valueChange"] }, { kind: "component", type: MngTableviewRouteComponent, selector: "mng-tableview-route", inputs: ["descriptor", "dataProvider", "actions"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: TranslateModule }, { kind: "pipe", type: i3.TranslatePipe, name: "translate" }, { kind: "ngmodule", type: FormlyModule }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.7", type: MngAuditEntityRevisionsPageComponent, isStandalone: true, selector: "mng-audit-entity-revisions-page", usesInheritance: true, 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            [itemsLabelProperty]=\"'entityName'\"\n            [(ngModel)]=\"selectedRevisionEntity\"\n            (valueChange)=\"onRevisionEntityChange()\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"></mng-dropdown>\n        <small *ngIf=\"!selectedRevisionEntity\" class=\"block\">\n            {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n        </small>\n    </div>\n</div>\n<div *ngIf=\"showTableview()\">\n    <mng-tableview-route [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n</div>\n", dependencies: [{ kind: "component", type: MngDropdownComponent, selector: "mng-dropdown", inputs: ["dataProvider", "dataKeyProperty", "itemsLabelProperty", "itemsLabelTranslate", "itemsValueProperty", "itemsDisabledProperty", "multiselect", "placeholder", "showClear", "selectFirstItem", "className", "dropdownClassName", "changeValueOnBlur"], outputs: ["valueChange"] }, { kind: "component", type: MngTableviewRouteComponent, selector: "mng-tableview-route", inputs: ["descriptor", "dataProvider", "actions"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: TranslateModule }, { kind: "pipe", type: i3.TranslatePipe, name: "translate" }, { kind: "ngmodule", type: FormlyModule }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: MngAuditEntityRevisionsPageComponent, decorators: [{
             type: Component,
-            args: [{ standalone: true, selector: 'mng-audit-entity-revisions-page', imports: [MngDropdownComponent, MngTableviewRouteComponent, FormsModule, AsyncPipe, NgIf, TranslateModule, FormlyModule], template: "<div class=\"card\">\n    <div class=\"field mb-0\">\n        <mng-dropdown\n            id=\"revisionEntityDropdown\"\n            [placeholder]=\"'pages.entityRevisions.dropdown.placeholder' | translate\"\n            [itemsLabelProperty]=\"'entityName'\"\n            [(ngModel)]=\"selectedRevisionEntity\"\n            (valueChange)=\"onRevisionEntityChange()\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"></mng-dropdown>\n        <small *ngIf=\"!selectedRevisionEntity\" class=\"block\">\n            {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n        </small>\n    </div>\n</div>\n<div *ngIf=\"showTable()\">\n    <mng-tableview-route [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n</div>\n" }]
+            args: [{ standalone: true, selector: 'mng-audit-entity-revisions-page', imports: [MngDropdownComponent, MngTableviewRouteComponent, FormsModule, AsyncPipe, NgIf, TranslateModule, FormlyModule], template: "<div class=\"card\">\n    <div class=\"field mb-0\">\n        <mng-dropdown\n            id=\"revisionEntityDropdown\"\n            [placeholder]=\"'pages.entityRevisions.dropdown.placeholder' | translate\"\n            [itemsLabelProperty]=\"'entityName'\"\n            [(ngModel)]=\"selectedRevisionEntity\"\n            (valueChange)=\"onRevisionEntityChange()\"\n            [dataProvider]=\"revisionEntitiesLookupProvider\"></mng-dropdown>\n        <small *ngIf=\"!selectedRevisionEntity\" class=\"block\">\n            {{ 'pages.entityRevisions.dropdown.helpText' | translate }}\n        </small>\n    </div>\n</div>\n<div *ngIf=\"showTableview()\">\n    <mng-tableview-route [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n</div>\n" }]
         }], ctorParameters: function () { return [{ type: i1.Router }]; } });
 
-let EntityChanges = class EntityChanges {
+var MngRevEntityWithChangesDto_1;
+let MngRevEntityWithChangesDto = class MngRevEntityWithChangesDto {
+    static { MngRevEntityWithChangesDto_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 MngRevEntityWithChangesDto_1.attributeTypeMap;
+    }
+};
+MngRevEntityWithChangesDto = MngRevEntityWithChangesDto_1 = __decorate([
+    TypeName('MngRevEntityWithChangesDto')
+], MngRevEntityWithChangesDto);
+ObjectSerializer.get().registerType(MngRevEntityWithChangesDto);
+
+let MngRevEntity = class MngRevEntity {
+};
+MngRevEntity = __decorate([
+    TypeName('MngRevEntity')
+], MngRevEntity);
+
+let MngRevEntityDetailed = class MngRevEntityDetailed extends MngRevEntity {
+};
+MngRevEntityDetailed = __decorate([
+    TypeName('MngRevEntityDetailed')
+], MngRevEntityDetailed);
+
+let MngEntityRevisionChangeState = class MngEntityRevisionChangeState {
+};
+MngEntityRevisionChangeState = __decorate([
+    TypeName('MngEntityRevisionChangeState')
+], MngEntityRevisionChangeState);
+
+let MngEntityRevisionChanges = class MngEntityRevisionChanges {
 };
-EntityChanges = __decorate([
-    TypeName('EntityChanges')
-], EntityChanges);
+MngEntityRevisionChanges = __decorate([
+    TypeName('MngEntityChanges')
+], MngEntityRevisionChanges);
 
 class EntityChangesFieldComponent extends AMngFormlyCustomFieldComponent {
     constructor() {
         super(...arguments);
+        this.destroyRef = inject(DestroyRef);
         this.entityChanges = [];
         this.modelFetched = new BehaviorSubject(false);
+        this.auditModel = [];
     }
     ngOnInit() {
-        this.injector?.get(MngAuditService, undefined, { optional: true })?.auditModel$.subscribe({
+        this.fieldValue = this.formControl.value;
+        this.injector
+            ?.get(MngAuditService, undefined, { optional: true })
+            ?.auditModel$.pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe({
             next: model => {
                 this.auditModel = model;
-                if ('entityNameChangesMap' in this.model) {
-                    for (const key of Object.keys(this.model['entityNameChangesMap'])) {
-                        const ec = new EntityChanges();
+                if (this.fieldValue) {
+                    for (const key of Object.keys(this.fieldValue)) {
+                        const ec = new MngEntityRevisionChanges();
                         ec.entityType = key;
                         ec.items = [];
-                        for (const change of this.model['entityNameChangesMap'][key]) {
-                            if (change.revType === RevisionType.Add) {
-                                ec.items.push({ revType: change.revType, ...change.entityNewState, color: 'green' });
+                        for (const change of this.fieldValue[key]) {
+                            if (change.revType === MngRevisionTypeDto.Add && change.entityNewState) {
+                                const item = new MngEntityRevisionChangeState();
+                                item.revType = change.revType;
+                                item.color = 'green';
+                                Object.entries(change.entityNewState).forEach(([key, value]) => (item[key] = value));
+                                ec.items.push(item);
                             }
-                            else if (change.revType === RevisionType.Del) {
-                                ec.items.push({ revType: change.revType, ...change.entityOldState, color: 'red' });
+                            else if (change.revType === MngRevisionTypeDto.Del && change.entityOldState) {
+                                const item = new MngEntityRevisionChangeState();
+                                item.revType = change.revType;
+                                item.color = 'red';
+                                Object.entries(change.entityOldState).forEach(([key, value]) => (item[key] = value));
+                                ec.items.push(item);
                             }
-                            else {
-                                ec.items.push({ revType: change.revType, ...change.entityOldState, color: 'red' });
-                                ec.items.push({ revType: change.revType, ...change.entityNewState, color: 'green' });
+                            else if (change.revType === MngRevisionTypeDto.Mod && change.entityOldState && change.entityNewState) {
+                                const itemOld = new MngEntityRevisionChangeState();
+                                itemOld.revType = change.revType;
+                                itemOld.color = 'red';
+                                Object.entries(change.entityOldState).forEach(([key, value]) => (itemOld[key] = value));
+                                const itemNew = new MngEntityRevisionChangeState();
+                                itemNew.revType = change.revType;
+                                itemNew.color = 'green';
+                                Object.entries(change.entityNewState).forEach(([key, value]) => (itemNew[key] = value));
+                                ec.items.push(itemOld);
+                                ec.items.push(itemNew);
                             }
                         }
                         this.entityChanges.push(ec);
@@ -788,7 +665,7 @@ class EntityChangesFieldComponent extends AMngFormlyCustomFieldComponent {
     }
     createDescriptor(entityChanges) {
         const changedFields = [];
-        if (entityChanges.items && entityChanges.items[0].revType === RevisionType.Mod) {
+        if (entityChanges.items && entityChanges.items[0].revType === MngRevisionTypeDto.Mod) {
             for (const key in entityChanges.items[0]) {
                 if (entityChanges.items[0][key] !== entityChanges.items[1][key]) {
                     changedFields.push(key);
@@ -796,25 +673,32 @@ class EntityChangesFieldComponent extends AMngFormlyCustomFieldComponent {
             }
         }
         const guiEntityModel = this.auditModel.filter(m => m.entityName === entityChanges.entityType)[0];
-        const desc = new TableDescriptor({}, undefined, undefined, guiEntityModel.entityName).withTitle(guiEntityModel.entityName).withClassName('py-2');
-        desc.addColumn('revType').asEnum(RevisionType);
-        AuditUtil.addColumnsFromModel(desc, guiEntityModel.properties);
-        desc.withRowClassName(undefined, (_, item) => (item.color === 'green' ? 'audit-row-added' : 'audit-row-deleted'));
+        const desc = new TableDescriptor(MngEntityRevisionChangeState, undefined, undefined, guiEntityModel.entityName).withClassName('py-2');
+        if (guiEntityModel.entityName) {
+            desc.withTitle(guiEntityModel.entityName);
+        }
+        desc.addColumn('revType').withTitle('MngEntityRevisionChangeState.properties.revType').asEnum(MngRevisionTypeDto);
+        if (guiEntityModel.properties) {
+            AuditUtil.addColumnsFromModel(desc, guiEntityModel.properties, undefined, false, false);
+        }
+        desc.withRowClassName(undefined, (_, item) => (item ? (item.color === 'green' ? 'audit-row-added' : 'audit-row-deleted') : ''));
         desc.columns.forEach(col => {
-            col.withSort(false);
             if (changedFields.length > 0 && changedFields.some(val => col.property === val)) {
                 col.withClassName('audit-cell');
             }
         });
         desc.withPaginationMode(TablePaginationModeEnum.Pagination);
+        desc.withCurrentColumnsReorderable();
+        desc.withCurrentColumnsToggleable();
+        desc.withDataKey(`EntityChangeField_${entityChanges.entityType ?? 'default'}`);
         return desc;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: EntityChangesFieldComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.7", type: EntityChangesFieldComponent, isStandalone: true, selector: "mng-entity-changes-field", inputs: { injector: "injector" }, usesInheritance: true, ngImport: i0, template: "<div *ngIf=\"modelFetched | async\">\n    <mng-table *ngFor=\"let ec of entityChanges\" [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n</div>\n", styles: ["::ng-deep tr.audit-row-deleted{background:hsla(3,100%,60%,.1)!important}::ng-deep tr.audit-row-deleted .audit-cell{background:hsla(3,90%,63%,.3)!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:hsla(145,76%,44%,.3)!important}\n"], dependencies: [{ kind: "directive", type: NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: MngTableComponent, selector: "mng-table", inputs: ["descriptor", "items", "queryResult", "loading", "dataProvider", "useQueryParams", "selectionMode", "selectionEnabled", "actions", "isColumnClickable", "viewContainer", "captionComponent", "columnActionComponent", "columnActionMinWidth", "globalFilterFields"], outputs: ["tableLoad", "cellClick", "selectionChange", "captionComponentInstance", "columnActionComponentInstance"] }, { kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: AsyncPipe, name: "async" }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.7", type: EntityChangesFieldComponent, isStandalone: true, selector: "mng-entity-changes-field", inputs: { injector: "injector" }, usesInheritance: true, ngImport: i0, template: "<div *ngIf=\"modelFetched | async; else loading\">\n    <mng-table *ngFor=\"let ec of entityChanges\" [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n</div>\n<ng-template #loading>\n    <div class=\"text-center\">\n        <i class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\n    </div>\n</ng-template>\n", styles: ["::ng-deep tr.audit-row-deleted{background:hsla(3,100%,60%,.1)!important}::ng-deep tr.audit-row-deleted .audit-cell{background:hsla(3,90%,63%,.3)!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:hsla(145,76%,44%,.3)!important}\n"], dependencies: [{ kind: "directive", type: NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: MngTableComponent, selector: "mng-table", inputs: ["descriptor", "items", "queryResult", "loading", "dataProvider", "useQueryParams", "selectionMode", "selectionEnabled", "actions", "isColumnClickable", "viewContainer", "captionComponent", "columnActionComponent", "columnActionMinWidth", "globalFilterFields"], outputs: ["tableLoad", "cellClick", "selectionChange", "captionComponentInstance", "columnActionComponentInstance"] }, { kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: AsyncPipe, name: "async" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: EntityChangesFieldComponent, decorators: [{
             type: Component,
-            args: [{ standalone: true, selector: 'mng-entity-changes-field', imports: [NgForOf, MngTableComponent, NgIf, AsyncPipe], template: "<div *ngIf=\"modelFetched | async\">\n    <mng-table *ngFor=\"let ec of entityChanges\" [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n</div>\n", styles: ["::ng-deep tr.audit-row-deleted{background:hsla(3,100%,60%,.1)!important}::ng-deep tr.audit-row-deleted .audit-cell{background:hsla(3,90%,63%,.3)!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:hsla(145,76%,44%,.3)!important}\n"] }]
+            args: [{ standalone: true, selector: 'mng-entity-changes-field', imports: [NgForOf, MngTableComponent, NgIf, AsyncPipe], template: "<div *ngIf=\"modelFetched | async; else loading\">\n    <mng-table *ngFor=\"let ec of entityChanges\" [items]=\"ec.items\" [descriptor]=\"createDescriptor(ec)\"></mng-table>\n</div>\n<ng-template #loading>\n    <div class=\"text-center\">\n        <i class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\n    </div>\n</ng-template>\n", styles: ["::ng-deep tr.audit-row-deleted{background:hsla(3,100%,60%,.1)!important}::ng-deep tr.audit-row-deleted .audit-cell{background:hsla(3,90%,63%,.3)!important}::ng-deep tr.audit-row-added{background-color:#1bc5621a!important}::ng-deep tr.audit-row-added .audit-cell{background:hsla(145,76%,44%,.3)!important}\n"] }]
         }], propDecorators: { injector: [{
                 type: Input
             }] } });
@@ -822,66 +706,73 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.7", ngImpor
 class MngAuditRevisionsPageComponent extends AMngTableviewRouteComponent {
     constructor() {
         super(...arguments);
+        this.destroyRef = inject(DestroyRef);
+        this.injector = inject(Injector);
         this.auditService = inject(MngAuditService);
         this.revisisonsApiService = inject(MngAuditRevisionsApiService);
-        this.injector = inject(Injector);
-        this.showTable = signal(false);
+        this.showTableview = signal(false);
     }
     ngOnInit() {
-        this.auditService.revModel$.subscribe({
+        this.auditService.revModel$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
             next: model => {
                 this.revModel = model;
                 super.ngOnInit();
-                setTimeout(() => this.showTable.set(true));
+                setTimeout(() => this.showTableview.set(true));
             }
         });
     }
     createTableviewDescriptor() {
         if (this.revModel) {
             const idProperty = this.revModel.properties?.filter(prop => prop.isId).map(prop => prop.resolvedPropertyName)[0];
-            const desc = new TableviewDescriptor({}, idProperty, undefined, this.revModel.entityName);
-            const detailsDescriptor = new EditorDescriptor(RevEntityWithChangesDto, 'revEntity.' + idProperty, undefined, TableviewEditorTypeEnum.Details);
-            AuditUtil.addColumnsFromModel(desc.table, this.revModel.properties);
-            AuditUtil.addFieldsFromModel(detailsDescriptor, this.revModel);
+            const desc = new TableviewDescriptor(MngRevEntity, idProperty, undefined, this.revModel.entityName);
+            const detailsDescriptor = new EditorDescriptor(MngRevEntityWithChangesDto, 'revEntity.' + idProperty, undefined, TableviewEditorTypeEnum.Details);
+            if (this.revModel.properties) {
+                AuditUtil.addColumnsFromModel(desc.table, this.revModel.properties);
+                AuditUtil.addFieldsFromModel(detailsDescriptor, this.revModel.properties);
+            }
             detailsDescriptor.addField('entityNameChangesMap').asCustomComponent(EntityChangesFieldComponent, ['field-no-label'], { injector: this.injector }).withDisabled();
-            desc.withDetailsDescriptor(detailsDescriptor);
+            desc.withDetailsDescriptor(detailsDescriptor); // MngRevEntity is extended by MngRevEntityWithChangesDto, so no real harm here
             desc.table.withFilterDisplay(TableFilterDisplayEnum.Row);
             return desc;
         }
-        return new TableviewDescriptor({});
+        return new TableviewDescriptor(MngRevEntity);
     }
     createTableviewDataProvider() {
         if (this.revModel) {
-            let allDataCount = 0;
-            return new TableviewDataProvider({}).withGetAll(qp => this.revisisonsApiService.getRevisionCount(qp).pipe(switchMap(revisionsCount => {
-                allDataCount = revisionsCount;
-                return this.revisisonsApiService.getRevisionList(qp);
-            }), map(values => MediusQueryResult.fromArray(values, allDataCount))));
+            return new TableviewDataProvider(MngRevEntity).withGetAll(qp => combineLatest([this.revisisonsApiService.getRevisionCount(qp), this.revisisonsApiService.getRevisionList(qp)]).pipe(map(([count, values]) => MediusQueryResult.fromArray(values, count))));
         }
-        return new TableviewDataProvider({});
+        return new TableviewDataProvider(MngRevEntity);
     }
     createActionDescriptors() {
         const detailsAction = new ActionEditorDescriptor(this.descriptor.detailsEditor, 'revision-details')
             .withPosition(ActionPositionEnum.RowClick)
             .withRouteTrigger(':itemId')
-            .withFetchFunction(ActionDataProviderUtil.runFetchOrFail)
             .withTableviewCategory(TableviewActionDefaultCategories.DETAILS)
-            .withFetchFunction(ctx => this.revisisonsApiService.getAllChangesForRevision(ctx.parameters.itemId));
+            .withFetchFunction(ctx => ctx.parameters.itemId
+            ? this.revisisonsApiService.getAllChangesForRevision(ctx.parameters.itemId).pipe(map(item => {
+                const revEntityWithChanges = new MngRevEntityDetailed();
+                revEntityWithChanges.rev = ctx.parameters.itemId;
+                revEntityWithChanges.revEntity = item.revEntity;
+                revEntityWithChanges.entityNameChangesMap = item.entityNameChangesMap;
+                return revEntityWithChanges;
+            }))
+            : throwError(() => new MngErrorInternal('No revision id provided for fetch function')));
         detailsAction.withEditorActions([new ActionEditorSubmitDescriptor(detailsAction, ActionEditorSubmitTypeEnum.Cancel)]);
         return [detailsAction];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: MngAuditRevisionsPageComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.7", type: MngAuditRevisionsPageComponent, isStandalone: true, selector: "mng-audit-revisions-page", usesInheritance: true, ngImport: i0, template: "<mng-tableview-route *ngIf=\"showTable()\" [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n", dependencies: [{ kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MngTableviewRouteComponent, selector: "mng-tableview-route", inputs: ["descriptor", "dataProvider", "actions"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.7", type: MngAuditRevisionsPageComponent, isStandalone: true, selector: "mng-audit-revisions-page", usesInheritance: true, ngImport: i0, template: "<mng-tableview-route *ngIf=\"showTableview()\" [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n", dependencies: [{ kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MngTableviewRouteComponent, selector: "mng-tableview-route", inputs: ["descriptor", "dataProvider", "actions"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.7", ngImport: i0, type: MngAuditRevisionsPageComponent, decorators: [{
             type: Component,
-            args: [{ standalone: true, selector: 'mng-audit-revisions-page', imports: [NgIf, MngTableviewComponent, AsyncPipe, MngTableviewComponent, RouterOutlet, JsonPipe, MngTableviewRouteComponent], changeDetection: ChangeDetectionStrategy.OnPush, template: "<mng-tableview-route *ngIf=\"showTable()\" [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n" }]
+            args: [{ standalone: true, selector: 'mng-audit-revisions-page', imports: [NgIf, MngTableviewComponent, AsyncPipe, MngTableviewComponent, RouterOutlet, JsonPipe, MngTableviewRouteComponent], changeDetection: ChangeDetectionStrategy.OnPush, template: "<mng-tableview-route *ngIf=\"showTableview()\" [descriptor]=\"descriptor\" [dataProvider]=\"dataProvider\" [actions]=\"actions\"></mng-tableview-route>\n" }]
         }] });
 
 function provideMngAuditRoutes(config) {
     return RoutesBuilder.create()
         .addRouteBuilder(RouteBuilder.create('', MngAuditPageComponent)
         .withProvider(MngAuditService)
+        .withProvider(MngAuditService)
         .withProvider(MngAuditRevisionsApiService)
         .withProvider({
         provide: MNG_AUDIT_MODULE_CONFIG_IT,
@@ -889,17 +780,9 @@ function provideMngAuditRoutes(config) {
     })
         .addChildBuilder(RouteBuilder.createRedirect('', 'revisions', 'full'))
         .addChildBuilder(TableviewRouteBuilder.fromComponent('revisions', MngAuditRevisionsPageComponent)
-        .withProvider({
-        useValue: 'zamenjajMeZInjectionTokenom',
-        provide: config
-    })
         .withMenuItem('pi pi-history', 'pages.revisions.title')
         .withTitle('pages.revisions.title'))
         .addChildBuilder(RouteBuilder.create('entity-revisions', MngAuditEntityRevisionsPageComponent)
-        .withProvider({
-        useValue: 'zamenjajMeZInjectionTokenom',
-        provide: config
-    })
         .withMenuItem('pi pi-history', 'pages.entityRevisions.title')
         .withTitle('pages.entityRevisions.title'))
         .addChildBuilder(TableviewRouteBuilder.fromComponent('entity-revisions/:entityClass', MngAuditEntityRevisionsPageComponent).withTitle('pages.entityRevisions.title')))