changed to Inherited column

This commit is contained in:
Erik Jan de Wit 2022-05-02 07:51:09 +02:00 committed by Jon Koops
parent a15eb11d81
commit d7187bd1e0
2 changed files with 8 additions and 7 deletions

View file

@ -152,7 +152,7 @@
"unAssignRole": "Unassign",
"hideInheritedRoles": "Hide inherited roles",
"assignRolesTo": "Assign roles to {{client}} account",
"inherentFrom": "Inherited from",
"inherent": "Inherited",
"unitLabel": "Select a time unit",
"times": {
"seconds": "Seconds",

View file

@ -19,7 +19,7 @@ import type { Clients } from "@keycloak/keycloak-admin-client/lib/resources/clie
import type KeycloakAdminClient from "@keycloak/keycloak-admin-client";
import { AddRoleMappingModal } from "./AddRoleMappingModal";
import { KeycloakDataTable } from "../table-toolbar/KeycloakDataTable";
import { emptyFormatter } from "../../util";
import { emptyFormatter, upperCaseFormatter } from "../../util";
import { useAlerts } from "../alert/Alerts";
import { useConfirmDialog } from "../confirm-dialog/ConfirmDialog";
import { useAdminClient } from "../../context/auth/AdminClient";
@ -63,11 +63,7 @@ export const mapRoles = (
export const ServiceRole = ({ role, client }: Row) => (
<>
{client && (
<Badge
key={`${client.id}-${role.id}`}
isRead
className="keycloak-admin--role-mapping__client-name"
>
<Badge isRead className="keycloak-admin--role-mapping__client-name">
{client.clientId}
</Badge>
)}
@ -288,6 +284,11 @@ export const RoleMapping = ({
transforms: [cellWidth(30)],
cellRenderer: ServiceRole,
},
{
name: "role.isInherited",
displayKey: t("common:inherent"),
cellFormatters: [upperCaseFormatter(), emptyFormatter()],
},
{
name: "role.description",
displayKey: t("common:description"),