Display filter names in case of cyclic filter

src/components/filter/FilterCreationDialog.tsx

@@ -25,7 +25,7 @@ import { MAX_CHAR_DESCRIPTION } from '../../utils/constants/uiConstants';
 import { EXPERT_FILTER_QUERY } from './expert/expertFilterConstants';
 import { FILTER_EQUIPMENTS_ATTRIBUTES } from './explicitNaming/ExplicitNamingFilterConstants';
 import { GsLang } from '../../utils';
-import { CustomError } from '../../services';
+import { CustomError, formatMessageValues } from '../../services';
 
 const emptyFormData = {
     [FieldConstants.NAME]: '',
@@ -116,6 +116,9 @@ export function FilterCreationDialog({
                         if (error instanceof CustomError && error.businessErrorCode != null) {
                             snackError({
                                 messageId: error.businessErrorCode,
+                                messageValues: error.businessErrorValues
+                                    ? formatMessageValues(error.businessErrorValues)
+                                    : undefined,
                             });
                         } else {
                             snackError({

src/components/filter/expert/ExpertFilterEditionDialog.tsx

@@ -20,7 +20,7 @@ import { saveExpertFilter } from '../utils/filterApi';
 import { expertFilterSchema } from './ExpertFilterForm';
 import { importExpertRules } from './expertFilterUtils';
 import { HeaderFilterSchema } from '../HeaderFilterForm';
-import { catchErrorHandler, CustomError } from '../../../services';
+import { catchErrorHandler, CustomError, formatMessageValues } from '../../../services';
 import { EXPERT_FILTER_QUERY } from './expertFilterConstants';
 
 const formSchema = yup
@@ -102,6 +102,9 @@ export function ExpertFilterEditionDialog({
                     if (error instanceof CustomError && error.businessErrorCode != null) {
                         snackError({
                             messageId: error.businessErrorCode,
+                            messageValues: error.businessErrorValues
+                                ? formatMessageValues(error.businessErrorValues)
+                                : undefined,
                             headerId: 'cannotSaveFilter',
                         });
                     } else {

src/services/businessErrorCode.ts

@@ -9,9 +9,18 @@ export class CustomError extends Error {
 
     businessErrorCode?: string;
 
-    constructor(message: string, status: number, businessErrorCode?: string) {
+    businessErrorValues?: Record<string, unknown>;
+
+    constructor(message: string, status: number, businessErrorCode?: string, properties?: Record<string, unknown>) {
         super(message);
         this.status = status;
         this.businessErrorCode = businessErrorCode;
+        this.businessErrorValues = properties;
     }
 }
+
+export function formatMessageValues(properties: Record<string, unknown>): Record<string, string> {
+    return Object.fromEntries(
+        Object.entries(properties).map(([key, value]) => [key, typeof value === 'object' ? JSON.stringify(value) : ''])
+    );
+}

src/services/index.ts

@@ -14,4 +14,4 @@ export * from './study-config';
 export * from './userAdmin';
 export * from './voltage-init';
 export * from './security-analysis';
-export { CustomError } from './businessErrorCode';
+export { CustomError, formatMessageValues } from './businessErrorCode';

src/services/utils.ts

@@ -68,6 +68,14 @@ const handleError = (response: Response) => {
         const errorName = 'HttpResponseError : ';
         const errorJson = parseError(text);
         let customError: CustomError;
+        if (errorJson?.businessErrorCode != null && errorJson?.businessErrorValues != null) {
+            throw new CustomError(
+                errorJson.message,
+                errorJson.status,
+                errorJson.businessErrorCode,
+                errorJson.businessErrorValues
+            );
+        }
         if (errorJson?.businessErrorCode != null) {
             throw new CustomError(errorJson.message, errorJson.status, errorJson.businessErrorCode);
         }

src/translations/en/businessErrorsEn.ts

@@ -25,5 +25,5 @@ export const businessErrorsEn = {
     'useradmin.groupAlreadyExists': 'User group already exists.',
     'useradmin.announcementInvalidPeriod': 'The announcement has an invalid time period.',
     'useradmin.announcementOverlap': 'The announcement period overlaps with an existing one.',
-    'filter.filterCycleDetected': 'Filter cycle detected.',
+    'filter.filterCycleDetected': 'Filter cycle detected between: {filters}',
 };

src/translations/fr/businessErrorsFr.ts

@@ -25,5 +25,5 @@ export const businessErrorsFr = {
     'useradmin.groupAlreadyExists': "Le groupe d'utilisateurs existe déjà.",
     'useradmin.announcementInvalidPeriod': "La période de l'annonce est invalide.",
     'useradmin.announcementOverlap': "La période de l'annonce chevauche une autre annonce existante.",
-    'filter.filterCycleDetected': 'Cycle de filtre détecté.',
+    'filter.filterCycleDetected': 'Cycle de filtre détecté entre : {filters}',
 };