External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

fetch already set values so the labels are known (#39415) (#39677)

Browse Source 
fixes: #39358


(cherry picked from commit 8e99d04668929f14c1a9bcd101a019365918e057)

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit 2025-05-14 19:40:00 +02:00 committed by GitHub
parent 054f0a2052
commit bebab54ecc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
js/apps/admin-ui/src/clients/authorization/ResourcesPolicySelect.tsx
View File

@ -23,6 +23,7 @@ import {
Controller,
ControllerRenderProps,
useFormContext,
useWatch,
} from "react-hook-form";
import { useTranslation } from "react-i18next";
import { Link, useNavigate } from "react-router-dom";
@ -101,9 +102,16 @@ export const ResourcesPolicySelect = ({
const [onUnsavedChangesConfirm, setOnUnsavedChangesConfirm] =
useState<() => void>();
const isAdminPermissionsClient = useIsAdminPermissionsClient(clientId);
const [selected, setSelected] = useState<Policies[]>([]);
const functions = typeMapping[name];
const value = useWatch({
control,
name: name!,
defaultValue: preSelected ? [preSelected] : [],
});
const convert = (
p: PolicyRepresentation | ResourceRepresentation,
): Policies => ({
@ -156,6 +164,28 @@ export const ResourcesPolicySelect = ({
[search],
);
useFetch(
async () => {
if (name === "resources")
return await Promise.all(
(value || []).map((id) =>
adminClient.clients.getResource({ id: clientId, resourceId: id }),
),
);
return await Promise.all(
(value || []).map(async (id) =>
adminClient.clients.findOnePolicy({
id: clientId,
type: "",
policyId: id,
}),
),
);
},
(result: any[]) => setSelected(result.map((r) => convert(r))),
[value],
);
const [toggleUnsavedChangesDialog, UnsavedChangesConfirm] = useConfirmDialog({
titleKey: t("unsavedChangesTitle"),
messageKey: t("unsavedChangesConfirm"),
@ -190,36 +220,32 @@ export const ResourcesPolicySelect = ({
) => {
return (
<ChipGroup>
{field.value?.map((permissionId) => {
const item = items.find(
(permission) => permission.id === permissionId,
);
if (!item) return;
const route = to(item);
return (
<Chip
key={item.id}
onClick={() => {
field.onChange(field.value?.filter((id) => id !== item.id));
}}
>
{selected?.map((item) => (
<Chip
key={item.id}
onClick={() => {
field.onChange(field.value?.filter((id) => id !== item.id) || []);
setSelected(selected?.filter((p) => p.id !== item.id) || []);
}}
>
{!isAdminPermissionsClient ? (
<Link
to={route}
to={to(item)}
onClick={(event) => {
if (isDirty) {
event.preventDefault();
setOnUnsavedChangesConfirm(() => () => navigate(route));
setOnUnsavedChangesConfirm(() => () => navigate(to(item)));
toggleUnsavedChangesDialog();
}
}}
>
{item.name}
</Link>
</Chip>
);
})}
) : (
item.name
)}
</Chip>
))}
</ChipGroup>
);
};