@mediusinc/mng-commons-audit 5.5.0-rc.1 → 5.5.0-rc.2

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

@@ -1,12 +1,11 @@
-import { CommonsConfigurationService, TypeRegistry, dataListParamsToUrlQuery, CommonsInternalError, itemIdToDefined, createRoute, createRouteRedirect, createRoutes } from '@mediusinc/mng-commons/core';
+import { CommonsConfigurationService, dataListParamsToUrlQuery, CommonsInternalError, getI18n, getI18nTypePropertyKey, effectWithDeps, 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 { InjectionToken, inject, Injectable, Component, ChangeDetectionStrategy, computed, signal, DestroyRef, input, Injector } from '@angular/core';
 import { shareReplay, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { HttpHeaders, HttpClient, HttpParams } from '@angular/common/http';
+import { HttpHeaders, HttpClient } 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';
 import * as i1 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
@@ -118,270 +117,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.12", ngImpo
             args: [{ standalone: true, selector: 'mng-audit-page', imports: [RouterOutlet], changeDetection: ChangeDetectionStrategy.OnPush, template: "<router-outlet></router-outlet>\n" }]
         }] });
 
-/**
- * Medius quarkus sampler
- * Sampler OPENAPI definition
- *
- * The version of the OpenAPI document: 1.0.0
- * Contact: info@medius.si
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-var GuiPropertyTypeDto;
-(function (GuiPropertyTypeDto) {
-    GuiPropertyTypeDto["LocalDate"] = "LOCAL_DATE";
-    GuiPropertyTypeDto["OffsetDateTime"] = "OFFSET_DATE_TIME";
-    GuiPropertyTypeDto["String"] = "STRING";
-    GuiPropertyTypeDto["Number"] = "NUMBER";
-    GuiPropertyTypeDto["Boolean"] = "BOOLEAN";
-    GuiPropertyTypeDto["Enum"] = "ENUM";
-    GuiPropertyTypeDto["Wildcard"] = "WILDCARD";
-})(GuiPropertyTypeDto || (GuiPropertyTypeDto = {}));
-TypeRegistry.get().registerEnum(GuiPropertyTypeDto, 'MngGuiPropertyTypeDto');
-
-/**
- * Medius quarkus sampler
- * Sampler OPENAPI definition
- *
- * The version of the OpenAPI document: 1.0.0
- * Contact: info@medius.si
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-var RevisionTypeDto;
-(function (RevisionTypeDto) {
-    RevisionTypeDto["Add"] = "ADD";
-    RevisionTypeDto["Mod"] = "MOD";
-    RevisionTypeDto["Del"] = "DEL";
-})(RevisionTypeDto || (RevisionTypeDto = {}));
-TypeRegistry.get().registerEnum(RevisionTypeDto, 'MngRevisionTypeDto');
-const revisionTypeEnum = enumModel(RevisionTypeDto.Add, RevisionTypeDto, 'MngRevisionTypeDto');
-
-class AuditUtil {
-    static { this._dateRegex = /\d{4}-[01]\d-[0-3]\d/; }
-    static addColumnsFromModel(descriptor, properties, modelType = undefined, addFilters = true, addSorts = true) {
-        for (const property of properties) {
-            if (!property.resolvedPropertyName) {
-                continue;
-            }
-            const isEnum = property.propertyType === GuiPropertyTypeDto.Enum;
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            let column = null;
-            if (isEnum) {
-                if (!property.possibleEnumValues) {
-                    continue;
-                }
-                const enumModel = AuditUtil.findEnum(property);
-                if (enumModel) {
-                    column = descriptor.addColumnEnum(property.resolvedPropertyName, enumModel);
-                    if (addFilters) {
-                        descriptor.addFilterLookupEnum(column.property, enumModel, property.possibleEnumValues);
-                    }
-                }
-                else {
-                    column = descriptor.addColumnUnsafe(property.resolvedPropertyName);
-                    if (addFilters) {
-                        descriptor.addFilterLookupUnsafe(column.property, lookupDataProvider().withLookup(() => property.possibleEnumValues ?? []));
-                    }
-                }
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.Number) {
-                column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asNumber();
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.Boolean) {
-                column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asBoolean();
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.LocalDate) {
-                column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asDate('dd. MM yyyy');
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.OffsetDateTime) {
-                column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asDate('dd. MM yyyy HH:mm');
-            }
-            else {
-                // string / wildcard
-                column = descriptor.addColumnUnsafe(property.resolvedPropertyName).withTitle(AuditUtil.getPropertyTitleKey(property, modelType));
-            }
-            if (modelType) {
-                column.withGetter((value, item) => item?.[modelType]?.[property.resolvedPropertyName]);
-            }
-            column.withTitle(AuditUtil.getPropertyTitleKey(property, modelType));
-            if (!isEnum && addFilters) {
-                descriptor.addFilterFromColumnDescriptorUnsafe(column);
-            }
-            if (addSorts) {
-                descriptor.withSortUnsafe(column.property);
-            }
-        }
-        return descriptor;
-    }
-    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 === GuiPropertyTypeDto.Enum) {
-                const enumModel = AuditUtil.findEnum(property);
-                if (enumModel) {
-                    if (!property.possibleEnumValues) {
-                        continue;
-                    }
-                    descriptor.addFieldLookupEnum((fieldPrepend + property.resolvedPropertyName), enumModel, property.possibleEnumValues).withDisabled();
-                }
-                else {
-                    descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName).withLabel(AuditUtil.getPropertyTitleKey(property, modelType));
-                }
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.Number) {
-                descriptor
-                    .addFieldUnsafe(fieldPrepend + property.resolvedPropertyName)
-                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
-                    .asNumber()
-                    .withDisabled();
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.Boolean) {
-                descriptor
-                    .addFieldUnsafe(fieldPrepend + property.resolvedPropertyName)
-                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
-                    .withDisabled();
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.LocalDate) {
-                descriptor
-                    .addFieldUnsafe(fieldPrepend + property.resolvedPropertyName)
-                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
-                    .asDatePicker({ format: 'dd. MMM yyyy' })
-                    .withDisabled();
-            }
-            else if (property.propertyType === GuiPropertyTypeDto.OffsetDateTime) {
-                descriptor
-                    .addFieldUnsafe(fieldPrepend + property.resolvedPropertyName)
-                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
-                    .asDatePicker({
-                    format: 'dd. MM yy',
-                    showTime: true,
-                    showSeconds: false
-                })
-                    .withDisabled();
-            }
-            else {
-                // string / wildcard
-                descriptor
-                    .addFieldUnsafe(fieldPrepend + property.resolvedPropertyName)
-                    .withLabel(AuditUtil.getPropertyTitleKey(property, modelType))
-                    .withDisabled();
-            }
-        }
-        return descriptor;
-    }
-    static buildDescriptorForEntityRevision(descriptor, revModel, entityModel) {
-        const revType = descriptor.addColumnEnum('revType', revisionTypeEnum).withTitle('MngEntityRevisionChangeState.properties.revType');
-        descriptor.addFieldLookupEnum('revType', revisionTypeEnum).withLabel('MngEntityRevisionChangeState.properties.revType');
-        descriptor.table.addFilterFromColumnDescriptorUnsafe(revType);
-        if (revModel.properties) {
-            AuditUtil.addColumnsFromModel(descriptor.table, revModel.properties, 'revEntity');
-            AuditUtil.addFieldsFromModel(descriptor.detailsEditor, revModel.properties, 'revEntity');
-        }
-        if (entityModel.properties) {
-            AuditUtil.addColumnsFromModel(descriptor.table, entityModel.properties, 'entityState');
-            AuditUtil.addFieldsFromModel(descriptor.detailsEditor, entityModel.properties, 'entityState');
-        }
-        return descriptor;
-    }
-    static findEnum(property) {
-        if (!property.enumClassSimpleName) {
-            return undefined;
-        }
-        let i18n = property.enumClassSimpleName;
-        let enumType = TypeRegistry.get().findEnum(i18n);
-        if (!enumType) {
-            i18n = property.enumClassSimpleName + 'Dto';
-            enumType = TypeRegistry.get().findEnum(i18n);
-        }
-        if (!enumType && Array.isArray(property.possibleEnumValues)) {
-            i18n = null;
-            enumType = property.possibleEnumValues?.reduce((acc, v) => {
-                const constName = v
-                    .split('_')
-                    .map(s => (s.length > 1 ? s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase() : s))
-                    .join('');
-                if (constName !== v) {
-                    acc[constName] = v;
-                }
-                acc[v] = constName;
-                return acc;
-            }, {});
-        }
-        return enumModelGeneric(enumType, i18n);
-    }
-    static extractPropertyName(fullPropertyName) {
-        if (fullPropertyName?.includes('entityState.')) {
-            return fullPropertyName.replace('entityState.', '');
-        }
-        else if (fullPropertyName?.includes('revEntity.')) {
-            return fullPropertyName?.replace('revEntity.', '');
-        }
-        return fullPropertyName;
-    }
-    static paramsToHttpParams(params) {
-        const routeParams = dataListParamsToUrlQuery(params, null);
-        let httpParams = new HttpParams();
-        Object.entries(routeParams).forEach(([key, value]) => {
-            httpParams = httpParams.append(key, value);
-        });
-        return httpParams;
-    }
-    static mapItemsToEntityChangesArray(fieldValue) {
-        const entityChanges = [];
-        for (const key of Object.keys(fieldValue)) {
-            const ec = { entityType: key, items: [] };
-            for (const change of fieldValue[key]) {
-                if (change.revType === RevisionTypeDto.Add && change.entityNewState) {
-                    const item = {
-                        revType: change.revType,
-                        color: 'green'
-                    };
-                    Object.entries(change.entityNewState).forEach(([key, value]) => (item[key] = value));
-                    ec.items?.push(item);
-                }
-                else if (change.revType === RevisionTypeDto.Del && change.entityOldState) {
-                    const item = {
-                        revType: change.revType,
-                        color: 'red'
-                    };
-                    Object.entries(change.entityOldState).forEach(([key, value]) => (item[key] = value));
-                    ec.items?.push(item);
-                }
-                else if (change.revType === RevisionTypeDto.Mod && change.entityOldState && change.entityNewState) {
-                    const itemOld = {
-                        revType: change.revType,
-                        color: 'red'
-                    };
-                    Object.entries(change.entityOldState).forEach(([key, value]) => (itemOld[key] = value));
-                    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);
-                }
-            }
-            entityChanges.push(ec);
-        }
-        return entityChanges;
-    }
-}
-
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types */
 class AuditRevisionsApiService extends AuditApiService {
     constructor() {
@@ -389,7 +124,7 @@ class AuditRevisionsApiService extends AuditApiService {
     }
     getRevisionList(params) {
         return this.http.get(this.getUrl(''), {
-            params: AuditUtil.paramsToHttpParams(params)
+            params: dataListParamsToUrlQuery(params)
         });
     }
     getAllChangesForRevision(revId) {
@@ -400,7 +135,7 @@ class AuditRevisionsApiService extends AuditApiService {
         localVarHeaders = localVarHeaders.set('Accept', 'application/json');
         return this.http
             .get(this.getUrl(`/states/${entityType}`), {
-            params: AuditUtil.paramsToHttpParams(params),
+            params: dataListParamsToUrlQuery(params),
             headers: localVarHeaders
         })
             .pipe(map(res => {
@@ -441,18 +176,181 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.12", ngImpo
             type: Injectable
         }], ctorParameters: () => [] });
 
+var GuiPropertyTypeDto;
+(function (GuiPropertyTypeDto) {
+    GuiPropertyTypeDto["LocalDate"] = "LOCAL_DATE";
+    GuiPropertyTypeDto["OffsetDateTime"] = "OFFSET_DATE_TIME";
+    GuiPropertyTypeDto["String"] = "STRING";
+    GuiPropertyTypeDto["Number"] = "NUMBER";
+    GuiPropertyTypeDto["Boolean"] = "BOOLEAN";
+    GuiPropertyTypeDto["Enum"] = "ENUM";
+    GuiPropertyTypeDto["Wildcard"] = "WILDCARD";
+})(GuiPropertyTypeDto || (GuiPropertyTypeDto = {}));
+
+var RevisionTypeDto;
+(function (RevisionTypeDto) {
+    RevisionTypeDto["Add"] = "ADD";
+    RevisionTypeDto["Mod"] = "MOD";
+    RevisionTypeDto["Del"] = "DEL";
+})(RevisionTypeDto || (RevisionTypeDto = {}));
+const revisionTypeEnum = enumModel(RevisionTypeDto.Add, RevisionTypeDto, 'MngRevisionTypeDto');
+
+const i18nBaseEntityKey = 'AuditEntities';
+function getI18nAuditEntityName(translate, entityName) {
+    return getI18n(translate, {}, `${i18nBaseEntityKey}.${entityName}.name`, `${i18nBaseEntityKey}.${entityName}`, `${entityName}.name`) ?? entityName;
+}
+function getI18nAuditEntityProperty(translate, entityName, propertyName, modelType = 'entityState') {
+    if (modelType === 'revEntity') {
+        return 'MngRevEntity.properties.' + propertyName;
+    }
+    else {
+        return getI18n(translate, {}, getI18nTypePropertyKey(`${i18nBaseEntityKey}.${entityName}`, propertyName), getI18nTypePropertyKey(entityName, propertyName)) ?? propertyName;
+    }
+}
+
+function auditAddColumnsFromModel(translate, descriptor, entityName, properties, modelType = undefined, addFilters = true, addSorts = true) {
+    for (const property of properties) {
+        if (!property.resolvedPropertyName) {
+            continue;
+        }
+        const isEnum = property.propertyType === GuiPropertyTypeDto.Enum;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let column = null;
+        if (isEnum) {
+            if (!property.possibleEnumValues) {
+                continue;
+            }
+            const enumModel = getEnumModel(property);
+            if (enumModel) {
+                column = descriptor.addColumnEnum(property.resolvedPropertyName, enumModel);
+                if (addFilters) {
+                    descriptor.addFilterLookupEnum(column.property, enumModel, property.possibleEnumValues);
+                }
+            }
+            else {
+                column = descriptor.addColumnUnsafe(property.resolvedPropertyName);
+                if (addFilters) {
+                    descriptor.addFilterLookupUnsafe(column.property, lookupDataProvider().withLookup(() => property.possibleEnumValues ?? []));
+                }
+            }
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.Number) {
+            column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asNumber();
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.Boolean) {
+            column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asBoolean();
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.LocalDate) {
+            column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asDate('dd. MM yyyy');
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.OffsetDateTime) {
+            column = descriptor.addColumnUnsafe(property.resolvedPropertyName).asDate('dd. MM yyyy HH:mm');
+        }
+        else {
+            // string / wildcard
+            column = descriptor.addColumnUnsafe(property.resolvedPropertyName).withTitle(getI18nAuditEntityProperty(translate, entityName, property.propertyName ?? '', modelType));
+        }
+        if (modelType) {
+            column.withGetter((value, item) => item?.[modelType]?.[property.resolvedPropertyName]);
+        }
+        column.withTitle(getI18nAuditEntityProperty(translate, entityName, property.propertyName ?? '', modelType));
+        if (!isEnum && addFilters) {
+            descriptor.addFilterFromColumnDescriptorUnsafe(column).withTitle(column.title ?? '');
+        }
+        if (addSorts) {
+            descriptor.withSortUnsafe(column.property);
+        }
+    }
+    return descriptor;
+}
+function auditAddFieldsFromModel(translate, descriptor, entityName, properties, modelType = 'revEntity') {
+    for (const property of properties) {
+        if (!property.resolvedPropertyName) {
+            continue;
+        }
+        const fieldPrepend = `${modelType}.`;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let field;
+        if (property.propertyType === GuiPropertyTypeDto.Enum) {
+            const enumModel = getEnumModel(property);
+            if (enumModel) {
+                if (!property.possibleEnumValues) {
+                    continue;
+                }
+                field = descriptor.addFieldLookupEnum((fieldPrepend + property.resolvedPropertyName), enumModel, property.possibleEnumValues);
+            }
+            else {
+                field = descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName);
+            }
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.Number) {
+            field = descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName).asNumber();
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.Boolean) {
+            field = descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName);
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.LocalDate) {
+            field = descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName).asDatePicker({ format: 'dd. MMM yyyy' });
+        }
+        else if (property.propertyType === GuiPropertyTypeDto.OffsetDateTime) {
+            field = descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName).asDatePicker({
+                format: 'dd. MM yy',
+                showTime: true,
+                showSeconds: false
+            });
+        }
+        else {
+            // string / wildcard
+            field = descriptor.addFieldUnsafe(fieldPrepend + property.resolvedPropertyName);
+        }
+        field.withLabel(getI18nAuditEntityProperty(translate, entityName, property.propertyName ?? '', modelType)).withDisabled();
+    }
+    return descriptor;
+}
+function auditBuildTableviewEntityRevision(translate, descriptor, revModel, entityModel) {
+    const revType = descriptor.addColumnEnum('revType', revisionTypeEnum).withTitle('MngEntityRevisionChangeState.properties.revType');
+    descriptor.addFieldLookupEnum('revType', revisionTypeEnum).withLabel('MngEntityRevisionChangeState.properties.revType');
+    descriptor.table.addFilterFromColumnDescriptorUnsafe(revType);
+    if (revModel.properties) {
+        auditAddColumnsFromModel(translate, descriptor.table, revModel.entityName ?? '', revModel.properties, 'revEntity');
+        auditAddFieldsFromModel(translate, descriptor.detailsEditor, revModel.entityName ?? '', revModel.properties, 'revEntity');
+    }
+    if (entityModel.properties) {
+        auditAddColumnsFromModel(translate, descriptor.table, entityModel.entityName ?? '', entityModel.properties, 'entityState');
+        auditAddFieldsFromModel(translate, descriptor.detailsEditor, entityModel.entityName ?? '', entityModel.properties, 'entityState');
+    }
+    return descriptor;
+}
+function getEnumModel(property) {
+    if (Array.isArray(property.possibleEnumValues)) {
+        const enumType = property.possibleEnumValues?.reduce((acc, v) => {
+            const constName = v
+                .split('_')
+                .map(s => (s.length > 1 ? s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase() : s))
+                .join('');
+            if (constName !== v) {
+                acc[constName] = v;
+            }
+            acc[v] = constName;
+            return acc;
+        }, {});
+        return enumModelGeneric(enumType, property.enumClassSimpleName);
+    }
+    return null;
+}
+
 class AuditEntityRevisionsPageComponent {
     constructor() {
-        this.router = inject(Router);
-        this.route = inject(ActivatedRoute);
-        this.translate = inject(TranslateService);
-        this.auditService = inject(AuditService);
-        this.revModel = toSignal(this.auditService.revModel$);
-        this.auditModel = toSignal(this.auditService.auditModel$);
-        this.entityClass = toSignal(this.route.paramMap.pipe(map(pm => pm.get('entityClass') ?? undefined)));
+        this.#router = inject(Router);
+        this.#route = inject(ActivatedRoute);
+        this.#translate = inject(TranslateService);
+        this.#auditService = inject(AuditService);
+        this.#revModel = toSignal(this.#auditService.revModel$);
+        this.#auditModel = toSignal(this.#auditService.auditModel$);
+        this.#entityClass = toSignal(this.#route.paramMap.pipe(map(pm => pm.get('entityClass') ?? undefined)));
         this.selectedRevisionEntity = computed(() => {
-            const entities = this.auditModel();
-            const entityClass = this.entityClass();
+            const entities = this.#auditModel();
+            const entityClass = this.#entityClass();
             if (entityClass && entities) {
                 for (const e of entities) {
                     if (e.entityName === entityClass) {
@@ -463,20 +361,21 @@ class AuditEntityRevisionsPageComponent {
             return undefined;
         });
         this.descriptor = computed(() => {
-            const revModel = this.revModel();
+            const revModel = this.#revModel();
             const selectedRevisionEntity = this.selectedRevisionEntity();
             if (!revModel || !selectedRevisionEntity?.entityName) {
                 return undefined;
             }
-            const desc = tableviewDescriptor({ id: 'mergedId', i18nBase: selectedRevisionEntity.entityName });
-            AuditUtil.buildDescriptorForEntityRevision(desc, revModel, selectedRevisionEntity);
+            const desc = tableviewDescriptor({ id: 'mergedId' });
+            auditBuildTableviewEntityRevision(this.#translate, desc, revModel, selectedRevisionEntity);
+            desc.table.withTitle(getI18nAuditEntityName(this.#translate, selectedRevisionEntity.entityName));
             desc.table.withColumnsResizable();
             desc.table.withCurrentColumnsReorderable();
             desc.table.withCurrentColumnsToggleable();
             return desc;
         });
         this.dataProvider = computed(() => {
-            const revModel = this.revModel();
+            const revModel = this.#revModel();
             const selectedRevisionEntity = this.selectedRevisionEntity();
             if (!revModel || !selectedRevisionEntity?.entityName) {
                 return undefined;
@@ -522,7 +421,7 @@ class AuditEntityRevisionsPageComponent {
                 .withEditorTitle('pages.entityRevisions.actions.details.editor.title');
             return [detailsAction];
         });
-        this.revisionEntitiesLookupProvider = lookupDataProviderWithService(AuditService).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) {
@@ -536,30 +435,36 @@ class AuditEntityRevisionsPageComponent {
                 }
             });
             modelI18n.forEach(item => {
-                const translatedEntityName = this.translate.instant('AuditEntities.' + item.entityName);
-                item.entityNameI18n = translatedEntityName.includes('AuditEntities.') ? item.entityName : translatedEntityName;
+                item.entityNameI18n = item.entityName ? getI18nAuditEntityName(this.#translate, item.entityName) : undefined;
             });
             return modelI18n;
         })));
         this.showTableview = signal(false);
-        effect(() => {
-            const descriptor = this.descriptor();
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        this.#showTableviewEffectRef = effectWithDeps([this.descriptor], descriptor => {
             if (descriptor) {
-                setTimeout(() => {
-                    this.showTableview.set(true);
-                });
+                this.showTableview.set(true);
             }
-        }, { allowSignalWrites: true });
+        });
     }
+    #router;
+    #route;
+    #translate;
+    #auditService;
+    #revModel;
+    #auditModel;
+    #entityClass;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    #showTableviewEffectRef;
     onRevisionEntityChange(value) {
         this.showTableview.set(false);
-        const currentUrl = this.router.url;
+        const currentUrl = this.#router.url;
         const routePrefix = currentUrl.substring(0, currentUrl.lastIndexOf('/audit/entity-revisions') + '/audit/entity-revisions'.length);
         if (value) {
-            this.router.navigate([routePrefix, value.entityName]);
+            this.#router.navigate([routePrefix, value.entityName]);
         }
         else {
-            this.router.navigate([routePrefix]);
+            this.#router.navigate([routePrefix]);
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.12", ngImport: i0, type: AuditEntityRevisionsPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
@@ -567,29 +472,77 @@ class AuditEntityRevisionsPageComponent {
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.12", 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: () => [] });
+            args: [{ standalone: true, selector: 'mng-audit-entity-revisions-page', imports: [DropdownComponent, FormsModule, 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" }]
+        }] });
+
+function auditMapToEntityChangesArray(fieldValue) {
+    const entityChanges = [];
+    for (const key of Object.keys(fieldValue)) {
+        const ec = { entityType: key, items: [] };
+        for (const change of fieldValue[key]) {
+            if (change.revType === RevisionTypeDto.Add && change.entityNewState) {
+                const item = {
+                    revType: change.revType,
+                    color: 'green'
+                };
+                Object.entries(change.entityNewState).forEach(([key, value]) => (item[key] = value));
+                ec.items?.push(item);
+            }
+            else if (change.revType === RevisionTypeDto.Del && change.entityOldState) {
+                const item = {
+                    revType: change.revType,
+                    color: 'red'
+                };
+                Object.entries(change.entityOldState).forEach(([key, value]) => (item[key] = value));
+                ec.items?.push(item);
+            }
+            else if (change.revType === RevisionTypeDto.Mod && change.entityOldState && change.entityNewState) {
+                const itemOld = {
+                    revType: change.revType,
+                    color: 'red'
+                };
+                Object.entries(change.entityOldState).forEach(([key, value]) => (itemOld[key] = value));
+                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);
+            }
+        }
+        entityChanges.push(ec);
+    }
+    return entityChanges;
+}
 
 class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
     constructor() {
         super(...arguments);
-        this.destroyRef = inject(DestroyRef);
+        this.#destroyRef = inject(DestroyRef);
+        this.#translate = inject(TranslateService);
+        this.injector = input();
         this.entityChanges = signal([]);
         this.modelFetched = signal(false);
-        this.auditModel = [];
+        this.#auditModel = [];
     }
+    #destroyRef;
+    #translate;
+    #auditModel;
+    #fieldValue;
     ngOnInit() {
-        this.fieldValue = this.formControl.value;
-        this.injector
+        this.#fieldValue = this.formControl.value;
+        const injector = this.injector();
+        injector
             ?.get(AuditService, undefined, { optional: true })
-            ?.auditModel$.pipe(takeUntilDestroyed(this.destroyRef))
+            ?.auditModel$.pipe(takeUntilDestroyed(this.#destroyRef))
             .subscribe({
             next: model => {
-                this.auditModel = model;
-                if (this.fieldValue) {
-                    this.entityChanges.set(AuditUtil.mapItemsToEntityChangesArray(this.fieldValue).map(fv => ({
+                this.#auditModel = model;
+                if (this.#fieldValue) {
+                    this.entityChanges.set(auditMapToEntityChangesArray(this.#fieldValue).map(fv => ({
                         data: fv,
-                        descriptor: this.createDescriptor(fv)
+                        descriptor: this.#createDescriptor(fv)
                     })));
                     this.modelFetched.set(true);
                 }
@@ -598,8 +551,11 @@ class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
                 throw new CommonsInternalError('Error while trying to fetch audit model from audit service', { name: 'EntityChangesFieldComponentError', cause: err });
             }
         });
+        if (injector) {
+            this.#translate = injector.get(TranslateService);
+        }
     }
-    createDescriptor(entityChanges) {
+    #createDescriptor(entityChanges) {
         const changedFields = [];
         if (entityChanges.items && entityChanges.items[0].revType === RevisionTypeDto.Mod) {
             for (const key in entityChanges.items[0]) {
@@ -608,14 +564,14 @@ class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
                 }
             }
         }
-        const guiEntityModel = this.auditModel.filter(m => m.entityName === entityChanges.entityType)[0];
+        const guiEntityModel = this.#auditModel.filter(m => m.entityName === entityChanges.entityType)[0];
         const desc = tableDescriptor({ i18nBase: guiEntityModel.entityName }).withClassName('py-2');
         if (guiEntityModel.entityName) {
-            desc.withTitle(guiEntityModel.entityName);
+            desc.withTitle(getI18nAuditEntityName(this.#translate, guiEntityModel.entityName));
         }
         desc.addColumnEnum('revType', revisionTypeEnum).withTitle('MngEntityRevisionChangeState.properties.revType');
         if (guiEntityModel.properties) {
-            AuditUtil.addColumnsFromModel(desc, guiEntityModel.properties, undefined, false, false);
+            auditAddColumnsFromModel(this.#translate, desc, guiEntityModel.entityName ?? '', guiEntityModel.properties, undefined, false, false);
         }
         desc.withRowClassName(undefined, (_, item) => (item ? (item.color === 'green' ? 'audit-row-added' : 'audit-row-deleted') : ''));
         desc.columns.forEach(col => {
@@ -630,42 +586,39 @@ class EntityChangesFieldComponent extends AFormlyCustomFieldComponent {
         return desc;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.12", ngImport: i0, type: EntityChangesFieldComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.12", type: EntityChangesFieldComponent, isStandalone: true, selector: "mng-entity-changes-field", inputs: { injector: "injector" }, usesInheritance: true, ngImport: i0, template: "@if (modelFetched()) {\n    <div>\n        @for (ec of entityChanges(); track ec) {\n            <mng-table [items]=\"ec.data.items\" [descriptor]=\"ec.descriptor\"></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", "cellClickEnabled", "selectionMode", "selectionEnabled", "rowReorderEnabled", "columnLastMinWidth", "captionComponent", "columnCustomLastComponent", "globalFilterFields"], outputs: ["tableLoad", "cellClick", "selectionChange", "captionComponentInstance", "columnCustomLastComponentInstance", "rowReorder"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.12", type: EntityChangesFieldComponent, isStandalone: true, selector: "mng-entity-changes-field", inputs: { injector: { classPropertyName: "injector", publicName: "injector", isSignal: true, isRequired: false, transformFunction: null } }, usesInheritance: true, ngImport: i0, template: "@if (modelFetched()) {\n    <div>\n        @for (ec of entityChanges(); track ec) {\n            <mng-table [items]=\"ec.data.items\" [descriptor]=\"ec.descriptor\"></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", "cellClickEnabled", "selectionMode", "selectionEnabled", "rowReorderEnabled", "columnLastMinWidth", "captionComponent", "columnCustomLastComponent", "globalFilterFields"], outputs: ["tableLoad", "cellClick", "selectionChange", "captionComponentInstance", "columnCustomLastComponentInstance", "rowReorder"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.12", ngImport: i0, type: EntityChangesFieldComponent, decorators: [{
             type: Component,
             args: [{ standalone: true, selector: 'mng-entity-changes-field', imports: [TableComponent], changeDetection: ChangeDetectionStrategy.OnPush, template: "@if (modelFetched()) {\n    <div>\n        @for (ec of entityChanges(); track ec) {\n            <mng-table [items]=\"ec.data.items\" [descriptor]=\"ec.descriptor\"></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: [{
-                type: Input
-            }] } });
+        }] });
 
 class AuditRevisionsPageComponent {
     constructor() {
-        this.injector = inject(Injector);
-        this.auditService = inject(AuditService);
-        this.revModel = toSignal(this.auditService.revModel$);
-        this.showTableview = computed(() => this.revModel() != null);
+        this.#injector = inject(Injector);
+        this.#translate = inject(TranslateService);
+        this.#auditService = inject(AuditService);
+        this.#revModel = toSignal(this.#auditService.revModel$);
+        this.showTableview = computed(() => this.#revModel() != null);
         this.descriptor = computed(() => {
-            const revModel = this.revModel();
+            const revModel = this.#revModel();
             if (revModel) {
                 const idProperty = revModel.properties?.filter(prop => prop.isId).map(prop => prop.resolvedPropertyName)[0];
                 const revEntModel = model({ id: 'rev', title: 'rev', i18nBase: 'MngRevEntity' });
-                if (revModel.entityName)
-                    revEntModel.withI18nBase(revModel.entityName);
                 if (idProperty)
                     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);
-                    AuditUtil.addFieldsFromModel(detailsDescriptor, revModel.properties);
+                    auditAddColumnsFromModel(this.#translate, desc.table, revModel.entityName ?? '', revModel.properties);
+                    auditAddFieldsFromModel(this.#translate, detailsDescriptor, revModel.entityName ?? '', revModel.properties);
                 }
                 detailsDescriptor
                     .addField('entityNameChangesMap')
                     .asCustomComponent(EntityChangesFieldComponent, {
                     fieldWrappers: ['field-no-label'],
-                    inputs: { injector: this.injector }
+                    inputs: { injector: this.#injector }
                 })
                     .withDisabled();
                 desc.withDetailsDescriptor(detailsDescriptor); // MngRevEntity is extended by MngRevEntityWithChangesDto, so no real harm here
@@ -688,12 +641,16 @@ class AuditRevisionsPageComponent {
             return [detailsAction];
         });
     }
+    #injector;
+    #translate;
+    #auditService;
+    #revModel;
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.12", ngImport: i0, type: AuditRevisionsPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.12", 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: "18.2.12", 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" }]
+            args: [{ standalone: true, selector: 'mng-audit-revisions-page', imports: [TableviewComponent], providers: [AuditRevisionsApiService], changeDetection: ChangeDetectionStrategy.OnPush, template: "@if (showTableview()) {\n    <mng-tableview [descriptor]=\"descriptor()\" [dataProvider]=\"dataProvider()\" [actions]=\"actions()\"></mng-tableview>\n}\n" }]
         }] });
 
 /**