Merge branch 'main' into jorism/typescript-pr1

gridsuite · May 15, 2024 · f1c1a8b · f1c1a8b
2 parents 0b54a76 + acc785d
commit f1c1a8b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/src/components/dialogs/custom-mui-dialog.tsx b/src/components/dialogs/custom-mui-dialog.tsx
@@ -36,6 +36,7 @@ interface ICustomMuiDialog {
     onCancel?: () => void;
     children: React.ReactNode;
     isDataFetching?: boolean;
+    language?: string;
 }
 
 const styles = {
@@ -61,6 +62,7 @@ const CustomMuiDialog: FunctionComponent<ICustomMuiDialog> = ({
     removeOptional = false,
     onCancel,
     children,
+    language,
 }) => {
     const { handleSubmit } = formMethods;
 
@@ -90,6 +92,7 @@ const CustomMuiDialog: FunctionComponent<ICustomMuiDialog> = ({
             {...formMethods}
             validationSchema={formSchema}
             removeOptional={removeOptional}
+            language={language}
         >
             <Dialog
                 sx={styles.dialogPaper}

diff --git a/src/components/filter/criteria-based/criteria-based-filter-edition-dialog.tsx b/src/components/filter/criteria-based/criteria-based-filter-edition-dialog.tsx
@@ -99,12 +99,9 @@ export const CriteriaBasedFilterEditionDialog: FunctionComponent<
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
 
     // default values are set via reset when we fetch data
-    const formMethods = {
-        ...useForm({
-            resolver: yupResolver(formSchema),
-        }),
-        language: language,
-    };
+    const formMethods = useForm({
+        resolver: yupResolver(formSchema),
+    });
 
     const {
         reset,
@@ -181,6 +178,7 @@ export const CriteriaBasedFilterEditionDialog: FunctionComponent<
             removeOptional={true}
             disabledSave={!!nameError || !!isValidating}
             isDataFetching={dataFetchStatus === FetchStatus.FETCHING}
+            language={language}
         >
             {isDataReady && (
                 <FilterForm

diff --git a/src/components/filter/expert/expert-filter-edition-dialog.tsx b/src/components/filter/expert/expert-filter-edition-dialog.tsx
@@ -19,7 +19,6 @@ import { saveExpertFilter } from '../utils/filter-api';
 import { importExpertRules } from './expert-filter-utils';
 import { UUID } from 'crypto';
 import { elementExistsType } from '../criteria-based/criteria-based-filter-edition-dialog';
-import { MergedFormContextProps } from '../../inputs/react-hook-form/provider/custom-form-provider';
 import { FilterContext } from '../filter-context';
 import { FilterType } from '../constants/filter-constants';
 import { FetchStatus } from '../../../utils/FetchStatus';
@@ -93,12 +92,9 @@ export const ExpertFilterEditionDialog: FunctionComponent<
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
 
     // default values are set via reset when we fetch data
-    const formMethods = {
-        ...useForm({
-            resolver: yupResolver(formSchema),
-        }),
-        language: language,
-    } as MergedFormContextProps;
+    const formMethods = useForm({
+        resolver: yupResolver(formSchema),
+    });
 
     const {
         reset,
@@ -186,6 +182,7 @@ export const ExpertFilterEditionDialog: FunctionComponent<
             removeOptional={true}
             disabledSave={!!nameError || !!isValidating}
             isDataFetching={dataFetchStatus === FetchStatus.FETCHING}
+            language={language}
         >
             <FilterContext.Provider
                 value={{

diff --git a/src/components/filter/explicit-naming/explicit-naming-filter-edition-dialog.tsx b/src/components/filter/explicit-naming/explicit-naming-filter-edition-dialog.tsx
@@ -81,12 +81,9 @@ const ExplicitNamingFilterEditionDialog: FunctionComponent<
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
 
     // default values are set via reset when we fetch data
-    const formMethods = {
-        ...useForm({
-            resolver: yupResolver(formSchema),
-        }),
-        language: language,
-    };
+    const formMethods = useForm({
+        resolver: yupResolver(formSchema),
+    });
 
     const {
         reset,
@@ -176,6 +173,7 @@ const ExplicitNamingFilterEditionDialog: FunctionComponent<
             removeOptional={true}
             disabledSave={!!nameError || !!isValidating}
             isDataFetching={dataFetchStatus === FetchStatus.FETCHING}
+            language={language}
         >
             {isDataReady && (
                 <FilterForm

diff --git a/src/components/filter/filter-creation-dialog.tsx b/src/components/filter/filter-creation-dialog.tsx
@@ -108,13 +108,10 @@ const FilterCreationDialog: FunctionComponent<FilterCreationDialogProps> = ({
 }) => {
     const { snackError } = useSnackMessage();
 
-    const formMethods = {
-        ...useForm({
-            defaultValues: emptyFormData,
-            resolver: yupResolver(formSchema) as unknown as Resolver,
-        }),
-        language: language,
-    } as MergedFormContextProps;
+    const formMethods = useForm({
+        defaultValues: emptyFormData,
+        resolver: yupResolver(formSchema) as unknown as Resolver,
+    });
 
     const {
         formState: { errors },
@@ -196,6 +193,7 @@ const FilterCreationDialog: FunctionComponent<FilterCreationDialogProps> = ({
             titleId={'createNewFilter'}
             removeOptional={true}
             disabledSave={!!nameError || !!isValidating}
+            language={language}
         >
             <FilterContext.Provider
                 value={{