From a26a4841bda807432cb339c7f5cf9e5e128330b6 Mon Sep 17 00:00:00 2001
From: edraft <sven.heidemann@sh-edraft.de>
Date: Wed, 12 Mar 2025 10:03:45 +0100
Subject: [PATCH] Smaller fixes

---
 .../modules/admin/administration/users/users.columns.ts  | 9 +++++++++
 .../admin/administration/users/users.data.service.ts     | 4 ++++
 .../domains/form-page/domain-form-page.component.html    | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/src/app/modules/admin/administration/users/users.columns.ts b/web/src/app/modules/admin/administration/users/users.columns.ts
index e1cbbd5..e0e22f9 100644
--- a/web/src/app/modules/admin/administration/users/users.columns.ts
+++ b/web/src/app/modules/admin/administration/users/users.columns.ts
@@ -6,6 +6,7 @@ import {
 } from 'src/app/core/base/page.columns';
 import { TableColumn } from 'src/app/modules/shared/components/table/table.model';
 import { User } from 'src/app/model/auth/user';
+import { Group } from 'src/app/model/entities/group';
 
 @Injectable()
 export class UsersColumns extends PageColumns<User> {
@@ -24,6 +25,14 @@ export class UsersColumns extends PageColumns<User> {
         type: 'text',
         value: (row: User) => row.email,
       },
+      {
+        name: 'roles',
+        translationKey: 'common.roles',
+        type: 'text',
+        filterable: true,
+        value: (row: User) => row.roles.map(role => role.name).join(', '),
+        width: '300px',
+      },
       ...DB_MODEL_COLUMNS,
     ];
   }
diff --git a/web/src/app/modules/admin/administration/users/users.data.service.ts b/web/src/app/modules/admin/administration/users/users.data.service.ts
index f27ebb3..1361816 100644
--- a/web/src/app/modules/admin/administration/users/users.data.service.ts
+++ b/web/src/app/modules/admin/administration/users/users.data.service.ts
@@ -61,6 +61,10 @@ export class UsersDataService
                 keycloakId
                 username
                 email
+                roles {
+                  id
+                  name
+                }
 
                 ...DB_MODEL
               }
diff --git a/web/src/app/modules/admin/domains/form-page/domain-form-page.component.html b/web/src/app/modules/admin/domains/form-page/domain-form-page.component.html
index 82d8e33..22274ea 100644
--- a/web/src/app/modules/admin/domains/form-page/domain-form-page.component.html
+++ b/web/src/app/modules/admin/domains/form-page/domain-form-page.component.html
@@ -6,7 +6,7 @@
         (onClose)="close()">
     <ng-template formPageHeader let-isUpdate>
         <h2>
-            {{ 'common.group' | translate }}
+            {{ 'common.domain' | translate }}
             {{
                 (isUpdate ? 'sidebar.header.update' : 'sidebar.header.create')
                     | translate