Updated history and frontend

api/src/api/route.py

@@ -8,32 +8,16 @@ from starlette.routing import Route as StarletteRoute
 
 from api.errors import unauthorized
 from api.middleware.request import get_request
+from api.route_api_key_extension import RouteApiKeyExtension
 from api.route_user_extension import RouteUserExtension
 from core.environment import Environment
 from data.schemas.administration.api_key import ApiKey
-from data.schemas.administration.api_key_dao import apiKeyDao
 from data.schemas.administration.user import User
 
 
-class Route(RouteUserExtension):
+class Route(RouteUserExtension, RouteApiKeyExtension):
     registered_routes: list[StarletteRoute] = []
 
-    @classmethod
-    async def get_api_key(cls, request: Request) -> ApiKey:
-        auth_header = request.headers.get("Authorization", None)
-        api_key = auth_header.split(" ")[1]
-        return await apiKeyDao.find_by_key(api_key)
-
-    @classmethod
-    async def _verify_api_key(cls, req: Request) -> bool:
-        auth_header = req.headers.get("Authorization", None)
-        if not auth_header or not auth_header.startswith("API-Key "):
-            return False
-
-        api_key = auth_header.split(" ")[1]
-        api_key_from_db = await apiKeyDao.find_by_key(api_key)
-        return api_key_from_db is not None and not api_key_from_db.deleted
-
     @classmethod
     async def _get_auth_type(
         cls, request: Request, auth_header: str
@@ -79,8 +63,7 @@ class Route(RouteUserExtension):
         return await cls._get_auth_type(request, auth_header)
 
     @classmethod
-    async def is_authorized(cls) -> bool:
-        request = get_request()
+    async def is_authorized(cls, request: Request) -> bool:
         if request is None:
             return False
 
@@ -119,7 +102,7 @@ class Route(RouteUserExtension):
                     return await f(request, *args, **kwargs)
                 return f(request, *args, **kwargs)
 
-            if not await cls.is_authorized():
+            if not await cls.is_authorized(request):
                 return unauthorized()
 
             if iscoroutinefunction(f):

api/src/api/route_api_key_extension.py

@@ -0,0 +1,27 @@
+from starlette.requests import Request
+
+from data.schemas.administration.api_key import ApiKey
+from data.schemas.administration.api_key_dao import apiKeyDao
+
+
+class RouteApiKeyExtension:
+
+    @classmethod
+    async def get_api_key(cls, request: Request) -> ApiKey:
+        auth_header = request.headers.get("Authorization", None)
+        api_key = auth_header.split(" ")[1]
+        return await apiKeyDao.find_single_by(
+            [{ApiKey.key: api_key}, {ApiKey.deleted: False}]
+        )
+
+    @classmethod
+    async def _verify_api_key(cls, req: Request) -> bool:
+        auth_header = req.headers.get("Authorization", None)
+        if not auth_header or not auth_header.startswith("API-Key "):
+            return False
+
+        api_key = auth_header.split(" ")[1]
+        api_key_from_db = await apiKeyDao.find_single_by(
+            [{ApiKey.key: api_key}, {ApiKey.deleted: False}]
+        )
+        return api_key_from_db is not None and not api_key_from_db.deleted

api/src/api/route_user_extension.py

@@ -18,6 +18,7 @@ logger = Logger(__name__)
 
 
 class RouteUserExtension:
+    _cached_users: dict[int, User] = {}
 
     @classmethod
     def _get_user_id_from_token(cls, request: Request) -> Optional[str]:
@@ -62,9 +63,7 @@ class RouteUserExtension:
         if request is None:
             return None
 
-        return await userDao.find_single_by(
-            [{User.keycloak_id: cls.get_token(request)}, {User.deleted: False}]
-        )
+        return await userDao.find_by_keycloak_id(cls.get_token(request))
 
     @classmethod
     async def get_user_or_default(cls) -> Optional[User]:

api/src/api_graphql/abc/db_history_model_query_abc.py

@@ -7,8 +7,7 @@ from core.database.abc.data_access_object_abc import DataAccessObjectABC
 
 class DbHistoryModelQueryABC(QueryABC):
 
-    def __init__(self, name: str = None):
-        assert name is not None, f"Name for {__name__} must be provided"
+    def __init__(self, name: str = __name__):
         QueryABC.__init__(self, f"{name}History")
 
         self.set_field("id", lambda x, *_: x.id)

api/src/api_graphql/field/dao_field.py

@@ -1,4 +1,4 @@
-from typing import Union, Type, Optional
+from typing import Union, Type, Optional, Callable
 
 from api_graphql.abc.collection_filter_abc import CollectionFilterABC
 from api_graphql.abc.field_abc import FieldABC
@@ -19,6 +19,7 @@ class DaoField(FieldABC):
         public: bool = False,
         dao: DataAccessObjectABC = None,
         filter_type: Type[FilterABC] = None,
+        default_filter: Callable = None,
         sort_type: Type[T] = None,
         direct_result: bool = False,
     ):
@@ -28,6 +29,7 @@ class DaoField(FieldABC):
         self._public = public
         self._dao = dao
         self._filter_type = filter_type
+        self._default_filter = default_filter
         self._sort_type = sort_type
         self._direct_result = direct_result
 
@@ -41,6 +43,10 @@ class DaoField(FieldABC):
     ) -> Optional[Type[FilterABC]]:
         return self._filter_type
 
+    @property
+    def default_filter(self) -> Optional[Callable]:
+        return self._default_filter
+
     @property
     def sort_type(self) -> Optional[Type[T]]:
         return self._sort_type

api/src/api_graphql/field/dao_field_builder.py

@@ -1,4 +1,4 @@
-from typing import Type, Self
+from typing import Type, Self, Callable
 
 from api_graphql.abc.field_builder_abc import FieldBuilderABC
 from api_graphql.abc.filter_abc import FilterABC
@@ -14,6 +14,7 @@ class DaoFieldBuilder(FieldBuilderABC):
 
         self._dao = None
         self._filter_type = None
+        self._default_filter = None
         self._sort_type = None
         self._direct_result = False
 
@@ -27,6 +28,12 @@ class DaoFieldBuilder(FieldBuilderABC):
         self._filter_type = filter_type
         return self
 
+    def with_default_filter(self, filter: Callable) -> Self:
+        assert filter is not None, "filter cannot be None"
+        assert callable(filter), "filter must be callable"
+        self._default_filter = filter
+        return self
+
     def with_sort(self, sort_type: Type[T]) -> Self:
         assert sort_type is not None, "sort cannot be None"
         self._sort_type = sort_type
@@ -45,6 +52,7 @@ class DaoFieldBuilder(FieldBuilderABC):
             self._public,
             self._dao,
             self._filter_type,
+            self._default_filter,
             self._sort_type,
             self._direct_result,
         )

api/src/api_graphql/field/mutation_field_builder.py

@@ -38,6 +38,9 @@ class MutationFieldBuilder(FieldBuilderABC):
             await broadcast.publish(f"{source}", result)
             return result
 
+        self._resolver = resolver_wrapper
+        return self
+
     def with_change_broadcast(self, source: str):
         assert self._resolver is not None, "resolver cannot be None for broadcast"
 

api/src/api_graphql/graphql/domain.gql

@@ -4,6 +4,18 @@ type DomainResult {
     nodes: [Domain]
 }
 
