if fetchError is true, render helper text

adguernier · adguernier · commit e9ac47d708b6 · 2023-06-22T10:48:44.000+02:00
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -537,8 +537,9 @@ If you provided a React element for the optionText prop, you must also provide t
         return String(getChoiceValue(option)) === String(getChoiceValue(value));
     };
     const renderHelperText =
+        !!fetchError ||
         helperText !== false ||
-        ((isTouched || isSubmitted || fetchError) && invalid);
+        ((isTouched || isSubmitted) && invalid);
 
     return (
         <>
diff --git a/packages/ra-ui-materialui/src/input/CheckboxGroupInput.tsx b/packages/ra-ui-materialui/src/input/CheckboxGroupInput.tsx
@@ -200,8 +200,9 @@ export const CheckboxGroupInput: FunctionComponent<CheckboxGroupInputProps> = pr
     }
 
     const renderHelperText =
+        !!fetchError ||
         helperText !== false ||
-        ((isTouched || isSubmitted || fetchError) && invalid);
+        ((isTouched || isSubmitted) && invalid);
 
     return (
         <StyledFormControl
diff --git a/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx b/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx
@@ -160,8 +160,9 @@ export const RadioButtonGroupInput = (props: RadioButtonGroupInputProps) => {
     }
 
     const renderHelperText =
+        !!fetchError ||
         helperText !== false ||
-        ((isTouched || isSubmitted || fetchError) && invalid);
+        ((isTouched || isSubmitted) && invalid);
 
     return (
         <StyledFormControl
diff --git a/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx b/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
@@ -275,8 +275,9 @@ export const SelectArrayInput = (props: SelectArrayInputProps) => {
               }
             : {};
     const renderHelperText =
+        !!fetchError ||
         helperText !== false ||
-        ((isTouched || isSubmitted || fetchError) && invalid);
+        ((isTouched || isSubmitted) && invalid);
 
     return (
         <>
diff --git a/packages/ra-ui-materialui/src/input/SelectInput.tsx b/packages/ra-ui-materialui/src/input/SelectInput.tsx
@@ -297,8 +297,9 @@ export const SelectInput = (props: SelectInputProps) => {
     }
 
     const renderHelperText =
+        !!fetchError ||
         helperText !== false ||
-        ((isTouched || isSubmitted || fetchError) && invalid);
+        ((isTouched || isSubmitted) && invalid);
 
     return (
         <>

Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,9 @@ export const CheckboxGroupInput: FunctionComponent<CheckboxGroupInputProps> = pr`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`const renderHelperText =`
	`203`	`+ !!fetchError \|\|`
`203`	`204`	`helperText !== false \|\|`
`204`		`- ((isTouched \|\| isSubmitted \|\| fetchError) && invalid);`
	`205`	`+ ((isTouched \|\| isSubmitted) && invalid);`
`205`	`206`
`206`	`207`	`return (`
`207`	`208`	`<StyledFormControl`
Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,9 @@ export const RadioButtonGroupInput = (props: RadioButtonGroupInputProps) => {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`const renderHelperText =`
	`163`	`+ !!fetchError \|\|`
`163`	`164`	`helperText !== false \|\|`
`164`		`- ((isTouched \|\| isSubmitted \|\| fetchError) && invalid);`
	`165`	`+ ((isTouched \|\| isSubmitted) && invalid);`
`165`	`166`
`166`	`167`	`return (`
`167`	`168`	`<StyledFormControl`
Original file line number	Diff line number	Diff line change
`@@ -297,8 +297,9 @@ export const SelectInput = (props: SelectInputProps) => {`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`const renderHelperText =`
	`300`	`+ !!fetchError \|\|`
`300`	`301`	`helperText !== false \|\|`
`301`		`- ((isTouched \|\| isSubmitted \|\| fetchError) && invalid);`
	`302`	`+ ((isTouched \|\| isSubmitted) && invalid);`
`302`	`303`
`303`	`304`	`return (`
`304`	`305`	`<>`