@gridsuite/commons-ui 0.138.0 → 0.140.0

package/dist/components/cardErrorBoundary/CardErrorBoundary.d.ts

@@ -22,6 +22,6 @@ export declare class CardErrorBoundary extends Component<PropsWithChildren<{}>,
     componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
     private handleExpandClick;
     private handleReloadClick;
-    render(): string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<import('react').ReactNode> | null | undefined;
+    render(): string | number | boolean | Iterable<import('react').ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 }
 export {};

package/dist/components/csvDownloader/csv-export.d.ts

@@ -1,2 +1,2 @@
 import { CsvExportProps } from './csv-export.type';
-export declare function CsvExport({ columns, tableNamePrefix, tableName, disabled, skipColumnHeaders, skipPinnedBottom, language, exportDataAsCsv, }: CsvExportProps): JSX.Element;
+export declare function CsvExport({ columns, tableNamePrefix, tableName, disabled, skipColumnHeaders, skipPinnedBottom, language, getData, }: CsvExportProps): JSX.Element;

package/dist/components/csvDownloader/csv-export.js

@@ -10,29 +10,20 @@ function CsvExport({
   skipColumnHeaders = false,
   skipPinnedBottom = false,
   language,
-  exportDataAsCsv
+  getData
 }) {
-  const { downloadCSVData } = useCsvExport();
+  const csvExport = useCsvExport();
   const download = useCallback(() => {
-    downloadCSVData({
+    csvExport.getData({
       columns,
       tableName,
       tableNamePrefix,
       skipColumnHeaders,
       skipPinnedBottom,
       language,
-      exportDataAsCsv
+      getData
     });
-  }, [
-    downloadCSVData,
-    columns,
-    tableName,
-    tableNamePrefix,
-    skipColumnHeaders,
-    skipPinnedBottom,
-    language,
-    exportDataAsCsv
-  ]);
+  }, [columns, csvExport, tableName, tableNamePrefix, skipColumnHeaders, skipPinnedBottom, language, getData]);
   return /* @__PURE__ */ jsx(ExportCsvButton, { disabled, onClick: download });
 }
 export {

package/dist/components/csvDownloader/csv-export.type.d.ts

@@ -7,7 +7,7 @@ export type CsvDownloadProps = {
     skipColumnHeaders?: boolean;
     skipPinnedBottom?: boolean;
     language: GsLang;
-    exportDataAsCsv: (params?: CsvExportParams) => void;
+    getData: (params?: CsvExportParams) => string | undefined | void;
 };
 export type CsvExportProps = CsvDownloadProps & {
     disabled: boolean;

package/dist/components/csvDownloader/use-csv-export.d.ts

@@ -1,4 +1,4 @@
 import { CsvDownloadProps } from './csv-export.type';
 export declare const useCsvExport: () => {
-    downloadCSVData: (props: CsvDownloadProps) => void;
+    getData: (props: CsvDownloadProps) => string | undefined | void;
 };

package/dist/components/csvDownloader/use-csv-export.js

@@ -7,30 +7,30 @@ import "@mui/icons-material";
 import "../../utils/types/equipmentType.js";
 import "../../utils/yupConfig.js";
 const NA_VALUE = "N/A";
-const formatNAValue = (value, intl) => {
-  return value === NA_VALUE ? intl.formatMessage({ id: "export/undefined" }) : value;
-};
 const useCsvExport = () => {
   const intl = useIntl();
-  const getCSVFilename = useCallback((tableName) => {
-    return tableName.trim().replace(/[\\/:"*?<>|\s]/g, "-").substring(0, 27);
-  }, []);
-  const downloadCSVData = useCallback(
+  const getData = useCallback(
     (props) => {
+      const formatNAValue = (value) => {
+        return value === NA_VALUE ? intl.formatMessage({ id: "export/undefined" }) : value;
+      };
       const hasColId = (colId) => {
         return colId !== void 0;
       };
       const processCell = (params) => {
         if (params.column.getColId() === "limitName") {
-          return formatNAValue(params.value, intl);
+          return formatNAValue(params.value);
         }
         if (props.language === LANG_FRENCH && typeof params.value === "number") {
           return params.value.toString().replace(".", ",");
         }
         return params.value;
       };
+      const getCSVFilename = (tableName) => {
+        return tableName.trim().replace(/[\\/:"*?<>|\s]/g, "-").substring(0, 27);
+      };
       const prefix = props.tableNamePrefix ?? "";
-      props.exportDataAsCsv({
+      return props.getData({
         suppressQuotes: false,
         skipPinnedBottom: props.skipPinnedBottom,
         columnSeparator: props.language === LANG_FRENCH ? ";" : ",",
@@ -41,9 +41,9 @@ const useCsvExport = () => {
         processCellCallback: processCell
       });
     },
-    [getCSVFilename, intl]
+    [intl]
   );
-  return { downloadCSVData };
+  return { getData };
 };
 export {
   useCsvExport

package/dist/components/dialogs/descriptionModificationDialog/DescriptionModificationDialog.js

@@ -9,6 +9,7 @@ import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
 import { CustomMuiDialog } from "../customMuiDialog/CustomMuiDialog.js";
 import { ExpandingTextField } from "../../inputs/reactHookForm/text/ExpandingTextField.js";
 import { MAX_CHAR_DESCRIPTION } from "../../../utils/constants/uiConstants.js";
+import { snackWithFallback } from "../../../utils/error.js";
 import * as yup from "yup";
 const schema = yup.object().shape({
   [FieldConstants.DESCRIPTION]: yup.string().max(MAX_CHAR_DESCRIPTION, "descriptionLimitError")
@@ -40,12 +41,7 @@ function DescriptionModificationDialog({
       updateElement(elementUuid, {
         [FieldConstants.DESCRIPTION]: data[FieldConstants.DESCRIPTION]?.trim() ?? ""
       }).catch((error) => {
-        if (error instanceof Object && "message" in error && typeof error.message === "string") {
-          snackError({
-            messageTxt: error.message,
-            headerId: "descriptionModificationError"
-          });
-        }
+        snackWithFallback(snackError, error, { headerId: "descriptionModificationError" });
       });
     },
     [elementUuid, updateElement, snackError]

package/dist/components/directoryItemSelector/DirectoryItemSelector.js

@@ -7,6 +7,7 @@ import { useSnackMessage } from "../../hooks/useSnackMessage.js";
 import { fetchElementsInfos } from "../../services/explore.js";
 import { fetchRootFolders, fetchDirectoryContent } from "../../services/directory.js";
 import { getExpansionPathsForSelected, fetchChildrenForExpandedNodes, initializeFromLastSelected, saveLastSelectedDirectoryFromNode } from "./utils.js";
+import { snackWithFallback } from "../../utils/error.js";
 const styles = {
   icon: (theme) => ({
     marginRight: theme.spacing(1),
@@ -168,10 +169,7 @@ function DirectoryItemSelector({
       nodeMap.current = mdr;
       setData(convertRoots(nrs));
     }).catch((error) => {
-      snackError({
-        messageTxt: error.message,
-        headerId: "DirectoryItemSelector"
-      });
+      snackWithFallback(snackError, error, { headerId: "DirectoryItemSelector" });
     }).finally(() => {
       setIsRootsLoaded(true);
     });

package/dist/components/elementSearch/hooks/useElementSearch.js

@@ -1,6 +1,7 @@
 import { useState, useRef, useCallback } from "react";
 import { useDebounce } from "../../../hooks/useDebounce.js";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
+import { snackWithFallback } from "../../../utils/error.js";
 const SEARCH_FETCH_TIMEOUT_MILLIS = 1e3;
 const useElementSearch = (props) => {
   const { fetchElements } = props;
@@ -32,10 +33,7 @@ const useElementSearch = (props) => {
           setElementsFound([]);
           setTotalElements(0);
           setIsLoading(false);
-          snackError({
-            messageTxt: error.message,
-            headerId: "equipmentsSearchingError"
-          });
+          snackWithFallback(snackError, error, { headerId: "equipmentsSearchingError" });
         }
       });
     },

package/dist/components/filter/FilterCreationDialog.js

@@ -14,10 +14,7 @@ import { FilterType } from "./constants/FilterConstants.js";
 import { MAX_CHAR_DESCRIPTION } from "../../utils/constants/uiConstants.js";
 import { EXPERT_FILTER_QUERY } from "./expert/expertFilterConstants.js";
 import { FILTER_EQUIPMENTS_ATTRIBUTES } from "./explicitNaming/ExplicitNamingFilterConstants.js";
-import { CustomError } from "../../services/businessErrorCode.js";
-import "../../utils/conversionUtils.js";
-import "@mui/icons-material";
-import "../../utils/types/equipmentType.js";
+import { snackWithFallback } from "../../utils/error.js";
 import * as yup from "yup";
 const emptyFormData = {
   [FieldConstants.NAME]: "",
@@ -63,9 +60,7 @@ function FilterCreationDialog({
           filterForm[FieldConstants.DESCRIPTION],
           null,
           (error) => {
-            snackError({
-              messageTxt: error.message
-            });
+            snackWithFallback(snackError, error);
           },
           onClose,
           activeDirectory
@@ -81,15 +76,7 @@ function FilterCreationDialog({
           activeDirectory,
           onClose,
           (error) => {
-            if (error instanceof CustomError && error.businessErrorCode != null) {
-              snackError({
-                messageId: error.businessErrorCode
-              });
-            } else {
-              snackError({
-                messageTxt: error.message
-              });
-            }
+            snackWithFallback(snackError, error);
           }
         );
       }
@@ -124,7 +111,8 @@ function FilterCreationDialog({
           creation: true,
           activeDirectory,
           filterType,
-          sourceFilterForExplicitNamingConversion
+          sourceFilterForExplicitNamingConversion,
+          language
         }
       )
     }

package/dist/components/filter/FilterForm.d.ts

@@ -1,2 +1,16 @@
-import { FilterFormProps } from './HeaderFilterForm';
-export declare function FilterForm({ sourceFilterForExplicitNamingConversion, creation, activeDirectory, filterType, }: Readonly<FilterFormProps>): import("react/jsx-runtime").JSX.Element;
+import { UUID } from 'node:crypto';
+import { GsLang } from '../../utils';
+export interface FilterFormProps {
+    creation?: boolean;
+    activeDirectory?: UUID;
+    filterType?: {
+        id: string;
+        label: string;
+    };
+    sourceFilterForExplicitNamingConversion?: {
+        id: UUID;
+        equipmentType: string;
+    };
+    language?: GsLang;
+}
+export declare function FilterForm({ sourceFilterForExplicitNamingConversion, creation, activeDirectory, filterType, language, }: Readonly<FilterFormProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/filter/FilterForm.js

@@ -20,21 +20,16 @@ function FilterForm({
   sourceFilterForExplicitNamingConversion,
   creation,
   activeDirectory,
-  filterType
+  filterType,
+  language
 }) {
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.unscrollableHeader, children: /* @__PURE__ */ jsx(
-      HeaderFilterForm,
-      {
-        creation,
-        activeDirectory,
-        sourceFilterForExplicitNamingConversion
-      }
-    ) }),
+    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.unscrollableHeader, children: /* @__PURE__ */ jsx(HeaderFilterForm, { creation, activeDirectory }) }),
     filterType?.id === FilterType.EXPLICIT_NAMING.id && /* @__PURE__ */ jsx(
       ExplicitNamingFilterForm,
       {
-        sourceFilterForExplicitNamingConversion
+        sourceFilterForExplicitNamingConversion,
+        language
       }
     ),
     filterType?.id === FilterType.EXPERT.id && /* @__PURE__ */ jsx(ExpertFilterForm, {})

package/dist/components/filter/HeaderFilterForm.d.ts

@@ -10,21 +10,17 @@ export declare const filterStyles: {
         readonly width: "50%";
     };
 };
-export interface FilterFormProps {
+export declare const HeaderFilterSchema: {
+    name: yup.StringSchema<string, yup.AnyObject, undefined, "">;
+    equipmentType: yup.StringSchema<string, yup.AnyObject, undefined, "">;
+    description: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
+};
+export interface HeaderFilterFormProps {
     creation?: boolean;
     activeDirectory?: UUID;
-    filterType?: {
-        id: string;
-        label: string;
-    };
     sourceFilterForExplicitNamingConversion?: {
         id: UUID;
         equipmentType: string;
     };
 }
-export declare const HeaderFilterSchema: {
-    name: yup.StringSchema<string, yup.AnyObject, undefined, "">;
-    equipmentType: yup.StringSchema<string, yup.AnyObject, undefined, "">;
-    description: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
-};
-export declare function HeaderFilterForm({ creation, activeDirectory }: Readonly<FilterFormProps>): import("react/jsx-runtime").JSX.Element;
+export declare function HeaderFilterForm({ creation, activeDirectory }: Readonly<HeaderFilterFormProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/filter/expert/ExpertFilterEditionDialog.js

@@ -13,12 +13,8 @@ import { saveExpertFilter } from "../utils/filterApi.js";
 import { expertFilterSchema } from "./ExpertFilterForm.js";
 import { importExpertRules } from "./expertFilterUtils.js";
 import { HeaderFilterSchema } from "../HeaderFilterForm.js";
-import { catchErrorHandler } from "../../../services/utils.js";
-import "../../../utils/conversionUtils.js";
-import "@mui/icons-material";
-import "../../../utils/types/equipmentType.js";
-import { CustomError } from "../../../services/businessErrorCode.js";
 import { EXPERT_FILTER_QUERY } from "./expertFilterConstants.js";
+import { snackWithFallback } from "../../../utils/error.js";
 import * as yup from "yup";
 const formSchema = yup.object().shape({
   ...HeaderFilterSchema,
@@ -61,13 +57,8 @@ function ExpertFilterEditionDialog({
           [EXPERT_FILTER_QUERY]: importExpertRules(response[EXPERT_FILTER_QUERY])
         });
       }).catch((error) => {
-        catchErrorHandler(error, (message) => {
-          setDataFetchStatus(FetchStatus.FETCH_ERROR);
-          snackError({
-            messageTxt: message,
-            headerId: "cannotRetrieveFilter"
-          });
-        });
+        setDataFetchStatus(FetchStatus.FETCH_ERROR);
+        snackWithFallback(snackError, error, { headerId: "cannotRetrieveFilter" });
       });
     }
   }, [id, name, open, reset, snackError, getFilterById, description]);
@@ -83,17 +74,7 @@ function ExpertFilterEditionDialog({
         null,
         onClose,
         (error) => {
-          if (error instanceof CustomError && error.businessErrorCode != null) {
-            snackError({
-              messageId: error.businessErrorCode,
-              headerId: "cannotSaveFilter"
-            });
-          } else {
-            snackError({
-              messageTxt: error.message,
-              headerId: "cannotSaveFilter"
-            });
-          }
+          snackWithFallback(snackError, error, { headerId: "cannotSaveFilter" });
         }
       );
       if (itemSelectionForCopy.sourceItemUuid === id) {

package/dist/components/filter/expert/expertFilterUtils.d.ts

@@ -12,4 +12,3 @@ export declare const queryValidator: QueryValidator;
 export declare const testQuery: (check: string, query: RuleGroupTypeAny) => boolean;
 export declare function getNumberOfSiblings(path: number[], query: RuleGroupTypeAny): number;
 export declare function recursiveRemove(query: RuleGroupTypeAny, path: number[]): RuleGroupTypeAny;
-export declare function getFilterEquipmentTypeLabel(equipmentType: string | undefined): string;

package/dist/components/filter/expert/expertFilterUtils.js

@@ -4,10 +4,6 @@ import { DataType } from "./expertFilter.type.js";
 import { OPERATOR_OPTIONS, RULES, FIELDS_OPTIONS } from "./expertFilterConstants.js";
 import { isBlankOrEmpty, convertOutputValue, convertInputValue } from "../../../utils/conversionUtils.js";
 import { FieldType } from "../../../utils/types/fieldType.js";
-import "react/jsx-runtime";
-import "@mui/icons-material";
-import { ALL_EQUIPMENTS } from "../../../utils/types/equipmentType.js";
-import "../../../utils/yupConfig.js";
 const searchTree = (tree, key, value) => {
   const stack = Object.values(tree);
   while (stack.length) {
@@ -361,16 +357,9 @@ function recursiveRemove(query, path) {
   }
   return remove(query, path);
 }
-function getFilterEquipmentTypeLabel(equipmentType) {
-  if (!equipmentType) {
-    return "";
-  }
-  return ALL_EQUIPMENTS[equipmentType]?.label ?? "";
-}
 export {
   countRules,
   exportExpertRules,
-  getFilterEquipmentTypeLabel,
   getNumberOfSiblings,
   getOperators,
   importExpertRules,

package/dist/components/filter/expert/index.js

@@ -2,7 +2,7 @@ import { ExpertFilterEditionDialog } from "./ExpertFilterEditionDialog.js";
 import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData } from "./ExpertFilterForm.js";
 import { CombinatorType, DataType, OperatorType } from "./expertFilter.type.js";
 import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXPERT_FILTER_EQUIPMENTS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_QUERY, FIELDS_OPTIONS, LOAD_TYPE_OPTIONS, OPERATOR_OPTIONS, PHASE_REGULATION_MODE_OPTIONS, RATIO_REGULATION_MODE_OPTIONS, REGULATION_TYPE_OPTIONS, RULES, SHUNT_COMPENSATOR_TYPE_OPTIONS, SVAR_REGULATION_MODE_OPTIONS } from "./expertFilterConstants.js";
-import { countRules, exportExpertRules, getFilterEquipmentTypeLabel, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expertFilterUtils.js";
+import { countRules, exportExpertRules, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expertFilterUtils.js";
 export {
   COMBINATOR_OPTIONS,
   CONVERTERS_MODE_OPTIONS,
@@ -28,7 +28,6 @@ export {
   expertFilterSchema,
   exportExpertRules,
   getExpertFilterEmptyFormData,
-  getFilterEquipmentTypeLabel,
   getNumberOfSiblings,
   getOperators,
   importExpertRules,

package/dist/components/filter/explicitNaming/ExplicitNamingFilterEditionDialog.js

@@ -15,6 +15,7 @@ import { FilterForm } from "../FilterForm.js";
 import { NO_ITEM_SELECTION_FOR_COPY, FilterType } from "../constants/FilterConstants.js";
 import { HeaderFilterSchema } from "../HeaderFilterForm.js";
 import { FILTER_EQUIPMENTS_ATTRIBUTES } from "./ExplicitNamingFilterConstants.js";
+import { snackWithFallback } from "../../../utils/error.js";
 import * as yup from "yup";
 const formSchema = yup.object().shape({
   ...HeaderFilterSchema,
@@ -61,10 +62,7 @@ function ExplicitNamingFilterEditionDialog({
         });
       }).catch((error) => {
         setDataFetchStatus(FetchStatus.FETCH_ERROR);
-        snackError({
-          messageTxt: error.message,
-          headerId: "cannotRetrieveFilter"
-        });
+        snackWithFallback(snackError, error, { headerId: "cannotRetrieveFilter" });
       });
     }
   }, [id, name, open, reset, snackError, getFilterById, description]);
@@ -78,9 +76,7 @@ function ExplicitNamingFilterEditionDialog({
         filterForm[FieldConstants.DESCRIPTION] ?? "",
         id,
         (error) => {
-          snackError({
-            messageTxt: error.message
-          });
+          snackWithFallback(snackError, error);
         },
         onClose
       );
@@ -106,7 +102,14 @@ function ExplicitNamingFilterEditionDialog({
       isDataFetching: dataFetchStatus === FetchStatus.FETCHING,
       language,
       unscrollableFullHeight: true,
-      children: isDataReady && /* @__PURE__ */ jsx(FilterForm, { activeDirectory, filterType: FilterType.EXPLICIT_NAMING })
+      children: isDataReady && /* @__PURE__ */ jsx(
+        FilterForm,
+        {
+          activeDirectory,
+          filterType: FilterType.EXPLICIT_NAMING,
+          language
+        }
+      )
     }
   );
 }

package/dist/components/filter/explicitNaming/ExplicitNamingFilterForm.d.ts

@@ -2,6 +2,7 @@ import { UUID } from 'node:crypto';
 import { FieldConstants } from '../../../utils/constants/fieldConstants';
 import { default as yup } from '../../../utils/yupConfig';
 import { DISTRIBUTION_KEY } from '../constants/FilterConstants';
+import { GsLang } from '../../../utils';
 export declare const explicitNamingFilterSchema: {
     filterEquipmentsAttributes: yup.ArraySchema<{
         equipmentID?: string | null | undefined;
@@ -22,6 +23,7 @@ export interface FilterForExplicitConversionProps {
 }
 interface ExplicitNamingFilterFormProps {
     sourceFilterForExplicitNamingConversion?: FilterForExplicitConversionProps;
+    language?: GsLang;
 }
-export declare function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }: ExplicitNamingFilterFormProps): import("react/jsx-runtime").JSX.Element;
+export declare function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion, language, }: Readonly<ExplicitNamingFilterFormProps>): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/filter/explicitNaming/ExplicitNamingFilterForm.js

@@ -23,6 +23,10 @@ import "../../dialogs/descriptionModificationDialog/DescriptionModificationDialo
 import "../../dialogs/elementSaveDialog/ElementSaveDialog.js";
 import { FILTER_EQUIPMENTS_ATTRIBUTES } from "./ExplicitNamingFilterConstants.js";
 import { filterStyles } from "../HeaderFilterForm.js";
+import "../../../utils/conversionUtils.js";
+import { snackWithFallback } from "../../../utils/error.js";
+import "@mui/icons-material";
+import "../../../utils/types/equipmentType.js";
 import * as yup from "yup";
 function isGeneratorOrLoad(equipmentType) {
   return equipmentType === Generator.type || equipmentType === Load.type;
@@ -57,7 +61,10 @@ function getExplicitNamingFilterEmptyFormData() {
     [FILTER_EQUIPMENTS_ATTRIBUTES]: makeDefaultTableRows()
   };
 }
-function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }) {
+function ExplicitNamingFilterForm({
+  sourceFilterForExplicitNamingConversion,
+  language
+}) {
   const intl = useIntl();
   const { snackError } = useSnackMessage();
   const { getValues, setValue } = useFormContext();
@@ -147,10 +154,7 @@ function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }) {
         }))
       );
     }).catch(
-      (error) => snackError({
-        messageTxt: error.message,
-        headerId: "convertIntoExplicitNamingFilterError"
-      })
+      (error) => snackWithFallback(snackError, error, { headerId: "convertIntoExplicitNamingFilterError" })
     );
   };
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -205,7 +209,8 @@ function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }) {
             id: "filterCsvFileName"
           }),
           fileHeaders: csvFileHeaders,
-          getDataFromCsv: getDataFromCsvFile
+          getDataFromCsv: getDataFromCsvFile,
+          language
         },
         cssProps: {
           padding: 1,

package/dist/components/filter/index.js

@@ -5,7 +5,7 @@ import { ExpertFilterEditionDialog } from "./expert/ExpertFilterEditionDialog.js
 import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData } from "./expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, OperatorType } from "./expert/expertFilter.type.js";
 import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXPERT_FILTER_EQUIPMENTS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_QUERY, FIELDS_OPTIONS, LOAD_TYPE_OPTIONS, OPERATOR_OPTIONS, PHASE_REGULATION_MODE_OPTIONS, RATIO_REGULATION_MODE_OPTIONS, REGULATION_TYPE_OPTIONS, RULES, SHUNT_COMPENSATOR_TYPE_OPTIONS, SVAR_REGULATION_MODE_OPTIONS } from "./expert/expertFilterConstants.js";
-import { countRules, exportExpertRules, getFilterEquipmentTypeLabel, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expert/expertFilterUtils.js";
+import { countRules, exportExpertRules, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expert/expertFilterUtils.js";
 import { ExplicitNamingFilterEditionDialog } from "./explicitNaming/ExplicitNamingFilterEditionDialog.js";
 import { ExplicitNamingFilterForm, explicitNamingFilterSchema, getExplicitNamingFilterEmptyFormData } from "./explicitNaming/ExplicitNamingFilterForm.js";
 import { FILTER_EQUIPMENTS_ATTRIBUTES } from "./explicitNaming/ExplicitNamingFilterConstants.js";
@@ -48,7 +48,6 @@ export {
   exportExpertRules,
   getExpertFilterEmptyFormData,
   getExplicitNamingFilterEmptyFormData,
-  getFilterEquipmentTypeLabel,
   getNumberOfSiblings,
   getOperators,
   importExpertRules,

package/dist/components/filter/utils/filterApi.js

@@ -3,8 +3,8 @@ import { Generator, Load } from "../../../utils/types/equipmentTypes.js";
 import { exportExpertRules } from "../expert/expertFilterUtils.js";
 import { DISTRIBUTION_KEY, FilterType } from "../constants/FilterConstants.js";
 import { createFilter, saveFilter } from "../../../services/explore.js";
-import { catchErrorHandler } from "../../../services/utils.js";
 import "../../../utils/conversionUtils.js";
+import { catchErrorHandler } from "../../../utils/error.js";
 import "react/jsx-runtime";
 import "@mui/icons-material";
 import "../../../utils/types/equipmentType.js";

package/dist/components/index.js

@@ -43,7 +43,7 @@ import { ExpertFilterEditionDialog } from "./filter/expert/ExpertFilterEditionDi
 import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData } from "./filter/expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, OperatorType } from "./filter/expert/expertFilter.type.js";
 import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXPERT_FILTER_EQUIPMENTS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_QUERY, FIELDS_OPTIONS, LOAD_TYPE_OPTIONS, OPERATOR_OPTIONS, PHASE_REGULATION_MODE_OPTIONS, RATIO_REGULATION_MODE_OPTIONS, REGULATION_TYPE_OPTIONS, RULES, SHUNT_COMPENSATOR_TYPE_OPTIONS, SVAR_REGULATION_MODE_OPTIONS } from "./filter/expert/expertFilterConstants.js";
-import { countRules, exportExpertRules, getFilterEquipmentTypeLabel, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./filter/expert/expertFilterUtils.js";
+import { countRules, exportExpertRules, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./filter/expert/expertFilterUtils.js";
 import { ExplicitNamingFilterEditionDialog } from "./filter/explicitNaming/ExplicitNamingFilterEditionDialog.js";
 import { ExplicitNamingFilterForm, explicitNamingFilterSchema, getExplicitNamingFilterEmptyFormData } from "./filter/explicitNaming/ExplicitNamingFilterForm.js";
 import { FILTER_EQUIPMENTS_ATTRIBUTES } from "./filter/explicitNaming/ExplicitNamingFilterConstants.js";
@@ -487,7 +487,6 @@ export {
   generateTreeViewFinderClass,
   getExpertFilterEmptyFormData,
   getExplicitNamingFilterEmptyFormData,
-  getFilterEquipmentTypeLabel,
   getLimitReductionsFormSchema,
   getNumberOfSiblings,
   getOperators,

package/dist/components/inputs/reactHookForm/DirectoryItemsInput.js

@@ -10,7 +10,7 @@ import "./provider/CustomFormProvider.js";
 import { useCustomFormContext } from "./provider/useCustomFormContext.js";
 import { ErrorInput } from "./errorManagement/ErrorInput.js";
 import { MidFormError } from "./errorManagement/MidFormError.js";
-import { ALL_EQUIPMENTS } from "../../../utils/types/equipmentType.js";
+import "../../../utils/types/equipmentType.js";
 import { fetchDirectoryElementPath } from "../../../services/directory.js";
 import "localized-countries";
 import "localized-countries/data/fr";
@@ -20,6 +20,7 @@ import { DirectoryItemSelector } from "../../directoryItemSelector/DirectoryItem
 import "../../../utils/conversionUtils.js";
 import { mergeSx } from "../../../utils/styles.js";
 import { ArrayAction } from "../../../utils/types/types.js";
+import { getEquipmentTypeShortLabel } from "../../../utils/labelUtils.js";
 import "../../../utils/yupConfig.js";
 import { NAME } from "./constants.js";
 import { OverflowableChip } from "./OverflowableChip.js";
@@ -187,7 +188,9 @@ function DirectoryItemsInput({
           ),
           elements?.length > 0 && /* @__PURE__ */ jsx(FormControl, { sx: styles.formDirectoryElements2, children: elements.map((item, index) => {
             const elementName = watchedElements?.[index]?.[NAME] ?? getValues(`${name}.${index}.${NAME}`) ?? item?.[NAME];
-            const equipmentTypeTagLabel = item?.specificMetadata?.equipmentType && ALL_EQUIPMENTS[item.specificMetadata.equipmentType]?.shortLabel || "";
+            const equipmentTypeShortLabel = getEquipmentTypeShortLabel(
+              item?.specificMetadata?.equipmentType
+            );
             const { sx: chipSx, ...otherChipProps } = chipProps ?? {};
             return /* @__PURE__ */ jsx(
               ChipComponent,
@@ -195,9 +198,9 @@ function DirectoryItemsInput({
                 onDelete: () => removeElements(index),
                 onClick: () => handleChipClick(index),
                 label: elementName ? /* @__PURE__ */ jsx(RawReadOnlyInput, { name: `${name}.${index}.${NAME}` }) : intl.formatMessage({ id: "elementNotFound" }),
-                ...equipmentTypeTagLabel && {
+                ...equipmentTypeShortLabel && {
                   helperText: intl.formatMessage({
-                    id: equipmentTypeTagLabel
+                    id: equipmentTypeShortLabel
                   })
                 },
                 sx: mergeSx(

package/dist/components/inputs/reactHookForm/OverflowableChipWithHelperText.js

@@ -7,7 +7,7 @@ function OverflowableChipWithHelperText({
 }) {
   return /* @__PURE__ */ jsxs(Box, { sx: { display: "flex", alignItems: "left", flexDirection: "column" }, children: [
     /* @__PURE__ */ jsx(OverflowableChip, { ...otherProps }),
-    helperText && /* @__PURE__ */ jsx(FormHelperText, { sx: { paddingLeft: 1.5, fontSize: "x-small" }, children: helperText })
+    helperText && /* @__PURE__ */ jsx(FormHelperText, { sx: { fontSize: "x-small" }, children: helperText })
   ] });
 }
 export {