From 6855ef3d7c919e5fda841b588032b8a30fb6dd55 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Thu, 26 Sep 2024 16:09:21 +0200
Subject: [PATCH] changed the way we detect that we are on the "create" screen

fixes: #33300
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
---
 .../src/organizations/DetailOrganization.tsx  |  2 +-
 .../src/organizations/OrganizationForm.tsx    | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/js/apps/admin-ui/src/organizations/DetailOrganization.tsx b/js/apps/admin-ui/src/organizations/DetailOrganization.tsx
index 3e83731689..d16eab590d 100644
--- a/js/apps/admin-ui/src/organizations/DetailOrganization.tsx
+++ b/js/apps/admin-ui/src/organizations/DetailOrganization.tsx
@@ -107,7 +107,7 @@ export default function DetailOrganization() {
                 onSubmit={form.handleSubmit(save)}
                 isHorizontal
               >
-                <OrganizationForm />
+                <OrganizationForm readOnly />
                 <ActionGroup>
                   <FormSubmitButton
                     formState={form.formState}
diff --git a/js/apps/admin-ui/src/organizations/OrganizationForm.tsx b/js/apps/admin-ui/src/organizations/OrganizationForm.tsx
index 03a5ffea80..ea19f2a67e 100644
--- a/js/apps/admin-ui/src/organizations/OrganizationForm.tsx
+++ b/js/apps/admin-ui/src/organizations/OrganizationForm.tsx
@@ -5,14 +5,12 @@ import {
   TextControl,
 } from "@keycloak/keycloak-ui-shared";
 import { FormGroup } from "@patternfly/react-core";
+import { useEffect } from "react";
+import { useFormContext, useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 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 { useParams } from "react-router-dom";
-import { EditOrganizationParams } from "./routes/EditOrganization";
-import { useFormContext, useWatch } from "react-hook-form";
-import { useEffect } from "react";
+import { MultiLineInput } from "../components/multi-line-input/MultiLineInput";
 
 export type OrganizationFormType = AttributeForm &
   Omit<OrganizationRepresentation, "domains" | "attributes"> & {
@@ -27,20 +25,22 @@ export const convertToOrg = (
   attributes: keyValueToArray(org.attributes),
 });
 
-export const OrganizationForm = () => {
+type OrganizationFormProps = {
+  readOnly?: boolean;
+};
+
+export const OrganizationForm = ({
+  readOnly = false,
+}: OrganizationFormProps) => {
   const { t } = useTranslation();
-  const { tab } = useParams<EditOrganizationParams>();
-  const { setValue, getFieldState } = useFormContext();
+  const { setValue } = useFormContext();
   const name = useWatch({ name: "name" });
-  const isEditable = tab !== "settings";
 
   useEffect(() => {
-    const { isDirty } = getFieldState("alias");
-
-    if (isEditable && !isDirty) {
+    if (!readOnly) {
       setValue("alias", name);
     }
-  }, [name, isEditable]);
+  }, [name, readOnly]);
 
   return (
     <>
@@ -53,7 +53,7 @@ export const OrganizationForm = () => {
         label={t("alias")}
         name="alias"
         labelIcon={t("organizationAliasHelp")}
-        isDisabled={!isEditable}
+        isDisabled={readOnly}
       />
       <FormGroup
         label={t("domain")}