Skip to content

now uses save from edit user #21809

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
Aug 9, 2023
Merged

now uses save from edit user #21809

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
c17b021
now uses save from edit user
edewit Jul 19, 2023
d11f27b
Merge branch 'main' into issue-21719
edewit Aug 9, 2023
3971052
fixed attribute save
edewit Aug 9, 2023
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
13 changes: 11 additions & 2 deletions js/apps/admin-ui/src/user/EditUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import { useNavigate } from "react-router-dom";
import { adminClient } from "../admin-client";
import { useAlerts } from "../components/alert/Alerts";
import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog";
import {
KeyValueType,
keyValueToArray,
} from "../components/key-value-form/key-value-convert";
import { KeycloakSpinner } from "../components/keycloak-spinner/KeycloakSpinner";
import {
RoutableTabs,
Expand Down Expand Up @@ -145,13 +149,18 @@ const EditUserForm = ({ user, bruteForced, refresh }: EditUserFormProps) => {
useUpdateEffect(() => userForm.reset(user), [user]);

const save = async (formUser: UserRepresentation) => {
const attributes =
"key" in (formUser.attributes?.[0] || [])
? keyValueToArray(formUser.attributes as KeyValueType[])
: user.attributes;
try {
await adminClient.users.update(
{ id: user.id! },
{
...user,
...formUser,
username: formUser.username?.trim(),
attributes: { ...user.attributes, ...formUser.attributes },
attributes,
},
);
addAlert(t("userSaved"), AlertVariant.success);
Expand Down Expand Up @@ -258,7 +267,7 @@ const EditUserForm = ({ user, bruteForced, refresh }: EditUserFormProps) => {
title={<TabTitleText>{t("common:attributes")}</TabTitleText>}
{...attributesTab}
>
<UserAttributes user={user} />
<UserAttributes user={user} save={save} />
</Tab>
)}
<Tab
Expand Down
34 changes: 5 additions & 29 deletions js/apps/admin-ui/src/user/UserAttributes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
import type UserRepresentation from "@keycloak/keycloak-admin-client/lib/defs/userRepresentation";
import {
AlertVariant,
PageSection,
PageSectionVariants,
} from "@patternfly/react-core";
import { useEffect, useState } from "react";
import { PageSection, PageSectionVariants } from "@patternfly/react-core";
import { useEffect } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";

import { adminClient } from "../admin-client";
import { useAlerts } from "../components/alert/Alerts";
import {
AttributeForm,
AttributesForm,
} from "../components/key-value-form/AttributeForm";
import {
arrayToKeyValue,
keyValueToArray,
} from "../components/key-value-form/key-value-convert";
import { arrayToKeyValue } from "../components/key-value-form/key-value-convert";
import { useUserProfile } from "../realm-settings/user-profile/UserProfileContext";

type UserAttributesProps = {
user: UserRepresentation;
save: (user: UserRepresentation) => void;
};

export const UserAttributes = ({ user: defaultUser }: UserAttributesProps) => {
const { t } = useTranslation("users");
const { addAlert, addError } = useAlerts();
const [user, setUser] = useState<UserRepresentation>(defaultUser);
export const UserAttributes = ({ user, save }: UserAttributesProps) => {
const form = useForm<AttributeForm>({ mode: "onChange" });
const { config } = useUserProfile();

Expand All @@ -39,18 +27,6 @@ export const UserAttributes = ({ user: defaultUser }: UserAttributesProps) => {
form.setValue("attributes", convertAttributes());
}, [user, config]);

const save = async (attributeForm: AttributeForm) => {
try {
const attributes = keyValueToArray(attributeForm.attributes!);
await adminClient.users.update({ id: user.id! }, { ...user, attributes });

setUser({ ...user, attributes });
addAlert(t("userSaved"), AlertVariant.success);
} catch (error) {
addError("groups:groupUpdateError", error);
}
};

return (
<PageSection variant={PageSectionVariants.light}>
<AttributesForm
Expand Down