8000 Backport to sort event types by agagancarczyk · Pull Request #35648 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Backport to sort event types #35648

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 1 commit into from
Dec 5, 2024
Merged

Backport to sort event types #35648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions js/apps/admin-ui/src/events/UserEvents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type EventRepresentation from "@keycloak/keycloak-admin-client/lib/defs/eventRepresentation";
import type EventType from "@keycloak/keycloak-admin-client/lib/defs/eventTypes";
import type { RealmEventsConfigRepresentation } from "@keycloak/keycloak-admin-client/lib/defs/realmEventsConfigRepresentation";
import {
KeycloakDataTable,
KeycloakSelect,
Expand Down Expand Up @@ -39,6 +38,7 @@ import DropdownPanel from "../components/dropdown-panel/DropdownPanel";
import { useRealm } from "../context/realm-context/RealmContext";
import { toUser } from "../user/routes/User";
import useFormatDate, { FORMAT_DATE_AND_TIME } from "../utils/useFormatDate";
import useLocaleSort from "../utils/useLocaleSort";

import "./events.css";

Expand Down Expand Up @@ -120,12 +120,13 @@ export const UserEvents = ({ user, client }: UserEventsProps) => {
const { adminClient } = useAdminClient();

const { t } = useTranslation();
const localeSort = useLocaleSort();
const { realm } = useRealm();
const formatDate = useFormatDate();
const [key, setKey] = useState(0);
const [searchDropdownOpen, setSearchDropdownOpen] = useState(false);
const [selectOpen, setSelectOpen] = useState(false);
const [events, setEvents] = useState<RealmEventsConfigRepresentation>();
const [events, setEvents] = useState<string[]>();
const [activeFilters, setActiveFilters] = useState<
Partial<UserEventSearchForm>
>({});
Expand Down Expand Up @@ -163,7 +164,8 @@ export const UserEvents = ({ user, client }: UserEventsProps) => {

useFetch(
() => adminClient.realms.getConfigEvents({ realm }),
(events) => setEvents(events),
(events) =>
setEvents(localeSort(events?.enabledEventTypes || [], (e) => e)),
[],
);

Expand Down Expand Up @@ -309,7 +311,7 @@ export const UserEvents = ({ user, client }: UserEventsProps) => {
</ChipGroup>
}
>
{events?.enabledEventTypes?.map((option) => (
{events?.map((option) => (
<SelectOption key={option} value={option}>
{t(`eventTypes.${option}.name`)}
</SelectOption>
Expand Down
0