libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

changed the way we detect that we are on the "create" screen

Browse source 
fixes: #33300
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit 2024-09-26 16:09:21 +02:00 committed by Alexander Schwartz
parent 76c1a669cc
commit 6855ef3d7c
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/apps/admin-ui/src/organizations/DetailOrganization.tsx
View file

@ -107,7 +107,7 @@ export default function DetailOrganization() {
onSubmit={form.handleSubmit(save)} onSubmit={form.handleSubmit(save)}
isHorizontal isHorizontal
> >
<OrganizationForm /> <OrganizationForm readOnly />
<ActionGroup> <ActionGroup>
<FormSubmitButton <FormSubmitButton
formState={form.formState} formState={form.formState}

28
js/apps/admin-ui/src/organizations/OrganizationForm.tsx
View file

@ -5,14 +5,12 @@ import {
TextControl, TextControl,
} from "@keycloak/keycloak-ui-shared"; } from "@keycloak/keycloak-ui-shared";
import { FormGroup } from "@patternfly/react-core"; import { FormGroup } from "@patternfly/react-core";
import { useEffect } from "react";
import { useFormContext, useWatch } from "react-hook-form";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { AttributeForm } from "../components/key-value-form/AttributeForm"; import { AttributeForm } from "../components/key-value-form/AttributeForm";
import { MultiLineInput } from "../components/multi-line-input/MultiLineInput";
import { keyValueToArray } from "../components/key-value-form/key-value-convert"; import { keyValueToArray } from "../components/key-value-form/key-value-convert";
import { useParams } from "react-router-dom"; import { MultiLineInput } from "../components/multi-line-input/MultiLineInput";
import { EditOrganizationParams } from "./routes/EditOrganization";
import { useFormContext, useWatch } from "react-hook-form";
import { useEffect } from "react";
export type OrganizationFormType = AttributeForm & export type OrganizationFormType = AttributeForm &
Omit<OrganizationRepresentation, "domains" | "attributes"> & { Omit<OrganizationRepresentation, "domains" | "attributes"> & {
@ -27,20 +25,22 @@ export const convertToOrg = (
attributes: keyValueToArray(org.attributes), attributes: keyValueToArray(org.attributes),
}); });
export const OrganizationForm = () => { type OrganizationFormProps = {
readOnly?: boolean;
};
export const OrganizationForm = ({
readOnly = false,
}: OrganizationFormProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { tab } = useParams<EditOrganizationParams>(); const { setValue } = useFormContext();
const { setValue, getFieldState } = useFormContext();
const name = useWatch({ name: "name" }); const name = useWatch({ name: "name" });
const isEditable = tab !== "settings";
useEffect(() => { useEffect(() => {
const { isDirty } = getFieldState("alias"); if (!readOnly) {
if (isEditable && !isDirty) {
setValue("alias", name); setValue("alias", name);
} }
}, [name, isEditable]); }, [name, readOnly]);
return ( return (
<> <>
@ -53,7 +53,7 @@ export const OrganizationForm = () => {
label={t("alias")} label={t("alias")}
name="alias" name="alias"
labelIcon={t("organizationAliasHelp")} labelIcon={t("organizationAliasHelp")}
isDisabled={!isEditable} isDisabled={readOnly}
/> />
<FormGroup <FormGroup
label={t("domain")} label={t("domain")}