From b5f7405fce7211aaace70eb5ed69cf5c755629e5 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Fri, 19 Feb 2021 16:22:05 -0500
Subject: [PATCH 1/9] change existing ids to data-testid

---
 .../user_fed_kerberos_test.spec.ts            | 22 +++++++++----------
 .../providers/CreateKerberosProviderPage.ts   | 12 +++++-----
 src/components/keycloak-card/KeycloakCard.tsx |  4 ++--
 .../UserFederationKerberosSettings.tsx        |  6 ++---
 src/user-federation/UserFederationSection.tsx |  4 ++--
 .../kerberos/KerberosSettingsRequired.tsx     |  8 +++----
 src/user-federation/shared/SettingsCache.tsx  |  6 ++---
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/cypress/integration/user_fed_kerberos_test.spec.ts b/cypress/integration/user_fed_kerberos_test.spec.ts
index cfaa34091f..c147136bf3 100644
--- a/cypress/integration/user_fed_kerberos_test.spec.ts
+++ b/cypress/integration/user_fed_kerberos_test.spec.ts
@@ -41,7 +41,7 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
 
     sidebarPage.goToUserFederation();
-    cy.get("[data-cy=kerberos-card]").click();
+    cy.get("[data-testid=kerberos-card]").click();
 
     providersPage.fillKerberosRequiredData(
       firstKerberosName,
@@ -60,7 +60,7 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
     sidebarPage.goToUserFederation();
 
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
@@ -81,7 +81,7 @@ describe("User Fed Kerberos tests", () => {
     sidebarPage.goToUserFederation();
     cy.wait(1000);
 
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
@@ -95,7 +95,7 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
     sidebarPage.goToUserFederation();
 
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
@@ -113,7 +113,7 @@ describe("User Fed Kerberos tests", () => {
     providersPage.cancel();
 
     cy.wait(1000);
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
@@ -133,7 +133,7 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
     sidebarPage.goToUserFederation();
 
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
@@ -158,7 +158,7 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
     sidebarPage.goToUserFederation();
 
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
@@ -196,8 +196,8 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
     sidebarPage.goToUserFederation();
 
-    cy.get('[data-cy="my-kerberos-2-dropdown"]').click();
-    cy.get('[data-cy="card-delete"]').click();
+    cy.get('[data-testid="my-kerberos-2-dropdown"]').click();
+    cy.get('[data-testid="card-delete"]').click();
 
     modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
 
@@ -209,13 +209,13 @@ describe("User Fed Kerberos tests", () => {
     loginPage.logIn();
     sidebarPage.goToUserFederation();
 
-    cy.get('[data-cy="keycloak-card-title"]')
+    cy.get('[data-testid="keycloak-card-title"]')
       .contains(firstKerberosName)
       .click();
     cy.wait(1000);
 
     cy.get('[data-testid="action-dropdown"]').click();
-    cy.get('[data-cy="delete-provider-cmd"]').click();
+    cy.get('[data-testid="delete-provider-cmd"]').click();
 
     modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
 
diff --git a/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts b/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
index 32b8319aa1..251b76cea1 100644
--- a/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
+++ b/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
@@ -19,10 +19,10 @@ export default class CreateKerberosProviderPage {
   cancelBtn: string;
 
   constructor() {
-    this.kerberosNameInput = "data-cy=kerberos-name";
-    this.kerberosRealmInput = "data-cy=kerberos-realm";
-    this.kerberosPrincipalInput = "data-cy=kerberos-principal";
-    this.kerberosKeytabInput = "data-cy=kerberos-keytab";
+    this.kerberosNameInput = "data-testid=kerberos-name";
+    this.kerberosRealmInput = "data-testid=kerberos-realm";
+    this.kerberosPrincipalInput = "data-testid=kerberos-principal";
+    this.kerberosKeytabInput = "data-testid=kerberos-keytab";
 
     this.kerberosEnabledInput = "#Kerberos-switch";
 
@@ -35,8 +35,8 @@ export default class CreateKerberosProviderPage {
     this.kerberosCachePolicyInput = "#kc-cache-policy";
     this.kerberosCachePolicyList = "#kc-cache-policy + ul";
 
-    this.saveBtn = "data-cy=kerberos-save";
-    this.cancelBtn = "data-cy=kerberos-cancel";
+    this.saveBtn = "data-testid=kerberos-save";
+    this.cancelBtn = "data-testid=kerberos-cancel";
   }
 
   //#region Required Settings
diff --git a/src/components/keycloak-card/KeycloakCard.tsx b/src/components/keycloak-card/KeycloakCard.tsx
index 163869b592..93cc5aae48 100644
--- a/src/components/keycloak-card/KeycloakCard.tsx
+++ b/src/components/keycloak-card/KeycloakCard.tsx
@@ -58,7 +58,7 @@ export const KeycloakCard = ({
         <CardActions>
           {dropdownItems && (
             <Dropdown
-              data-cy={`${title}-dropdown`}
+              data-testid={`${title}-dropdown`}
               isPlain
               position={"right"}
               toggle={<KebabToggle onToggle={onDropdownToggle} />}
@@ -68,7 +68,7 @@ export const KeycloakCard = ({
             />
           )}
         </CardActions>
-        <CardTitle data-cy="keycloak-card-title">{title}</CardTitle>
+        <CardTitle data-testid="keycloak-card-title">{title}</CardTitle>
       </CardHeader>
       <CardBody />
       <CardFooter>
diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index 2ea8b81e8e..82877c8dbe 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -60,7 +60,7 @@ const KerberosSettingsHeader = ({
             <DropdownItem
               key="delete"
               onClick={() => toggleDeleteDialog()}
-              data-cy="delete-provider-cmd"
+              data-testid="delete-provider-cmd"
             >
               {t("deleteProvider")}
             </DropdownItem>,
@@ -174,13 +174,13 @@ export const UserFederationKerberosSettings = () => {
         <SettingsCache form={form} showSectionHeading />
         <Form onSubmit={form.handleSubmit(save)}>
           <ActionGroup>
-            <Button variant="primary" type="submit" data-cy="kerberos-save">
+            <Button variant="primary" type="submit" data-testid="kerberos-save">
               {t("common:save")}
             </Button>
             <Button
               variant="link"
               onClick={() => history.push(`/${realm}/user-federation`)}
-              data-cy="kerberos-cancel"
+              data-testid="kerberos-cancel"
             >
               {t("common:cancel")}
             </Button>
diff --git a/src/user-federation/UserFederationSection.tsx b/src/user-federation/UserFederationSection.tsx
index 3705c1b1f9..f8dd9f2019 100644
--- a/src/user-federation/UserFederationSection.tsx
+++ b/src/user-federation/UserFederationSection.tsx
@@ -113,7 +113,7 @@ export const UserFederationSection = () => {
           onClick={() => {
             toggleDeleteForCard(userFederation.id!);
           }}
-          data-cy="card-delete"
+          data-testid="card-delete"
         >
           {t("common:delete")}
         </DropdownItem>,
@@ -179,7 +179,7 @@ export const UserFederationSection = () => {
               <Card
                 isHoverable
                 onClick={() => history.push(`${url}/kerberos/new`)}
-                data-cy="kerberos-card"
+                data-testid="kerberos-card"
               >
                 <CardTitle>
                   <Split hasGutter>
diff --git a/src/user-federation/kerberos/KerberosSettingsRequired.tsx b/src/user-federation/kerberos/KerberosSettingsRequired.tsx
index e53e6c0259..bbe0143bb7 100644
--- a/src/user-federation/kerberos/KerberosSettingsRequired.tsx
+++ b/src/user-federation/kerberos/KerberosSettingsRequired.tsx
@@ -107,7 +107,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateName")}`,
               },
             })}
-            data-cy="kerberos-name"
+            data-testid="kerberos-name"
           />
           {form.errors.name && (
             <div className="error">{form.errors.name.message}</div>
@@ -137,7 +137,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateRealm")}`,
               },
             })}
-            data-cy="kerberos-realm"
+            data-testid="kerberos-realm"
           />
           {form.errors.config &&
             form.errors.config.kerberosRealm &&
@@ -171,7 +171,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateServerPrincipal")}`,
               },
             })}
-            data-cy="kerberos-principal"
+            data-testid="kerberos-principal"
           />
           {form.errors.config &&
             form.errors.config.serverPrincipal &&
@@ -205,7 +205,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateKeyTab")}`,
               },
             })}
-            data-cy="kerberos-keytab"
+            data-testid="kerberos-keytab"
           />
           {form.errors.config &&
             form.errors.config.keyTab &&
diff --git a/src/user-federation/shared/SettingsCache.tsx b/src/user-federation/shared/SettingsCache.tsx
index 2e15db8d68..58d345874f 100644
--- a/src/user-federation/shared/SettingsCache.tsx
+++ b/src/user-federation/shared/SettingsCache.tsx
@@ -126,7 +126,7 @@ export const SettingsCache = ({
                 }}
                 selections={value}
                 variant={SelectVariant.single}
-                data-cy="kerberos-cache-policy"
+                data-testid="kerberos-cache-policy"
               >
                 <SelectOption key={0} value={["DEFAULT"]} isPlaceholder />
                 <SelectOption key={1} value={["EVICT_DAILY"]} />
@@ -156,7 +156,7 @@ export const SettingsCache = ({
               control={form.control}
               render={({ onChange, value }) => (
                 <Select
-                  data-cy="cache-day"
+                  data-testid="cache-day"
                   toggleId="kc-eviction-day"
                   required
                   onToggle={() =>
@@ -294,7 +294,7 @@ export const SettingsCache = ({
               id="kc-max-lifespan"
               name="config.maxLifespan[0]"
               ref={form.register}
-              data-cy="kerberos-cache-lifespan"
+              data-testid="kerberos-cache-lifespan"
             />
           </FormGroup>
         ) : (

From 733d5f4b6f9f317c6707c5741eada2a815ab0f90 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Fri, 19 Feb 2021 18:13:07 -0500
Subject: [PATCH 2/9] ldap saves working

---
 .../UserFederationLdapSettings.tsx            | 108 +++++++++++-------
 src/user-federation/UserFederationSection.tsx |   6 +-
 .../ldap/LdapSettingsAdvanced.tsx             |   4 +-
 .../ldap/LdapSettingsConnection.tsx           |   2 +-
 .../ldap/LdapSettingsGeneral.tsx              |  50 ++++----
 .../ldap/LdapSettingsKerberosIntegration.tsx  |   4 +-
 .../ldap/LdapSettingsSearching.tsx            |   2 +-
 .../ldap/LdapSettingsSynchronization.tsx      |   2 +-
 8 files changed, 104 insertions(+), 74 deletions(-)

diff --git a/src/user-federation/UserFederationLdapSettings.tsx b/src/user-federation/UserFederationLdapSettings.tsx
index 893572a094..c67781f2b2 100644
--- a/src/user-federation/UserFederationLdapSettings.tsx
+++ b/src/user-federation/UserFederationLdapSettings.tsx
@@ -47,6 +47,7 @@ const LdapSettingsHeader = ({
   toggleRemoveUsersDialog,
 }: LdapSettingsHeaderProps) => {
   const { t } = useTranslation("user-federation");
+  const { id } = useParams<{ id: string }>();
   const [toggleDisableDialog, DisableConfirm] = useConfirmDialog({
     titleKey: "user-federation:userFedDisableConfirmTitle",
     messageKey: "user-federation:userFedDisableConfirm",
@@ -59,46 +60,53 @@ const LdapSettingsHeader = ({
   return (
     <>
       <DisableConfirm />
-      <ViewHeader
-        titleKey="LDAP"
-        subKey=""
-        dropdownItems={[
-          <DropdownItem
-            key="sync"
-            onClick={() => console.log("Sync users TBD")}
-          >
-            {t("syncChangedUsers")}
-          </DropdownItem>,
-          <DropdownItem
-            key="syncall"
-            onClick={() => console.log("Sync all users TBD")}
-          >
-            {t("syncAllUsers")}
-          </DropdownItem>,
-          <DropdownItem
-            key="unlink"
-            onClick={() => console.log("Unlink users TBD")}
-          >
-            {t("unlinkUsers")}
-          </DropdownItem>,
-          <DropdownItem key="remove" onClick={() => toggleRemoveUsersDialog()}>
-            {t("removeImported")}
-          </DropdownItem>,
-          <DropdownSeparator key="separator" />,
-          <DropdownItem key="delete" onClick={() => toggleDeleteDialog()}>
-            {t("deleteProvider")}
-          </DropdownItem>,
-        ]}
-        isEnabled={value === "true"}
-        onToggle={(value) => {
-          if (!value) {
-            toggleDisableDialog();
-          } else {
-            onChange("" + value);
-            save();
-          }
-        }}
-      />
+      {id === "new" ? (
+        <ViewHeader titleKey="LDAP" subKey="" />
+      ) : (
+        <ViewHeader
+          titleKey="LDAP"
+          subKey=""
+          dropdownItems={[
+            <DropdownItem
+              key="sync"
+              onClick={() => console.log("Sync users TBD")}
+            >
+              {t("syncChangedUsers")}
+            </DropdownItem>,
+            <DropdownItem
+              key="syncall"
+              onClick={() => console.log("Sync all users TBD")}
+            >
+              {t("syncAllUsers")}
+            </DropdownItem>,
+            <DropdownItem
+              key="unlink"
+              onClick={() => console.log("Unlink users TBD")}
+            >
+              {t("unlinkUsers")}
+            </DropdownItem>,
+            <DropdownItem
+              key="remove"
+              onClick={() => toggleRemoveUsersDialog()}
+            >
+              {t("removeImported")}
+            </DropdownItem>,
+            <DropdownSeparator key="separator" />,
+            <DropdownItem key="delete" onClick={() => toggleDeleteDialog()}>
+              {t("deleteProvider")}
+            </DropdownItem>,
+          ]}
+          isEnabled={value === "true"}
+          onToggle={(value) => {
+            if (!value) {
+              toggleDisableDialog();
+            } else {
+              onChange("" + value);
+              save();
+            }
+          }}
+        />
+      )}
     </>
   );
 };
@@ -134,11 +142,23 @@ export const UserFederationLdapSettings = () => {
 
   const save = async (component: ComponentRepresentation) => {
     try {
-      await adminClient.components.update({ id }, component);
+      if (id) {
+        if (id === "new") {
+          await adminClient.components.create(component);
+        } else {
+          await adminClient.components.update({ id }, component);
+        }
+      }
       setupForm(component as ComponentRepresentation);
-      addAlert(t("saveSuccess"), AlertVariant.success);
+      addAlert(
+        t(id === "new" ? "createSuccess" : "saveSuccess"),
+        AlertVariant.success
+      );
     } catch (error) {
-      addAlert(`${t("saveError")} '${error}'`, AlertVariant.danger);
+      addAlert(
+        `${t(id === "new" ? "createError" : "saveError")} '${error}'`,
+        AlertVariant.danger
+      );
     }
   };
 
@@ -179,7 +199,7 @@ export const UserFederationLdapSettings = () => {
       <RemoveUsersConfirm />
       <Controller
         name="config.enabled[0]"
-        defaultValue={["true"]}
+        defaultValue={["true"][0]}
         control={form.control}
         render={({ onChange, value }) => (
           <LdapSettingsHeader
diff --git a/src/user-federation/UserFederationSection.tsx b/src/user-federation/UserFederationSection.tsx
index f8dd9f2019..85d5b7b68b 100644
--- a/src/user-federation/UserFederationSection.tsx
+++ b/src/user-federation/UserFederationSection.tsx
@@ -190,7 +190,11 @@ export const UserFederationSection = () => {
                   </Split>
                 </CardTitle>
               </Card>
-              <Card isHoverable>
+              <Card
+                isHoverable
+                onClick={() => history.push(`${url}/ldap/new`)}
+                data-testid="ldap-card"
+              >
                 <CardTitle>
                   <Split hasGutter>
                     <SplitItem>
diff --git a/src/user-federation/ldap/LdapSettingsAdvanced.tsx b/src/user-federation/ldap/LdapSettingsAdvanced.tsx
index 139d174e3a..f10fdd566e 100644
--- a/src/user-federation/ldap/LdapSettingsAdvanced.tsx
+++ b/src/user-federation/ldap/LdapSettingsAdvanced.tsx
@@ -74,7 +74,7 @@ export const LdapSettingsAdvanced = ({
         >
           <Controller
             name="config.validatePasswordPolicy"
-            defaultValue={"false"}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
@@ -103,7 +103,7 @@ export const LdapSettingsAdvanced = ({
         >
           <Controller
             name="config.trustEmail"
-            defaultValue={"false"}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
diff --git a/src/user-federation/ldap/LdapSettingsConnection.tsx b/src/user-federation/ldap/LdapSettingsConnection.tsx
index 41854823d7..b7c9098108 100644
--- a/src/user-federation/ldap/LdapSettingsConnection.tsx
+++ b/src/user-federation/ldap/LdapSettingsConnection.tsx
@@ -167,7 +167,7 @@ export const LdapSettingsConnection = ({
         >
           <Controller
             name="config.connectionPooling"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
diff --git a/src/user-federation/ldap/LdapSettingsGeneral.tsx b/src/user-federation/ldap/LdapSettingsGeneral.tsx
index 4d9443b60a..4d2e20ac40 100644
--- a/src/user-federation/ldap/LdapSettingsGeneral.tsx
+++ b/src/user-federation/ldap/LdapSettingsGeneral.tsx
@@ -10,6 +10,8 @@ import React, { useState } from "react";
 import { HelpItem } from "../../components/help-enabler/HelpItem";
 import { UseFormMethods, Controller } from "react-hook-form";
 import { FormAccess } from "../../components/form-access/FormAccess";
+import { useRealm } from "../../context/realm-context/RealmContext";
+
 import { WizardSectionHeader } from "../../components/wizard-section-header/WizardSectionHeader";
 
 export type LdapSettingsGeneralProps = {
@@ -25,6 +27,7 @@ export const LdapSettingsGeneral = ({
 }: LdapSettingsGeneralProps) => {
   const { t } = useTranslation("user-federation");
   const helpText = useTranslation("user-federation-help").t;
+  const { realm } = useRealm();
 
   const [isVendorDropdownOpen, setIsVendorDropdownOpen] = useState(false);
 
@@ -51,12 +54,36 @@ export const LdapSettingsGeneral = ({
           isRequired
         >
           {/* These hidden fields are required so data object written back matches data retrieved */}
-          <TextInput
+          {/* <TextInput
             hidden
             type="text"
             id="kc-console-id"
             name="id"
             ref={form.register}
+          /> */}
+          <TextInput
+            hidden
+            type="text"
+            id="kc-console-provider-id"
+            name="providerId"
+            defaultValue="ldap"
+            ref={form.register}
+          />
+          <TextInput
+            hidden
+            type="text"
+            id="kc-console-provider-type"
+            name="providerType"
+            defaultValue="org.keycloak.storage.UserStorageProvider"
+            ref={form.register}
+          />
+          <TextInput
+            hidden
+            type="text"
+            id="kc-console-parentId"
+            name="parentId"
+            defaultValue={realm}
+            ref={form.register}
           />
           <TextInput
             isRequired
@@ -70,27 +97,6 @@ export const LdapSettingsGeneral = ({
               },
             })}
           />
-          <TextInput
-            hidden
-            type="text"
-            id="kc-console-provider-id"
-            name="providerId"
-            ref={form.register}
-          />
-          <TextInput
-            hidden
-            type="text"
-            id="kc-console-provider-type"
-            name="providerType"
-            ref={form.register}
-          />
-          <TextInput
-            hidden
-            type="text"
-            id="kc-console-parentId"
-            name="parentId"
-            ref={form.register}
-          />
           {form.errors.name && (
             <div className="error">{form.errors.name.message}</div>
           )}
diff --git a/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx b/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
index 0595a96f51..42c16347f7 100644
--- a/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
+++ b/src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
@@ -45,7 +45,7 @@ export const LdapSettingsKerberosIntegration = ({
         >
           <Controller
             name="config.allowKerberosAuthentication"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
@@ -73,7 +73,7 @@ export const LdapSettingsKerberosIntegration = ({
         >
           <Controller
             name="config.useKerberosForPasswordAuthentication"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
diff --git a/src/user-federation/ldap/LdapSettingsSearching.tsx b/src/user-federation/ldap/LdapSettingsSearching.tsx
index acbc51ed7f..a79feee6ef 100644
--- a/src/user-federation/ldap/LdapSettingsSearching.tsx
+++ b/src/user-federation/ldap/LdapSettingsSearching.tsx
@@ -332,7 +332,7 @@ export const LdapSettingsSearching = ({
         >
           <Controller
             name="config.pagination"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
diff --git a/src/user-federation/ldap/LdapSettingsSynchronization.tsx b/src/user-federation/ldap/LdapSettingsSynchronization.tsx
index 7b408f8035..5ceba8baae 100644
--- a/src/user-federation/ldap/LdapSettingsSynchronization.tsx
+++ b/src/user-federation/ldap/LdapSettingsSynchronization.tsx
@@ -44,7 +44,7 @@ export const LdapSettingsSynchronization = ({
         >
           <Controller
             name="config.importEnabled"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch

From 489ed640498a837a2c5a2ef53b2537328a76ebf7 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Mon, 22 Feb 2021 09:52:49 -0500
Subject: [PATCH 3/9] fix 404 issue on new

---
 src/user-federation/UserFederationKerberosSettings.tsx | 8 +++++---
 src/user-federation/UserFederationLdapSettings.tsx     | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index 82877c8dbe..d5ac8b02d4 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -93,9 +93,11 @@ export const UserFederationKerberosSettings = () => {
 
   useEffect(() => {
     (async () => {
-      const fetchedComponent = await adminClient.components.findOne({ id });
-      if (fetchedComponent) {
-        setupForm(fetchedComponent);
+      if (id !== "new") {
+        const fetchedComponent = await adminClient.components.findOne({ id });
+        if (fetchedComponent) {
+          setupForm(fetchedComponent);
+        }
       }
     })();
   }, []);
diff --git a/src/user-federation/UserFederationLdapSettings.tsx b/src/user-federation/UserFederationLdapSettings.tsx
index c67781f2b2..2715dc6e20 100644
--- a/src/user-federation/UserFederationLdapSettings.tsx
+++ b/src/user-federation/UserFederationLdapSettings.tsx
@@ -123,9 +123,11 @@ export const UserFederationLdapSettings = () => {
 
   useEffect(() => {
     (async () => {
-      const fetchedComponent = await adminClient.components.findOne({ id });
-      if (fetchedComponent) {
-        setupForm(fetchedComponent);
+      if (id !== "new") {
+        const fetchedComponent = await adminClient.components.findOne({ id });
+        if (fetchedComponent) {
+          setupForm(fetchedComponent);
+        }
       }
     })();
   }, []);

From 84d8df2b052f54b40f72cde34f2f8fdab9e350ae Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Mon, 22 Feb 2021 14:48:03 -0500
Subject: [PATCH 4/9] regex and number fields to provide simple client side
 validation

---
 .../ldap/LdapSettingsConnection.tsx              |  2 +-
 .../ldap/LdapSettingsSearching.tsx               | 16 ++++++++++++++--
 .../ldap/LdapSettingsSynchronization.tsx         |  6 +++---
 src/user-federation/messages.json                |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/user-federation/ldap/LdapSettingsConnection.tsx b/src/user-federation/ldap/LdapSettingsConnection.tsx
index b7c9098108..1916ccb054 100644
--- a/src/user-federation/ldap/LdapSettingsConnection.tsx
+++ b/src/user-federation/ldap/LdapSettingsConnection.tsx
@@ -193,7 +193,7 @@ export const LdapSettingsConnection = ({
           fieldId="kc-console-connection-timeout"
         >
           <TextInput
-            type="text"
+            type="number"
             id="kc-console-connection-timeout"
             name="config.connectionTimeout[0]"
             ref={form.register}
diff --git a/src/user-federation/ldap/LdapSettingsSearching.tsx b/src/user-federation/ldap/LdapSettingsSearching.tsx
index a79feee6ef..44547a8b9b 100644
--- a/src/user-federation/ldap/LdapSettingsSearching.tsx
+++ b/src/user-federation/ldap/LdapSettingsSearching.tsx
@@ -256,8 +256,20 @@ export const LdapSettingsSearching = ({
             type="text"
             id="kc-user-ldap-filter"
             name="config.customUserSearchFilter[0]"
-            ref={form.register}
+            ref={form.register({ 
+              pattern: {
+                value: /(\(.*\))$/,
+                message: `${t("validateCustomUserSearchFilter")}`
+              }  
+            })}
           />
+          {form.errors.config &&
+            form.errors.config.customUserSearchFilter &&
+            form.errors.config.customUserSearchFilter[0] && (
+              <div className="error">
+                {form.errors.config.customUserSearchFilter[0].message}
+              </div>
+            )}
         </FormGroup>
 
         <FormGroup
@@ -312,7 +324,7 @@ export const LdapSettingsSearching = ({
           fieldId="kc-read-timeout"
         >
           <TextInput
-            type="text"
+            type="number"
             id="kc-read-timeout"
             name="config.readTimeout[0]"
             ref={form.register}
diff --git a/src/user-federation/ldap/LdapSettingsSynchronization.tsx b/src/user-federation/ldap/LdapSettingsSynchronization.tsx
index 5ceba8baae..81b7deba4a 100644
--- a/src/user-federation/ldap/LdapSettingsSynchronization.tsx
+++ b/src/user-federation/ldap/LdapSettingsSynchronization.tsx
@@ -71,7 +71,7 @@ export const LdapSettingsSynchronization = ({
           fieldId="kc-batch-size"
         >
           <TextInput
-            type="text"
+            type="number"
             id="kc-batch-size"
             name="config.batchSizeForSync[0]"
             ref={form.register}
@@ -92,7 +92,7 @@ export const LdapSettingsSynchronization = ({
           fieldId="kc-full-sync-period"
         >
           <TextInput
-            type="text"
+            type="number"
             id="kc-full-sync-period"
             name="config.fullSyncPeriod[0]"
             ref={form.register}
@@ -113,7 +113,7 @@ export const LdapSettingsSynchronization = ({
           hasNoPaddingTop
         >
           <TextInput
-            type="text"
+            type="number"
             id="kc-changed-users-sync-period"
             name="config.changedSyncPeriod[0]"
             ref={form.register}
diff --git a/src/user-federation/messages.json b/src/user-federation/messages.json
index c115a8f3fa..f6b30b6b41 100644
--- a/src/user-federation/messages.json
+++ b/src/user-federation/messages.json
@@ -110,6 +110,7 @@
     "validateUsersDn": "You must enter users DN",
     "validateUsernameLDAPAttribute": "You must enter a username LDAP attribute",
     "validateRdnLdapAttribute": "You must enter an RDN LDAP attribute",
+    "validateCustomUserSearchFilter": "Filter must be enclosed in parentheses, for example: (filter)", 
 
     "id": "ID",
     "mapperType": "Mapper type",

From 0ee4f7ea8e5cc000527bb9652539c8627721eba2 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 23 Feb 2021 15:49:57 -0500
Subject: [PATCH 5/9] cypress tests working

---
 .../user_fed_kerberos_test.spec.ts            |   2 +-
 .../integration/user_fed_ldap_test.spec.ts    | 275 ++++++++++++++++++
 .../providers/CreateLdapProviderPage.ts       | 155 ++++++++++
 .../UserFederationKerberosSettings.tsx        |   2 +-
 .../UserFederationLdapSettings.tsx            |   9 +-
 .../ldap/LdapSettingsConnection.tsx           |  19 +-
 .../ldap/LdapSettingsGeneral.tsx              |   9 +-
 .../ldap/LdapSettingsSearching.tsx            |  11 +-
 src/user-federation/messages.json             |   3 +-
 9 files changed, 469 insertions(+), 16 deletions(-)
 create mode 100644 cypress/integration/user_fed_ldap_test.spec.ts
 create mode 100644 cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts

diff --git a/cypress/integration/user_fed_kerberos_test.spec.ts b/cypress/integration/user_fed_kerberos_test.spec.ts
index c147136bf3..dcd6973f87 100644
--- a/cypress/integration/user_fed_kerberos_test.spec.ts
+++ b/cypress/integration/user_fed_kerberos_test.spec.ts
@@ -215,7 +215,7 @@ describe("User Fed Kerberos tests", () => {
     cy.wait(1000);
 
     cy.get('[data-testid="action-dropdown"]').click();
-    cy.get('[data-testid="delete-provider-cmd"]').click();
+    cy.get('[data-testid="delete-kerberos-cmd"]').click();
 
     modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
 
diff --git a/cypress/integration/user_fed_ldap_test.spec.ts b/cypress/integration/user_fed_ldap_test.spec.ts
new file mode 100644
index 0000000000..a9bdf42401
--- /dev/null
+++ b/cypress/integration/user_fed_ldap_test.spec.ts
@@ -0,0 +1,275 @@
+import LoginPage from "../support/pages/LoginPage";
+import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import CreateLdapProviderPage from "../support/pages/admin_console/manage/providers/CreateLdapProviderPage";
+import Masthead from "../support/pages/admin_console/Masthead";
+import ModalUtils from "../support/util/ModalUtils";
+
+const loginPage = new LoginPage();
+const masthead = new Masthead();
+const sidebarPage = new SidebarPage();
+const providersPage = new CreateLdapProviderPage();
+const modalUtils = new ModalUtils();
+
+const firstLdapName = "my-ldap";
+const firstLdapVendor = "Active Directory";
+
+const connectionUrl = "ldap://";
+const firstBindType = "simple";
+const firstBindDn = "user-1";
+const firstBindCreds = "password1";
+
+const firstUsersDn = "user-dn-1";
+const firstUserLdapAtt = "uid";
+const firstRdnLdapAtt = "uid";
+const firstUuidLdapAtt = "entryUUID";
+const firstUserObjClasses = "inetOrgPerson, organizationalPerson";
+
+const secondLdapName = `${firstLdapName}-2`;
+const secondLdapVendor = "Other";
+
+const secondBindType = "none";
+const secondBindDn = "user-2";
+const secondBindCreds = "password2";
+
+const secondUsersDn = "user-dn-2";
+const secondUserLdapAtt = "cn";
+const secondRdnLdapAtt = "cn";
+const secondUuidLdapAtt = "objectGUID";
+const secondUserObjClasses = "person, organizationalPerson, user";
+
+const defaultPolicy = "DEFAULT";
+const newPolicy = "EVICT_WEEKLY";
+const defaultLdapDay = "Sunday";
+const defaultLdapHour = "00";
+const defaultLdapMinute = "00";
+const newLdapDay = "Wednesday";
+const newLdapHour = "15";
+const newLdapMinute = "55";
+
+const createdSuccessMessage = "User federation provider successfully created";
+const savedSuccessMessage = "User federation provider successfully saved";
+const deletedSuccessMessage = "The user federation provider has been deleted.";
+const deleteModalTitle = "Delete user federation provider?";
+const disableModalTitle = "Disable user federation provider?";
+
+describe("User Fed LDAP tests", () => {
+  it("Create Ldap provider from empty state", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get("[data-testid=ldap-card]").click();
+
+    providersPage.fillLdapRequiredGeneralData(
+      firstLdapName,
+      firstLdapVendor,
+    );
+    providersPage.fillLdapRequiredConnectionData(
+      connectionUrl,
+      firstBindType,
+      firstBindDn,
+      firstBindCreds,
+    );
+    providersPage.fillLdapRequiredSearchingData(
+      firstUsersDn,
+      firstUserLdapAtt,
+      firstRdnLdapAtt,
+      firstUuidLdapAtt,
+      firstUserObjClasses
+    );
+
+    providersPage.save();
+
+    masthead.checkNotificationMessage(createdSuccessMessage);
+    sidebarPage.goToUserFederation();
+  });
+
+  it("Update an existing LDAP provider and save", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+    providersPage.selectCacheType(newPolicy);
+
+    cy.contains(defaultLdapDay).click();
+    cy.contains(newLdapDay).click();
+
+    cy.contains(defaultLdapHour).click();
+    cy.contains(newLdapHour).click();
+
+    cy.contains(defaultLdapMinute).click();
+    cy.contains(newLdapMinute).click();
+
+    providersPage.save();
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+    cy.wait(1000);
+
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+
+    expect(cy.contains(newPolicy).should("exist"));
+    expect(cy.contains(defaultPolicy).should("not.exist"));
+  });
+
+  it("Change existing LDAP provider and click button to cancel", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.wait(1000);
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+    providersPage.selectCacheType(newPolicy);
+
+    cy.contains(newLdapDay).click();
+    cy.contains(defaultLdapDay).click();
+
+    cy.contains(newLdapHour).click();
+    cy.contains(defaultLdapHour).click();
+
+    cy.contains(newLdapMinute).click();
+    cy.contains(defaultLdapMinute).click();
+
+    providersPage.cancel();
+
+    cy.wait(1000);
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+    providersPage.selectCacheType(newPolicy);
+
+    expect(cy.contains(newLdapDay).should("exist"));
+    expect(cy.contains(newLdapHour).should("exist"));
+    expect(cy.contains(newLdapMinute).should("exist"));
+
+    expect(cy.contains(defaultLdapMinute).should("not.exist"));
+
+    sidebarPage.goToUserFederation();
+  });
+
+  it("Disable an existing LDAP provider", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+
+    providersPage.disableEnabledSwitch();
+
+    modalUtils.checkModalTitle(disableModalTitle).confirmModal();
+
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+
+    cy.wait(1000);
+    expect(cy.contains("Disabled").should("exist"));
+  });
+
+  it("Enable an existing previously-disabled LDAP provider", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.wait(1000);
+
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+
+    providersPage.enableEnabledSwitch();
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+
+    cy.wait(1000);
+    expect(cy.contains("Enabled").should("exist"));
+  });
+
+  it("Create new LDAP provider using the New Provider dropdown", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    // cy get contains
+    cy.contains("button", "Add new provider", ).click();
+    cy.contains("li", "LDAP").click();
+
+
+    // cy.contains("Add new provider").click();
+    // cy.contains("LDAP").click();
+
+    providersPage.fillLdapRequiredGeneralData(
+      secondLdapName,
+      secondLdapVendor,
+    );
+    providersPage.fillLdapRequiredConnectionData(
+      connectionUrl,
+      secondBindType,
+      secondBindDn,
+      secondBindCreds,
+    );
+    providersPage.fillLdapRequiredSearchingData(
+      secondUsersDn,
+      secondUserLdapAtt,
+      secondRdnLdapAtt,
+      secondUuidLdapAtt,
+      secondUserObjClasses
+    );
+
+    providersPage.save();
+
+    masthead.checkNotificationMessage(createdSuccessMessage);
+    sidebarPage.goToUserFederation();
+  });
+
+  it("Delete an LDAP provider from card view using the card's menu", () => {
+
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-testid="my-ldap-2-dropdown"]').click();
+    cy.get('[data-testid="card-delete"]').click();
+
+    modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
+
+    masthead.checkNotificationMessage(deletedSuccessMessage);
+  });
+
+  it("Delete an LDAP provider using the Settings view's Action menu", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-testid="keycloak-card-title"]')
+      .contains(firstLdapName)
+      .click();
+    cy.wait(1000);
+
+    cy.get('[data-testid="action-dropdown"]').click();
+    cy.get('[data-testid="delete-ldap-cmd"]').click();
+
+    modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
+
+    masthead.checkNotificationMessage(deletedSuccessMessage);
+  });
+});
diff --git a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
new file mode 100644
index 0000000000..4bc3166a91
--- /dev/null
+++ b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
@@ -0,0 +1,155 @@
+export default class CreateLdapProviderPage {
+  ldapNameInput: string;
+  ldapVendorInput: string;
+  ldapVendorList: string;
+
+  ldapConnectionUrlInput: string;
+  ldapBindTypeInput: string;
+  ldapBindTypeList: string;
+  ldapBindDnInput: string;
+  ldapBindCredsInput: string;
+
+  ldapUsersDnInput: string;
+  ldapUserLdapAttInput: string;
+  ldapRdnLdapAttInput: string;
+  ldapUuidLdapAttInput: string;
+  ldapUserObjClassesInput: string;
+
+  ldapEnabledInput: string;
+
+  ldapCacheDayInput: string;
+  ldapCacheDayList: string;
+  ldapCacheHourInput: string;
+  ldapCacheHourList: string;
+  ldapCacheMinuteInput: string;
+  ldapCacheMinuteList: string;
+  ldapCachePolicyInput: string;
+  ldapCachePolicyList: string;
+
+  saveBtn: string;
+  cancelBtn: string;
+
+  constructor() {
+    // LdapSettingsGeneral required input values
+    this.ldapNameInput = "data-testid=ldap-name";
+    this.ldapVendorInput = "#kc-vendor";
+    this.ldapVendorList = "#kc-vendor + ul";
+
+    // LdapSettingsConnection required input values
+    this.ldapConnectionUrlInput = "data-testid=ldap-connection-url";
+    this.ldapBindTypeInput = "#kc-bind-type";
+    this.ldapBindTypeList = "#kc-bind-type + ul";
+    this.ldapBindDnInput = "data-testid=ldap-bind-dn";
+    this.ldapBindCredsInput = "data-testid=ldap-bind-credentials";
+
+    // LdapSettingsSearching required input values
+    this.ldapUsersDnInput = "data-testid=ldap-users-dn";
+    this.ldapUserLdapAttInput = "data-testid=ldap-username-attribute";
+    this.ldapRdnLdapAttInput = "data-testid=ldap-rdn-attribute";
+    this.ldapUuidLdapAttInput = "data-testid=ldap-uuid-attribute";
+    this.ldapUserObjClassesInput = "data-testid=ldap-user-object-classes";
+
+    // SettingsCache input values
+    this.ldapCacheDayInput = "#kc-eviction-day";
+    this.ldapCacheDayList = "#kc-eviction-day + ul";
+    this.ldapCacheHourInput = "#kc-eviction-hour";
+    this.ldapCacheHourList = "#kc-eviction-hour + ul";
+    this.ldapCacheMinuteInput = "#kc-eviction-minute";
+    this.ldapCacheMinuteList = "#kc-eviction-minute + ul";
+    this.ldapCachePolicyInput = "#kc-cache-policy";
+    this.ldapCachePolicyList = "#kc-cache-policy + ul";
+
+    // LDAP settings enabled switch
+    this.ldapEnabledInput = "#LDAP-switch";
+
+    // LDAP action buttons
+    this.saveBtn = "data-testid=ldap-save";
+    this.cancelBtn = "data-testid=ldap-cancel";
+  }
+
+  // Required fields - these always must be filled out when testing a save, everything else can feasibly be left blank (TEST THIS)
+  fillLdapRequiredGeneralData(
+    name: string,
+    vendor: string,
+  ) {
+    if (name) {
+      cy.get(`[${this.ldapNameInput}]`).type(name);
+    }
+    if (vendor) {
+      cy.get(this.ldapVendorInput).click();
+      cy.get(this.ldapVendorList).contains(vendor).click();
+    }
+    return this;
+  }
+
+  fillLdapRequiredConnectionData(
+    connectionUrl: string,
+    bindType: string,
+    bindDn: string,
+    bindCreds: string,
+  ) {
+    if (connectionUrl) {
+      cy.get(`[${this.ldapConnectionUrlInput}]`).type(connectionUrl);
+    }
+    if (bindType) {
+      cy.get(this.ldapBindTypeInput).click();
+      cy.get(this.ldapBindTypeList).contains(bindType).click();
+    }
+    if (bindDn) {
+      cy.get(`[${this.ldapBindDnInput}]`).type(bindDn);
+    }
+    if (bindCreds) {
+      cy.get(`[${this.ldapBindCredsInput}]`).type(bindCreds);
+    }
+    return this;
+  }
+
+  fillLdapRequiredSearchingData(
+    usersDn: string,
+    userLdapAtt: string,
+    rdnLdapAtt: string,
+    uuidLdapAtt: string,
+    userObjClasses: string
+  ) {
+    if (usersDn) {
+      cy.get(`[${this.ldapUsersDnInput}]`).type(usersDn);
+    }
+    if (userLdapAtt) {
+      cy.get(`[${this.ldapUserLdapAttInput}]`).type(userLdapAtt);
+    }
+    if (rdnLdapAtt) {
+      cy.get(`[${this.ldapRdnLdapAttInput}]`).type(rdnLdapAtt);
+    }
+    if (uuidLdapAtt) {
+      cy.get(`[${this.ldapUuidLdapAttInput}]`).type(uuidLdapAtt);
+    }
+    if (userObjClasses) {
+      cy.get(`[${this.ldapUserObjClassesInput}]`).type(userObjClasses);
+    }
+    return this;
+  }
+
+  selectCacheType(cacheType: string) {
+    cy.get(this.ldapCachePolicyInput).click();
+    cy.get(this.ldapCachePolicyList).contains(cacheType).click();
+    return this;
+  }
+
+  disableEnabledSwitch() {
+    cy.get(this.ldapEnabledInput).uncheck({ force: true });
+  }
+
+  enableEnabledSwitch() {
+    cy.get(this.ldapEnabledInput).check({ force: true });
+  }
+
+  save() {
+    cy.get(`[${this.saveBtn}]`).click();
+    return this;
+  }
+
+  cancel() {
+    cy.get(`[${this.cancelBtn}]`).click();
+    return this;
+  }
+}
diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index d5ac8b02d4..1a1d3befb1 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -60,7 +60,7 @@ const KerberosSettingsHeader = ({
             <DropdownItem
               key="delete"
               onClick={() => toggleDeleteDialog()}
-              data-testid="delete-provider-cmd"
+              data-testid="delete-kerberos-cmd"
             >
               {t("deleteProvider")}
             </DropdownItem>,
diff --git a/src/user-federation/UserFederationLdapSettings.tsx b/src/user-federation/UserFederationLdapSettings.tsx
index 2715dc6e20..e9d49300ae 100644
--- a/src/user-federation/UserFederationLdapSettings.tsx
+++ b/src/user-federation/UserFederationLdapSettings.tsx
@@ -92,7 +92,11 @@ const LdapSettingsHeader = ({
               {t("removeImported")}
             </DropdownItem>,
             <DropdownSeparator key="separator" />,
-            <DropdownItem key="delete" onClick={() => toggleDeleteDialog()}>
+            <DropdownItem
+              key="delete"
+              onClick={() => toggleDeleteDialog()}
+              data-testid="delete-ldap-cmd"
+            >
               {t("deleteProvider")}
             </DropdownItem>,
           ]}
@@ -235,12 +239,13 @@ export const UserFederationLdapSettings = () => {
         </ScrollForm>
         <Form onSubmit={form.handleSubmit(save)}>
           <ActionGroup>
-            <Button variant="primary" type="submit">
+            <Button variant="primary" type="submit" data-testid="ldap-save">
               {t("common:save")}
             </Button>
             <Button
               variant="link"
               onClick={() => history.push(`/${realm}/user-federation`)}
+              data-testid="ldap-cancel"
             >
               {t("common:cancel")}
             </Button>
diff --git a/src/user-federation/ldap/LdapSettingsConnection.tsx b/src/user-federation/ldap/LdapSettingsConnection.tsx
index 1916ccb054..5b7d0214c0 100644
--- a/src/user-federation/ldap/LdapSettingsConnection.tsx
+++ b/src/user-federation/ldap/LdapSettingsConnection.tsx
@@ -66,6 +66,7 @@ export const LdapSettingsConnection = ({
             isRequired
             type="text"
             id="kc-console-connection-url"
+            data-testid="ldap-connection-url"
             name="config.connectionUrl[0]"
             ref={form.register({
               required: {
@@ -229,6 +230,7 @@ export const LdapSettingsConnection = ({
                 }}
                 selections={value}
                 variant={SelectVariant.single}
+                data-testid="ldap-bind-type"
               >
                 <SelectOption key={3} value="simple" />
                 <SelectOption key={4} value="none" />
@@ -246,13 +248,27 @@ export const LdapSettingsConnection = ({
             />
           }
           fieldId="kc-console-bind-dn"
+          isRequired
         >
           <TextInput
             type="text"
             id="kc-console-bind-dn"
+            data-testid="ldap-bind-dn"
             name="config.bindDn[0]"
-            ref={form.register}
+            ref={form.register({
+              required: {
+                value: true,
+                message: `${t("validateBindDn")}`,
+              },
+            })}
           />
+          {form.errors.config &&
+            form.errors.config.bindDn &&
+            form.errors.config.bindDn[0] && (
+              <div className="error">
+                {form.errors.config.bindDn[0].message}
+              </div>
+            )}
         </FormGroup>
         <FormGroup
           label={t("bindCredentials")}
@@ -271,6 +287,7 @@ export const LdapSettingsConnection = ({
               isRequired
               type={isPasswordVisible ? "text" : "password"}
               id="kc-console-bind-credentials"
+              data-testid="ldap-bind-credentials"
               name="config.bindCredential[0]"
               ref={form.register({
                 required: {
diff --git a/src/user-federation/ldap/LdapSettingsGeneral.tsx b/src/user-federation/ldap/LdapSettingsGeneral.tsx
index 4d2e20ac40..e590002edc 100644
--- a/src/user-federation/ldap/LdapSettingsGeneral.tsx
+++ b/src/user-federation/ldap/LdapSettingsGeneral.tsx
@@ -54,13 +54,6 @@ export const LdapSettingsGeneral = ({
           isRequired
         >
           {/* These hidden fields are required so data object written back matches data retrieved */}
-          {/* <TextInput
-            hidden
-            type="text"
-            id="kc-console-id"
-            name="id"
-            ref={form.register}
-          /> */}
           <TextInput
             hidden
             type="text"
@@ -96,6 +89,7 @@ export const LdapSettingsGeneral = ({
                 message: `${t("validateName")}`,
               },
             })}
+            data-testid="ldap-name"
           />
           {form.errors.name && (
             <div className="error">{form.errors.name.message}</div>
@@ -129,6 +123,7 @@ export const LdapSettingsGeneral = ({
                 }}
                 selections={value}
                 variant={SelectVariant.single}
+                // data-testid="ldap-vendor"
               >
                 <SelectOption key={0} value="ad" isPlaceholder>
                   Active Directory
diff --git a/src/user-federation/ldap/LdapSettingsSearching.tsx b/src/user-federation/ldap/LdapSettingsSearching.tsx
index 44547a8b9b..f7d7e25bac 100644
--- a/src/user-federation/ldap/LdapSettingsSearching.tsx
+++ b/src/user-federation/ldap/LdapSettingsSearching.tsx
@@ -97,6 +97,7 @@ export const LdapSettingsSearching = ({
             isRequired
             type="text"
             id="kc-console-users-dn"
+            data-testid="ldap-users-dn"
             name="config.usersDn[0]"
             ref={form.register({
               required: {
@@ -129,6 +130,7 @@ export const LdapSettingsSearching = ({
             isRequired
             type="text"
             id="kc-username-ldap-attribute"
+            data-testid="ldap-username-attribute"
             name="config.usernameLDAPAttribute[0]"
             ref={form.register({
               required: {
@@ -161,6 +163,7 @@ export const LdapSettingsSearching = ({
             isRequired
             type="text"
             id="kc-rdn-ldap-attribute"
+            data-testid="ldap-rdn-attribute"
             name="config.rdnLDAPAttribute[0]"
             ref={form.register({
               required: {
@@ -193,6 +196,7 @@ export const LdapSettingsSearching = ({
             isRequired
             type="text"
             id="kc-uuid-ldap-attribute"
+            data-testid="ldap-uuid-attribute"
             name="config.uuidLDAPAttribute[0]"
             ref={form.register({
               required: {
@@ -225,6 +229,7 @@ export const LdapSettingsSearching = ({
             isRequired
             type="text"
             id="kc-user-object-classes"
+            data-testid="ldap-user-object-classes"
             name="config.userObjectClasses[0]"
             ref={form.register({
               required: {
@@ -256,11 +261,11 @@ export const LdapSettingsSearching = ({
             type="text"
             id="kc-user-ldap-filter"
             name="config.customUserSearchFilter[0]"
-            ref={form.register({ 
+            ref={form.register({
               pattern: {
                 value: /(\(.*\))$/,
-                message: `${t("validateCustomUserSearchFilter")}`
-              }  
+                message: `${t("validateCustomUserSearchFilter")}`,
+              },
             })}
           />
           {form.errors.config &&
diff --git a/src/user-federation/messages.json b/src/user-federation/messages.json
index f6b30b6b41..885af7eb5c 100644
--- a/src/user-federation/messages.json
+++ b/src/user-federation/messages.json
@@ -104,7 +104,8 @@
     "validateServerPrincipal":"You must enter a server principal",
     "validateKeyTab": "You must enter a key tab",
     "validateConnectionUrl": "You must enter a connection URL",
-    "validateBindCredentials": "You must enter bind credentials",
+    "validateBindDn": "You must enter the DN of the LDAP admin",
+    "validateBindCredentials": "You must enter the password of the LDAP admin",
     "validateUuidLDAPAttribute": "You must enter a UUID LDAP attribute",
     "validateUserObjectClasses": "You must enter one or more user object classes",
     "validateUsersDn": "You must enter users DN",

From 123ee2562615573092a4c5b21d719dd04ac06f14 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Mon, 1 Mar 2021 16:56:26 -0500
Subject: [PATCH 6/9] refactor tests first pass

---
 .../integration/user_fed_ldap_test.spec.ts    | 99 ++++---------------
 .../providers/CreateLdapProviderPage.ts       | 15 ++-
 2 files changed, 31 insertions(+), 83 deletions(-)

diff --git a/cypress/integration/user_fed_ldap_test.spec.ts b/cypress/integration/user_fed_ldap_test.spec.ts
index a9bdf42401..265215475d 100644
--- a/cypress/integration/user_fed_ldap_test.spec.ts
+++ b/cypress/integration/user_fed_ldap_test.spec.ts
@@ -53,22 +53,24 @@ const deleteModalTitle = "Delete user federation provider?";
 const disableModalTitle = "Disable user federation provider?";
 
 describe("User Fed LDAP tests", () => {
-  it("Create Ldap provider from empty state", () => {
+  beforeEach(() => {
     cy.visit("");
+    cy.wait(1000);
     loginPage.logIn();
+    cy.wait(1000);
     sidebarPage.goToUserFederation();
+    cy.wait(1000);
+  });
 
+  it("Create Ldap provider from empty state", () => {
     cy.get("[data-testid=ldap-card]").click();
 
-    providersPage.fillLdapRequiredGeneralData(
-      firstLdapName,
-      firstLdapVendor,
-    );
+    providersPage.fillLdapRequiredGeneralData(firstLdapName, firstLdapVendor);
     providersPage.fillLdapRequiredConnectionData(
       connectionUrl,
       firstBindType,
       firstBindDn,
-      firstBindCreds,
+      firstBindCreds
     );
     providersPage.fillLdapRequiredSearchingData(
       firstUsersDn,
@@ -85,14 +87,8 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Update an existing LDAP provider and save", () => {
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
+    providersPage.clickProviderCard(firstLdapName);
 
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
     providersPage.selectCacheType(newPolicy);
 
     cy.contains(defaultLdapDay).click();
@@ -110,25 +106,14 @@ describe("User Fed LDAP tests", () => {
     sidebarPage.goToUserFederation();
     cy.wait(1000);
 
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
+    providersPage.clickProviderCard(firstLdapName);
 
     expect(cy.contains(newPolicy).should("exist"));
     expect(cy.contains(defaultPolicy).should("not.exist"));
   });
 
   it("Change existing LDAP provider and click button to cancel", () => {
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
-
-    cy.wait(1000);
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
+    providersPage.clickProviderCard(firstLdapName);
     providersPage.selectCacheType(newPolicy);
 
     cy.contains(newLdapDay).click();
@@ -141,32 +126,21 @@ describe("User Fed LDAP tests", () => {
     cy.contains(defaultLdapMinute).click();
 
     providersPage.cancel();
+    cy.wait(1000);
 
-    cy.wait(1000);
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
+    providersPage.clickProviderCard(firstLdapName);
     providersPage.selectCacheType(newPolicy);
 
     expect(cy.contains(newLdapDay).should("exist"));
     expect(cy.contains(newLdapHour).should("exist"));
     expect(cy.contains(newLdapMinute).should("exist"));
-
     expect(cy.contains(defaultLdapMinute).should("not.exist"));
 
     sidebarPage.goToUserFederation();
   });
 
   it("Disable an existing LDAP provider", () => {
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
-
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
+    providersPage.clickProviderCard(firstLdapName);
 
     providersPage.disableEnabledSwitch();
 
@@ -184,48 +158,29 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Enable an existing previously-disabled LDAP provider", () => {
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
-
-    cy.wait(1000);
-
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
+    providersPage.clickProviderCard(firstLdapName);
 
     providersPage.enableEnabledSwitch();
+
     masthead.checkNotificationMessage(savedSuccessMessage);
 
     sidebarPage.goToUserFederation();
-
     cy.wait(1000);
+
     expect(cy.contains("Enabled").should("exist"));
   });
 
   it("Create new LDAP provider using the New Provider dropdown", () => {
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
-
     // cy get contains
-    cy.contains("button", "Add new provider", ).click();
+    cy.contains("button", "Add new provider").click();
     cy.contains("li", "LDAP").click();
 
-
-    // cy.contains("Add new provider").click();
-    // cy.contains("LDAP").click();
-
-    providersPage.fillLdapRequiredGeneralData(
-      secondLdapName,
-      secondLdapVendor,
-    );
+    providersPage.fillLdapRequiredGeneralData(secondLdapName, secondLdapVendor);
     providersPage.fillLdapRequiredConnectionData(
       connectionUrl,
       secondBindType,
       secondBindDn,
-      secondBindCreds,
+      secondBindCreds
     );
     providersPage.fillLdapRequiredSearchingData(
       secondUsersDn,
@@ -242,11 +197,6 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Delete an LDAP provider from card view using the card's menu", () => {
-
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
-
     cy.get('[data-testid="my-ldap-2-dropdown"]').click();
     cy.get('[data-testid="card-delete"]').click();
 
@@ -256,14 +206,7 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Delete an LDAP provider using the Settings view's Action menu", () => {
-    cy.visit("");
-    loginPage.logIn();
-    sidebarPage.goToUserFederation();
-
-    cy.get('[data-testid="keycloak-card-title"]')
-      .contains(firstLdapName)
-      .click();
-    cy.wait(1000);
+    providersPage.clickProviderCard(firstLdapName);
 
     cy.get('[data-testid="action-dropdown"]').click();
     cy.get('[data-testid="delete-ldap-cmd"]').click();
diff --git a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
index 4bc3166a91..3cf2bc3c26 100644
--- a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
+++ b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
@@ -68,10 +68,7 @@ export default class CreateLdapProviderPage {
   }
 
   // Required fields - these always must be filled out when testing a save, everything else can feasibly be left blank (TEST THIS)
-  fillLdapRequiredGeneralData(
-    name: string,
-    vendor: string,
-  ) {
+  fillLdapRequiredGeneralData(name: string, vendor: string) {
     if (name) {
       cy.get(`[${this.ldapNameInput}]`).type(name);
     }
@@ -86,7 +83,7 @@ export default class CreateLdapProviderPage {
     connectionUrl: string,
     bindType: string,
     bindDn: string,
-    bindCreds: string,
+    bindCreds: string
   ) {
     if (connectionUrl) {
       cy.get(`[${this.ldapConnectionUrlInput}]`).type(connectionUrl);
@@ -135,12 +132,20 @@ export default class CreateLdapProviderPage {
     return this;
   }
 
+  clickProviderCard(cardName) {
+    cy.get('[data-testid="keycloak-card-title"]').contains(cardName).click();
+    cy.wait(1000);
+    return this;
+  }
+
   disableEnabledSwitch() {
     cy.get(this.ldapEnabledInput).uncheck({ force: true });
+    return this;
   }
 
   enableEnabledSwitch() {
     cy.get(this.ldapEnabledInput).check({ force: true });
+    return this;
   }
 
   save() {

From bfef63081b4b55ef92bb398f04cd0c47018bf7ff Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Mon, 1 Mar 2021 17:11:22 -0500
Subject: [PATCH 7/9] add missing type for test method

---
 .../admin_console/manage/providers/CreateLdapProviderPage.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
index 3cf2bc3c26..27e9fac833 100644
--- a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
+++ b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
@@ -132,7 +132,7 @@ export default class CreateLdapProviderPage {
     return this;
   }
 
-  clickProviderCard(cardName) {
+  clickProviderCard(cardName: string) {
     cy.get('[data-testid="keycloak-card-title"]').contains(cardName).click();
     cy.wait(1000);
     return this;

From de5765ae6ff6a6adc2e693b01d42d95cf8d90d16 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 2 Mar 2021 10:23:21 -0500
Subject: [PATCH 8/9] abstracted and simplified tests

---
 .../integration/user_fed_ldap_test.spec.ts    | 62 +++++--------------
 .../providers/CreateLdapProviderPage.ts       | 35 ++++++++++-
 2 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/cypress/integration/user_fed_ldap_test.spec.ts b/cypress/integration/user_fed_ldap_test.spec.ts
index 265215475d..d08a2930c2 100644
--- a/cypress/integration/user_fed_ldap_test.spec.ts
+++ b/cypress/integration/user_fed_ldap_test.spec.ts
@@ -63,8 +63,7 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Create Ldap provider from empty state", () => {
-    cy.get("[data-testid=ldap-card]").click();
-
+    providersPage.clickNewCard("ldap");
     providersPage.fillLdapRequiredGeneralData(firstLdapName, firstLdapVendor);
     providersPage.fillLdapRequiredConnectionData(
       connectionUrl,
@@ -87,18 +86,12 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Update an existing LDAP provider and save", () => {
-    providersPage.clickProviderCard(firstLdapName);
-
+    providersPage.clickExistingCard(firstLdapName);
     providersPage.selectCacheType(newPolicy);
 
-    cy.contains(defaultLdapDay).click();
-    cy.contains(newLdapDay).click();
-
-    cy.contains(defaultLdapHour).click();
-    cy.contains(newLdapHour).click();
-
-    cy.contains(defaultLdapMinute).click();
-    cy.contains(newLdapMinute).click();
+    providersPage.changeTime(defaultLdapDay, newLdapDay);
+    providersPage.changeTime(defaultLdapHour, newLdapHour);
+    providersPage.changeTime(defaultLdapMinute, newLdapMinute);
 
     providersPage.save();
     masthead.checkNotificationMessage(savedSuccessMessage);
@@ -106,29 +99,24 @@ describe("User Fed LDAP tests", () => {
     sidebarPage.goToUserFederation();
     cy.wait(1000);
 
-    providersPage.clickProviderCard(firstLdapName);
+    providersPage.clickExistingCard(firstLdapName);
 
     expect(cy.contains(newPolicy).should("exist"));
     expect(cy.contains(defaultPolicy).should("not.exist"));
   });
 
   it("Change existing LDAP provider and click button to cancel", () => {
-    providersPage.clickProviderCard(firstLdapName);
+    providersPage.clickExistingCard(firstLdapName);
     providersPage.selectCacheType(newPolicy);
 
-    cy.contains(newLdapDay).click();
-    cy.contains(defaultLdapDay).click();
-
-    cy.contains(newLdapHour).click();
-    cy.contains(defaultLdapHour).click();
-
-    cy.contains(newLdapMinute).click();
-    cy.contains(defaultLdapMinute).click();
+    providersPage.changeTime(newLdapDay, defaultLdapDay);
+    providersPage.changeTime(newLdapHour, defaultLdapHour);
+    providersPage.changeTime(newLdapMinute, defaultLdapMinute);
 
     providersPage.cancel();
     cy.wait(1000);
 
-    providersPage.clickProviderCard(firstLdapName);
+    providersPage.clickExistingCard(firstLdapName);
     providersPage.selectCacheType(newPolicy);
 
     expect(cy.contains(newLdapDay).should("exist"));
@@ -140,41 +128,33 @@ describe("User Fed LDAP tests", () => {
   });
 
   it("Disable an existing LDAP provider", () => {
-    providersPage.clickProviderCard(firstLdapName);
-
+    providersPage.clickExistingCard(firstLdapName);
     providersPage.disableEnabledSwitch();
 
     modalUtils.checkModalTitle(disableModalTitle).confirmModal();
 
     masthead.checkNotificationMessage(savedSuccessMessage);
-
     sidebarPage.goToUserFederation();
     masthead.checkNotificationMessage(savedSuccessMessage);
 
     sidebarPage.goToUserFederation();
-
     cy.wait(1000);
     expect(cy.contains("Disabled").should("exist"));
   });
 
   it("Enable an existing previously-disabled LDAP provider", () => {
-    providersPage.clickProviderCard(firstLdapName);
-
+    providersPage.clickExistingCard(firstLdapName);
     providersPage.enableEnabledSwitch();
 
     masthead.checkNotificationMessage(savedSuccessMessage);
 
     sidebarPage.goToUserFederation();
     cy.wait(1000);
-
     expect(cy.contains("Enabled").should("exist"));
   });
 
   it("Create new LDAP provider using the New Provider dropdown", () => {
-    // cy get contains
-    cy.contains("button", "Add new provider").click();
-    cy.contains("li", "LDAP").click();
-
+    providersPage.clickMenuCommand("Add new provider", "LDAP");
     providersPage.fillLdapRequiredGeneralData(secondLdapName, secondLdapVendor);
     providersPage.fillLdapRequiredConnectionData(
       connectionUrl,
@@ -189,30 +169,20 @@ describe("User Fed LDAP tests", () => {
       secondUuidLdapAtt,
       secondUserObjClasses
     );
-
     providersPage.save();
-
     masthead.checkNotificationMessage(createdSuccessMessage);
     sidebarPage.goToUserFederation();
   });
 
   it("Delete an LDAP provider from card view using the card's menu", () => {
-    cy.get('[data-testid="my-ldap-2-dropdown"]').click();
-    cy.get('[data-testid="card-delete"]').click();
-
+    providersPage.deleteCardFromCard(secondLdapName);
     modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
-
     masthead.checkNotificationMessage(deletedSuccessMessage);
   });
 
   it("Delete an LDAP provider using the Settings view's Action menu", () => {
-    providersPage.clickProviderCard(firstLdapName);
-
-    cy.get('[data-testid="action-dropdown"]').click();
-    cy.get('[data-testid="delete-ldap-cmd"]').click();
-
+    providersPage.deleteCardFromMenu(firstLdapName);
     modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
-
     masthead.checkNotificationMessage(deletedSuccessMessage);
   });
 });
diff --git a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
index 27e9fac833..a5054ea374 100644
--- a/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
+++ b/cypress/support/pages/admin_console/manage/providers/CreateLdapProviderPage.ts
@@ -67,7 +67,26 @@ export default class CreateLdapProviderPage {
     this.cancelBtn = "data-testid=ldap-cancel";
   }
 
-  // Required fields - these always must be filled out when testing a save, everything else can feasibly be left blank (TEST THIS)
+  changeTime(oldTime: string, newTime: string) {
+    cy.contains(oldTime).click();
+    cy.contains(newTime).click();
+    return this;
+  }
+
+  deleteCardFromCard(card: string) {
+    cy.get(`[data-testid=${card}-dropdown]`).click();
+    cy.get('[data-testid="card-delete"]').click();
+    return this;
+  }
+
+  deleteCardFromMenu(card: string) {
+    this.clickExistingCard(card);
+    cy.get('[data-testid="action-dropdown"]').click();
+    cy.get('[data-testid="delete-ldap-cmd"]').click();
+    return this;
+  }
+
+  // Required fields - these always must be filled out when testing a save
   fillLdapRequiredGeneralData(name: string, vendor: string) {
     if (name) {
       cy.get(`[${this.ldapNameInput}]`).type(name);
@@ -132,12 +151,24 @@ export default class CreateLdapProviderPage {
     return this;
   }
 
-  clickProviderCard(cardName: string) {
+  clickExistingCard(cardName: string) {
     cy.get('[data-testid="keycloak-card-title"]').contains(cardName).click();
     cy.wait(1000);
     return this;
   }
 
+  clickMenuCommand(menu: string, command: string) {
+    cy.contains("button", menu).click();
+    cy.contains("li", command).click();
+    return this;
+  }
+
+  clickNewCard(providerType: string) {
+    cy.get(`[data-testid=${providerType}-card]`).click();
+    cy.wait(1000);
+    return this;
+  }
+
   disableEnabledSwitch() {
     cy.get(this.ldapEnabledInput).uncheck({ force: true });
     return this;

From 79a97a0755760ec89a94000a42182f47a872ded8 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 2 Mar 2021 10:37:51 -0500
Subject: [PATCH 9/9] add min values

---
 src/user-federation/ldap/LdapSettingsConnection.tsx      | 1 +
 src/user-federation/ldap/LdapSettingsSearching.tsx       | 1 +
 src/user-federation/ldap/LdapSettingsSynchronization.tsx | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/src/user-federation/ldap/LdapSettingsConnection.tsx b/src/user-federation/ldap/LdapSettingsConnection.tsx
index 5b7d0214c0..7b0d4f0c28 100644
--- a/src/user-federation/ldap/LdapSettingsConnection.tsx
+++ b/src/user-federation/ldap/LdapSettingsConnection.tsx
@@ -195,6 +195,7 @@ export const LdapSettingsConnection = ({
         >
           <TextInput
             type="number"
+            min={0}
             id="kc-console-connection-timeout"
             name="config.connectionTimeout[0]"
             ref={form.register}
diff --git a/src/user-federation/ldap/LdapSettingsSearching.tsx b/src/user-federation/ldap/LdapSettingsSearching.tsx
index f7d7e25bac..654d254b8d 100644
--- a/src/user-federation/ldap/LdapSettingsSearching.tsx
+++ b/src/user-federation/ldap/LdapSettingsSearching.tsx
@@ -330,6 +330,7 @@ export const LdapSettingsSearching = ({
         >
           <TextInput
             type="number"
+            min={0}
             id="kc-read-timeout"
             name="config.readTimeout[0]"
             ref={form.register}
diff --git a/src/user-federation/ldap/LdapSettingsSynchronization.tsx b/src/user-federation/ldap/LdapSettingsSynchronization.tsx
index 81b7deba4a..b6dbccfb79 100644
--- a/src/user-federation/ldap/LdapSettingsSynchronization.tsx
+++ b/src/user-federation/ldap/LdapSettingsSynchronization.tsx
@@ -72,6 +72,7 @@ export const LdapSettingsSynchronization = ({
         >
           <TextInput
             type="number"
+            min={0}
             id="kc-batch-size"
             name="config.batchSizeForSync[0]"
             ref={form.register}
@@ -93,6 +94,7 @@ export const LdapSettingsSynchronization = ({
         >
           <TextInput
             type="number"
+            min={-1}
             id="kc-full-sync-period"
             name="config.fullSyncPeriod[0]"
             ref={form.register}
@@ -114,6 +116,7 @@ export const LdapSettingsSynchronization = ({
         >
           <TextInput
             type="number"
+            min={-1}
             id="kc-changed-users-sync-period"
             name="config.changedSyncPeriod[0]"
             ref={form.register}