fixing issues defined in 510

fixing: #510
This commit is contained in:
Erik Jan de Wit 2021-04-15 12:23:36 +02:00
parent 9ec20852be
commit 42da9bf637
3 changed files with 51 additions and 4 deletions

View file

@ -1,10 +1,12 @@
import React, { ReactNode, useContext, useState } from "react"; import React, { ReactNode, useContext, useState } from "react";
import { Link } from "react-router-dom";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { import {
Button, Button,
Modal, Modal,
ModalVariant, ModalVariant,
ToolbarItem, ToolbarItem,
Tooltip,
} from "@patternfly/react-core"; } from "@patternfly/react-core";
import moment from "moment"; import moment from "moment";
@ -12,6 +14,7 @@ import { useAdminClient } from "../context/auth/AdminClient";
import { KeycloakDataTable } from "../components/table-toolbar/KeycloakDataTable"; import { KeycloakDataTable } from "../components/table-toolbar/KeycloakDataTable";
import { RealmContext } from "../context/realm-context/RealmContext"; import { RealmContext } from "../context/realm-context/RealmContext";
import { import {
cellWidth,
Table, Table,
TableBody, TableBody,
TableHeader, TableHeader,
@ -40,13 +43,34 @@ const DisplayDialog = ({ titleKey, onClose, children }: DisplayDialogProps) => {
); );
}; };
const MAX_TEXT_LENGTH = 38;
const Truncate = ({
text,
children,
}: {
text?: string;
children: (text: string) => any;
}) => {
const definedText = text || "";
const needsTruncation = definedText.length > MAX_TEXT_LENGTH;
const truncatedText = definedText.substr(0, MAX_TEXT_LENGTH);
return (
<>
{needsTruncation && (
<Tooltip content={text}>{children(truncatedText + "...")}</Tooltip>
)}
{!needsTruncation && <>{children(definedText)}</>}
</>
);
};
export const AdminEvents = () => { export const AdminEvents = () => {
const { t } = useTranslation("events"); const { t } = useTranslation("events");
const adminClient = useAdminClient(); const adminClient = useAdminClient();
const { realm } = useContext(RealmContext); const { realm } = useContext(RealmContext);
const [key, setKey] = useState(""); const [key, setKey] = useState(0);
const refresh = () => setKey(`${new Date().getTime()}`); const refresh = () => setKey(new Date().getTime());
const [authEvent, setAuthEvent] = useState<AdminEventRepresentation>(); const [authEvent, setAuthEvent] = useState<AdminEventRepresentation>();
const [representationEvent, setRepresentationEvent] = useState< const [representationEvent, setRepresentationEvent] = useState<
@ -65,6 +89,27 @@ export const AdminEvents = () => {
return await adminClient.realms.findAdminEvents({ ...params }); return await adminClient.realms.findAdminEvents({ ...params });
}; };
const LinkResource = (row: AdminEventRepresentation) => (
<>
<Truncate text={row.resourcePath}>
{(text) => (
<>
{row.resourceType !== "COMPONENT" && (
<Link
to={`/${realm}/${row.resourcePath}${
row.resourceType !== "GROUP" ? "/settings" : ""
}`}
>
{text}
</Link>
)}
{row.resourceType === "COMPONENT" && <span>{text}</span>}
</>
)}
</Truncate>
</>
);
return ( return (
<> <>
{authEvent && ( {authEvent && (
@ -120,6 +165,7 @@ export const AdminEvents = () => {
{ {
name: "resourcePath", name: "resourcePath",
displayKey: "events:resourcePath", displayKey: "events:resourcePath",
cellRenderer: LinkResource,
}, },
{ {
name: "resourceType", name: "resourceType",
@ -128,6 +174,7 @@ export const AdminEvents = () => {
{ {
name: "operationType", name: "operationType",
displayKey: "events:operationType", displayKey: "events:operationType",
transforms: [cellWidth(10)],
}, },
{ {
name: "", name: "",

View file

@ -74,7 +74,7 @@ export const UsersSection = () => {
const UserDetailLink = (user: UserRepresentation) => ( const UserDetailLink = (user: UserRepresentation) => (
<> <>
<Link key={user.username} to={`${url}/${user.id}/details`}> <Link key={user.username} to={`${url}/${user.id}/settings`}>
{user.username} {user.username}
</Link> </Link>
</> </>

View file

@ -66,7 +66,7 @@ export const UsersTabs = () => {
{id && ( {id && (
<KeycloakTabs isBox> <KeycloakTabs isBox>
<Tab <Tab
eventKey="details" eventKey="settings"
data-testid="user-details-tab" data-testid="user-details-tab"
title={<TabTitleText>{t("details")}</TabTitleText>} title={<TabTitleText>{t("details")}</TabTitleText>}
> >