+type DomainHistory implements DbHistoryModel {
+    id: Int
+    name: String
+
+    shortUrls: [ShortUrl]
+
+    deleted: Boolean
+    editor: String
+    created: String
+    updated: String
+}
+
 type Domain implements DbModel {
     id: Int
     name: String
@@ -14,6 +26,8 @@ type Domain implements DbModel {
     editor: User
     created: String
     updated: String
+
+    history: [DomainHistory]
 }
 
 input DomainSort {

api/src/api_graphql/graphql/group.gql

@@ -4,6 +4,19 @@ type GroupResult {
     nodes: [Group]
 }
 
+type GroupHistory implements DbHistoryModel {
+    id: Int
+    name: String
+
+    shortUrls: [ShortUrl]
+    roles: [Role]
+
+    deleted: Boolean
+    editor: String
+    created: String
+    updated: String
+}
+
 type Group implements DbModel {
     id: Int
     name: String
@@ -15,6 +28,7 @@ type Group implements DbModel {
     editor: User
     created: String
     updated: String
+    history: [GroupHistory]
 }
 
 input GroupSort {

api/src/api_graphql/graphql/permission.gql

@@ -4,6 +4,17 @@ type PermissionResult {
     nodes: [Permission]
 }
 
+type PermissionHistory implements DbHistoryModel {
+    id: Int
+    name: String
+    description: String
+
+    deleted: Boolean
+    editor: String
+    created: String
+    updated: String
+}
+
 type Permission implements DbModel {
     id: Int
     name: String
@@ -13,6 +24,8 @@ type Permission implements DbModel {
     editor: User
     created: String
     updated: String
+
+    history: [PermissionHistory]
 }
 
 input PermissionSort {
@@ -21,7 +34,7 @@ input PermissionSort {
     description: SortOrder
 
     deleted: SortOrder
-    editorId: SortOrder
+    editor: UserSort
     created: SortOrder
     updated: SortOrder
 }
@@ -32,7 +45,7 @@ input PermissionFilter {
     description: StringFilter
 
     deleted: BooleanFilter
-    editor: IntFilter
+    editor: UserFilter
     created: DateFilter
     updated: DateFilter
 }

api/src/api_graphql/graphql/short_url.gql

@@ -4,6 +4,23 @@ type ShortUrlResult {
     nodes: [ShortUrl]
 }
 
+type ShortUrlHistory implements DbHistoryModel {
+    id: Int
+    shortUrl: String
+    targetUrl: String
+    description: String
+    visits: Int
+    loadingScreen: Boolean
+
+    group: Group
+    domain: Domain
+
+    deleted: Boolean
+    editor: String
+    created: String
+    updated: String
+}
+
 type ShortUrl implements DbModel {
     id: Int
     shortUrl: String
@@ -18,6 +35,7 @@ type ShortUrl implements DbModel {
     editor: User
     created: String
     updated: String
+    history: [ShortUrlHistory]
 }
 
 input ShortUrlSort {

api/src/api_graphql/graphql/subscription.gql

@@ -9,6 +9,7 @@ type Subscription {
     settingChange: SubscriptionChange
     userChange: SubscriptionChange
     userSettingChange: SubscriptionChange
+    userLogout: SubscriptionChange
 
     domainChange: SubscriptionChange
     groupChange: SubscriptionChange

api/src/api_graphql/queries/domain_history_query.py

@@ -0,0 +1,22 @@
+from api_graphql.abc.db_history_model_query_abc import DbHistoryModelQueryABC
+from data.schemas.public.domain import Domain
+from data.schemas.public.short_url import ShortUrl
+from data.schemas.public.short_url_dao import shortUrlDao
+
+
+class DomainHistoryQuery(DbHistoryModelQueryABC):
+    def __init__(self):
+        DbHistoryModelQueryABC.__init__(self, "Domain")
+
+        self.set_field("name", lambda x, *_: x.name)
+        self.set_field("shortUrls", self._get_urls)
+
+    @staticmethod
+    async def _get_urls(domain: Domain, *_):
+        return await shortUrlDao.find_by(
+            [
+                {ShortUrl.domain_id: domain.id},
+                {ShortUrl.deleted: False},
+                {"updated": {"lessOrEqual": domain.updated}},
+            ]
+        )

api/src/api_graphql/queries/domain_query.py

@@ -1,5 +1,6 @@
 from api_graphql.abc.db_model_query_abc import DbModelQueryABC
 from data.schemas.public.domain import Domain
+from data.schemas.public.domain_dao import domainDao
 from data.schemas.public.group import Group
 from data.schemas.public.short_url import ShortUrl
 from data.schemas.public.short_url_dao import shortUrlDao
@@ -7,11 +8,13 @@ from data.schemas.public.short_url_dao import shortUrlDao
 
 class DomainQuery(DbModelQueryABC):
     def __init__(self):
-        DbModelQueryABC.__init__(self, "Domain")
+        DbModelQueryABC.__init__(self, "Domain", domainDao, with_history=True)
 
         self.set_field("name", lambda x, *_: x.name)
         self.set_field("shortUrls", self._get_urls)
 
+        self.set_history_reference_dao(shortUrlDao, "domainid")
+
     @staticmethod
     async def _get_urls(domain: Domain, *_):
         return await shortUrlDao.find_by({ShortUrl.domain_id: domain.id})

api/src/api_graphql/queries/group_history_query.py

@@ -0,0 +1,47 @@
+from api_graphql.abc.db_history_model_query_abc import DbHistoryModelQueryABC
+from api_graphql.field.resolver_field_builder import ResolverFieldBuilder
+from api_graphql.require_any_resolvers import group_by_assignment_resolver
+from data.schemas.public.group import Group
+from data.schemas.public.group_dao import groupDao
+from data.schemas.public.group_role_assignment_dao import groupRoleAssignmentDao
+from data.schemas.public.short_url import ShortUrl
+from data.schemas.public.short_url_dao import shortUrlDao
+from service.permission.permissions_enum import Permissions
+
+
+class GroupHistoryQuery(DbHistoryModelQueryABC):
+    def __init__(self):
+        DbHistoryModelQueryABC.__init__(self, "Group")
+
+        self.set_field("name", lambda x, *_: x.name)
+        self.field(
+            ResolverFieldBuilder("shortUrls")
+            .with_resolver(self._get_urls)
+            .with_require_any(
+                [
+                    Permissions.groups,
+                ],
+                [group_by_assignment_resolver],
+            )
+        )
+        self.set_field(
+            "roles",
+            lambda x, *_: self._resolve_foreign_history(
+                x.updated,
+                x.id,
+                groupRoleAssignmentDao,
+                groupDao,
+                lambda y: y.role_id,
+                obj_key="groupid",
+            ),
+        )
+
+    @staticmethod
+    async def _get_urls(group: Group, *_):
+        return await shortUrlDao.find_by(
+            [
+                {ShortUrl.group_id: group.id},
+                {ShortUrl.deleted: False},
+                {"updated": {"lessOrEqual": group.updated}},
+            ]
+        )

api/src/api_graphql/queries/group_query.py

@@ -3,6 +3,7 @@ from api_graphql.field.resolver_field_builder import ResolverFieldBuilder
 from api_graphql.require_any_resolvers import group_by_assignment_resolver
 from data.schemas.public.group import Group
 from data.schemas.public.group_dao import groupDao
+from data.schemas.public.group_role_assignment_dao import groupRoleAssignmentDao
 from data.schemas.public.short_url import ShortUrl
 from data.schemas.public.short_url_dao import shortUrlDao
 from service.permission.permissions_enum import Permissions
@@ -10,7 +11,7 @@ from service.permission.permissions_enum import Permissions
 
 class GroupQuery(DbModelQueryABC):
     def __init__(self):
-        DbModelQueryABC.__init__(self, "Group")
+        DbModelQueryABC.__init__(self, "Group", groupDao, with_history=True)
 
         self.set_field("name", lambda x, *_: x.name)
         self.field(
@@ -25,6 +26,9 @@ class GroupQuery(DbModelQueryABC):
         )
         self.set_field("roles", self._get_roles)
 
+        self.set_history_reference_dao(shortUrlDao, "groupid")
+        self.set_history_reference_dao(groupRoleAssignmentDao, "groupid")
+
     @staticmethod
     async def _get_urls(group: Group, *_):
         return await shortUrlDao.find_by({ShortUrl.group_id: group.id})

api/src/api_graphql/queries/short_url_history_query.py

@@ -0,0 +1,14 @@
+from api_graphql.abc.db_history_model_query_abc import DbHistoryModelQueryABC
+
+
+class ShortUrlQuery(DbHistoryModelQueryABC):
+    def __init__(self):
+        DbHistoryModelQueryABC.__init__(self, "ShortUrl")
+
+        self.set_field("shortUrl", lambda x, *_: x.short_url)
+        self.set_field("targetUrl", lambda x, *_: x.target_url)
+        self.set_field("description", lambda x, *_: x.description)
+        self.set_field("group", lambda x, *_: x.group)
+        self.set_field("domain", lambda x, *_: x.domain)
+        self.set_field("visits", lambda x, *_: x.visit_count)
+        self.set_field("loadingScreen", lambda x, *_: x.loading_screen)

api/src/api_graphql/queries/short_url_query.py

@@ -1,9 +1,10 @@
 from api_graphql.abc.db_model_query_abc import DbModelQueryABC
+from data.schemas.public.short_url_dao import shortUrlDao
 
 
 class ShortUrlQuery(DbModelQueryABC):
     def __init__(self):
-        DbModelQueryABC.__init__(self, "ShortUrl")
+        DbModelQueryABC.__init__(self, "ShortUrl", shortUrlDao, with_history=True)
 
         self.set_field("shortUrl", lambda x, *_: x.short_url)
         self.set_field("targetUrl", lambda x, *_: x.target_url)

api/src/api_graphql/subscription.py

@@ -49,6 +49,12 @@ class Subscription(SubscriptionABC):
             .with_public(True)
         )
 
+        self.subscribe(
+            SubscriptionFieldBuilder("userLogout")
+            .with_resolver(lambda message, *_: message.message)
+            .with_public(True)
+        )
+
         self.subscribe(
             SubscriptionFieldBuilder("domainChange")
             .with_resolver(lambda message, *_: message.message)

api/src/redirector.py

@@ -111,7 +111,11 @@ def _find_short_url_by_path(path: str) -> Optional[dict]:
     if "errors" in data:
         logger.warning(f"Failed to find short url by path {path} -> {data["errors"]}")
 
-    if "data" not in data or "shortUrls" not in data["data"] or "nodes" not in data["data"]["shortUrls"]:
+    if (
+        "data" not in data
+        or "shortUrls" not in data["data"]
+        or "nodes" not in data["data"]["shortUrls"]
+    ):
         return None
 
     data = data["data"]["shortUrls"]["nodes"]

web/src/app/app.component.html

@@ -1,11 +1,16 @@
-<main *ngIf="isLoggedIn && !hideUI; else home" [class]="theme">
+<main [class]="theme">
+  <div
+    class="warning bg3 flex justify-center p-1.5"
+    *ngIf="showTechnicalDemoBanner">
+    {{ 'technical_demo_banner' | translate }}
+  </div>
   <app-header></app-header>
 
   <div class="app">
     <aside *ngIf="showSidebar">
       <app-sidebar></app-sidebar>
     </aside>
-        <section class="component">
+    <section class="component" *ngIf="loadedGuiSettings">
       <router-outlet></router-outlet>
     </section>
   </div>
@@ -30,7 +35,3 @@
   </p-confirmDialog>
 </main>
 <app-spinner></app-spinner>
-
-<ng-template #home>
-    <router-outlet></router-outlet>
-</ng-template>

web/src/app/app.component.ts

@@ -2,8 +2,8 @@ import { Component, OnDestroy } from '@angular/core';
 import { SidebarService } from 'src/app/service/sidebar.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { AuthService } from 'src/app/service/auth.service';
 import { GuiService } from 'src/app/service/gui.service';
+import { FeatureFlagService } from 'src/app/service/feature-flag.service';
 
 @Component({
   selector: 'app-root',
@@ -11,36 +11,35 @@ import { GuiService } from 'src/app/service/gui.service';
   styleUrl: './app.component.scss',
 })
 export class AppComponent implements OnDestroy {
-  theme = 'open-redirect';
   showSidebar = false;
-  hideUI = false;
-  isLoggedIn = false;
+  theme = 'lan-maestro';
+  showTechnicalDemoBanner = false;
+
+  loadedGuiSettings = false;
   unsubscribe$ = new Subject<void>();
 
   constructor(
     private sidebar: SidebarService,
-    private auth: AuthService,
-    private gui: GuiService
+    private gui: GuiService,
+    private features: FeatureFlagService
   ) {
-    this.auth.loadUser();
-
-    this.auth.user$.pipe(takeUntil(this.unsubscribe$)).subscribe(user => {
-      this.isLoggedIn = user !== null && user !== undefined;
+    this.features.get('TechnicalDemoBanner').then(showTechnicalDemoBanner => {
+      this.showTechnicalDemoBanner = showTechnicalDemoBanner;
     });
-
     this.sidebar.visible$
       .pipe(takeUntil(this.unsubscribe$))
       .subscribe(visible => {
         this.showSidebar = visible;
       });
 
-    this.gui.hideGui$.pipe(takeUntil(this.unsubscribe$)).subscribe(hide => {
-      this.hideUI = hide;
-    });
-
     this.gui.theme$.pipe(takeUntil(this.unsubscribe$)).subscribe(theme => {
       this.theme = theme;
     });
+    this.gui.loadedGuiSettings$
+      .pipe(takeUntil(this.unsubscribe$))
+      .subscribe(loaded => {
+        this.loadedGuiSettings = loaded;
+      });
   }
 
   ngOnDestroy() {

web/src/app/app.module.ts

@@ -1,4 +1,11 @@
-import { APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
+import {
+  APP_INITIALIZER,
+  ApplicationRef,
+  DoBootstrap,
+  ErrorHandler,
+  Injector,
+  NgModule,
+} from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { AppRoutingModule } from './app-routing.module';
@@ -23,6 +30,8 @@ import { SidebarComponent } from './components/sidebar/sidebar.component';
 import { ErrorHandlingService } from 'src/app/service/error-handling.service';
 import { ConfigService } from 'src/app/service/config.service';
 import { ServerUnavailableComponent } from 'src/app/components/error/server-unavailable/server-unavailable.component';
+import { SpinnerService } from 'src/app/service/spinner.service';
+import { AuthService } from 'src/app/service/auth.service';
 
 if (environment.production) {
   Logger.enableProductionMode();
@@ -95,6 +104,20 @@ export function appInitializerFactory(
       useClass: ErrorHandlingService,
     },
   ],
-  bootstrap: [AppComponent],
 })
-export class AppModule {}
+export class AppModule implements DoBootstrap {
+  constructor(private injector: Injector) {}
+
+  async ngDoBootstrap(appRef: ApplicationRef) {
+    const spinner = this.injector.get(SpinnerService);
+    spinner.show();
+
+    const auth = this.injector.get(AuthService);
+    const user = await auth.loadUser();
+    if (!user) {
+      await auth.login();
+    }
+
+    appRef.bootstrap(AppComponent);
+  }
+}

web/src/app/components/error/not-found/not-found.component.ts

@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+import { ErrorComponentBase } from 'src/app/core/base/error-component-base';
 
 @Component({
   selector: 'app-not-found',
   templateUrl: './not-found.component.html',
   styleUrls: ['./not-found.component.scss'],
 })
-export class NotFoundComponent {}
+export class NotFoundComponent extends ErrorComponentBase {}

web/src/app/components/error/server-unavailable/server-unavailable.component.ts

@@ -1,13 +1,16 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
+import { ErrorComponentBase } from 'src/app/core/base/error-component-base';
 
 @Component({
   selector: 'app-server-unavailable',
   templateUrl: './server-unavailable.component.html',
   styleUrls: ['./server-unavailable.component.scss'],
 })
-export class ServerUnavailableComponent {
-  constructor(private router: Router) {}
+export class ServerUnavailableComponent extends ErrorComponentBase {
+  constructor(private router: Router) {
+    super();
+  }
 
   async retryConnection() {
     await this.router.navigate(['/']);

web/src/app/components/footer/footer.component.html

@@ -1,7 +1,14 @@
-<footer>
+<footer class="flex justify-between pl-1 pr-1">
+  <div class="hidden md:block">
+    <span>web: {{ webVersion }}</span>
+    <span class="divider"> | </span>
+    <span>api: {{ apiVersion }}</span>
+  </div>
+  <div>
     <a [href]="termsUrl">{{ 'footer.terms' | translate }}</a>
     <span class="divider"> | </span>
     <a [href]="privacyUrl">{{ 'footer.privacy' | translate }}</a>
     <span class="divider"> | </span>
     <a [href]="imprintUrl">{{ 'footer.imprint' | translate }}</a>
+  </div>
 </footer>

web/src/app/components/footer/footer.component.scss

@@ -1,16 +0,0 @@
-@import "../../../styles/constants.scss";
-
-footer {
-  width: 100%;
-  min-height: 25px;
-  padding: 0 5px;
-
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 10px;
-
-  a {
-    text-decoration: none;
-  }
-}

web/src/app/components/footer/footer.component.spec.ts

@@ -1,23 +1,37 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { FooterComponent } from "src/app/components/footer/footer.component";
-import { TranslateModule } from "@ngx-translate/core";
-import { BrowserModule } from "@angular/platform-browser";
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { SharedModule } from "src/app/modules/shared/shared.module";
+import { FooterComponent } from 'src/app/components/footer/footer.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
 
-describe("FooterComponent", () => {
+describe('FooterComponent', () => {
   let component: FooterComponent;
   let fixture: ComponentFixture<FooterComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [FooterComponent],
-      imports: [
-        BrowserModule,
-        BrowserAnimationsModule,
-        SharedModule,
-        TranslateModule.forRoot(),
+      imports: [SharedModule, TranslateModule.forRoot()],
+      providers: [
+        AuthService,
+        KeycloakService,
+        ErrorHandlingService,
+        ToastService,
+        MessageService,
+        ConfirmationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: { params: of({}) },
+          },
+        },
       ],
     }).compileComponents();
   });
@@ -28,7 +42,7 @@ describe("FooterComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/components/footer/footer.component.ts

@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
 import { ConfigService } from 'src/app/service/config.service';
+import { VersionService } from 'src/app/service/version.service';
+import { ToastService } from 'src/app/service/toast.service';
 
 @Component({
   selector: 'app-footer',
@@ -7,7 +9,21 @@ import { ConfigService } from 'src/app/service/config.service';
   styleUrls: ['./footer.component.scss'],
 })
 export class FooterComponent {
-  constructor(private config: ConfigService) {}
+  webVersion = '0.0.0';
+  apiVersion = '0.0.0';
+
+  constructor(
+    private toast: ToastService,
+    private config: ConfigService,
+    private version: VersionService
+  ) {
+    this.version.getApiVersion().subscribe(version => {
+      this.apiVersion = version;
+    });
+    this.version.getWebVersion().subscribe(version => {
+      this.webVersion = version.version;
+    });
+  }
 
   get termsUrl(): string {
     return this.config.settings.termsUrl;

web/src/app/components/header/header.component.html

@@ -2,22 +2,25 @@
   <div class="header">
     <div class="flex items-center justify-center">
       <p-button
-                    *ngIf="user"
+        type="button"
         icon="pi pi-bars"
         class="btn icon-btn p-button-text"
-                    (onClick)="toggleSidebar()"
-            ></p-button>
+        (onClick)="toggleSidebar()"></p-button>
     </div>
     <div class="logo">
       <!--        <img src="/assets/images/logo.svg" alt="logo"/>-->
     </div>
     <div class="app-name">
-            <h1>Open-redirect</h1>
+      <h1>LAN-Maestro</h1>
     </div>
   </div>
 
+  <div class="flex items-center justify-center w-1/3" *ngIf="menu.length > 0">
+    <app-menu-bar class="w-full" [elements]="menu"></app-menu-bar>
+  </div>
+
   <div class="flex items-center justify-center">
-        <div class="flex items-center justify-center">
+    <div class="flex items-center justify-center" *ngIf="themeList.length > 0">
       <p-button
         type="button"
         icon="pi pi-palette"
@@ -29,7 +32,7 @@
         [model]="themeList"
         class="lang-menu"></p-menu>
     </div>
-        <div class="flex items-center justify-center">
+    <div class="flex items-center justify-center" *ngIf="langList.length > 0">
       <p-button
         type="button"
         icon="pi pi-globe"

web/src/app/components/header/header.component.spec.ts

@@ -1,16 +1,16 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { HeaderComponent } from "src/app/components/header/header.component";
-import { TranslateModule } from "@ngx-translate/core";
-import { ConfirmationService, MessageService } from "primeng/api";
-import { ActivatedRoute } from "@angular/router";
-import { of } from "rxjs";
-import { SharedModule } from "src/app/modules/shared/shared.module";
-import { ErrorHandlingService } from "src/app/service/error-handling.service";
-import { ToastService } from "src/app/service/toast.service";
-import { AuthService } from "src/app/service/auth.service";
-import { KeycloakService } from "keycloak-angular";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HeaderComponent } from 'src/app/components/header/header.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
 
-describe("HeaderComponent", () => {
+describe('HeaderComponent', () => {
   let component: HeaderComponent;
   let fixture: ComponentFixture<HeaderComponent>;
 
@@ -41,7 +41,7 @@ describe("HeaderComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/components/header/header.component.ts

@@ -48,12 +48,12 @@ export class HeaderComponent implements OnInit, OnDestroy {
       });
 
     this.auth.user$.pipe(takeUntil(this.unsubscribe$)).subscribe(async user => {
-      this.user = user;
       await this.initMenuLists();
-      if (user) {
       await this.loadTheme();
       await this.loadLang();
-      }
+
+      this.user = user;
+      this.guiService.loadedGuiSettings$.next(true);
     });
 
     this.themeList = this.config.settings.themes.map(theme => {
@@ -87,27 +87,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
   }
 
   async initMenuList() {
-    this.menu = [
-      {
-        label: 'common.news',
-        routerLink: ['/'],
-        icon: 'pi pi-home',
-      },
-      {
-        label: 'header.menu.about',
-        routerLink: ['/about'],
-        icon: 'pi pi-info',
-      },
-    ];
-
-    if (this.auth.user$.value) {
-      this.menu.push({
-        label: 'header.menu.admin',
-        routerLink: ['/admin'],
-        icon: 'pi pi-cog',
-        visible: await this.auth.isAdmin(),
-      });
-    }
+    this.menu = [];
   }
 
   async initLangMenuList() {

web/src/app/components/home/home.component.html

@@ -0,0 +1 @@
+<p>home works!</p>

web/src/app/components/home/home.component.spec.ts

@@ -1,15 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { HomeComponent } from './home.component';
-import { SharedModule } from 'src/app/modules/shared/shared.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { AuthService } from 'src/app/service/auth.service';
-import { KeycloakService } from 'keycloak-angular';
-import { ErrorHandlingService } from 'src/app/service/error-handling.service';
-import { ToastService } from 'src/app/service/toast.service';
-import { ConfirmationService, MessageService } from 'primeng/api';
-import { ActivatedRoute } from '@angular/router';
-import { of } from 'rxjs';
 
 describe('HomeComponent', () => {
   let component: HomeComponent;
@@ -18,21 +9,6 @@ describe('HomeComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [HomeComponent],
-      imports: [SharedModule, TranslateModule.forRoot()],
-      providers: [
-        AuthService,
-        KeycloakService,
-        ErrorHandlingService,
-        ToastService,
-        MessageService,
-        ConfirmationService,
-        {
-          provide: ActivatedRoute,
-          useValue: {
-            snapshot: { params: of({}) },
-          },
-        },
-      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(HomeComponent);

web/src/app/components/home/home.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { KeycloakService } from 'keycloak-angular';
+import { SpinnerService } from 'src/app/service/spinner.service';
 
 @Component({
   selector: 'app-home',
@@ -7,9 +7,7 @@ import { KeycloakService } from 'keycloak-angular';
   styleUrl: './home.component.scss',
 })
 export class HomeComponent {
-  constructor(private keycloak: KeycloakService) {
-    if (!this.keycloak.isLoggedIn()) {
-      this.keycloak.login().then(() => {});
-    }
+  constructor(private spinner: SpinnerService) {
+    this.spinner.hide();
   }
 }

web/src/app/components/sidebar/sidebar.component.spec.ts

@@ -1,17 +1,17 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SidebarComponent } from "./sidebar.component";
-import { SharedModule } from "src/app/modules/shared/shared.module";
-import { TranslateModule } from "@ngx-translate/core";
-import { AuthService } from "src/app/service/auth.service";
-import { ErrorHandlingService } from "src/app/service/error-handling.service";
-import { ToastService } from "src/app/service/toast.service";
-import { ConfirmationService, MessageService } from "primeng/api";
-import { ActivatedRoute } from "@angular/router";
-import { of } from "rxjs";
-import { KeycloakService } from "keycloak-angular";
+import { SidebarComponent } from './sidebar.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { KeycloakService } from 'keycloak-angular';
 
-describe("SidebarComponent", () => {
+describe('SidebarComponent', () => {
   let component: SidebarComponent;
   let fixture: ComponentFixture<SidebarComponent>;
 
@@ -40,7 +40,7 @@ describe("SidebarComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/components/sidebar/sidebar.component.ts

@@ -1,13 +1,13 @@
-import { Component, OnDestroy } from "@angular/core";
-import { MenuElement } from "src/app/model/view/menu-element";
-import { Subject } from "rxjs";
-import { SidebarService } from "src/app/service/sidebar.service";
-import { takeUntil } from "rxjs/operators";
+import { Component, OnDestroy } from '@angular/core';
+import { MenuElement } from 'src/app/model/view/menu-element';
+import { Subject } from 'rxjs';
+import { SidebarService } from 'src/app/service/sidebar.service';
+import { takeUntil } from 'rxjs/operators';
 
 @Component({
-  selector: "app-sidebar",
-  templateUrl: "./sidebar.component.html",
-  styleUrl: "./sidebar.component.scss",
+  selector: 'app-sidebar',
+  templateUrl: './sidebar.component.html',
+  styleUrl: './sidebar.component.scss',
 })
 export class SidebarComponent implements OnDestroy {
   elements: MenuElement[] = [];
@@ -17,7 +17,7 @@ export class SidebarComponent implements OnDestroy {
   constructor(private sidebar: SidebarService) {
     this.sidebar.elements$
       .pipe(takeUntil(this.unsubscribe$))
-      .subscribe((elements) => {
+      .subscribe(elements => {
         this.elements = elements;
       });
   }

web/src/app/components/spinner/spinner.component.spec.ts

@@ -1,8 +1,8 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SpinnerComponent } from "src/app/components/spinner/spinner.component";
+import { SpinnerComponent } from 'src/app/components/spinner/spinner.component';
 
-describe("SpinnerComponent", () => {
+describe('SpinnerComponent', () => {
   let component: SpinnerComponent;
   let fixture: ComponentFixture<SpinnerComponent>;
 
@@ -18,7 +18,7 @@ describe("SpinnerComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/components/spinner/spinner.component.ts

@@ -1,16 +1,16 @@
-import { Component } from "@angular/core";
-import { SpinnerService } from "src/app/service/spinner.service";
+import { Component } from '@angular/core';
+import { SpinnerService } from 'src/app/service/spinner.service';
 
 @Component({
-  selector: "app-spinner",
-  templateUrl: "./spinner.component.html",
-  styleUrls: ["./spinner.component.scss"],
+  selector: 'app-spinner',
+  templateUrl: './spinner.component.html',
+  styleUrls: ['./spinner.component.scss'],
 })
 export class SpinnerComponent {
   showSpinnerState = false;
 
   constructor(public spinnerService: SpinnerService) {
-    this.spinnerService.showSpinnerState$.subscribe((value) => {
+    this.spinnerService.showSpinnerState$.subscribe(value => {
       this.showSpinnerState = value;
     });
   }

web/src/app/core/base/error-component-base.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { SpinnerService } from 'src/app/service/spinner.service';
+
+export class ErrorComponentBase {
+  constructor() {
+    const spinner = inject(SpinnerService);
+    spinner.hide();
+  }
+}

web/src/app/core/base/form-page-base.ts

@@ -26,8 +26,8 @@ export abstract class FormPageBase<
   protected filterService = inject(FilterService);
   protected dataService = inject(PageDataService) as S;
 
-  protected constructor() {
-    const id = this.route.snapshot.params['id'];
+  protected constructor(idKey: string = 'id') {
+    const id = this.route.snapshot.params[idKey];
     this.validateRoute(id);
 
     this.buildForm();

web/src/app/core/base/page-base.ts

@@ -115,7 +115,6 @@ export abstract class PageBase<
       .onChange()
       .pipe(takeUntil(this.unsubscribe$))
       .subscribe(() => {
-        logger.debug('Reload data');
         this.load(true);
       });
   }

web/src/app/core/base/page-with-history.data.service.ts

@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { MutationResult } from 'apollo-angular';
+import { Filter } from 'src/app/model/graphql/filter/filter.model';
+import { Sort } from 'src/app/model/graphql/filter/sort.model';
+import { QueryResult } from 'src/app/model/entities/query-result';
+import { DbModel } from 'src/app/model/entities/db-model';
+
+@Injectable({
+  providedIn: 'root',
+})
+export abstract class PageWithHistoryDataService<T> {
+  abstract load(
+    filter?: Filter[],
+    sort?: Sort[],
+    skip?: number,
+    take?: number
+  ): Observable<QueryResult<T>>;
+
+  abstract loadHistory(id: number, options?: object): Observable<DbModel[]>;
+
+  abstract onChange(): Observable<void>;
+}
+
+export interface Create<T, C> {
+  create(object: C): Observable<T | undefined> | Observable<MutationResult>;
+}
+
+export interface Update<T, U> {
+  update(object: U): Observable<T | undefined> | Observable<MutationResult>;
+}
+
+export interface Delete<T> {
+  delete(
+    object: T
+  ): Observable<T | undefined | boolean> | Observable<MutationResult>;
+}
+
+export interface Restore<T> {
+  restore(
+    object: T
+  ): Observable<T | undefined | boolean> | Observable<MutationResult>;
+}
+
+export interface LoadHistory<T> {
+  loadHistory(
+    id: number
+  ): Observable<T | undefined | boolean> | Observable<DbModel[] | undefined>;
+}

web/src/app/core/base/page.columns.ts

@@ -14,6 +14,7 @@ export const ID_COLUMN = {
   translationKey: 'common.id',
   type: 'number',
   filterable: true,
+  sortable: true,
   value: (row: { id?: number }) => row.id,
   class: 'max-w-24',
 };
@@ -23,6 +24,7 @@ export const NAME_COLUMN = {
   translationKey: 'common.name',
   type: 'text',
   filterable: true,
+  sortable: true,
   value: (row: { name?: string }) => row.name,
 };
 
@@ -31,6 +33,7 @@ export const DESCRIPTION_COLUMN = {
   translationKey: 'common.description',
   type: 'text',
   filterable: true,
+  sortable: true,
   value: (row: { description?: string }) => row.description,
 };
 
@@ -38,35 +41,49 @@ export const DELETED_COLUMN = {
   name: 'deleted',
   translationKey: 'common.deleted',
   type: 'bool',
-  filterable: true,
+  filterable: false,
+  sortable: true,
   value: (row: DbModel) => row.deleted,
+  visible: false,
 };
 
 export const EDITOR_COLUMN = {
   name: 'editor',
   translationKey: 'common.editor',
+  type: 'text',
+  filterable: true,
   value: (row: DbModel) => row.editor?.username,
+  filterSelector: (mode: string, value: unknown) => {
+    return { editor: { username: { [mode]: value } } };
+  },
+  class: 'max-w-32',
+  visible: false,
 };
 
 export const CREATED_UTC_COLUMN = {
-  name: 'createdUtc',
+  name: 'created',
   translationKey: 'common.created',
   type: 'date',
   filterable: true,
-  value: (row: DbModel) => row.createdUtc,
+  sortable: true,
+  value: (row: DbModel) => row.created,
   class: 'max-w-32',
+  visible: false,
 };
 
 export const UPDATED_UTC_COLUMN = {
-  name: 'updatedUtc',
+  name: 'updated',
   translationKey: 'common.updated',
   type: 'date',
   filterable: true,
-  value: (row: DbModel) => row.updatedUtc,
+  sortable: true,
+  value: (row: DbModel) => row.updated,
   class: 'max-w-32',
+  visible: false,
 };
 
 export const DB_MODEL_COLUMNS = [
+  DELETED_COLUMN,
   EDITOR_COLUMN,
   CREATED_UTC_COLUMN,
   UPDATED_UTC_COLUMN,

web/src/app/core/guard/auth.guard.ts

@@ -1,22 +1,39 @@
-import { Injectable } from "@angular/core";
-import { CanActivate } from "@angular/router";
-import { KeycloakService } from "keycloak-angular";
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+import { KeycloakService } from 'keycloak-angular';
+import { Logger } from 'src/app/service/logger.service';
+import { AuthService } from 'src/app/service/auth.service';
+
+const logger = new Logger('AuthGuard');
 
 @Injectable({
-  providedIn: "root",
+  providedIn: 'root',
 })
 export class AuthGuard implements CanActivate {
-  constructor(private keycloak: KeycloakService) {}
+  constructor(
+    private keycloak: KeycloakService,
+    private auth: AuthService,
+    private router: Router
+  ) {}
 
   async canActivate(): Promise<boolean> {
+    try {
+      if (!this.keycloak.isLoggedIn()) {
+        logger.debug('User not logged in, redirecting to login page');
+        await this.auth.login();
+      }
+
       if (this.keycloak.isTokenExpired()) {
+        logger.debug('Token expired, updating token');
         await this.keycloak.updateToken();
       }
-
-    if (!this.keycloak.isLoggedIn()) {
-      await this.keycloak.login();
+    } catch (err) {
+      logger.error('Error during authentication', err);
+      await this.router.navigate(['/']);
+      return false;
     }
 
+    logger.debug('Check is user logged in');
     return this.keycloak.isLoggedIn();
   }
 }

web/src/app/core/guard/permission.guard.ts

@@ -1,24 +1,24 @@
-import { Injectable } from "@angular/core";
-import { ActivatedRouteSnapshot, Router } from "@angular/router";
-import { Logger } from "src/app/service/logger.service";
-import { ToastService } from "src/app/service/toast.service";
-import { AuthService } from "src/app/service/auth.service";
-import { PermissionsEnum } from "src/app/model/auth/permissionsEnum";
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { Logger } from 'src/app/service/logger.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { AuthService } from 'src/app/service/auth.service';
+import { PermissionsEnum } from 'src/app/model/auth/permissionsEnum';
 
-const log = new Logger("PermissionGuard");
+const log = new Logger('PermissionGuard');
 
 @Injectable({
-  providedIn: "root",
+  providedIn: 'root',
 })
 export class PermissionGuard {
   constructor(
     private router: Router,
     private toast: ToastService,
-    private auth: AuthService,
+    private auth: AuthService
   ) {}
 
   async canActivate(route: ActivatedRouteSnapshot): Promise<boolean> {
-    const permissions = route.data["permissions"] as PermissionsEnum[];
+    const permissions = route.data['permissions'] as PermissionsEnum[];
 
     if (!permissions || permissions.length === 0) {
       return true;
@@ -26,11 +26,11 @@ export class PermissionGuard {
 
     const validate = await this.auth.hasAnyPermissionLazy(permissions);
     if (!validate) {
-      log.debug("Permission denied", permissions);
-      this.toast.warn("common.warning", "error.permission_denied");
-      this.router.navigate(["/"]).then();
+      log.debug('Permission denied', permissions);
+      this.toast.warn('common.warning', 'error.permission_denied');
+      this.router.navigate(['/']).then();
     }
-    log.debug("Permission granted", permissions);
+    log.debug('Permission granted', permissions);
     return validate;
   }
 }

web/src/app/core/token.interceptor.ts

@@ -2,27 +2,55 @@ import { HttpInterceptorFn } from '@angular/common/http';
 import { KeycloakService } from 'keycloak-angular';
 import { inject } from '@angular/core';
 import { from, switchMap } from 'rxjs';
+import { ConfigService } from 'src/app/service/config.service';
+import { catchError } from 'rxjs/operators';
+import { AuthService } from 'src/app/service/auth.service';
 
 export const tokenInterceptor: HttpInterceptorFn = (req, next) => {
-  const keycloak = inject(KeycloakService);
+  const config = inject(ConfigService);
+  if (
+    !config.settings.api.url ||
+    !req.url.startsWith(config.settings.api.url)
+  ) {
+    return next(req);
+  }
 
+  const keycloak = inject(KeycloakService);
   if (!keycloak.isLoggedIn()) {
     return next(req);
   }
 
-  if (keycloak.isTokenExpired()) {
-    keycloak.updateToken().then();
-  }
-
   return from(keycloak.getToken()).pipe(
     switchMap(token => {
-      const modifiedReq = token
-        ? req.clone({
+      if (!token) {
+        return next(req);
+      }
+
+      if (!keycloak.isTokenExpired()) {
+        return next(
+          req.clone({
             headers: req.headers.set('Authorization', `Bearer ${token}`),
           })
-        : req;
+        );
+      }
 
-      return next(modifiedReq);
+      return from(keycloak.updateToken(30)).pipe(
+        switchMap(() => {
+          return keycloak.getToken();
+        }),
+        switchMap(newToken => {
+          return next(
+            req.clone({
+              headers: req.headers.set('Authorization', `Bearer ${newToken}`),
+            })
+          );
+        }),
+        catchError(() => {
+          const auth = inject(AuthService);
+          auth.logout().then();
+          return next(req);
+        })
+      );
     })
   );
 };

web/src/app/model/auth/permissionsEnum.ts

@@ -2,6 +2,10 @@ export enum PermissionsEnum {
   // Administration
   administrator = 'administrator',
 
+  // Settings
+  settings = 'settings',
+  settingsUpdate = 'settings.update',
+
   apiKeys = 'api_keys',
   apiKeysCreate = 'api_keys.create',
   apiKeysUpdate = 'api_keys.update',

web/src/app/model/auth/user.ts

@@ -1,13 +1,14 @@
-import { Role } from "src/app/model/entities/role";
-import { DbModel } from "src/app/model/entities/db-model";
+import { Role } from 'src/app/model/entities/role';
+import { DbModelWithHistory } from 'src/app/model/entities/db-model';
 
 export interface NotExistingUser {
   keycloakId: string;
   username: string;
 }
 
-export interface User extends DbModel {
+export interface User extends DbModelWithHistory {
   id: number;
+  keycloakId: string;
   username: string;
   email: string;
   roles: Role[];

web/src/app/model/entities/api-key.ts

@@ -1,7 +1,7 @@
-import { DbModel } from 'src/app/model/entities/db-model';
+import { DbModelWithHistory } from 'src/app/model/entities/db-model';
 import { Permission } from 'src/app/model/entities/role';
 
-export interface ApiKey extends DbModel {
+export interface ApiKey extends DbModelWithHistory {
   identifier?: string;
   key?: string;
   permissions?: Permission[];

web/src/app/model/entities/db-model.ts

@@ -1,9 +1,19 @@
-import { User } from "src/app/model/auth/user";
+import { User } from 'src/app/model/auth/user';
+
+export interface DbModelWithHistory {
+  id?: number;
+  editor?: User;
+  deleted?: boolean;
+  created?: Date;
+  updated?: Date;
+
+  history?: DbModel[];
+}
 
 export interface DbModel {
   id?: number;
   editor?: User;
   deleted?: boolean;
-  createdUtc?: Date;
-  updatedUtc?: Date;
+  created?: Date;
+  updated?: Date;
 }

web/src/app/model/entities/role.ts

@@ -1,9 +1,11 @@
-import { DbModel } from "src/app/model/entities/db-model";
+import { DbModel, DbModelWithHistory } from 'src/app/model/entities/db-model';
+import { User } from 'src/app/model/auth/user';
 
-export interface Role extends DbModel {
+export interface Role extends DbModelWithHistory {
   name?: string;
   description?: string;
   permissions?: Permission[];
+  users?: User[];
 }
 
 export interface RoleCreateInput {

web/src/app/model/graphql/db-model.query.ts

@@ -1,5 +1,5 @@
-import { gql } from "apollo-angular";
-import { EDITOR_FRAGMENT } from "src/app/model/graphql/editor.query";
+import { gql } from 'apollo-angular';
+import { EDITOR_FRAGMENT } from 'src/app/model/graphql/editor.query';
 
 export const DB_MODEL_FRAGMENT = gql`
   fragment DB_MODEL on DbModel {
@@ -10,9 +10,21 @@ export const DB_MODEL_FRAGMENT = gql`
     editor {
       ...EDITOR
     }
-    createdUtc
-    updatedUtc
+    created
+    updated
   }
 
   ${EDITOR_FRAGMENT}
 `;
+
+export const DB_HISTORY_MODEL_FRAGMENT = gql`
+  fragment DB_HISTORY_MODEL on DbHistoryModel {
+    __typename
+    id
+
+    deleted
+    editor
+    created
+    updated
+  }
+`;

web/src/app/model/graphql/editor.query.ts

@@ -1,4 +1,4 @@
-import { gql } from "apollo-angular";
+import { gql } from 'apollo-angular';
 
 export const EDITOR_FRAGMENT = gql`
   fragment EDITOR on User {

web/src/app/model/graphql/filter/sort.model.ts

@@ -2,6 +2,6 @@
 export type Sort = { [key: string]: any };
 
 export enum SortOrder {
-  ASC = "ASC",
-  DESC = "DESC",
+  ASC = 'ASC',
+  DESC = 'DESC',
 }

web/src/app/model/view/menu-element.ts

@@ -7,4 +7,5 @@ export interface MenuElement {
   visible?: boolean;
   disabled?: boolean;
   expanded?: boolean;
+  isSection?: boolean;
 }

web/src/app/model/view/themes.enum.ts

@@ -1,3 +1,3 @@
 export enum Themes {
-  Default = "maxlan-dark-theme",
+  Default = 'maxlan-dark-theme',
 }

web/src/app/modules/admin/administration/administration.module.ts

@@ -6,6 +6,11 @@ import { PermissionsEnum } from 'src/app/model/auth/permissionsEnum';
 import { SharedModule } from 'src/app/modules/shared/shared.module';
 
 const routes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    redirectTo: 'users',
+  },
   {
     path: 'users',
     title: 'Users | Maxlan',

web/src/app/modules/admin/administration/api-keys/api-keys.data.service.ts

@@ -12,7 +12,10 @@ import { Filter } from 'src/app/model/graphql/filter/filter.model';
 import { Sort } from 'src/app/model/graphql/filter/sort.model';
 import { Apollo, gql } from 'apollo-angular';
 import { QueryResult } from 'src/app/model/entities/query-result';
-import { DB_MODEL_FRAGMENT } from 'src/app/model/graphql/db-model.query';
+import {
+  DB_HISTORY_MODEL_FRAGMENT,
+  DB_MODEL_FRAGMENT,
+} from 'src/app/model/graphql/db-model.query';
 import { catchError, map } from 'rxjs/operators';
 import { SpinnerService } from 'src/app/service/spinner.service';
 import {
@@ -20,10 +23,12 @@ import {
   ApiKeyCreateInput,
   ApiKeyUpdateInput,
 } from 'src/app/model/entities/api-key';
+import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service';
+import { DbModel } from 'src/app/model/entities/db-model';
 
 @Injectable()
 export class ApiKeysDataService
-  extends PageDataService<ApiKey>
+  extends PageWithHistoryDataService<ApiKey>
   implements
     Create<ApiKey, ApiKeyCreateInput>,
     Update<ApiKey, ApiKeyUpdateInput>,
@@ -91,8 +96,7 @@ export class ApiKeysDataService
       .query<{ apiKeys: QueryResult<ApiKey> }>({
         query: gql`
           query getApiKey($id: Int) {
-            apiKeys(filter: { id: { equal: $id } }) {
-              nodes {
+            apiKey(filter: { id: { equal: $id } }) {
               id
               identifier
               permissions {
@@ -102,7 +106,6 @@ export class ApiKeysDataService
               ...DB_MODEL
             }
           }
-          }
 
           ${DB_MODEL_FRAGMENT}
         `,
@@ -119,6 +122,42 @@ export class ApiKeysDataService
       .pipe(map(result => result.data.apiKeys.nodes[0]));
   }
 
+  loadHistory(id: number): Observable<DbModel[]> {
+    return this.apollo
+      .query<{ apiKeys: QueryResult<ApiKey> }>({
+        query: gql`
+          query getApiKeyHistory($id: Int) {
+            apiKeys(filter: { id: { equal: $id } }) {
+              count
+              totalCount
+              nodes {
+                history {
+                  id
+                  identifier
+                  permissions {
+                    name
+                  }
+
+                  ...DB_HISTORY_MODEL
+                }
+              }
+            }
+          }
+          ${DB_HISTORY_MODEL_FRAGMENT}
+        `,
+        variables: {
+          id,
+        },
+      })
+      .pipe(
+        catchError(err => {
+          this.spinner.hide();
+          throw err;
+        })
+      )
+      .pipe(map(result => result.data?.apiKeys?.nodes?.[0]?.history ?? []));
+  }
+
   onChange(): Observable<void> {
     return this.apollo
       .subscribe<{ apiKeyChange: void }>({
@@ -208,7 +247,7 @@ export class ApiKeysDataService
     return this.apollo
       .mutate<{ apiKey: { delete: boolean } }>({
         mutation: gql`
-          mutation deleteApiKey($id: ID!) {
+          mutation deleteApiKey($id: Int!) {
             apiKey {
               delete(id: $id)
             }
@@ -231,7 +270,7 @@ export class ApiKeysDataService
     return this.apollo
       .mutate<{ apiKey: { restore: boolean } }>({
         mutation: gql`
-          mutation restoreApiKey($id: ID!) {
+          mutation restoreApiKey($id: Int!) {
             apiKey {
               restore(id: $id)
             }
@@ -255,7 +294,7 @@ export class ApiKeysDataService
       .query<{ permissions: QueryResult<Permission> }>({
         query: gql`
           query getPermissions {
-            permissions {
+            permissions(sort: [{ name: ASC }]) {
               nodes {
                 id
                 name
@@ -279,6 +318,10 @@ export class ApiKeysDataService
         provide: PageDataService,
         useClass: ApiKeysDataService,
       },
+      {
+        provide: PageWithHistoryDataService,
+        useClass: ApiKeysDataService,
+      },
       ApiKeysDataService,
     ];
   }

web/src/app/modules/admin/administration/api-keys/api-keys.module.ts

@@ -8,6 +8,7 @@ import { ApiKeyFormPageComponent } from 'src/app/modules/admin/administration/ap
 import { ApiKeysPage } from 'src/app/modules/admin/administration/api-keys/api-keys.page';
 import { ApiKeysDataService } from 'src/app/modules/admin/administration/api-keys/api-keys.data.service';
 import { ApiKeysColumns } from 'src/app/modules/admin/administration/api-keys/api-keys.columns';
+import { HistoryComponent } from 'src/app/modules/admin/administration/api-keys/history/history.component';
 
 const routes: Routes = [
   {
@@ -31,12 +32,20 @@ const routes: Routes = [
           permissions: [PermissionsEnum.apiKeysUpdate],
         },
       },
+      {
+        path: 'history/:historyId',
+        component: HistoryComponent,
+        canActivate: [PermissionGuard],
+        data: {
+          permissions: [PermissionsEnum.apiKeys],
+        },
+      },
     ],
   },
 ];
 
 @NgModule({
-  declarations: [ApiKeysPage, ApiKeyFormPageComponent],
+  declarations: [ApiKeysPage, ApiKeyFormPageComponent, HistoryComponent],
   imports: [CommonModule, SharedModule, RouterModule.forChild(routes)],
   providers: [ApiKeysDataService.provide(), ApiKeysColumns.provide()],
 })

web/src/app/modules/admin/administration/api-keys/api-keys.page.html

@@ -11,6 +11,7 @@
   [(skip)]="skip"
   [(take)]="take"
   (load)="load()"
+  [history]="true"
   [create]="true"
   [update]="true"
   (delete)="delete($event)"

web/src/app/modules/admin/administration/api-keys/form-page/api-key-form-page.component.html

@@ -6,7 +6,7 @@
   (onClose)="close()">
   <ng-template formPageHeader let-isUpdate>
     <h2>
-            {{ 'common.role' | translate }}
+      {{ 'common.api_key' | translate }}
       {{
         (isUpdate ? 'sidebar.header.update' : 'sidebar.header.create')
           | translate
@@ -21,22 +21,26 @@
     </div>
     <div class="form-page-input">
       <p class="label">{{ 'common.identifier' | translate }}</p>
-            <input pInputText class="value" type="text" formControlName="identifier"/>
+      <input
+        pInputText
+        class="value"
+        type="text"
+        formControlName="identifier" />
     </div>
     <div class="divider"></div>
 
     <div class="flex flex-col gap-5">
       <div *ngFor="let group of Object.keys(permissionGroups)">
-                <div class="flex flex-col gap-2">
+        <div class="flex flex-col">
           <div class="flex justify-between">
-                        <label class="flex-1" for="roles.permission_groups.{{ group }}">
+            <label class="flex-1" for="apiKeys.permission_groups.{{ group }}">
               <h3>
                 {{ 'permissions.' + group | translate }}
               </h3>
             </label>
             <form #form="ngForm">
               <p-inputSwitch
-                                    name="roles.permission_groups.{{ group }}"
+                name="apiKeys.permission_groups.{{ group }}"
                 (onChange)="toggleGroup($event, group)"
                 [ngModel]="isGroupChecked(group)"></p-inputSwitch>
             </form>
@@ -44,20 +48,14 @@
 
           <div
             *ngFor="let permission of permissionGroups[group]"
-                            class="flex flex-col">
-                        <div class="flex items-center justify-between w-full">
+            class="flex items-center justify-between w-full">
             <label class="flex-1" for="{{ permission.name }}">
               {{ 'permissions.' + permission.name | translate }}
             </label>
-                            <p-inputSwitch class="flex items-center justify-center" [formControlName]="permission.name">
+            <p-inputSwitch [formControlName]="permission.name">
+              >
             </p-inputSwitch>
           </div>
-                        <div *ngIf="permission.description">
-                            <p class="text-sm text-gray-500">
-                                {{ permission.description }}
-                            </p>
-                        </div>
-                    </div>
         </div>
       </div>
     </div>

web/src/app/modules/admin/administration/api-keys/form-page/api-key-form-page.component.ts

@@ -11,7 +11,6 @@ import {
   ApiKeyUpdateInput,
 } from 'src/app/model/entities/api-key';
 import { ApiKeysDataService } from 'src/app/modules/admin/administration/api-keys/api-keys.data.service';
-import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'app-api-key-form-page',
@@ -27,10 +26,7 @@ export class ApiKeyFormPageComponent extends FormPageBase<
   permissionGroups: { [key: string]: Permission[] } = {};
   allPermissions: Permission[] = [];
 
-  constructor(
-    private toast: ToastService,
-    private translate: TranslateService
-  ) {
+  constructor(private toast: ToastService) {
     super();
     this.initializePermissions().then(() => {
       if (!this.nodeId) {
@@ -40,8 +36,10 @@ export class ApiKeyFormPageComponent extends FormPageBase<
         return;
       }
 
-      this.dataService.loadById(this.nodeId).subscribe(apiKey => {
-        this.node = apiKey;
+      this.dataService
+        .load([{ id: { equal: this.nodeId } }])
+        .subscribe(apiKey => {
+          this.node = apiKey.nodes[0];
           this.setForm(this.node);
         });
     });
@@ -51,12 +49,7 @@ export class ApiKeyFormPageComponent extends FormPageBase<
     const permissions = await firstValueFrom(
       this.dataService.getAllPermissions()
     );
-    this.allPermissions = permissions.map(x => {
-      const key = `permission_descriptions.${x.name}`;
-      const description = this.translate.instant(key);
-      x.description = description === key ? undefined : description;
-      return x;
-    });
+    this.allPermissions = permissions;
     this.permissionGroups = permissions.reduce(
       (acc, p) => {
         const group = p.name.includes('.') ? p.name.split('.')[0] : p.name;

web/src/app/modules/admin/administration/api-keys/history/history.component.html

@@ -0,0 +1,3 @@
+<app-history-sidebar
+  [loadHistory]="loadHistory"
+  [columns]="columns"></app-history-sidebar>

web/src/app/modules/admin/administration/api-keys/history/history.component.spec.ts

@@ -0,0 +1,65 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HistoryComponent } from './history.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { PageDataService } from 'src/app/core/base/page.data.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ApiKeysDataService } from 'src/app/modules/admin/administration/api-keys/api-keys.data.service';
+import { PageColumns } from 'src/app/core/base/page.columns';
+import { MockPageColumns } from 'src/app/modules/shared/test/page.columns.mock';
+
+describe('HistoryComponent', () => {
+  let component: HistoryComponent<unknown>;
+  let fixture: ComponentFixture<HistoryComponent<unknown>>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [HistoryComponent],
+      imports: [
+        BrowserAnimationsModule,
+        SharedModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        AuthService,
+        KeycloakService,
+        ErrorHandlingService,
+        ToastService,
+        MessageService,
+        ConfirmationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: { params: { historyId: '3' } },
+          },
+        },
+        {
+          provide: PageDataService,
+          useClass: ApiKeysDataService,
+        },
+        {
+          provide: PageColumns,
+          useClass: MockPageColumns,
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HistoryComponent);
+    component = fixture.componentInstance;
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    component.loadHistory = (id: number) => of([]);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/modules/admin/administration/api-keys/history/history.component.ts

@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service';
+import { PageColumns } from 'src/app/core/base/page.columns';
+
+@Component({
+  selector: 'app-history',
+  templateUrl: './history.component.html',
+  styleUrl: './history.component.scss',
+})
+export class HistoryComponent<T> {
+  loadHistory = (id: number) => this.data.loadHistory(id);
+  columns = this._columns.get();
+
+  constructor(
+    public data: PageWithHistoryDataService<T>,
+    private _columns: PageColumns<T>
+  ) {}
+}

web/src/app/modules/admin/administration/feature-flags/feature-flags.page.ts

@@ -5,6 +5,8 @@ import { SpinnerService } from 'src/app/service/spinner.service';
 import { catchError, takeUntil } from 'rxjs/operators';
 import { InputSwitchChangeEvent } from 'primeng/inputswitch';
 import { Subject } from 'rxjs';
+import { PermissionsEnum } from 'src/app/model/auth/permissionsEnum';
+import { AuthService } from 'src/app/service/auth.service';
 
 @Component({
   selector: 'app-feature-flags',
@@ -18,10 +20,18 @@ export class FeatureFlagsPage implements OnInit, OnDestroy {
 
   constructor(
     private spinner: SpinnerService,
-    private data: FeatureFlagsDataService
+    private data: FeatureFlagsDataService,
+    private auth: AuthService
   ) {}
 
-  ngOnInit() {
+  async ngOnInit() {
+    const isAllowed = await this.auth.hasAnyPermissionLazy([
+      PermissionsEnum.administrator,
+    ]);
+    if (!isAllowed) {
+      throw new Error('Unauthorized');
+    }
+
     this.data
       .onUpdate()
       .pipe(takeUntil(this.unsubscribe$))
@@ -53,7 +63,14 @@ export class FeatureFlagsPage implements OnInit, OnDestroy {
       });
   }
 
-  change(flag: FeatureFlag, event: InputSwitchChangeEvent) {
+  async change(flag: FeatureFlag, event: InputSwitchChangeEvent) {
+    const isAllowed = await this.auth.hasAnyPermissionLazy([
+      PermissionsEnum.administrator,
+    ]);
+    if (!isAllowed) {
+      throw new Error('Unauthorized');
+    }
+
     flag.value = event.checked;
     this.spinner.show();
     this.data

web/src/app/modules/admin/administration/roles/history/history.component.html

@@ -0,0 +1,3 @@
+<app-history-sidebar
+  [loadHistory]="loadHistory"
+  [columns]="columns"></app-history-sidebar>

web/src/app/modules/admin/administration/roles/history/history.component.spec.ts

@@ -0,0 +1,65 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HistoryComponent } from './history.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { PageDataService } from 'src/app/core/base/page.data.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { RolesDataService } from 'src/app/modules/admin/administration/roles/roles.data.service';
+import { PageColumns } from 'src/app/core/base/page.columns';
+import { MockPageColumns } from 'src/app/modules/shared/test/page.columns.mock';
+
+describe('HistoryComponent', () => {
+  let component: HistoryComponent<unknown>;
+  let fixture: ComponentFixture<HistoryComponent<unknown>>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [HistoryComponent],
+      imports: [
+        BrowserAnimationsModule,
+        SharedModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        AuthService,
+        KeycloakService,
+        ErrorHandlingService,
+        ToastService,
+        MessageService,
+        ConfirmationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: { params: { historyId: '3' } },
+          },
+        },
+        {
+          provide: PageDataService,
+          useClass: RolesDataService,
+        },
+        {
+          provide: PageColumns,
+          useClass: MockPageColumns,
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HistoryComponent);
+    component = fixture.componentInstance;
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    component.loadHistory = (id: number) => of([]);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/modules/admin/administration/roles/history/history.component.ts

@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service';
+import { PageColumns } from 'src/app/core/base/page.columns';
+
+@Component({
+  selector: 'app-history',
+  templateUrl: './history.component.html',
+  styleUrl: './history.component.scss',
+})
+export class HistoryComponent<T> {
+  loadHistory = (id: number) => this.data.loadHistory(id);
+  columns = this._columns.get();
+
+  constructor(
+    public data: PageWithHistoryDataService<T>,
+    private _columns: PageColumns<T>
+  ) {}
+}

web/src/app/modules/admin/administration/roles/roles.columns.ts

@@ -12,7 +12,23 @@ import { TableColumn } from 'src/app/modules/shared/components/table/table.model
 @Injectable()
 export class RolesColumns extends PageColumns<Role> {
   get(): TableColumn<Role>[] {
-    return [ID_COLUMN, NAME_COLUMN, DESCRIPTION_COLUMN, ...DB_MODEL_COLUMNS];
+    return [
+      ID_COLUMN,
+      NAME_COLUMN,
+      DESCRIPTION_COLUMN,
+      {
+        name: 'users',
+        translationKey: 'sidebar.users',
+        type: 'text',
+        filterable: false,
+        sortable: false,
+        value: (row: Role) =>
+          (row?.users ?? []).map(user => user.username).join(', '),
+        width: '300px',
+        visible: false,
+      },
+      ...DB_MODEL_COLUMNS,
+    ];
   }
 
   static provide(): Provider[] {

web/src/app/modules/admin/administration/roles/roles.data.service.ts

@@ -17,13 +17,18 @@ import { Filter } from 'src/app/model/graphql/filter/filter.model';
 import { Sort } from 'src/app/model/graphql/filter/sort.model';
 import { Apollo, gql } from 'apollo-angular';
 import { QueryResult } from 'src/app/model/entities/query-result';
-import { DB_MODEL_FRAGMENT } from 'src/app/model/graphql/db-model.query';
+import {
+  DB_HISTORY_MODEL_FRAGMENT,
+  DB_MODEL_FRAGMENT,
+} from 'src/app/model/graphql/db-model.query';
 import { catchError, map } from 'rxjs/operators';
 import { SpinnerService } from 'src/app/service/spinner.service';
+import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service';
+import { DbModel } from 'src/app/model/entities/db-model';
 
 @Injectable()
 export class RolesDataService
-  extends PageDataService<Role>
+  extends PageWithHistoryDataService<Role>
   implements
     Create<Role, RoleCreateInput>,
     Update<Role, RoleUpdateInput>,
@@ -59,6 +64,10 @@ export class RolesDataService
                 id
                 name
                 description
+                users {
+                  id
+                  username
+                }
 
                 ...DB_MODEL
               }
@@ -99,6 +108,10 @@ export class RolesDataService
                   id
                   name
                 }
+                users {
+                  id
+                  username
+                }
 
                 ...DB_MODEL
               }
@@ -120,6 +133,44 @@ export class RolesDataService
       .pipe(map(result => result.data.roles.nodes[0]));
   }
 
+  loadHistory(id: number): Observable<DbModel[]> {
+    return this.apollo
+      .query<{ roles: QueryResult<Role> }>({
+        query: gql`
+          query getRoleHistory($id: Int) {
+            roles(filter: { id: { equal: $id } }) {
+              count
+              totalCount
+              nodes {
+                history {
+                  id
+
+                  name
+                  description
+                  permissions {
+                    name
+                  }
+
+                  ...DB_HISTORY_MODEL
+                }
+              }
+            }
+          }
+          ${DB_HISTORY_MODEL_FRAGMENT}
+        `,
+        variables: {
+          id,
+        },
+      })
+      .pipe(
+        catchError(err => {
+          this.spinner.hide();
+          throw err;
+        })
+      )
+      .pipe(map(result => result.data?.roles?.nodes?.[0]?.history ?? []));
+  }
+
   onChange(): Observable<void> {
     return this.apollo
       .subscribe<{ roleChange: void }>({
@@ -213,7 +264,7 @@ export class RolesDataService
     return this.apollo
       .mutate<{ role: { delete: boolean } }>({
         mutation: gql`
-          mutation deleteRole($id: ID!) {
+          mutation deleteRole($id: Int!) {
             role {
               delete(id: $id)
             }
@@ -236,7 +287,7 @@ export class RolesDataService
     return this.apollo
       .mutate<{ role: { restore: boolean } }>({
         mutation: gql`
-          mutation restoreRole($id: ID!) {
+          mutation restoreRole($id: Int!) {
             role {
               restore(id: $id)
             }
@@ -260,7 +311,7 @@ export class RolesDataService
       .query<{ permissions: QueryResult<Permission> }>({
         query: gql`
           query getPermissions {
-            permissions {
+            permissions(sort: [{ name: ASC }]) {
               nodes {
                 id
                 name
@@ -284,6 +335,10 @@ export class RolesDataService
         provide: PageDataService,
         useClass: RolesDataService,
       },
+      {
+        provide: PageWithHistoryDataService,
+        useClass: RolesDataService,
+      },
       RolesDataService,
     ];
   }

web/src/app/modules/admin/administration/roles/roles.module.ts

@@ -8,6 +8,7 @@ import { RoleFormPageComponent } from 'src/app/modules/admin/administration/role
 import { RolesPage } from 'src/app/modules/admin/administration/roles/roles.page';
 import { RolesDataService } from 'src/app/modules/admin/administration/roles/roles.data.service';
 import { RolesColumns } from 'src/app/modules/admin/administration/roles/roles.columns';
+import { HistoryComponent } from 'src/app/modules/admin/administration/roles/history/history.component';
 
 const routes: Routes = [
   {
@@ -31,12 +32,20 @@ const routes: Routes = [
           permissions: [PermissionsEnum.rolesUpdate],
         },
       },
+      {
+        path: 'history/:historyId',
+        component: HistoryComponent,
+        canActivate: [PermissionGuard],
+        data: {
+          permissions: [PermissionsEnum.roles],
+        },
+      },
     ],
   },
 ];
 
 @NgModule({
-  declarations: [RolesPage, RoleFormPageComponent],
+  declarations: [RolesPage, RoleFormPageComponent, HistoryComponent],
   imports: [CommonModule, SharedModule, RouterModule.forChild(routes)],
   providers: [RolesDataService.provide(), RolesColumns.provide()],
 })

web/src/app/modules/admin/administration/roles/roles.page.html

@@ -11,6 +11,7 @@
   [(skip)]="skip"
   [(take)]="take"
   (load)="load()"
+  [history]="true"
   [create]="true"
   [update]="true"
   (delete)="delete($event)"

web/src/app/modules/admin/administration/settings/settings.page.ts

@@ -5,6 +5,8 @@ import { SpinnerService } from 'src/app/service/spinner.service';
 import { catchError, takeUntil } from 'rxjs/operators';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { Subject } from 'rxjs';
+import { AuthService } from 'src/app/service/auth.service';
+import { PermissionsEnum } from 'src/app/model/auth/permissionsEnum';
 
 @Component({
   selector: 'app-settings',
@@ -24,10 +26,18 @@ export class SettingsPage implements OnInit, OnDestroy {
   constructor(
     private spinner: SpinnerService,
     private data: SettingsDataService,
-    private fb: FormBuilder
+    private fb: FormBuilder,
+    private auth: AuthService
   ) {}
 
-  ngOnInit() {
+  async ngOnInit() {
+    const isAllowed = await this.auth.hasAnyPermissionLazy([
+      PermissionsEnum.settings,
+    ]);
+    if (!isAllowed) {
+      throw new Error('Unauthorized');
+    }
+
     this.data
       .onUpdate()
       .pipe(takeUntil(this.unsubscribe$))
@@ -66,7 +76,14 @@ export class SettingsPage implements OnInit, OnDestroy {
       });
   }
 
-  save() {
+  async save() {
+    const isAllowed = await this.auth.hasAnyPermissionLazy([
+      PermissionsEnum.settingsUpdate,
+    ]);
+    if (!isAllowed) {
+      throw new Error('Unauthorized');
+    }
+
     if (this.settingsForm.pristine) {
       return;
     }

web/src/app/modules/admin/administration/users/form-page/user-form-page.component.html

@@ -15,7 +15,7 @@
   </ng-template>
 
   <ng-template formPageContent>
-    <ng-container *ngIf="notExistingUsers; else showId"></ng-container>
+    <ng-container *ngIf="!this.nodeId; else showId">
       <div class="form-page-input">
         <p class="label">{{ 'common.id' | translate }}</p>
         <p-dropdown
@@ -24,9 +24,12 @@
           optionValue="keycloakId"
           formControlName="keycloakId"></p-dropdown>
       </div>
+    </ng-container>
     <ng-template #showId>
+      <div class="form-page-input">
         <p class="label">{{ 'common.id' | translate }}</p>
         <input pInputText class="value" type="number" formControlName="id" />
+      </div>
     </ng-template>
 
     <div class="form-page-input">

web/src/app/modules/admin/administration/users/form-page/user-form-page.component.ts

@@ -33,7 +33,7 @@ export class UserFormPageComponent extends FormPageBase<
 
     if (!this.nodeId) {
       this.dataService.getNotExistingUsersFromKeycloak().subscribe(users => {
-        this.notExistingUsers = users;
+        this.notExistingUsers = users ?? [];
         this.node = this.new();
         this.setForm(this.node);
       });

web/src/app/modules/admin/administration/users/history/history.component.html

@@ -0,0 +1,3 @@
+<app-history-sidebar
+  [loadHistory]="loadHistory"
+  [columns]="columns"></app-history-sidebar>

web/src/app/modules/admin/administration/users/history/history.component.spec.ts

@@ -0,0 +1,65 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HistoryComponent } from './history.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { PageDataService } from 'src/app/core/base/page.data.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { MockPageColumns } from 'src/app/modules/shared/test/page.columns.mock';
+import { PageColumns } from 'src/app/core/base/page.columns';
+import { UsersDataService } from 'src/app/modules/admin/administration/users/users.data.service';
+
+describe('HistoryComponent', () => {
+  let component: HistoryComponent<unknown>;
+  let fixture: ComponentFixture<HistoryComponent<unknown>>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [HistoryComponent],
+      imports: [
+        BrowserAnimationsModule,
+        SharedModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        AuthService,
+        KeycloakService,
+        ErrorHandlingService,
+        ToastService,
+        MessageService,
+        ConfirmationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: { params: { historyId: '3' } },
+          },
+        },
+        {
+          provide: PageDataService,
+          useClass: UsersDataService,
+        },
+        {
+          provide: PageColumns,
+          useClass: MockPageColumns,
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HistoryComponent);
+    component = fixture.componentInstance;
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    component.loadHistory = (id: number) => of([]);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/modules/admin/administration/users/history/history.component.ts

@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service';
+import { PageColumns } from 'src/app/core/base/page.columns';
+
+@Component({
+  selector: 'app-history',
+  templateUrl: './history.component.html',
+  styleUrl: './history.component.scss',
+})
+export class HistoryComponent<T> {
+  loadHistory = (id: number) => this.data.loadHistory(id);
+  columns = this._columns.get();
+
+  constructor(
+    public data: PageWithHistoryDataService<T>,
+    private _columns: PageColumns<T>
+  ) {}
+}

web/src/app/modules/admin/administration/users/users.columns.ts

@@ -12,6 +12,14 @@ export class UsersColumns extends PageColumns<User> {
   get(): TableColumn<User>[] {
     return [
       ID_COLUMN,
+      {
+        name: 'keycloakId',
+        translationKey: 'user.keycloak_id',
+        type: 'text',
+        filterable: true,
+        sortable: true,
+        value: (row: User) => row.keycloakId,
+      },
       {
         name: 'username',
         translationKey: 'user.username',
@@ -28,8 +36,10 @@ export class UsersColumns extends PageColumns<User> {
         name: 'roles',
         translationKey: 'common.roles',
         type: 'text',
-        filterable: true,
-        value: (row: User) => row.roles.map(role => role.name).join(', '),
+        filterable: false,
+        sortable: false,
+        value: (row: User) =>
+          (row?.roles ?? []).map(role => role.name).join(', '),
         width: '300px',
       },
       ...DB_MODEL_COLUMNS,

web/src/app/modules/admin/administration/users/users.data.service.ts

@@ -11,7 +11,10 @@ import { Filter } from 'src/app/model/graphql/filter/filter.model';
 import { Sort } from 'src/app/model/graphql/filter/sort.model';
 import { Apollo, gql } from 'apollo-angular';
 import { QueryResult } from 'src/app/model/entities/query-result';
-import { DB_MODEL_FRAGMENT } from 'src/app/model/graphql/db-model.query';
+import {
+  DB_HISTORY_MODEL_FRAGMENT,
+  DB_MODEL_FRAGMENT,
+} from 'src/app/model/graphql/db-model.query';
 import { catchError, map } from 'rxjs/operators';
 import { SpinnerService } from 'src/app/service/spinner.service';
 import {
@@ -21,10 +24,12 @@ import {
   UserUpdateInput,
 } from 'src/app/model/auth/user';
 import { Role } from 'src/app/model/entities/role';
+import { DbModel } from 'src/app/model/entities/db-model';
+import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service';
 
 @Injectable()
 export class UsersDataService
-  extends PageDataService<User>
+  extends PageWithHistoryDataService<User>
   implements
     Create<User, UserCreateInput>,
     Update<User, UserUpdateInput>,
@@ -61,6 +66,7 @@ export class UsersDataService
                 keycloakId
                 username
                 email
+
                 roles {
                   id
                   name
@@ -127,6 +133,44 @@ export class UsersDataService
       .pipe(map(result => result.data.users.nodes[0]));
   }
 
+  loadHistory(id: number): Observable<DbModel[]> {
+    return this.apollo
+      .query<{ users: QueryResult<User> }>({
+        query: gql`
+          query getUserHistory($id: Int) {
+            users(filter: { id: { equal: $id } }) {
+              count
+              totalCount
+              nodes {
+                history {
+                  id
+                  keycloakId
+                  username
+                  email
+                  roles {
+                    name
+                  }
+
+                  ...DB_HISTORY_MODEL
+                }
+              }
+            }
+          }
+          ${DB_HISTORY_MODEL_FRAGMENT}
+        `,
+        variables: {
+          id,
+        },
+      })
+      .pipe(
+        catchError(err => {
+          this.spinner.hide();
+          throw err;
+        })
+      )
+      .pipe(map(result => result.data?.users?.nodes?.[0]?.history ?? []));
+  }
+
   onChange(): Observable<void> {
     return this.apollo
       .subscribe<{ userChange: void }>({
@@ -213,7 +257,7 @@ export class UsersDataService
     return this.apollo
       .mutate<{ user: { delete: boolean } }>({
         mutation: gql`
-          mutation deleteUser($id: ID!) {
+          mutation deleteUser($id: Int!) {
             user {
               delete(id: $id)
             }
@@ -236,7 +280,7 @@ export class UsersDataService
     return this.apollo
       .mutate<{ user: { restore: boolean } }>({
         mutation: gql`
-          mutation restoreUser($id: ID!) {
+          mutation restoreUser($id: Int!) {
             user {
               restore(id: $id)
             }
@@ -280,16 +324,14 @@ export class UsersDataService
 
   getNotExistingUsersFromKeycloak(): Observable<NotExistingUser[]> {
     return this.apollo
-      .query<{ notExistingUsersFromKeycloak: QueryResult<NotExistingUser> }>({
+      .query<{ notExistingUsersFromKeycloak: NotExistingUser[] }>({
         query: gql`
           query getNotExistingUsers {
             notExistingUsersFromKeycloak {
-              nodes {
               keycloakId
               username
             }
           }
-          }
         `,
       })
       .pipe(
@@ -298,7 +340,7 @@ export class UsersDataService
           throw err;
         })
       )
-      .pipe(map(result => result.data.notExistingUsersFromKeycloak.nodes));
+      .pipe(map(result => result.data.notExistingUsersFromKeycloak));
   }
 
   static provide(): Provider[] {
@@ -307,6 +349,10 @@ export class UsersDataService
         provide: PageDataService,
         useClass: UsersDataService,
       },
+      {
+        provide: PageWithHistoryDataService,
+        useClass: UsersDataService,
+      },
       UsersDataService,
     ];
   }

web/src/app/modules/admin/administration/users/users.module.ts

@@ -8,6 +8,7 @@ import { UserFormPageComponent } from 'src/app/modules/admin/administration/user
 import { UsersPage } from 'src/app/modules/admin/administration/users/users.page';
 import { UsersDataService } from 'src/app/modules/admin/administration/users/users.data.service';
 import { UsersColumns } from 'src/app/modules/admin/administration/users/users.columns';
+import { HistoryComponent } from 'src/app/modules/admin/administration/users/history/history.component';
 
 const routes: Routes = [
   {
@@ -31,12 +32,20 @@ const routes: Routes = [
           permissions: [PermissionsEnum.usersUpdate],
         },
       },
+      {
+        path: 'history/:historyId',
+        component: HistoryComponent,
+        canActivate: [PermissionGuard],
+        data: {
+          permissions: [PermissionsEnum.users],
+        },
+      },
     ],
   },
 ];
 
 @NgModule({
-  declarations: [UsersPage, UserFormPageComponent],
+  declarations: [UsersPage, UserFormPageComponent, HistoryComponent],
   imports: [CommonModule, SharedModule, RouterModule.forChild(routes)],
   providers: [UsersDataService.provide(), UsersColumns.provide()],
 })

web/src/app/modules/admin/administration/users/users.page.html

@@ -11,6 +11,7 @@
   [(skip)]="skip"
   [(take)]="take"
   (load)="load()"
+  [history]="true"
   [create]="true"
   [update]="true"
   (delete)="delete($event)"

web/src/app/modules/shared/components/history/history-sidebar.component.html

@@ -0,0 +1,32 @@
+<p-sidebar
+  [(visible)]="showSidebar"
+  position="right"
+  [baseZIndex]="10000"
+  styleClass="w-1/3"
+  (onHide)="close()">
+  <ng-template pTemplate="header">
+    <div class="flex justify-between items-center w-full">
+      <h1 class="text-xl font-bold">
+        {{ 'history.header' | translate }}
+      </h1>
+    </div>
+  </ng-template>
+
+  <div class="h-full">
+    <div class="flex flex-col gap-1">
+      <div *ngFor="let entry of history" class="p-4 rounded-lg bg2">
+        <div
+          *ngFor="let item of entry | keyvalue"
+          class="grid grid-cols-6 gap-4 items-center mb-2">
+          <div class="font-medium col-span-2">
+            {{ getAttributeTranslationKey(item.key) | translate }}
+          </div>
+          <div class="col-span-1 text-center">-></div>
+          <div class="value col-span-3 overflow-hidden">
+            {{ item.value }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</p-sidebar>

web/src/app/modules/shared/components/history/history-sidebar.component.spec.ts

@@ -0,0 +1,54 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HistorySidebarComponent } from 'src/app/modules/shared/components/history/history-sidebar.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
+describe('HistorySidebarComponent', () => {
+  let component: HistorySidebarComponent<unknown>;
+  let fixture: ComponentFixture<HistorySidebarComponent<unknown>>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [HistorySidebarComponent],
+      imports: [
+        BrowserAnimationsModule,
+        SharedModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        AuthService,
+        KeycloakService,
+        ErrorHandlingService,
+        ToastService,
+        MessageService,
+        ConfirmationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: { params: { historyId: '3' } },
+          },
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HistorySidebarComponent);
+    component = fixture.componentInstance;
+    component.columns = [];
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    component.loadHistory = (id: number) => of([]);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/modules/shared/components/history/history-sidebar.component.ts

@@ -0,0 +1,138 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { DbModel } from 'src/app/model/entities/db-model';
+import { SpinnerService } from 'src/app/service/spinner.service';
+import { User } from 'src/app/model/auth/user';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TableColumn } from 'src/app/modules/shared/components/table/table.model';
+import { Observable } from 'rxjs';
+
+interface History {
+  id?: number;
+  editor?: User;
+  deleted?: boolean;
+  created?: Date;
+  updated?: Date;
+
+  [x: string | number | symbol]: unknown;
+}
+
+@Component({
+  selector: 'app-history-sidebar',
+  templateUrl: './history-sidebar.component.html',
+  styleUrl: './history-sidebar.component.scss',
+})
+export class HistorySidebarComponent<T> implements OnInit {
+  @Input({ required: true }) loadHistory!: (
+    id: number
+  ) => Observable<DbModel[]>;
+  @Input({ required: true }) columns!: TableColumn<T>[];
+  historyId!: number;
+
+  private translations: { [key: string]: string } = {};
+  public history: History[] = [];
+  public showSidebar: boolean = false;
+
+  constructor(
+    private spinner: SpinnerService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) {
+    this.spinner.show();
+    const id = this.route.snapshot.params['historyId'];
+    if (!id) {
+      throw new Error('History ID is required');
+    }
+    this.historyId = +id;
+  }
+
+  ngOnInit() {
+    this.open();
+  }
+
+  open(): void {
+    this.columns.forEach(column => {
+      this.translations[column.name] = column.translationKey;
+    });
+
+    this.showSidebar = true;
+    this.loadHistory(this.historyId).subscribe(data => {
+      this.history = data ? this.processHistory(data) : [];
+      this.spinner.hide();
+    });
+
+    let oldHistory: Partial<History> = {};
+    for (const history of this.history) {
+      const attributes = Object.keys(history).map(key => {
+        return key;
+      });
+      for (const attribute of attributes) {
+        if (history[attribute] === oldHistory[attribute]) {
+          delete oldHistory[attribute];
+        }
+      }
+
+      oldHistory = history;
+    }
+  }
+
+  close() {
+    const backRoute = this.historyId ? '../..' : '..';
+
+    this.router.navigate([backRoute], { relativeTo: this.route }).then(() => {
+      this.spinner.hide();
+    });
+  }
+
+  private processHistory(data: DbModel[]): History[] {
+    const history = (data as History[]).map(entry => {
+      const filteredEntry: History = {};
+      for (const key in entry) {
+        if (!key.startsWith('_') && !key.startsWith('__')) {
+          filteredEntry[key] = this.flattenValue(entry[key]);
+        }
+      }
+      return filteredEntry;
+    });
+
+    const reversedHistory = [...history].reverse();
+
+    let cumulativeHistory: Partial<History> = {};
+    for (const entry of reversedHistory) {
+      const attributes = Object.keys(entry);
+      for (const attribute of attributes) {
+        if (
+          attribute !== 'editor' &&
+          entry[attribute] === cumulativeHistory[attribute]
+        ) {
+          delete entry[attribute];
+        }
+      }
+      cumulativeHistory = { ...cumulativeHistory, ...entry };
+    }
+
+    return reversedHistory.reverse();
+  }
+
+  private flattenValue(value: unknown): string {
+    if (value === null) {
+      return '';
+    }
+
+    if (value && typeof value === 'object') {
+      return (
+        Array.isArray(value)
+          ? value
+          : Object.entries(value)
+              .filter(([key]) => !key.startsWith('_') && !key.startsWith('__'))
+              .map(([, val]) => val)
+      )
+        .map(item => this.flattenValue(item))
+        .join(', ');
+    }
+    return String(value);
+  }
+
+  public getAttributeTranslationKey(key: string): string {
+    return this.translations[key] || `history.${key}`;
+  }
+}

web/src/app/modules/shared/components/menu-bar/menu-bar.component.spec.ts

@@ -1,14 +1,38 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MenuBarComponent } from "src/app/modules/shared/components/menu-bar/menu-bar.component";
+import { MenuBarComponent } from 'src/app/modules/shared/components/menu-bar/menu-bar.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
 
-describe("MenuBarComponent", () => {
+describe('MenuBarComponent', () => {
   let component: MenuBarComponent;
   let fixture: ComponentFixture<MenuBarComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [MenuBarComponent],
+      imports: [SharedModule, TranslateModule.forRoot()],
+      providers: [
+        AuthService,
+        KeycloakService,
+        ErrorHandlingService,
+        ToastService,
+        MessageService,
+        ConfirmationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: { params: of({}) },
+          },
+        },
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(MenuBarComponent);
@@ -16,7 +40,7 @@ describe("MenuBarComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/modules/shared/components/side-menu/side-menu.component.spec.ts

@@ -1,8 +1,8 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SideMenuComponent } from "./side-menu.component";
+import { SideMenuComponent } from './side-menu.component';
 
-describe("SideMenuComponent", () => {
+describe('SideMenuComponent', () => {
   let component: SideMenuComponent;
   let fixture: ComponentFixture<SideMenuComponent>;
 
@@ -16,7 +16,7 @@ describe("SideMenuComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/modules/shared/components/side-menu/side-menu.component.ts

@@ -1,10 +1,10 @@
-import { Component, Input } from "@angular/core";
-import { MenuElement } from "src/app/model/view/menu-element";
+import { Component, Input } from '@angular/core';
+import { MenuElement } from 'src/app/model/view/menu-element';
 
 @Component({
-  selector: "app-side-menu",
-  templateUrl: "./side-menu.component.html",
-  styleUrl: "./side-menu.component.scss",
+  selector: 'app-side-menu',
+  templateUrl: './side-menu.component.html',
+  styleUrl: './side-menu.component.scss',
 })
 export class SideMenuComponent {
   @Input() elements: MenuElement[] = [];

web/src/app/modules/shared/components/slidein/form-page.component.html

@@ -1,7 +1,7 @@
 <p-sidebar
   [visible]="true"
   position="right"
-  [style]="{ width: 'min-content', minWidth: '450px' }"
+  [style]="{ width: 'min-content', minWidth: '500px' }"
   (onHide)="onClose.emit()"
   (visibleChange)="!$event ? onClose.emit() : undefined">
   <ng-template pTemplate="headless">

web/src/app/modules/shared/components/slidein/form-page.component.spec.ts

@@ -1,18 +1,18 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { FormPageComponent } from "src/app/modules/shared/components/slidein/form-page.component";
-import { SharedModule } from "src/app/modules/shared/shared.module";
-import { TranslateModule } from "@ngx-translate/core";
-import { AuthService } from "src/app/service/auth.service";
-import { KeycloakService } from "keycloak-angular";
-import { ErrorHandlingService } from "src/app/service/error-handling.service";
-import { ToastService } from "src/app/service/toast.service";
-import { ConfirmationService, MessageService } from "primeng/api";
-import { ActivatedRoute } from "@angular/router";
-import { of } from "rxjs";
-import { FormGroup } from "@angular/forms";
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormPageComponent } from 'src/app/modules/shared/components/slidein/form-page.component';
+import { SharedModule } from 'src/app/modules/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from 'src/app/service/auth.service';
+import { KeycloakService } from 'keycloak-angular';
+import { ErrorHandlingService } from 'src/app/service/error-handling.service';
+import { ToastService } from 'src/app/service/toast.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { FormGroup } from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-describe("FormpageComponent", () => {
+describe('FormpageComponent', () => {
   let component: FormPageComponent<string>;
   let fixture: ComponentFixture<FormPageComponent<string>>;
 
@@ -46,7 +46,7 @@ describe("FormpageComponent", () => {
     fixture.detectChanges();
   });
 
-  it("should create", () => {
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

web/src/app/modules/shared/components/slidein/form-page.component.ts

@@ -5,18 +5,18 @@ import {
   Input,
   Output,
   TemplateRef,
-} from "@angular/core";
-import { FormGroup } from "@angular/forms";
-import { SpinnerService } from "src/app/service/spinner.service";
+} from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { SpinnerService } from 'src/app/service/spinner.service';
 import {
   FormPageContentDirective,
   FormPageHeaderDirective,
-} from "src/app/modules/shared/form";
+} from 'src/app/modules/shared/form';
 
 @Component({
-  selector: "app-form-page",
-  templateUrl: "./form-page.component.html",
-  styleUrl: "./form-page.component.scss",
+  selector: 'app-form-page',
+  templateUrl: './form-page.component.html',
+  styleUrl: './form-page.component.scss',
 })
 export class FormPageComponent<T> {
   @Input({ required: true }) formGroup!: FormGroup;

web/src/app/modules/shared/components/table/table.component.html

@@ -74,7 +74,7 @@
     <tr>
       <th
         *ngFor="let column of visibleColumns"
-                    [pSortableColumn]="column.name"
+        [pSortableColumn]="column.sortable != false ? column.name : undefined"
         [class]="column.class ?? ''"
         [style.min-width]="
           column.minWidth ? column.minWidth + ' !important' : ''
@@ -85,7 +85,9 @@
         ">
         <div class="flex items-center space-x-2">
           <span>{{ column.translationKey | translate }}</span>
-                    <p-sortIcon [field]="column.name"></p-sortIcon>
+          <p-sortIcon
+            [field]="column.name"
+            *ngIf="column.sortable != false"></p-sortIcon>
         </div>
       </th>
       <th *ngIf="update || delete.observed || customRowActionsVisible"></th>
@@ -217,6 +219,13 @@
           pTooltip="{{ 'table.restore' | translate }}"
           (click)="restore.emit(row)"
           [disabled]="rowDisabled(row)"></p-button>
+        <p-button
+          *ngIf="history"
+          class="icon-btn btn"
+          icon="pi pi-history"
+          tooltipPosition="left"
+          pTooltip="{{ 'table.history' | translate }}"
+          routerLink="history/{{ row.id }}"></p-button>
       </td>
     </tr>
   </ng-template>

web/src/app/modules/shared/components/table/table.component.ts

@@ -18,7 +18,7 @@ import { RowsPerPageOption } from 'src/app/service/filter.service';
 import { Filter } from 'src/app/model/graphql/filter/filter.model';
 import { Sort, SortOrder } from 'src/app/model/graphql/filter/sort.model';
 import { FormControl, FormGroup } from '@angular/forms';
-import { debounceTime, Subject } from 'rxjs';
+import { debounceTime, Observable, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Logger } from 'src/app/service/logger.service';
 import { AuthService } from 'src/app/service/auth.service';
@@ -27,6 +27,7 @@ import {
   CustomActionsDirective,
   CustomRowActionsDirective,
 } from 'src/app/modules/shared/components/table/table';
+import { DbModel } from 'src/app/model/entities/db-model';
 
 const logger = new Logger('TableComponent');
 
@@ -76,12 +77,14 @@ export class TableComponent<T> implements OnInit {
 
   // eslint-disable-next-line @angular-eslint/no-output-native
   @Output() load = new EventEmitter<void>();
+  @Input() loadHistory?: (id: number) => Observable<DbModel[] | undefined>;
   @Input() loading = true;
 
   @Input() dataKey = 'id';
   @Input() responsiveLayout: 'stack' | 'scroll' = 'stack';
   @Input() selectableColumns = true;
 
+  @Input() history = false;
   @Input() create = false;
   @Input() update = false;
   @Input() createBaseUrl = '';
@@ -157,13 +160,6 @@ export class TableComponent<T> implements OnInit {
   }
 
   resolveColumns() {
-    if (!this.rows || this.rows.length == 0) {
-      this.resolvedColumns = [];
-      return;
-    }
-
-    const resolvedColumns: ResolvedTableColumn<T>[][] = [];
-
     const columns = this.columns
       .map(x => {
         if (x.visible === undefined || x.visible === null) {
@@ -173,6 +169,12 @@ export class TableComponent<T> implements OnInit {
       })
       .filter(x => !x.hidden && x.visible === true);
 
+    if (!this.rows || this.rows.length == 0) {
+      this.resolvedColumns = [];
+      return;
+    }
+
+    const resolvedColumns: ResolvedTableColumn<T>[][] = [];
     this.rows.forEach(row => {
       const resolvedRow: ResolvedTableColumn<T>[] = [];
       columns.forEach(column => {
@@ -297,9 +299,24 @@ export class TableComponent<T> implements OnInit {
     });
   }
 
-  public setFilterForm() {
+  setFilterForm() {
     this.filterForm = this.defaultFilterForm;
 
+    this.filter.forEach(f => {
+      Object.keys(f).forEach(key => {
+        const value = f[key];
+        if (this.filterForm.contains(key)) {
+          if (typeof value === 'object' && value !== null) {
+            Object.keys(value).forEach(subKey => {
+              this.filterForm.get(key)?.setValue(value[subKey]);
+            });
+          } else {
+            this.filterForm.get(key)?.setValue(value);
+          }
+        }
+      });
+    });
+
     this.filterForm.valueChanges
       .pipe(takeUntil(this.unsubscriber$), debounceTime(200))
       .subscribe(changes => {
@@ -345,6 +362,10 @@ export class TableComponent<T> implements OnInit {
 
             const filterMode = column.filterMode || defaultFilterMode;
 
+            if (column.filterSelector) {
+              return column.filterSelector(filterMode, value);
+            }
+
             return { [key]: { [filterMode]: value } };
           });
 

web/src/app/modules/shared/components/table/table.model.ts

@@ -1,4 +1,5 @@
 import { PermissionsEnum } from 'src/app/model/auth/permissionsEnum';
+import { Filter } from 'src/app/model/graphql/filter/filter.model';
 
 export type TableColumnValue<T> = T | T[keyof T] | string;
 
@@ -15,7 +16,7 @@ export interface TableColumn<T> {
   filterable?: boolean;
   filterMode?: 'contains' | 'startsWith' | 'endsWith' | 'equals';
   sort?: (a: T, b: T) => number;
-  filter?: (row: T, filter: string) => boolean;
+  filterSelector?: (mode: string, value: unknown) => Filter;
   minWidth?: string;
   width?: string;
   maxWidth?: string;