@gridsuite/commons-ui 0.68.1 → 0.68.3

package/dist/assets/ExpertFilterForm.css

@@ -129,11 +129,6 @@
     border-bottom: 2px solid #ba000d;
 }
 
-.queryBuilder {
-    overflow: auto;
-    max-height: 600px;
-}
-
 /* DnD section, copied from original, just 'border-bottom-color: lightgrey' change */
 [data-inlinecombinators='disabled'] .dndOver.rule,
 [data-inlinecombinators='disabled'] .dndOver.ruleGroup-header {

package/dist/components/dialogs/customMuiDialog/CustomMuiDialog.d.ts

@@ -18,5 +18,39 @@ export interface CustomMuiDialogProps {
     isDataFetching?: boolean;
     language?: string;
     confirmationMessageKey?: string;
+    unscrollableFullHeight?: boolean;
 }
-export declare function CustomMuiDialog({ open, formSchema, formMethods, onClose, onSave, isDataFetching, onValidationError, titleId, disabledSave, removeOptional, onCancel, children, language, confirmationMessageKey, }: Readonly<CustomMuiDialogProps>): import("react/jsx-runtime").JSX.Element;
+/**
+ * all those styles are made to work with each other in order to control the scroll behavior:
+ * <fullHeightDialog>
+ *   <unscrollableContainer>
+ *     <unscrollableHeader/> => there may be several unscrollableHeader one after another
+ *     <scrollableContent/>
+ *   </unscrollableContainer>
+ * </fullHeightDialog>
+ */
+export declare const unscrollableDialogStyles: {
+    fullHeightDialog: {
+        '.MuiDialog-paper': {
+            width: string;
+            minWidth: string;
+            margin: string;
+            height: string;
+        };
+    };
+    unscrollableContainer: {
+        display: string;
+        flexDirection: string;
+        overflowY: string;
+    };
+    unscrollableHeader: {
+        flex: string;
+        padding: number;
+    };
+    scrollableContent: {
+        flex: string;
+        overflowY: string;
+        padding: number;
+    };
+};
+export declare function CustomMuiDialog({ open, formSchema, formMethods, onClose, onSave, isDataFetching, onValidationError, titleId, disabledSave, removeOptional, onCancel, children, language, confirmationMessageKey, unscrollableFullHeight, }: Readonly<CustomMuiDialogProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/dialogs/customMuiDialog/CustomMuiDialog.js

@@ -15,6 +15,30 @@ const styles = {
     }
   }
 };
