Merge branch 'main' into contingencyListByFilter

Author: basseche

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.120.0",
+    "version": "0.120.1",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",

package.json

@@ -20,8 +20,8 @@ import React, { useMemo, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import CsvDownloader from 'react-csv-downloader';
 import { useWatch } from 'react-hook-form';
-import { FieldConstants } from '../../../../../utils/constants/fieldConstants';
-import { CancelButton } from '../../utils/CancelButton';
+import { FieldConstants, GsLang, LANG_FRENCH } from '../../../../../utils';
+import { CancelButton } from '../../utils';
 
 export interface CsvUploaderProps {
     name: string;
@@ -34,6 +34,7 @@ export interface CsvUploaderProps {
     validateData: (rows: string[][]) => boolean;
     getDataFromCsv: any;
     useFieldArrayOutput: any;
+    language: GsLang;
 }
 
 export function CsvUploader({
@@ -47,6 +48,7 @@ export function CsvUploader({
     validateData = () => true,
     getDataFromCsv,
     useFieldArrayOutput,
+    language,
 }: Readonly<CsvUploaderProps>) {
     const watchTableValues = useWatch({ name });
     const { append, replace } = useFieldArrayOutput;
@@ -178,7 +180,11 @@ export function CsvUploader({
                         <Grid container spacing={2}>
                             <Grid container item>
                                 <Grid item xs={6}>
-                                    <CsvDownloader datas={data} filename={fileName} separator=",">
+                                    <CsvDownloader
+                                        datas={data}
+                                        filename={fileName}
+                                        separator={language === LANG_FRENCH ? ';' : ','}
+                                    >
                                         <Button variant="contained">
                                             <FormattedMessage id="GenerateCSV" />
                                         </Button>
@@ -194,6 +200,7 @@ export function CsvUploader({
                                     config={{
                                         // We use | for multi values in one cell, then we remove it from the default value for this config, to avoid delimiter autodetection
                                         delimitersToGuess: [',', '	', ';', RECORD_SEP, UNIT_SEP],
+                                        delimiter: language === LANG_FRENCH ? ';' : ',',
                                     }}
                                 >
                                     {({ getRootProps, acceptedFile }: any) => (

src/components/inputs/reactHookForm/agGridTable/csvUploader/CsvUploader.tsx

@@ -87,30 +87,42 @@ export function useUniqueNameValidation({
 
     // We have to use an useEffect because the name can change from outside of this component (when we upload a case file for instance)
     useEffect(() => {
-        const trimmedValue = value?.trim?.();
-        if (!trimmedValue && isDirty) {
-            clearErrors('root.isValidating');
-            setError(name, {
-                type: 'validate',
-                message: 'nameEmpty',
-            });
-            return;
+        const trimmedValue = value.trim();
+
+        if (selectedDirectory) {
+            debouncedHandleCheckName(trimmedValue);
         }
 
-        if (!isDirty || defaultFieldValue?.trim?.() === trimmedValue) {
+        // if the name is unchanged, we don't do custom validation
+        if (!isDirty) {
             clearErrors(name);
             return;
         }
-
-        setError('root.isValidating', {
-            type: 'validate',
-            message: 'cantSubmitWhileValidating',
-        });
-
-        if (directory) {
+        if (trimmedValue) {
+            clearErrors(name);
+            setError('root.isValidating', {
+                type: 'validate',
+                message: 'cantSubmitWhileValidating',
+            });
             debouncedHandleCheckName(trimmedValue);
+        } else {
+            clearErrors('root.isValidating');
+            setError(name, {
+                type: 'validate',
+                message: 'nameEmpty',
+            });
         }
-    }, [value, debouncedHandleCheckName, setError, clearErrors, name, isDirty, defaultFieldValue, directory]);
+    }, [
+        value,
+        debouncedHandleCheckName,
+        setError,
+        clearErrors,
+        name,
+        isDirty,
+        defaultFieldValue,
+        directory,
+        selectedDirectory,
+    ]);
 
     return {
         isValidating,