change commons-ui version (#572)

* change commons-ui version

* Fix `getCriteriaBasedSchema` and `getCriteriaBasedFormData` usage

---------

Co-authored-by: Tristan Chuine <[email protected]>
Co-authored-by: Bassel El Cheikh <[email protected]>

Author: basseche

package-lock.json

@@ -7,7 +7,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.72.0",
+        "@gridsuite/commons-ui": "0.72.2",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

package.json

@@ -8,6 +8,7 @@
 import { v4 as uuid4 } from 'uuid';
 import {
     CONTINGENCY_LIST_EQUIPMENTS,
+    type CriteriaBasedData,
     EquipmentType,
     FieldConstants,
     getCriteriaBasedFormData,
@@ -27,23 +28,6 @@ export interface IdentifierList {
     identifierList: Identifier[];
 }
 
-export interface RangeInputData {
-    [FieldConstants.OPERATION_TYPE]: string;
-    [FieldConstants.VALUE_1]: number | null;
-    [FieldConstants.VALUE_2]: number | null;
-}
-
-export interface CriteriaBasedData {
-    [FieldConstants.COUNTRIES]?: string[];
-    [FieldConstants.COUNTRIES_1]?: string[];
-    [FieldConstants.COUNTRIES_2]?: string[];
-    [FieldConstants.NOMINAL_VOLTAGE]?: RangeInputData | null;
-    [FieldConstants.NOMINAL_VOLTAGE_1]?: RangeInputData | null;
-    [FieldConstants.NOMINAL_VOLTAGE_2]?: RangeInputData | null;
-    [FieldConstants.NOMINAL_VOLTAGE_3]?: RangeInputData | null;
-    [key: string]: any;
-}
-
 export type ContingencyListFormData = {
     [FieldConstants.NAME]: string;
     [FieldConstants.DESCRIPTION]?: string;
@@ -77,14 +61,14 @@ export const getContingencyListEmptyFormData = (name = '') => ({
     [FieldConstants.CONTINGENCY_LIST_TYPE]: ContingencyListType.CRITERIA_BASED.id,
     [FieldConstants.SCRIPT]: '',
     [FieldConstants.EQUIPMENT_TYPE]: null,
-    ...getCriteriaBasedFormData({}, {}),
+    ...getCriteriaBasedFormData(),
 });
 
 export const getCriteriaBasedFormDataFromFetchedElement = (response: any, name: string) => ({
     [FieldConstants.NAME]: name,
     [FieldConstants.CONTINGENCY_LIST_TYPE]: ContingencyListType.CRITERIA_BASED.id,
     [FieldConstants.EQUIPMENT_TYPE]: response.equipmentType,
-    ...getCriteriaBasedFormData(response, {}),
+    ...getCriteriaBasedFormData(response),
 });
 
 export const getExplicitNamingFormDataFromFetchedElement = (response: any) => {

src/components/dialogs/contingency-list/contingency-list-utils.ts

@@ -40,7 +40,7 @@ const schema = yup.object().shape({
         otherwise: (schemaOtherwise) => schemaOtherwise.nullable(),
     }),
     ...getExplicitNamingSchema(),
-    ...getCriteriaBasedSchema({}),
+    ...getCriteriaBasedSchema(),
 });
 
 const emptyFormData = getContingencyListEmptyFormData();
@@ -104,6 +104,7 @@ export default function ContingencyListCreationDialog({
             onClose={closeAndClear}
             onSave={onSubmit}
             formSchema={schema}
+            // @ts-expect-error TODO: formSchema is of type ContingencyListFormDataWithRequiredCriteria but formMethods of type ContingencyListFormData
             formMethods={methods}
             titleId={titleId}
             removeOptional

src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx

@@ -49,7 +49,7 @@ export default function ContingencyListCreationForm() {
         />
     );
 
-    const emptyValues = getCriteriaBasedFormData({}, {});
+    const emptyValues = getCriteriaBasedFormData();
     return (
         <>
             <Box sx={unscrollableDialogStyles.unscrollableHeader}>

src/components/dialogs/contingency-list/creation/contingency-list-creation-form.tsx

@@ -32,11 +32,9 @@ import { PARAM_LANGUAGE } from '../../../../../utils/config-params';
 const schema = yup.object().shape({
     [FieldConstants.NAME]: yup.string().trim().required('nameEmpty'),
     [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(),
-    ...getCriteriaBasedSchema(null),
+    ...getCriteriaBasedSchema(),
 });
 
-const emptyFormData = (name?: string) => getContingencyListEmptyFormData(name);
-
 export interface CriteriaBasedEditionDialogProps {
     contingencyListId: string;
     contingencyListType: string;
@@ -62,7 +60,7 @@ export default function CriteriaBasedEditionDialog({
     const selectionForCopy = useSelector((state: AppState) => state.selectionForCopy);
     const dispatch = useDispatch();
     const methods = useForm<CriteriaBasedEditionFormData>({
-        defaultValues: emptyFormData(name),
+        defaultValues: getContingencyListEmptyFormData(name),
         resolver: yupResolver<CriteriaBasedEditionFormData>(schema),
     });
 
@@ -93,7 +91,7 @@ export default function CriteriaBasedEditionDialog({
     }, [contingencyListId, contingencyListType, name, reset, snackError]);
 
     const closeAndClear = () => {
-        reset(emptyFormData());
+        reset(getContingencyListEmptyFormData());
         onClose();
     };
 

src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx

@@ -20,7 +20,7 @@ import { AppState } from '../../../../../redux/types';
 import { SUPPORTED_CONTINGENCY_LIST_EQUIPMENTS } from '../../contingency-list-utils';
 
 export default function CriteriaBasedEditionForm() {
-    const emptyValues = getCriteriaBasedFormData({}, {});
+    const emptyValues = getCriteriaBasedFormData();
     const activeDirectory = useSelector((state: AppState) => state.activeDirectory);
     return (
         <>

src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-form.tsx

@@ -9,12 +9,13 @@ import ReconnectingWebSocket from 'reconnecting-websocket';
 import {
     backendFetch,
     backendFetchJson,
+    type CriteriaBasedData,
     ElementType,
     fetchEnv,
     FieldConstants,
     getRequestParamFromList,
-    GsLang,
-    GsTheme,
+    type GsLang,
+    type GsTheme,
 } from '@gridsuite/commons-ui';
 import { LiteralUnion } from 'type-fest';
 import { IncomingHttpHeaders } from 'node:http';
@@ -25,7 +26,6 @@ import { store } from '../redux/store';
 import { ContingencyListType } from './elementType';
 import { CONTINGENCY_ENDPOINTS } from './constants-endpoints';
 import { AppState } from '../redux/types';
-import { CriteriaBasedData } from '../components/dialogs/contingency-list/contingency-list-utils';
 import { PrepareContingencyListForBackend } from '../components/dialogs/contingency-list-helper';
 import { UsersIdentities } from './user-identities.type';