8000 BACKPORT: Events tab on client and user by edewit · Pull Request #35512 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

BACKPORT: Events tab on client and user #35512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edewit merged 3 commits into from
Dec 3, 2024
Merged

BACKPORT: Events tab on client and user #35512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd909fa
[issue-33569] Show User Events on dedicated tab on Client-/User-Detai…
antikalk Oct 22, 2024
f39d9c6
use user and client from form when on the events section (#35098)
edewit Nov 19, 2024
458b955
Remove columns and un-clearable filters (#34735)
edewit Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...dmin-ui/cypress/support/pages/admin-ui/manage/clients/client_details/ClientDetailsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export enum ClientsDetailsTab {
ServiceAccountsRoles = "Service accounts roles",
Advanced = "Advanced",
Scope = "Scope",
UserEvents = "Events",
}

export default class ClientDetailsPage extends CommonPage {
Expand Down
115 changes: 68 additions & 47 deletions js/apps/admin-ui/src/clients/ClientDetails.tsx
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import { ClientScopes } from "./scopes/ClientScopes";
import { EvaluateScopes } from "./scopes/EvaluateScopes";
import { ServiceAccount } from "./service-account/ServiceAccount";
import { getProtocolName, isRealmClient } from "./utils";
import { UserEvents } from "../events/UserEvents";

type ClientDetailHeaderProps = {
onChange: (value: boolean) => void;
Expand Down Expand Up @@ -190,7 +191,7 @@ export default function ClientDetails() {

const { t } = useTranslation();
const { addAlert, addError } = useAlerts();
const { realm } = useRealm();
const { realm, realmRepresentation } = useRealm();
const { hasAccess } = useAccess();
const isFeatureEnabled = useIsFeatureEnabled();

Expand Down Expand Up @@ -225,54 +226,65 @@ export default function ClientDetails() {
return sortBy(roles, (role) => role.name?.toUpperCase());
};

const useTab = (tab: ClientTab) =>
useRoutableTab(
toClient({
realm,
clientId,
tab,
}),
);

const settingsTab = useTab("settings");
const keysTab = useTab("keys");
const credentialsTab = useTab("credentials");
const rolesTab = useTab("roles");
const clientScopesTab = useTab("clientScopes");
const authorizationTab = useTab("authorization");
const serviceAccountTab = useTab("serviceAccount");
const sessionsTab = useTab("sessions");
const permissionsTab = useTab("permissions");
const advancedTab = useTab("advanced");

const useClientScopesTab = (tab: ClientScopesTab) =>
useRoutableTab(
toClientScopesTab({
realm,
clientId,
tab,
}),
);
const tab = (tab: ClientTab) =>
toClient({
realm,
clientId,
tab,
});

const settingsTab = useRoutableTab(tab("settings"));
const keysTab = useRoutableTab(tab("keys"));
const credentialsTab = useRoutableTab(tab("credentials"));
const rolesTab = useRoutableTab(tab("roles"));
const clientScopesTab = useRoutableTab(tab("clientScopes"));
const authorizationTab = useRoutableTab(tab("authorization"));
const serviceAccountTab = useRoutableTab(tab("serviceAccount"));
const sessionsTab = useRoutableTab(tab("sessions"));
const permissionsTab = useRoutableTab(tab("permissions"));
const advancedTab = useRoutableTab(tab("advanced"));
const userEventsTab = useRoutableTab(tab("user-events"));

const clientScopesTabRoute = (tab: ClientScopesTab) =>
toClientScopesTab({
realm,
clientId,
tab,
});

const clientScopesSetupTab = useRoutableTab(clientScopesTabRoute("setup"));
const clientScopesEvaluateTab = useRoutableTab(
clientScopesTabRoute("evaluate"),
);

const clientScopesSetupTab = useClientScopesTab("setup");
const clientScopesEvaluateTab = useClientScopesTab("evaluate");
const authorizationTabRoute = (tab: AuthorizationTab) =>
toAuthorizationTab({
realm,
clientId,
tab,
});

const useAuthorizationTab = (tab: AuthorizationTab) =>
useRoutableTab(
toAuthorizationTab({
realm,
clientId,
tab,
}),
);

const authorizationSettingsTab = useAuthorizationTab("settings");
const authorizationResourcesTab = useAuthorizationTab("resources");
const authorizationScopesTab = useAuthorizationTab("scopes");
const authorizationPoliciesTab = useAuthorizationTab("policies");
const authorizationPermissionsTab = useAuthorizationTab("permissions");
const authorizationEvaluateTab = useAuthorizationTab("evaluate");
const authorizationExportTab = useAuthorizationTab("export");
const authorizationSettingsTab = useRoutableTab(
authorizationTabRoute("settings"),
);
const authorizationResourcesTab = useRoutableTab(
authorizationTabRoute("resources"),
);
const authorizationScopesTab = useRoutableTab(
authorizationTabRoute("scopes"),
);
const authorizationPoliciesTab = useRoutableTab(
authorizationTabRoute("policies"),
);
const authorizationPermissionsTab = useRoutableTab(
authorizationTabRoute("permissions"),
);
const authorizationEvaluateTab = useRoutableTab(
authorizationTabRoute("evaluate"),
);
const authorizationExportTab = useRoutableTab(
authorizationTabRoute("export"),
);

const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({
titleKey: "clientDeleteConfirmTitle",
Expand Down Expand Up @@ -663,6 +675,15 @@ export default function ClientDetails() {
>
<AdvancedTab save={save} client={client} />
</Tab>
{hasAccess("view-events") && realmRepresentation?.eventsEnabled && (
<Tab
data-testid="user-events-tab"
title={<TabTitleText>{t("events")}</TabTitleText>}
{...userEventsTab}
>
<UserEvents client={client.clientId} />
</Tab>
)}
</RoutableTabs>
</FormProvider>
</PageSection>
Expand Down
3 changes: 2 additions & 1 deletion js/apps/admin-ui/src/clients/routes/Client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export type ClientTab =
| "authorization"
| "serviceAccount"
| "permissions"
| "sessions";
| "sessions"
| "user-events";

export type ClientParams = {
realm: string;
Expand Down
Loading
0