From 84cf306833699339fb3f95881d372b14ba5a9b07 Mon Sep 17 00:00:00 2001
From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com>
Date: Fri, 8 Mar 2024 10:26:49 +0000
Subject: [PATCH] Changed key provider form to use ui shared   (#27704)

* replaced KeycloakTextInput with TextControl

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>

* replaced KeycloakTextInput with TextControl and fixed helpText

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>

* small test fix

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>

---------

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>
Co-authored-by: Agnieszka Gancarczyk <agancarc@redhat.com>
---
 .../realm_settings/RealmSettingsPage.ts       |   2 +-
 .../admin/messages/messages_en.properties     |   1 +
 .../keys/key-providers/KeyProviderForm.tsx    | 108 ++++++------------
 3 files changed, 37 insertions(+), 74 deletions(-)

diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts
index a87cd5be98..acc7f9d67d 100644
--- a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts
+++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts
@@ -83,7 +83,7 @@ export default class RealmSettingsPage extends CommonPage {
   activeSwitch = "active";
   enabledSwitch = "enabled";
   addProviderButton = "add-provider-button";
-  displayName = "name-input";
+  displayName = "name";
   enableEvents = "eventsEnabled";
   eventsUserSave = "save-user";
   enableAdminEvents = "adminEventsEnabled";
diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
index 4c1bd57f2d..0d58bf7167 100644
--- a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
+++ b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
@@ -750,6 +750,7 @@ eventTypes.EXECUTE_ACTIONS_ERROR.name=Execute actions error
 path=Path
 overwritten=Overwritten
 mapperNameHelp=Name of the mapper
+providerIdHelp=Provider ID
 deleteProviderError=Error deleting the provider
 supportedLocalesHelp=The locales to support for this realm. The user chooses one of these locales on the login screen.
 comparisonHelp=Specifies the comparison method used to evaluate the requested context classes or statements. The default is "Exact".
diff --git a/js/apps/admin-ui/src/realm-settings/keys/key-providers/KeyProviderForm.tsx b/js/apps/admin-ui/src/realm-settings/keys/key-providers/KeyProviderForm.tsx
index 1a77cccc2b..9d7258460a 100644
--- a/js/apps/admin-ui/src/realm-settings/keys/key-providers/KeyProviderForm.tsx
+++ b/js/apps/admin-ui/src/realm-settings/keys/key-providers/KeyProviderForm.tsx
@@ -3,21 +3,16 @@ import {
   ActionGroup,
   AlertVariant,
   Button,
-  FormGroup,
   PageSection,
-  TextInput,
-  ValidatedOptions,
 } from "@patternfly/react-core";
-import { Controller, FormProvider, useForm } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
-import { HelpItem } from "ui-shared";
-
+import { TextControl } from "ui-shared";
 import { adminClient } from "../../../admin-client";
 import { useAlerts } from "../../../components/alert/Alerts";
 import { DynamicComponents } from "../../../components/dynamic/DynamicComponents";
 import { FormAccess } from "../../../components/form/FormAccess";
-import { KeycloakTextInput } from "../../../components/keycloak-text-input/KeycloakTextInput";
 import { ViewHeader } from "../../../components/view-header/ViewHeader";
 import { useServerInfo } from "../../../context/server-info/ServerInfoProvider";
 import { KEY_PROVIDER_TYPE } from "../../../util";
@@ -47,13 +42,7 @@ export const KeyProviderForm = ({
   const form = useForm<ComponentRepresentation>({
     mode: "onChange",
   });
-  const {
-    register,
-    control,
-    handleSubmit,
-    formState: { errors },
-    reset,
-  } = form;
+  const { handleSubmit, reset } = form;
 
   const save = async (component: ComponentRepresentation) => {
     if (component.config)
@@ -99,73 +88,46 @@ export const KeyProviderForm = ({
 
   return (
     <FormAccess isHorizontal role="manage-realm" onSubmit={handleSubmit(save)}>
-      {id && (
-        <FormGroup
-          label={t("providerId")}
-          labelIcon={
-            <HelpItem
-              helpText={t("mapperNameHelp")}
-              fieldLabelId="providerId"
-            />
-          }
-          fieldId="providerId"
-          isRequired
-        >
-          <KeycloakTextInput
-            id="providerId"
-            data-testid="providerId-input"
-            isReadOnly
-            {...register("id")}
-          />
-        </FormGroup>
-      )}
-      <FormGroup
-        label={t("name")}
-        labelIcon={
-          <HelpItem helpText={t("mapperNameHelp")} fieldLabelId="name" />
-        }
-        fieldId="name"
-        isRequired
-        validated={
-          errors.name ? ValidatedOptions.error : ValidatedOptions.default
-        }
-        helperTextInvalid={t("required")}
-      >
-        <Controller
-          name="name"
-          control={control}
-          rules={{ required: true }}
-          defaultValue={providerType}
-          render={({ field }) => (
-            <TextInput
-              id="name"
-              value={field.value}
-              onChange={field.onChange}
-              data-testid="name-input"
-            />
-          )}
-        />
-      </FormGroup>
       <FormProvider {...form}>
+        {id && (
+          <TextControl
+            name="id"
+            label={t("providerId")}
+            labelIcon={t("providerIdHelp")}
+            rules={{
+              required: t("required"),
+            }}
+            readOnly
+          />
+        )}
+        <TextControl
+          name="name"
+          defaultValue={providerType}
+          label={t("name")}
+          labelIcon={t("mapperNameHelp")}
+          rules={{
+            required: t("required"),
+          }}
+        />
         <DynamicComponents
           properties={
             allComponentTypes.find((type) => type.id === providerType)
               ?.properties || []
           }
         />
+        <ActionGroup>
+          <Button
+            data-testid="add-provider-button"
+            variant="primary"
+            type="submit"
+          >
+            {t("save")}
+          </Button>
+          <Button onClick={() => onClose?.()} variant="link">
+            {t("cancel")}
+          </Button>
+        </ActionGroup>
       </FormProvider>
-      <ActionGroup>
-        <Button
-          data-testid="add-provider-button"
-          variant="primary"
-          type="submit"
-        >
-          {t("save")}
-        </Button>
-        <Button onClick={() => onClose?.()} variant="link">
-          {t("cancel")}
-        </Button>
-      </ActionGroup>
     </FormAccess>
   );
 };