From 3f2969e897e4f71567ccd415944f4a531a163910 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Fri, 4 Dec 2020 10:50:35 +0100
Subject: [PATCH] TextArea doesn't need to be a child of controller

fixes: #230
---
 src/clients/ClientSettings.tsx            |  4 +-
 src/components/form-access/FormAccess.tsx |  1 +
 src/realm-roles/RealmRoleForm.tsx         | 49 ++++++++++++-----------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/clients/ClientSettings.tsx b/src/clients/ClientSettings.tsx
index fa8faf6523..307f9386e8 100644
--- a/src/clients/ClientSettings.tsx
+++ b/src/clients/ClientSettings.tsx
@@ -87,7 +87,7 @@ export const ClientSettings = ({ form, save }: ClientSettingsProps) => {
             hasNoPaddingTop
           >
             <Controller
-              name="alwaysDisplayInConsole"
+              name="attributes.display_on_consent_screen"
               defaultValue={false}
               control={form.control}
               render={({ onChange, value }) => (
@@ -107,7 +107,7 @@ export const ClientSettings = ({ form, save }: ClientSettingsProps) => {
           >
             <TextArea
               id="kc-consent-screen-text"
-              name="consentText"
+              name="attributes.consent_screen_text"
               ref={form.register}
             />
           </FormGroup>
diff --git a/src/components/form-access/FormAccess.tsx b/src/components/form-access/FormAccess.tsx
index 5b1b000cab..98fedafd3b 100644
--- a/src/components/form-access/FormAccess.tsx
+++ b/src/components/form-access/FormAccess.tsx
@@ -86,6 +86,7 @@ export const FormAccess = ({
             children,
           } as any);
         }
+
         return cloneElement(
           child,
           child.type === FormGroup ||
diff --git a/src/realm-roles/RealmRoleForm.tsx b/src/realm-roles/RealmRoleForm.tsx
index 782877815e..8a7e47f118 100644
--- a/src/realm-roles/RealmRoleForm.tsx
+++ b/src/realm-roles/RealmRoleForm.tsx
@@ -16,12 +16,7 @@ import {
   ValidatedOptions,
 } from "@patternfly/react-core";
 import { useTranslation } from "react-i18next";
-import {
-  Controller,
-  SubmitHandler,
-  useForm,
-  UseFormMethods,
-} from "react-hook-form";
+import { SubmitHandler, useForm, UseFormMethods } from "react-hook-form";
 
 import RoleRepresentation from "keycloak-admin/lib/defs/roleRepresentation";
 import { FormAccess } from "../components/form-access/FormAccess";
@@ -63,25 +58,31 @@ const RoleForm = ({ form, save, editMode }: RoleFormType) => {
           isReadOnly={editMode}
         />
       </FormGroup>
-      <FormGroup label={t("description")} fieldId="kc-description">
-        <Controller
+      <FormGroup
+        label={t("description")}
+        fieldId="kc-description"
+        validated={
+          form.errors.description
+            ? ValidatedOptions.error
+            : ValidatedOptions.default
+        }
+        helperTextInvalid={form.errors.description?.message}
+      >
+        <TextArea
           name="description"
-          defaultValue=""
-          control={form.control}
-          rules={{ maxLength: 255 }}
-          render={({ onChange, value }) => (
-            <TextArea
-              type="text"
-              validated={
-                form.errors.description
-                  ? ValidatedOptions.error
-                  : ValidatedOptions.default
-              }
-              id="kc-role-description"
-              value={value}
-              onChange={onChange}
-            />
-          )}
+          ref={form.register({
+            maxLength: {
+              value: 255,
+              message: t("common:maxLength", { length: 255 }),
+            },
+          })}
+          type="text"
+          validated={
+            form.errors.description
+              ? ValidatedOptions.error
+              : ValidatedOptions.default
+          }
+          id="kc-role-description"
         />
       </FormGroup>
       <ActionGroup>