From f9b26eca505293e1d44f9fcf472d32f25980b988 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Tue, 18 Jul 2023 14:04:54 +0200 Subject: [PATCH 1/4] no longer use subgroup cache fixes: #21693 --- .../admin-ui/src/groups/GroupAttributes.tsx | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/js/apps/admin-ui/src/groups/GroupAttributes.tsx b/js/apps/admin-ui/src/groups/GroupAttributes.tsx index 3d1f4c686d54..f7d68fe65d5c 100644 --- a/js/apps/admin-ui/src/groups/GroupAttributes.tsx +++ b/js/apps/admin-ui/src/groups/GroupAttributes.tsx @@ -3,22 +3,20 @@ import { PageSection, PageSectionVariants, } from "@patternfly/react-core"; -import { useEffect } from "react"; +import { useState } from "react"; import { useForm } from "react-hook-form"; import { useTranslation } from "react-i18next"; import { useLocation } from "react-router-dom"; +import GroupRepresentation from "@keycloak/keycloak-admin-client/lib/defs/groupRepresentation"; 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 { useSubGroups } from "./SubGroupsContext"; +import { convertFormValuesToObject, convertToFormValues } from "../util"; +import { useFetch } from "../utils/useFetch"; import { getLastId } from "./groupIdUtils"; export const GroupAttributes = () => { @@ -29,27 +27,24 @@ export const GroupAttributes = () => { }); const location = useLocation(); - const id = getLastId(location.pathname); - const { currentGroup, subGroups, setSubGroups } = useSubGroups(); - - const convertAttributes = (attr?: Record) => { - return arrayToKeyValue(attr || currentGroup()?.attributes!); - }; + const id = getLastId(location.pathname)!; + const [currentGroup, setCurrentGroup] = useState(); - useEffect(() => { - form.setValue("attributes", convertAttributes()); - }, [subGroups]); + useFetch( + () => adminClient.groups.findOne({ id }), + (group) => { + convertToFormValues(group!, form.setValue); + setCurrentGroup(group); + }, + [], + ); const save = async (attributeForm: AttributeForm) => { try { - const group = currentGroup(); - const attributes = keyValueToArray(attributeForm.attributes!); + const group = currentGroup; + const attributes = convertFormValuesToObject(attributeForm).attributes; await adminClient.groups.update({ id: id! }, { ...group, attributes }); - setSubGroups([ - ...subGroups.slice(0, subGroups.length - 1), - { ...group, attributes }, - ]); addAlert(t("groupUpdated"), AlertVariant.success); } catch (error) { addError("groups:groupUpdateError", error); @@ -61,12 +56,8 @@ export const GroupAttributes = () => { - form.reset({ - attributes: convertAttributes(), - }) - } + fineGrainedAccess={currentGroup?.access?.manage} + reset={() => form.reset(currentGroup?.attributes)} /> ); From 5fb54b999b49627aac873db2defeba174791129d Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Wed, 19 Jul 2023 11:58:37 +0200 Subject: [PATCH 2/4] pr review --- js/apps/admin-ui/src/groups/GroupAttributes.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/apps/admin-ui/src/groups/GroupAttributes.tsx b/js/apps/admin-ui/src/groups/GroupAttributes.tsx index f7d68fe65d5c..9f9dc69196ff 100644 --- a/js/apps/admin-ui/src/groups/GroupAttributes.tsx +++ b/js/apps/admin-ui/src/groups/GroupAttributes.tsx @@ -41,9 +41,11 @@ export const GroupAttributes = () => { const save = async (attributeForm: AttributeForm) => { try { - const group = currentGroup; const attributes = convertFormValuesToObject(attributeForm).attributes; - await adminClient.groups.update({ id: id! }, { ...group, attributes }); + await adminClient.groups.update( + { id: id! }, + { ...currentGroup, attributes }, + ); addAlert(t("groupUpdated"), AlertVariant.success); } catch (error) { From 676ed358d82ec8de36f1eb0fcce340a748dcc968 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Thu, 20 Jul 2023 12:18:54 +0200 Subject: [PATCH 3/4] fixed revert --- js/apps/admin-ui/src/groups/GroupAttributes.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/apps/admin-ui/src/groups/GroupAttributes.tsx b/js/apps/admin-ui/src/groups/GroupAttributes.tsx index 9f9dc69196ff..29a6c980e204 100644 --- a/js/apps/admin-ui/src/groups/GroupAttributes.tsx +++ b/js/apps/admin-ui/src/groups/GroupAttributes.tsx @@ -47,6 +47,7 @@ export const GroupAttributes = () => { { ...currentGroup, attributes }, ); + setCurrentGroup({ ...currentGroup, attributes }); addAlert(t("groupUpdated"), AlertVariant.success); } catch (error) { addError("groups:groupUpdateError", error); @@ -59,7 +60,7 @@ export const GroupAttributes = () => { form={form} save={save} fineGrainedAccess={currentGroup?.access?.manage} - reset={() => form.reset(currentGroup?.attributes)} + reset={() => convertToFormValues(currentGroup!, form.setValue)} /> ); From 5d90ad65287fa0da605a70196ebe704d0ab05be4 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Wed, 9 Aug 2023 12:27:30 +0200 Subject: [PATCH 4/4] fix reset --- js/apps/admin-ui/src/groups/GroupAttributes.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/apps/admin-ui/src/groups/GroupAttributes.tsx b/js/apps/admin-ui/src/groups/GroupAttributes.tsx index 29a6c980e204..bf09ddd9d55a 100644 --- a/js/apps/admin-ui/src/groups/GroupAttributes.tsx +++ b/js/apps/admin-ui/src/groups/GroupAttributes.tsx @@ -1,3 +1,4 @@ +import GroupRepresentation from "@keycloak/keycloak-admin-client/lib/defs/groupRepresentation"; import { AlertVariant, PageSection, @@ -8,13 +9,13 @@ import { useForm } from "react-hook-form"; import { useTranslation } from "react-i18next"; import { useLocation } from "react-router-dom"; -import GroupRepresentation from "@keycloak/keycloak-admin-client/lib/defs/groupRepresentation"; import { adminClient } from "../admin-client"; import { useAlerts } from "../components/alert/Alerts"; import { AttributeForm, AttributesForm, } from "../components/key-value-form/AttributeForm"; +import { arrayToKeyValue } from "../components/key-value-form/key-value-convert"; import { convertFormValuesToObject, convertToFormValues } from "../util"; import { useFetch } from "../utils/useFetch"; import { getLastId } from "./groupIdUtils"; @@ -60,7 +61,11 @@ export const GroupAttributes = () => { form={form} save={save} fineGrainedAccess={currentGroup?.access?.manage} - reset={() => convertToFormValues(currentGroup!, form.setValue)} + reset={() => + form.reset({ + attributes: arrayToKeyValue(currentGroup?.attributes!), + }) + } /> );