libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Fix/edit user label (#1631)

Browse source 
* fixed user label editing bug

* fixed user label editing bug

* feedback

Co-authored-by: Agnieszka Gancarczyk <agancarc@redhat.com>
This commit is contained in:
agagancarczyk 2021-12-02 10:35:49 +00:00 committed by GitHub
parent bc8ffed934
commit 72c34e0d46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/user/UserCredentials.tsx
View file

@ -243,9 +243,13 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
}, [selectedCredential.credentialData]);
const saveUserLabel = async () => {
const credentialToEdit = userCredentials.find(
(credential) => credential.id === editedUserCredential.id
);
const userLabelFormValue = getValues1();
if (Object.keys(editedUserCredential).length === 0) {
if (!credentialToEdit) {
return;
}
@ -253,17 +257,18 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
await adminClient.users.updateCredentialLabel(
{
id: user.id!,
credentialId: editedUserCredential.id!,
credentialId: credentialToEdit.id!,
},
userLabelFormValue.userLabel || ""
);
refresh();
addAlert(t("updateCredentialUserLabelSuccess"), AlertVariant.success);
setIsUserLabelEdit(false);
setEditedUserCredential({});
} catch (error) {
addError(t("updateCredentialUserLabelError"), error);
setIsUserLabelEdit(false);
}
setIsUserLabelEdit(false);
};
return (
@ -475,7 +480,7 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
</Tr>
</Thead>
<Tbody>
<Tr key={"key"}>
<Tr>
{userCredentials.map((credential) => (
<>
<Td
@ -506,11 +511,9 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
/>
<div className="kc-userLabel-actionBtns">
<Button
key={"key-acceptBtn"}
variant="link"
className="kc-editUserLabel-acceptBtn"
onClick={() => {
setEditedUserCredential(credential);
handleSubmit1(saveUserLabel)();
setIsUserLabelEdit(false);
}}
@ -518,7 +521,6 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
icon={<CheckIcon />}
/>
<Button
key={"key-cancelBtn"}
variant="link"
className="kc-editUserLabel-cancelBtn"
onClick={() => setIsUserLabelEdit(false)}
@ -531,10 +533,12 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
<>
{credential.userLabel ?? ""}
<Button
key={"key"}
variant="link"
className="kc-editUserLabel-btn"
onClick={() => setIsUserLabelEdit(true)}
onClick={() => {
setEditedUserCredential(credential);
setIsUserLabelEdit(true);
}}
data-testid="editUserLabelBtn"
icon={<PencilAltIcon />}
/>