Skip to content

Commit 758482d

Browse files
authored
fix(user management): fix app roles display (eclipse-tractusx#1546)
* fix(user management): fixed display of app roles in user list table * fix(user management): update translations
1 parent dfeabfb commit 758482d

File tree

3 files changed

+28
-15
lines changed

3 files changed

+28
-15
lines changed

src/assets/locales/de/main.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,8 +1126,8 @@
11261126
"addUserRight": {
11271127
"headline": "Assign app roles to your user(s)",
11281128
"noRolesFound": "No user roles found",
1129-
"selectUsersDescription": "[abstract] Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
1130-
"addRolesDescription": "[abstract] Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
1129+
"selectUsersDescription": "Ordnen Sie Ihren Benutzern die entsprechenden Anwendungsrollen zu, um sicherzustellen, dass sie über die erforderlichen Berechtigungen und Zugriffsrechte für ihre Aufgaben verfügen.",
1130+
"addRolesDescription": "Ordnen Sie Ihren Benutzern die entsprechenden Anwendungsrollen zu, um sicherzustellen, dass sie über die erforderlichen Berechtigungen und Zugriffsrechte für ihre Aufgaben verfügen.",
11311131
"confirmSelectedUsers": "Confirm selected users",
11321132
"confirmSelectedRoles": "Confirm selected roles",
11331133
"selectRoles": "Select Roles:",

src/assets/locales/en/main.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,8 +1126,8 @@
11261126
"addUserRight": {
11271127
"headline": "Assign app roles to your user(s)",
11281128
"noRolesFound": "No user roles found",
1129-
"selectUsersDescription": "[abstract] Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
1130-
"addRolesDescription": "[abstract] Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
1129+
"selectUsersDescription": "Assign the appropriate application roles to your users to ensure they have the necessary permissions and access levels required for their tasks.",
1130+
"addRolesDescription": "Assign the appropriate application roles to your users to ensure they have the necessary permissions and access levels required for their tasks.",
11311131
"confirmSelectedUsers": "Confirm selected users",
11321132
"confirmSelectedRoles": "Confirm selected roles",
11331133
"selectRoles": "Select Roles:",

src/components/shared/frame/UserList/index.tsx

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,22 +157,35 @@ export const UserList = ({
157157
scrollbarWidth: 'none',
158158
}}
159159
>
160-
{roles.length
161-
? roles
162-
.filter(
163-
(role: RoleType | string) =>
164-
typeof role !== 'string' &&
165-
role.clientId === getClientId()
166-
)
167-
.map((role: RoleType) => (
160+
{isDetail
161+
? roles.length
162+
? roles
163+
.filter(
164+
(role: RoleType | string) =>
165+
typeof role !== 'string' &&
166+
role.clientId === getClientId()
167+
)
168+
.map((role: RoleType) => (
169+
<StatusTag
170+
key={role.roleId}
171+
color="label"
172+
label={role.roleName}
173+
className="statusTag"
174+
/>
175+
))
176+
: ''
177+
: roles.length
178+
? roles.map((role: RoleType | string) => (
168179
<StatusTag
169-
key={role.roleId}
180+
key={typeof role === 'string' ? role : role.roleId}
170181
color="label"
171-
label={role.roleName}
182+
label={
183+
typeof role === 'string' ? role : role.roleName
184+
}
172185
className="statusTag"
173186
/>
174187
))
175-
: ''}
188+
: ''}
176189
</span>
177190
),
178191
},

0 commit comments

Comments
 (0)