error message for invalid filter type (#484)

Signed-off-by: Mathieu DEHARBE <[email protected]>
gridsuite · Jul 5, 2024 · 9cafed5 · 9cafed5
1 parent 1f4a5f4
commit 9cafed5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/src/components/filter/criteria-based/criteria-based-form.tsx b/src/components/filter/criteria-based/criteria-based-form.tsx
@@ -10,8 +10,9 @@ import { useFormContext, useWatch } from 'react-hook-form';
 import { Grid } from '@mui/material';
 import SelectInput from '../../inputs/react-hook-form/select-inputs/select-input';
 import InputWithPopupConfirmation from '../../inputs/react-hook-form/select-inputs/input-with-popup-confirmation';
-import { FunctionComponent } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 import { FormEquipment } from '../utils/filter-form-utils';
+import { useSnackMessage } from '../../../hooks/useSnackMessage';
 
 export interface CriteriaBasedFormProps {
     equipments: Record<string, FormEquipment>;
@@ -23,11 +24,20 @@ const CriteriaBasedForm: FunctionComponent<CriteriaBasedFormProps> = ({
     defaultValues,
 }) => {
     const { getValues, setValue } = useFormContext();
+    const { snackError } = useSnackMessage();
 
     const watchEquipmentType = useWatch({
         name: FieldConstants.EQUIPMENT_TYPE,
     });
 
+    useEffect(() => {
+        if (watchEquipmentType && !equipments[watchEquipmentType]) {
+            snackError({
+                headerId: 'obsoleteFilter',
+            });
+        }
+    }, [snackError, equipments, watchEquipmentType]);
+
     const openConfirmationPopup = () => {
         return (
             JSON.stringify(getValues(FieldConstants.CRITERIA_BASED)) !==
@@ -59,6 +69,7 @@ const CriteriaBasedForm: FunctionComponent<CriteriaBasedFormProps> = ({
                 />
             </Grid>
             {watchEquipmentType &&
+                equipments[watchEquipmentType] &&
                 equipments[watchEquipmentType].fields.map(
                     (equipment: any, index: number) => {
                         const EquipmentForm = equipment.renderer;

diff --git a/src/components/filter/explicit-naming/explicit-naming-filter-form.tsx b/src/components/filter/explicit-naming/explicit-naming-filter-form.tsx
@@ -27,6 +27,7 @@ import { useSnackMessage } from '../../../hooks/useSnackMessage';
 import { ElementType } from '../../../utils/ElementType';
 import ModifyElementSelection from '../../dialogs/modify-element-selection';
 import { exportFilter } from '../../../services/study';
+import { EquipmentType } from '../../../utils/EquipmentType';
 
 export const FILTER_EQUIPMENTS_ATTRIBUTES = 'filterEquipmentsAttributes';
 
@@ -132,6 +133,17 @@ const ExplicitNamingFilterForm: FunctionComponent<
         name: FieldConstants.EQUIPMENT_TYPE,
     });
 
+    useEffect(() => {
+        if (
+            watchEquipmentType &&
+            !((watchEquipmentType as EquipmentType) in FILTER_EQUIPMENTS)
+        ) {
+            snackError({
+                headerId: 'obsoleteFilter',
+            });
+        }
+    }, [snackError, watchEquipmentType]);
+
     const forGeneratorOrLoad = isGeneratorOrLoad(watchEquipmentType);
 
     useEffect(() => {

diff --git a/src/components/translations/filter-en.ts b/src/components/translations/filter-en.ts
@@ -22,6 +22,8 @@ const filter_en = {
     isNotPartOf: 'is not part of',
     emptyRule: 'Filter contains an empty field',
     incorrectRule: 'Filter contains an incorrect field',
+    obsoleteFilter:
+        'This filter is no longer supported. Please remove it or change its equipment type.',
     betweenRule:
         "Left value of 'between' rule have to be lower than the right value",
     emptyGroup:

diff --git a/src/components/translations/filter-fr.ts b/src/components/translations/filter-fr.ts
@@ -22,6 +22,8 @@ const filter_fr = {
     isNotPartOf: 'ne fait pas partie de',
     emptyRule: 'Le filtre contient un champ vide',
     incorrectRule: 'Le filtre contient un champ incorrect',
+    obsoleteFilter:
+        "Ce filtre n'est plus supporté. Veuillez le supprimer ou changer son type d'équipement.",
     betweenRule:
         "La valeur de gauche d'une règle 'entre' doit être inférieure à la valeur de droite",
     emptyGroup: