Add filter by substation or VL to contingency list

package.json

@@ -22,7 +22,7 @@
     "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
-        "@gridsuite/commons-ui": "0.131.0",
+        "@gridsuite/commons-ui": "0.132.0",
         "@hookform/resolvers": "^4.1.3",
         "@mui/icons-material": "^5.18.0",
         "@mui/lab": "5.0.0-alpha.175",

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

@@ -16,7 +16,12 @@ import {
 import type { SetRequired } from 'type-fest';
 import { prepareContingencyListForBackend } from '../contingency-list-helper';
 import { ContingencyListType } from '../../../utils/elementType';
-import { FilterAttributes } from '../../../utils/contingency-list.type';
+import {
+    ContingencyFieldConstants,
+    FilterAttributes,
+    FilterBasedContingencyList,
+    FilterElement,
+} from '../../../utils/contingency-list.type';
 
 export interface Identifier {
     type: 'ID_BASED';
@@ -72,13 +77,25 @@ export const getCriteriaBasedFormDataFromFetchedElement = (response: any, name:
     ...getCriteriaBasedFormData(response),
 });
 
-export const getFilterBasedFormDataFromFetchedElement = (response: any, name: string, description: string) => ({
+export const getFilterBasedFormDataFromFetchedElement = (
+    response: FilterBasedContingencyList,
+    name: string,
+    description: string
+) => ({
     [FieldConstants.NAME]: name,
     [FieldConstants.DESCRIPTION]: description,
     [FieldConstants.CONTINGENCY_LIST_TYPE]: ContingencyListType.FILTERS.id,
     [FieldConstants.FILTERS]: response.filters.map((filter: FilterAttributes) => {
-        return { id: filter.id, name: filter.name, specificMetadata: { equipmentType: filter.equipmentType } };
+        return {
+            id: filter.id,
+            name: filter.name ?? '',
+            specificMetadata: { equipmentType: filter.equipmentType ?? '' },
+        };
     }),
+    [ContingencyFieldConstants.SUB_EQUIPMENT_TYPES_BY_FILTER]: response.selectedEquipmentTypesByFilter.map((value) => ({
+        [ContingencyFieldConstants.FILTER_ID]: value.filterId,
+        [ContingencyFieldConstants.SUB_EQUIPMENT_TYPES]: value.equipmentTypes,
+    })),
 });
 
 export const getExplicitNamingFormDataFromFetchedElement = (response: any, name: string, description: string) => {
@@ -141,3 +158,10 @@ export const SUPPORTED_CONTINGENCY_LIST_EQUIPMENTS = Object.fromEntries(
         ([key]) => !excludedEquipmentTypes.includes(key as EquipmentType)
     )
 );
+
+export function isSubstationOrVoltageLevelFilter(filter: FilterElement) {
+    return (
+        filter.specificMetadata.equipmentType === EquipmentType.SUBSTATION ||
+        filter.specificMetadata.equipmentType === EquipmentType.VOLTAGE_LEVEL
+    );
+}

src/components/dialogs/contingency-list/filter-based/contingency-list-filter-based-dialog.tsx

@@ -9,16 +9,21 @@ import {
     CustomMuiDialog,
     FieldConstants,
     MAX_CHAR_DESCRIPTION,
-    TreeViewFinderNodeProps,
     useSnackMessage,
     yupConfig as yup,
 } from '@gridsuite/commons-ui';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useSelector } from 'react-redux';
 import { useCallback, useEffect, useState } from 'react';
-import { UUID } from 'crypto';
+import { UUID } from 'node:crypto';
 import { ObjectSchema } from 'yup';
+import {
+    ContingencyFieldConstants,
+    FilterBasedContingencyList,
+    FilterElement,
+    FilterSubEquipments,
+} from '../../../../utils/contingency-list.type';
 import ContingencyListFilterBasedForm from './contingency-list-filter-based-form';
 import { AppState } from '../../../../redux/types';
 import {
@@ -29,24 +34,34 @@ import {
 import { handleNotAllowedError } from '../../../utils/rest-errors';
 import { ContingencyListType } from '../../../../utils/elementType';
 import { getFilterBasedFormDataFromFetchedElement } from '../contingency-list-utils';
-import { FilterBasedContingencyList } from '../../../../utils/contingency-list.type';
 
 const schema: ObjectSchema<ContingencyListFilterBasedFormData> = yup.object().shape({
     [FieldConstants.NAME]: yup.string().required(),
     [FieldConstants.DESCRIPTION]: yup.string().max(MAX_CHAR_DESCRIPTION),
     [FieldConstants.FILTERS]: yup.array().required(),
+    [ContingencyFieldConstants.SUB_EQUIPMENT_TYPES_BY_FILTER]: yup
+        .array()
+        .required()
+        .of(
+            yup.object().shape({
+                [ContingencyFieldConstants.FILTER_ID]: yup.string().required(),
+                [ContingencyFieldConstants.SUB_EQUIPMENT_TYPES]: yup.array().required().of(yup.string().required()),
+            })
+        ),
 });
 
 export interface ContingencyListFilterBasedFormData {
     [FieldConstants.NAME]: string;
     [FieldConstants.DESCRIPTION]?: string;
-    [FieldConstants.FILTERS]: TreeViewFinderNodeProps[];
+    [FieldConstants.FILTERS]: FilterElement[];
+    [ContingencyFieldConstants.SUB_EQUIPMENT_TYPES_BY_FILTER]: FilterSubEquipments[];
 }
 
 const getContingencyListEmptyFormData = (name = '') => ({
     [FieldConstants.NAME]: name,
     [FieldConstants.DESCRIPTION]: '',
     [FieldConstants.FILTERS]: [],
+    [ContingencyFieldConstants.SUB_EQUIPMENT_TYPES_BY_FILTER]: [],
 });
 
 const emptyFormData = (name?: string) => getContingencyListEmptyFormData(name);
@@ -111,11 +126,17 @@ export default function FilterBasedContingencyListDialog({
     const onSubmit = useCallback(
         (data: ContingencyListFilterBasedFormData) => {
             const filterBaseContingencyList: FilterBasedContingencyList = {
-                filters: data[FieldConstants.FILTERS]?.map((item: TreeViewFinderNodeProps) => {
+                filters: data[FieldConstants.FILTERS]?.map((filter) => {
                     return {
-                        id: item.id,
+                        id: filter.id,
                     };
                 }),
+                selectedEquipmentTypesByFilter: data[ContingencyFieldConstants.SUB_EQUIPMENT_TYPES_BY_FILTER]?.map(
+                    (filterSubEquipments) => ({
+                        filterId: filterSubEquipments[ContingencyFieldConstants.FILTER_ID],
+                        equipmentTypes: filterSubEquipments[ContingencyFieldConstants.SUB_EQUIPMENT_TYPES],
+                    })
+                ),
             };
 
             if (id) {
@@ -170,9 +191,14 @@ export default function FilterBasedContingencyListDialog({
             onSave={onSubmit}
             formSchema={schema}
             formMethods={methods}
-            unscrollableFullHeight
             disabledSave={Boolean(!!nameError || isValidating)}
             isDataFetching={isFetching}
+            sx={{
+                '.MuiDialog-paper': {
+                    minWidth: '60vw',
+                    height: '95vh',
+                },
+            }}
         >
             <ContingencyListFilterBasedForm />
         </CustomMuiDialog>