Use the limit sets tabular modification from commons-ui

src/components/app-wrapper.jsx

@@ -104,8 +104,6 @@ import backend_locale_en from '../translations/external/backend-locale-en';
 import backend_locale_fr from '../translations/external/backend-locale-fr';
 import dynamic_mapping_models_en from '../translations/external/dynamic-mapping-models-en';
 import dynamic_mapping_models_fr from '../translations/external/dynamic-mapping-models-fr';
-import csv_locale_en from '../translations/dynamic/csv-locale-en';
-import csv_locale_fr from '../translations/dynamic/csv-locale-fr';
 import filter_locale_en from '../translations/dynamic/filter-locale-en';
 import filter_locale_fr from '../translations/dynamic/filter-locale-fr';
 import menu_locale_en from '../translations/dynamic/menu-locale-en';
@@ -435,7 +433,6 @@ const messages = {
         ...grid_en,
         ...backend_locale_en,
         ...dynamic_mapping_models_en,
-        ...csv_locale_en,
         ...filter_locale_en,
         ...menu_locale_en,
         ...table_locale_en,
@@ -482,7 +479,6 @@ const messages = {
         ...grid_fr,
         ...backend_locale_fr,
         ...dynamic_mapping_models_fr,
-        ...csv_locale_fr,
         ...filter_locale_fr,
         ...menu_locale_fr,
         ...table_locale_fr,

src/components/dialogs/network-modifications/limit-sets/limit-sets-modification-dialog.tsx

@@ -4,21 +4,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import {
-    AMOUNT_TEMPORARY_LIMITS,
-    CSV_FILENAME,
-    MODIFICATIONS_TABLE,
-    OLGS_MODIFICATION_TYPE,
-    TYPE,
-} from '../../../utils/field-constants';
 import { useIntl } from 'react-intl';
 import {
     CustomFormProvider,
-    formatModification,
-    ModificationType,
-    OPERATIONAL_LIMITS_GROUPS_MODIFICATION_TYPE,
+    limitSetsTabularModificationEmptyFormData,
+    LimitSetsTabularModificationForm,
+    type LimitSetsTabularModificationDto,
+    limitSetsTabularModificationDtoToForm,
+    limitSetsTabularModificationFormSchema,
+    limitSetsTabularModificationFormToDto,
+    type LimitSetsTabularModificationFormType,
     snackWithFallback,
     useSnackMessage,
+    ModificationType,
 } from '@gridsuite/commons-ui';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -29,23 +27,12 @@
 import type { UUID } from 'node:crypto';
 import { CurrentTreeNode } from '../../../graph/tree-node.type';
 import { FetchStatus } from 'services/utils.type';
-import { LimitSetsTabularModificationForm } from './limit-sets-tabular-modification-form';
 import { createTabularModification } from '../../../../services/study/network-modifications';
-import {
-    emptyFormData,
-    formatBackToFront,
-    formatOperationalLimitGroupsFrontToBack,
-    formatSelectedOperationalGroupId,
-    formSchema,
-    LimitSetModificationMetadata,
-    SchemaType,
-    LIMIT_SETS_TABULAR_MODIFICATION_EQUIPMENTS,
-} from './limit-sets-tabular-modification-utils';
 
 interface LimitSetsModificationDialogProps {
     studyUuid: UUID;
     currentNode: CurrentTreeNode;
-    editData: LimitSetModificationMetadata;
+    editData: LimitSetsTabularModificationDto;
     isUpdate: boolean;
     editDataFetchStatus: FetchStatus;
 }
@@ -62,68 +49,49 @@
     const intl = useIntl();
 
     const { snackError } = useSnackMessage();
-    const formMethods = useForm({
-        defaultValues: emptyFormData,
-        resolver: yupResolver(formSchema),
+    const formMethods = useForm<LimitSetsTabularModificationFormType>({
+        defaultValues: limitSetsTabularModificationEmptyFormData,
+        resolver: yupResolver(limitSetsTabularModificationFormSchema),
     });
 
     const {
         reset,
-        getValues,
         formState: { errors },
     } = formMethods;
 
     const disableSave = Object.keys(errors).length > 0;
 
     const clear = useCallback(() => {
-        reset(emptyFormData);
+        reset(limitSetsTabularModificationEmptyFormData);
     }, [reset]);
 
     useEffect(() => {
         if (editData) {
-            reset(formatBackToFront(editData));
+            reset(limitSetsTabularModificationDtoToForm(editData));
         }
     }, [editData, reset, intl]);
 
     const dataFetching = useMemo(() => {
         return isUpdate && editDataFetchStatus === FetchStatus.RUNNING;
     }, [editDataFetchStatus, isUpdate]);
 
-    const onSubmit = useCallback<SubmitHandler<SchemaType>>(
+    const onSubmit = useCallback<SubmitHandler<LimitSetsTabularModificationFormType>>(
         (formData) => {
-            const amountMaxTemporaryLimits = getValues(AMOUNT_TEMPORARY_LIMITS);
-            const equipmentModificationType = LIMIT_SETS_TABULAR_MODIFICATION_EQUIPMENTS[formData[TYPE]];
-            const modifications = formData[MODIFICATIONS_TABLE]?.map((row) => {
-                let modification = formatModification(row);
-                Object.keys(modification).forEach((key) => {
-                    modification[key] = row[key];
-                });
-                modification.operationalLimitsGroups = [
-                    formatOperationalLimitGroupsFrontToBack(modification, amountMaxTemporaryLimits),
-                ];
-                formatSelectedOperationalGroupId(modification);
-                modification.type = equipmentModificationType; // ex: LINE_MODIFICATION
-                if (row.modificationType === OPERATIONAL_LIMITS_GROUPS_MODIFICATION_TYPE.REPLACE) {
-                    // when 'modificationType' CSV column is REPLACE : activate the 'replace' back-end mode to delete
-                    // all existing limit sets before adding a new one.
-                    modification[OLGS_MODIFICATION_TYPE] = OPERATIONAL_LIMITS_GROUPS_MODIFICATION_TYPE.REPLACE;
-                }
-                return modification;
-            });
+            const { modificationType, modifications, csvFilename } = limitSetsTabularModificationFormToDto(formData);
 
             createTabularModification({
                 studyUuid,
                 nodeUuid: currentNodeUuid,
-                modificationType: equipmentModificationType,
+                modificationType,
                 modifications,
                 modificationUuid: editData?.uuid,
                 tabularType: ModificationType.LIMIT_SETS_TABULAR_MODIFICATION,
-                csvFilename: formData[CSV_FILENAME],
+                csvFilename,
             }).catch((error) => {
                 snackWithFallback(snackError, error, { headerId: 'TabularModificationError' });
             });
         },
-        [currentNodeUuid, editData, getValues, snackError, studyUuid]
+        [currentNodeUuid, editData, snackError, studyUuid]
     );
 
     const open = useOpenShortWaitFetching({
@@ -133,7 +101,7 @@
     });
 
     return (
-        <CustomFormProvider validationSchema={formSchema} {...formMethods}>
+        <CustomFormProvider validationSchema={limitSetsTabularModificationFormSchema} {...formMethods}>
             <ModificationDialog
                 fullWidth
                 maxWidth={'lg'}