use value when it's present

Signed-off-by: Erik Jan de Wit <[email protected]>
edewit · Oct 25, 2024 · 9d6213a · 9d6213a
1 parent d76f5fc
commit 9d6213a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...ress/support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage.ts b/...ress/support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage.ts
@@ -84,7 +84,7 @@ export default class ProviderBaseGeneralSettingsPage extends PageObject {
   #jwksUrl = "config.jwksUrl";
   #pkceSwitch = "#config\\.pkceEnabled";
   #pkceMethod = "#pkceMethod";
-  #clientAuth = "#clientAuthentication";
+  #clientAuth = "#clientAuthMethod";
   #clientAssertionSigningAlg = "#clientAssertionSigningAlg";
   #clientAssertionAudienceInput = "#clientAssertionAudience";
   #jwtX509HeadersSwitch = "#jwtX509HeadersEnabled";

diff --git a/js/libs/ui-shared/src/controls/PasswordControl.tsx b/js/libs/ui-shared/src/controls/PasswordControl.tsx
@@ -11,6 +11,7 @@ import {
   UseControllerProps,
   useController,
 } from "react-hook-form";
+import { getRuleValue } from "../utils/getRuleValue";
 import { FormLabel } from "./FormLabel";
 import { PasswordInput, PasswordInputProps } from "./PasswordInput";
 
@@ -32,7 +33,7 @@ export const PasswordControl = <
   props: PasswordControlProps<T, P>,
 ) => {
   const { labelIcon, ...rest } = props;
-  const required = !!props.rules?.required;
+  const required = !!getRuleValue(props.rules?.required);
   const defaultValue = props.defaultValue ?? ("" as PathValue<T, P>);
 
   const { field, fieldState } = useController({

diff --git a/js/libs/ui-shared/src/controls/TextControl.tsx b/js/libs/ui-shared/src/controls/TextControl.tsx
@@ -14,7 +14,7 @@ import {
   UseControllerProps,
   useController,
 } from "react-hook-form";
-
+import { getRuleValue } from "../utils/getRuleValue";
 import { FormLabel } from "./FormLabel";
 
 export type TextControlProps<
@@ -36,7 +36,7 @@ export const TextControl = <
   props: TextControlProps<T, P>,
 ) => {
   const { labelIcon, helperText, ...rest } = props;
-  const required = !!props.rules?.required;
+  const required = !!getRuleValue(props.rules?.required);
   const defaultValue = props.defaultValue ?? ("" as PathValue<T, P>);
 
   const { field, fieldState } = useController({