Merge branch 'dev' into feat/paginate-user-roles-table

2026-05-04 11:34:19 +00:00 · 2026-03-31 18:55:21 +02:00
parent efb2e78d9d 5e0e4f1452
commit 152b452bee
247 changed files with 15708 additions and 4635 deletions
--- a/src/app/[orgId]/settings/access/users/page.tsx
+++ b/src/app/[orgId]/settings/access/users/page.tsx
@@ -92,9 +92,14 @@ export default async function UsersPage(props: UsersPageProps) {
            idpId: user.idpId,
            idpName: user.idpName || t("idpNameInternal"),
            status: t("userConfirmed"),
-            role: user.isOwner
-                ? t("accessRoleOwner")
-                : user.roleName || t("accessRoleMember"),
+            roleLabels: user.isOwner
+                ? [t("accessRoleOwner")]
+                : (() => {
+                      const names = (user.roles ?? [])
+                          .map((r) => r.roleName)
+                          .filter((n): n is string => Boolean(n?.length));
+                      return names.length ? names : [t("accessRoleMember")];
+                  })(),
            isOwner: user.isOwner || false
        };
    });