Skip to content

no longer use subgroup cache #21783

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 6 commits into from
Aug 9, 2023
Merged

no longer use subgroup cache #21783

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9b26ec
no longer use subgroup cache
edewit Jul 18, 2023
5fb54b9
pr review
edewit Jul 19, 2023
0f3f288
Merge branch 'main' into issue-21693
edewit Jul 19, 2023
88a89c5
Merge branch 'main' into issue-21693
edewit Jul 20, 2023
676ed35
fixed revert
edewit Jul 20, 2023
5d90ad6
fix reset
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
47 changes: 23 additions & 24 deletions js/apps/admin-ui/src/groups/GroupAttributes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import GroupRepresentation from "@keycloak/keycloak-admin-client/lib/defs/groupRepresentation";
import {
AlertVariant,
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";
Expand All @@ -14,11 +15,9 @@ 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 { arrayToKeyValue } from "../components/key-value-form/key-value-convert";
import { convertFormValuesToObject, convertToFormValues } from "../util";
import { useFetch } from "../utils/useFetch";
import { getLastId } from "./groupIdUtils";

export const GroupAttributes = () => {
Expand All @@ -29,27 +28,27 @@ export const GroupAttributes = () => {
});

const location = useLocation();
const id = getLastId(location.pathname);
const { currentGroup, subGroups, setSubGroups } = useSubGroups();

const convertAttributes = (attr?: Record<string, any>) => {
return arrayToKeyValue(attr || currentGroup()?.attributes!);
};
const id = getLastId(location.pathname)!;
const [currentGroup, setCurrentGroup] = useState<GroupRepresentation>();

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!);
await adminClient.groups.update({ id: id! }, { ...group, attributes });
const attributes = convertFormValuesToObject(attributeForm).attributes;
await adminClient.groups.update(
{ id: id! },
{ ...currentGroup, attributes },
);

setSubGroups([
...subGroups.slice(0, subGroups.length - 1),
{ ...group, attributes },
]);
setCurrentGroup({ ...currentGroup, attributes });
addAlert(t("groupUpdated"), AlertVariant.success);
} catch (error) {
addError("groups:groupUpdateError", error);
Expand All @@ -61,10 +60,10 @@ export const GroupAttributes = () => {
<AttributesForm
form={form}
save={save}
fineGrainedAccess={currentGroup()?.access?.manage}
fineGrainedAccess={currentGroup?.access?.manage}
reset={() =>
form.reset({
attributes: convertAttributes(),
attributes: arrayToKeyValue(currentGroup?.attributes!),
})
}
/>
Expand Down