+const unscrollableDialogStyles = {
+  fullHeightDialog: {
+    ".MuiDialog-paper": {
+      width: "auto",
+      minWidth: "1024px",
+      margin: "auto",
+      height: "95vh"
+    }
+  },
+  unscrollableContainer: {
+    display: "flex",
+    flexDirection: "column",
+    overflowY: "hidden"
+  },
+  unscrollableHeader: {
+    flex: "none",
+    padding: 1
+  },
+  scrollableContent: {
+    flex: "auto",
+    overflowY: "auto",
+    padding: 1
+  }
+};
 function CustomMuiDialog({
   open,
   formSchema,
@@ -29,7 +53,8 @@ function CustomMuiDialog({
   onCancel,
   children,
   language,
-  confirmationMessageKey
+  confirmationMessageKey,
+  unscrollableFullHeight = false
 }) {
   const [openConfirmationPopup, setOpenConfirmationPopup] = useState(false);
   const [validatedData, setValidatedData] = useState(void 0);
@@ -80,22 +105,31 @@ function CustomMuiDialog({
       removeOptional,
       language,
       children: [
-        /* @__PURE__ */ jsxs(Dialog, { sx: styles.dialogPaper, open, onClose: handleClose, fullWidth: true, children: [
-          isDataFetching && /* @__PURE__ */ jsx(LinearProgress, {}),
-          /* @__PURE__ */ jsx(DialogTitle, { children: /* @__PURE__ */ jsx(Grid, { item: true, xs: 11, children: /* @__PURE__ */ jsx(FormattedMessage, { id: titleId }) }) }),
-          /* @__PURE__ */ jsx(DialogContent, { children }),
-          /* @__PURE__ */ jsxs(DialogActions, { children: [
-            /* @__PURE__ */ jsx(CancelButton, { onClick: handleCancel }),
-            /* @__PURE__ */ jsx(
-              SubmitButton,
-              {
-                variant: "outlined",
-                disabled: disabledSave,
-                onClick: handleSubmit(handleValidate, handleValidationError)
-              }
-            )
-          ] })
-        ] }),
+        /* @__PURE__ */ jsxs(
+          Dialog,
+          {
+            sx: unscrollableFullHeight ? unscrollableDialogStyles.fullHeightDialog : styles.dialogPaper,
+            open,
+            onClose: handleClose,
+            fullWidth: true,
+            children: [
+              isDataFetching && /* @__PURE__ */ jsx(LinearProgress, {}),
+              /* @__PURE__ */ jsx(DialogTitle, { children: /* @__PURE__ */ jsx(Grid, { item: true, xs: 11, children: /* @__PURE__ */ jsx(FormattedMessage, { id: titleId }) }) }),
+              /* @__PURE__ */ jsx(DialogContent, { sx: unscrollableFullHeight ? unscrollableDialogStyles.unscrollableContainer : null, children }),
+              /* @__PURE__ */ jsxs(DialogActions, { children: [
+                /* @__PURE__ */ jsx(CancelButton, { onClick: handleCancel }),
+                /* @__PURE__ */ jsx(
+                  SubmitButton,
+                  {
+                    variant: "outlined",
+                    disabled: disabledSave,
+                    onClick: handleSubmit(handleValidate, handleValidationError)
+                  }
+                )
+              ] })
+            ]
+          }
+        ),
         confirmationMessageKey && /* @__PURE__ */ jsx(
           PopupConfirmationDialog,
           {
@@ -110,5 +144,6 @@ function CustomMuiDialog({
   );
 }
 export {
-  CustomMuiDialog
+  CustomMuiDialog,
+  unscrollableDialogStyles
 };

package/dist/components/dialogs/index.js

@@ -1,4 +1,4 @@
-import { CustomMuiDialog } from "./customMuiDialog/CustomMuiDialog.js";
+import { CustomMuiDialog, unscrollableDialogStyles } from "./customMuiDialog/CustomMuiDialog.js";
 import { DescriptionModificationDialog } from "./descriptionModificationDialog/DescriptionModificationDialog.js";
 import { ModifyElementSelection } from "./modifyElementSelection/ModifyElementSelection.js";
 import { PopupConfirmationDialog } from "./popupConfirmationDialog/PopupConfirmationDialog.js";
@@ -6,5 +6,6 @@ export {
   CustomMuiDialog,
   DescriptionModificationDialog,
   ModifyElementSelection,
-  PopupConfirmationDialog
+  PopupConfirmationDialog,
+  unscrollableDialogStyles
 };

package/dist/components/filter/FilterCreationDialog.js

@@ -106,6 +106,7 @@ function FilterCreationDialog({
       removeOptional: true,
       disabledSave: !!nameError || !!isValidating,
       language,
+      unscrollableFullHeight: true,
       children: /* @__PURE__ */ jsx(
         FilterForm,
         {

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

@@ -1,13 +1,3 @@
-import { ElementExistsType } from '../../utils/types/elementType';
-import { UUID } from 'crypto';
+import { FilterFormProps } from './HeaderFilterForm';
 
-export interface FilterFormProps {
-    creation?: boolean;
-    activeDirectory?: UUID;
-    elementExists?: ElementExistsType;
-    sourceFilterForExplicitNamingConversion?: {
-        id: UUID;
-        equipmentType: string;
-    };
-}
-export declare function FilterForm(props: FilterFormProps): import("react/jsx-runtime").JSX.Element;
+export declare function FilterForm({ sourceFilterForExplicitNamingConversion, creation, activeDirectory, elementExists, }: Readonly<FilterFormProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/filter/FilterForm.js

@@ -1,51 +1,42 @@
-import { jsxs, jsx, Fragment } from "react/jsx-runtime";
-import { useEffect } from "react";
-import { useFormContext, useWatch } from "react-hook-form";
-import { Grid } from "@mui/material";
+import { jsxs, Fragment, jsx } from "react/jsx-runtime";
+import { Box } from "@mui/material";
+import { useWatch } from "react-hook-form";
+import { HeaderFilterForm } from "./HeaderFilterForm.js";
 import { FieldConstants } from "../../utils/constants/fieldConstants.js";
 import { CriteriaBasedFilterForm } from "./criteriaBased/CriteriaBasedFilterForm.js";
 import { ExplicitNamingFilterForm } from "./explicitNaming/ExplicitNamingFilterForm.js";
 import { ExpertFilterForm } from "./expert/ExpertFilterForm.js";
 import { FilterType } from "./constants/FilterConstants.js";
-import { RadioInput } from "../inputs/reactHookForm/booleans/RadioInput.js";
-import { ElementType } from "../../utils/types/elementType.js";
-import { UniqueNameInput } from "../inputs/reactHookForm/text/UniqueNameInput.js";
-import { DescriptionField } from "../inputs/reactHookForm/text/DescriptionField.js";
-function FilterForm(props) {
-  const { sourceFilterForExplicitNamingConversion, creation, activeDirectory, elementExists } = props;
-  const { setValue } = useFormContext();
+import { unscrollableDialogStyles } from "../dialogs/customMuiDialog/CustomMuiDialog.js";
+import "../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
+import "react";
+import "react-intl";
+import "@mui/icons-material";
+import "../treeViewFinder/TreeViewFinder.js";
+import "notistack";
+import "@mui/material/Dialog";
+import "@mui/material/DialogTitle";
+import "@mui/material/DialogContent";
+import "@mui/material/DialogActions";
+import "@mui/material/Button";
+import "@mui/material/styles";
+function FilterForm({
+  sourceFilterForExplicitNamingConversion,
+  creation,
+  activeDirectory,
+  elementExists
+}) {
   const filterType = useWatch({ name: FieldConstants.FILTER_TYPE });
-  const handleChange = (_event, value) => {
-    setValue(FieldConstants.FILTER_TYPE, value);
-  };
-  useEffect(() => {
-    if (sourceFilterForExplicitNamingConversion) {
-      setValue(FieldConstants.FILTER_TYPE, FilterType.EXPLICIT_NAMING.id);
-    }
-  }, [sourceFilterForExplicitNamingConversion, setValue]);
-  return /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, children: [
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(
-      UniqueNameInput,
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.unscrollableHeader, children: /* @__PURE__ */ jsx(
+      HeaderFilterForm,
       {
-        name: FieldConstants.NAME,
-        label: "nameProperty",
-        elementType: ElementType.FILTER,
-        autoFocus: creation,
+        creation,
         activeDirectory,
-        elementExists
+        elementExists,
+        sourceFilterForExplicitNamingConversion
       }
     ) }),
-    creation && /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(DescriptionField, {}) }),
-      !sourceFilterForExplicitNamingConversion && /* @__PURE__ */ jsx(Grid, { item: true, children: /* @__PURE__ */ jsx(
-        RadioInput,
-        {
-          name: FieldConstants.FILTER_TYPE,
-          options: Object.values(FilterType),
-          formProps: { onChange: handleChange }
-        }
-      ) })
-    ] }),
     filterType === FilterType.CRITERIA_BASED.id && /* @__PURE__ */ jsx(CriteriaBasedFilterForm, {}),
     filterType === FilterType.EXPLICIT_NAMING.id && /* @__PURE__ */ jsx(
       ExplicitNamingFilterForm,

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

@@ -0,0 +1,13 @@
+import { ElementExistsType } from '../../utils/types/elementType';
+import { UUID } from 'crypto';
+
+export interface FilterFormProps {
+    creation?: boolean;
+    activeDirectory?: UUID;
+    elementExists?: ElementExistsType;
+    sourceFilterForExplicitNamingConversion?: {
+        id: UUID;
+        equipmentType: string;
+    };
+}
+export declare function HeaderFilterForm({ sourceFilterForExplicitNamingConversion, creation, activeDirectory, elementExists, }: Readonly<FilterFormProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/filter/HeaderFilterForm.js

@@ -0,0 +1,53 @@
+import { jsxs, jsx, Fragment } from "react/jsx-runtime";
+import { useFormContext } from "react-hook-form";
+import { useEffect } from "react";
+import { Grid } from "@mui/material";
+import { FieldConstants } from "../../utils/constants/fieldConstants.js";
+import { FilterType } from "./constants/FilterConstants.js";
+import { UniqueNameInput } from "../inputs/reactHookForm/text/UniqueNameInput.js";
+import { ElementType } from "../../utils/types/elementType.js";
+import { DescriptionField } from "../inputs/reactHookForm/text/DescriptionField.js";
+import { RadioInput } from "../inputs/reactHookForm/booleans/RadioInput.js";
+function HeaderFilterForm({
+  sourceFilterForExplicitNamingConversion,
+  creation,
+  activeDirectory,
+  elementExists
+}) {
+  const { setValue } = useFormContext();
+  useEffect(() => {
+    if (sourceFilterForExplicitNamingConversion) {
+      setValue(FieldConstants.FILTER_TYPE, FilterType.EXPLICIT_NAMING.id);
+    }
+  }, [sourceFilterForExplicitNamingConversion, setValue]);
+  const handleChange = (_event, value) => {
+    setValue(FieldConstants.FILTER_TYPE, value);
+  };
+  return /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, children: [
+    /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(
+      UniqueNameInput,
+      {
+        name: FieldConstants.NAME,
+        label: "nameProperty",
+        elementType: ElementType.FILTER,
+        autoFocus: creation,
+        activeDirectory,
+        elementExists
+      }
+    ) }),
+    creation && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(DescriptionField, {}) }),
+      !sourceFilterForExplicitNamingConversion && /* @__PURE__ */ jsx(Grid, { item: true, children: /* @__PURE__ */ jsx(
+        RadioInput,
+        {
+          name: FieldConstants.FILTER_TYPE,
+          options: Object.values(FilterType),
+          formProps: { onChange: handleChange }
+        }
+      ) })
+    ] })
+  ] });
+}
+export {
+  HeaderFilterForm
+};

package/dist/components/filter/criteriaBased/CriteriaBasedFilterEditionDialog.js

@@ -95,6 +95,7 @@ function CriteriaBasedFilterEditionDialog({
       disabledSave: !!nameError || !!isValidating,
       isDataFetching: dataFetchStatus === FetchStatus.FETCHING,
       language,
+      unscrollableFullHeight: true,
       children: isDataReady && /* @__PURE__ */ jsx(FilterForm, { activeDirectory, elementExists })
     }
   );

package/dist/components/filter/criteriaBased/CriteriaBasedFilterForm.js

@@ -1,5 +1,4 @@
-import { jsxs, jsx } from "react/jsx-runtime";
-import Grid from "@mui/material/Grid";
+import { jsx } from "react/jsx-runtime";
 import { filterPropertiesYupSchema, FilterProperties } from "./FilterProperties.js";
 import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
 import "../../../utils/yupConfig.js";
@@ -18,16 +17,14 @@ const criteriaBasedFilterEmptyFormData = getCriteriaBasedFormData(null, {
   [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: []
 });
 function CriteriaBasedFilterForm() {
-  return /* @__PURE__ */ jsxs(Grid, { container: true, item: true, spacing: 1, children: [
-    /* @__PURE__ */ jsx(
-      CriteriaBasedForm,
-      {
-        equipments: FILTER_EQUIPMENTS,
-        defaultValues: criteriaBasedFilterEmptyFormData[FieldConstants.CRITERIA_BASED]
-      }
-    ),
-    /* @__PURE__ */ jsx(FilterProperties, {})
-  ] });
+  return /* @__PURE__ */ jsx(
+    CriteriaBasedForm,
+    {
+      equipments: FILTER_EQUIPMENTS,
+      defaultValues: criteriaBasedFilterEmptyFormData[FieldConstants.CRITERIA_BASED],
+      children: /* @__PURE__ */ jsx(FilterProperties, {})
+    }
+  );
 }
 export {
   CriteriaBasedFilterForm,

package/dist/components/filter/criteriaBased/CriteriaBasedForm.d.ts

@@ -1,7 +1,9 @@
 import { FormEquipment } from '../utils/filterFormUtils';
+import { ReactElement } from 'react';
 
 export interface CriteriaBasedFormProps {
     equipments: Record<string, FormEquipment>;
     defaultValues: Record<string, any>;
+    children?: ReactElement;
 }
-export declare function CriteriaBasedForm({ equipments, defaultValues }: CriteriaBasedFormProps): import("react/jsx-runtime").JSX.Element;
+export declare function CriteriaBasedForm({ equipments, defaultValues, children }: Readonly<CriteriaBasedFormProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/filter/criteriaBased/CriteriaBasedForm.js

@@ -1,12 +1,23 @@
-import { jsxs, jsx } from "react/jsx-runtime";
+import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { useFormContext, useWatch } from "react-hook-form";
-import { Grid } from "@mui/material";
+import { Box, Grid } from "@mui/material";
 import { useEffect } from "react";
 import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
 import { SelectInput } from "../../inputs/reactHookForm/selectInputs/SelectInput.js";
 import { InputWithPopupConfirmation } from "../../inputs/reactHookForm/selectInputs/InputWithPopupConfirmation.js";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
-function CriteriaBasedForm({ equipments, defaultValues }) {
+import { unscrollableDialogStyles } from "../../dialogs/customMuiDialog/CustomMuiDialog.js";
+import "../../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
+import "react-intl";
+import "@mui/icons-material";
+import "../../treeViewFinder/TreeViewFinder.js";
+import "@mui/material/Dialog";
+import "@mui/material/DialogTitle";
+import "@mui/material/DialogContent";
+import "@mui/material/DialogActions";
+import "@mui/material/Button";
+import "@mui/material/styles";
+function CriteriaBasedForm({ equipments, defaultValues, children }) {
   const { getValues, setValue } = useFormContext();
   const { snackError } = useSnackMessage();
   const watchEquipmentType = useWatch({
@@ -27,8 +38,8 @@ function CriteriaBasedForm({ equipments, defaultValues }) {
       (field) => setValue(`${FieldConstants.CRITERIA_BASED}.${field}`, defaultValues[field])
     );
   };
-  return /* @__PURE__ */ jsxs(Grid, { container: true, item: true, spacing: 2, children: [
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.unscrollableHeader, children: /* @__PURE__ */ jsx(
       InputWithPopupConfirmation,
       {
         Input: SelectInput,
@@ -41,11 +52,14 @@ function CriteriaBasedForm({ equipments, defaultValues }) {
         validateButtonLabel: "button.changeType"
       }
     ) }),
-    watchEquipmentType && equipments[watchEquipmentType] && equipments[watchEquipmentType].fields.map((equipment, index) => {
-      const EquipmentForm = equipment.renderer;
-      const uniqueKey = `${watchEquipmentType}-${index}`;
-      return /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, flexGrow: 1, children: /* @__PURE__ */ jsx(EquipmentForm, { ...equipment.props }) }, uniqueKey);
-    })
+    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.scrollableContent, children: /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, children: [
+      watchEquipmentType && equipments[watchEquipmentType] && equipments[watchEquipmentType].fields.map((equipment, index) => {
+        const EquipmentForm = equipment.renderer;
+        const uniqueKey = `${watchEquipmentType}-${index}`;
+        return /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, flexGrow: 1, children: /* @__PURE__ */ jsx(EquipmentForm, { ...equipment.props }) }, uniqueKey);
+      }),
+      children
+    ] }) })
   ] });
 }
 export {

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

@@ -106,6 +106,7 @@ function ExpertFilterEditionDialog({
       disabledSave: !!nameError || !!isValidating,
       isDataFetching: dataFetchStatus === FetchStatus.FETCHING,
       language,
+      unscrollableFullHeight: true,
       children: isDataReady && /* @__PURE__ */ jsx(FilterForm, { activeDirectory, elementExists })
     }
   );

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

@@ -1,12 +1,12 @@
 import '../../../assets/ExpertFilterForm.css';
-import { jsxs, jsx } from "react/jsx-runtime";
+import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { useCallback, useMemo } from "react";
-import Grid from "@mui/material/Grid";
 import { formatQuery } from "react-querybuilder";
 import { useFormContext, useWatch } from "react-hook-form";
 import * as yup from "yup";
 import { v4 } from "uuid";
 import { useIntl } from "react-intl";
+import { Box } from "@mui/material";
 import { testQuery } from "./expertFilterUtils.js";
 import { COMBINATOR_OPTIONS, OPERATOR_OPTIONS, EXPERT_FILTER_EQUIPMENTS, RULES, EXPERT_FILTER_FIELDS } from "./expertFilterConstants.js";
 import { FieldType } from "./expertFilter.type.js";
@@ -15,6 +15,17 @@ import { InputWithPopupConfirmation } from "../../inputs/reactHookForm/selectInp
 import { SelectInput } from "../../inputs/reactHookForm/selectInputs/SelectInput.js";
 import { FilterType } from "../constants/FilterConstants.js";
 import { CustomReactQueryBuilder } from "../../inputs/reactQueryBuilder/CustomReactQueryBuilder.js";
+import { unscrollableDialogStyles } from "../../dialogs/customMuiDialog/CustomMuiDialog.js";
+import "../../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
+import "@mui/icons-material";
+import "../../treeViewFinder/TreeViewFinder.js";
+import "notistack";
+import "@mui/material/Dialog";
+import "@mui/material/DialogTitle";
+import "@mui/material/DialogContent";
+import "@mui/material/DialogActions";
+import "@mui/material/Button";
+import "@mui/material/styles";
 yup.setLocale({
   mixed: {
     required: "YupRequired",
@@ -85,8 +96,8 @@ function ExpertFilterForm() {
       };
     });
   }, [intl, watchEquipmentType]);
-  return /* @__PURE__ */ jsxs(Grid, { container: true, item: true, spacing: 2, children: [
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.unscrollableHeader, children: /* @__PURE__ */ jsx(
       InputWithPopupConfirmation,
       {
         Input: SelectInput,
@@ -99,7 +110,7 @@ function ExpertFilterForm() {
         validateButtonLabel: "button.changeType"
       }
     ) }),
-    watchEquipmentType && isSupportedEquipmentType(watchEquipmentType) && /* @__PURE__ */ jsx(CustomReactQueryBuilder, { name: EXPERT_FILTER_QUERY, fields: translatedFields })
+    /* @__PURE__ */ jsx(Box, { sx: unscrollableDialogStyles.scrollableContent, children: watchEquipmentType && isSupportedEquipmentType(watchEquipmentType) && /* @__PURE__ */ jsx(CustomReactQueryBuilder, { name: EXPERT_FILTER_QUERY, fields: translatedFields }) })
   ] });
 }
 export {

package/dist/components/filter/expert/expertFilter.type.d.ts

@@ -156,7 +156,9 @@ export declare enum FieldType {
     CONVERTER_STATION_NOMINAL_VOLTAGE_2 = "CONVERTER_STATION_NOMINAL_VOLTAGE_2",
     DC_NOMINAL_VOLTAGE = "DC_NOMINAL_VOLTAGE",
     PAIRING_KEY = "PAIRING_KEY",
-    TIE_LINE_ID = "TIE_LINE_ID"
+    TIE_LINE_ID = "TIE_LINE_ID",
+    LOW_SHORT_CIRCUIT_CURRENT_LIMIT = "LOW_SHORT_CIRCUIT_CURRENT_LIMIT",
+    HIGH_SHORT_CIRCUIT_CURRENT_LIMIT = "HIGH_SHORT_CIRCUIT_CURRENT_LIMIT"
 }
 export declare enum DataType {
     STRING = "STRING",

package/dist/components/filter/expert/expertFilter.type.js

@@ -156,6 +156,8 @@ var FieldType = /* @__PURE__ */ ((FieldType2) => {
   FieldType2["DC_NOMINAL_VOLTAGE"] = "DC_NOMINAL_VOLTAGE";
   FieldType2["PAIRING_KEY"] = "PAIRING_KEY";
   FieldType2["TIE_LINE_ID"] = "TIE_LINE_ID";
+  FieldType2["LOW_SHORT_CIRCUIT_CURRENT_LIMIT"] = "LOW_SHORT_CIRCUIT_CURRENT_LIMIT";
+  FieldType2["HIGH_SHORT_CIRCUIT_CURRENT_LIMIT"] = "HIGH_SHORT_CIRCUIT_CURRENT_LIMIT";
   return FieldType2;
 })(FieldType || {});
 var DataType = /* @__PURE__ */ ((DataType2) => {

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

@@ -1076,5 +1076,17 @@ export declare const FIELDS_OPTIONS: {
         label: string;
         dataType: DataType;
     };
+    LOW_SHORT_CIRCUIT_CURRENT_LIMIT: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+        inputType: string;
+    };
+    HIGH_SHORT_CIRCUIT_CURRENT_LIMIT: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+        inputType: string;
+    };
 };
 export declare const EXPERT_FILTER_FIELDS: Record<string, Field[]>;

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

@@ -1019,6 +1019,18 @@ const FIELDS_OPTIONS = {
     name: FieldType.TIE_LINE_ID,
     label: "tieLineId",
     dataType: DataType.STRING
+  },
+  LOW_SHORT_CIRCUIT_CURRENT_LIMIT: {
+    name: FieldType.LOW_SHORT_CIRCUIT_CURRENT_LIMIT,
+    label: "lowShortCircuitCurrentLimit",
+    dataType: DataType.NUMBER,
+    inputType: "number"
+  },
+  HIGH_SHORT_CIRCUIT_CURRENT_LIMIT: {
+    name: FieldType.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT,
+    label: "highShortCircuitCurrentLimit",
+    dataType: DataType.NUMBER,
+    inputType: "number"
   }
 };
 const EXPERT_FILTER_FIELDS = {
@@ -1031,7 +1043,9 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.LOW_VOLTAGE_LIMIT,
     FIELDS_OPTIONS.HIGH_VOLTAGE_LIMIT,
     FIELDS_OPTIONS.PROPERTY,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
+    FIELDS_OPTIONS.LOW_SHORT_CIRCUIT_CURRENT_LIMIT,
+    FIELDS_OPTIONS.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT
   ],
   LINE: [
     FIELDS_OPTIONS.ID,

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

@@ -2,13 +2,14 @@ import { defaultOperators, getParentPath, findPath, remove } from "react-querybu
 import { validate } from "uuid";
 import { FieldType, DataType } from "./expertFilter.type.js";
 import { FIELDS_OPTIONS, OPERATOR_OPTIONS, RULES } from "./expertFilterConstants.js";
-import { isBlankOrEmpty, microUnitToUnit, unitToMicroUnit } from "../../../utils/conversionUtils.js";
+import { isBlankOrEmpty, microUnitToUnit, kiloUnitToUnit, unitToMicroUnit, unitToKiloUnit } from "../../../utils/conversionUtils.js";
 const microUnits = [
   FieldType.SHUNT_CONDUCTANCE_1,
   FieldType.SHUNT_CONDUCTANCE_2,
   FieldType.SHUNT_SUSCEPTANCE_1,
   FieldType.SHUNT_SUSCEPTANCE_2
 ];
+const kiloUnits = [FieldType.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT, FieldType.LOW_SHORT_CIRCUIT_CURRENT_LIMIT];
 const searchTree = (tree, key, value) => {
   const stack = Object.values(tree);
   while (stack.length) {
@@ -131,6 +132,12 @@ function changeValueUnit(value, field) {
     }
     return value.map((a) => microUnitToUnit(a));
   }
+  if (kiloUnits.includes(field)) {
+    if (!Array.isArray(value)) {
+      return kiloUnitToUnit(value);
+    }
+    return value.map((a) => kiloUnitToUnit(a));
+  }
   return value;
 }
 function exportExpertRules(query) {
@@ -202,11 +209,19 @@ function importExpertRules(query) {
       if (rule.dataType === DataType.NUMBER) {
         return rule.values.map((value) => parseFloat(value)).map((numberValue) => {
           return microUnits.includes(rule.field) ? unitToMicroUnit(numberValue) : numberValue;
+        }).map((numberValue) => {
+          return kiloUnits.includes(rule.field) ? unitToKiloUnit(numberValue) : numberValue;
         }).sort((a, b) => a - b);
       }
       return rule.values.sort();
     }
-    return microUnits.includes(rule.field) ? unitToMicroUnit(parseFloat(rule.value)) : rule.value;
+    if (microUnits.includes(rule.field)) {
+      return unitToMicroUnit(parseFloat(rule.value));
+    }
+    if (kiloUnits.includes(rule.field)) {
+      return unitToKiloUnit(parseFloat(rule.value));
+    }
+    return rule.value;
   }
   function transformRule(rule) {
     var _a;

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

@@ -109,6 +109,7 @@ function ExplicitNamingFilterEditionDialog({
       disabledSave: !!nameError || !!isValidating,
       isDataFetching: dataFetchStatus === FetchStatus.FETCHING,
       language,
+      unscrollableFullHeight: true,
       children: isDataReady && /* @__PURE__ */ jsx(FilterForm, { activeDirectory, elementExists })
     }
   );