@gridsuite/commons-ui 0.150.0 → 0.152.0

package/dist/components/parameters/sensi/sensitivity-table.js

@@ -1,11 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { TableContainer, Table, TableHead, TableRow, TableCell, Box, Tooltip, IconButton, TableBody } from "@mui/material";
 import { AddCircle } from "@mui/icons-material";
-import { useCallback } from "react";
+import { useRef, useCallback } from "react";
 import { useIntl } from "react-intl";
 import { useFormContext } from "react-hook-form";
 import { TableRowComponent } from "./table-row.js";
-import { ACTIVATED, MONITORED_BRANCHES, INJECTIONS, HVDC_LINES, PSTS, COUNT } from "./constants.js";
 import "@hello-pangea/dnd";
 import { MAX_ROWS_NUMBER } from "../../dnd-table/dnd-table.type.js";
 import "../../overflowableText/OverflowableText.js";
@@ -31,6 +30,7 @@ import "../../inputs/reactQueryBuilder/CustomReactQueryBuilder.js";
 import "uuid";
 import "../../inputs/reactQueryBuilder/PropertyValueEditor.js";
 import "react-querybuilder";
+import { isValidSensiParameterRow } from "./utils.js";
 function SensitivityTable({
   arrayFormName,
   useFieldArrayOutput,
@@ -39,55 +39,45 @@ function SensitivityTable({
   createRows,
   disableAdd,
   disableDelete = false,
-  onFormChanged,
-  onChangeParams
+  onFormChanged
 }) {
   const intl = useIntl();
   const { getValues } = useFormContext();
   const { fields: currentRows, append, remove } = useFieldArrayOutput;
+  const validRowCountRef = useRef(
+    (getValues(arrayFormName) || []).filter((row) => isValidSensiParameterRow(row)).length
+  );
+  const handleRowChanged = useCallback(
+    (index) => {
+      const currentRowValues = getValues(arrayFormName);
+      const row = currentRowValues[index];
+      const currentValidRowCount = currentRowValues.filter(
+        (r) => isValidSensiParameterRow(r)
+      ).length;
+      const previousValidRowCount = validRowCountRef.current;
+      validRowCountRef.current = currentValidRowCount;
+      if (currentValidRowCount !== previousValidRowCount || isValidSensiParameterRow(row)) {
+        onFormChanged();
+      }
+    },
+    [getValues, arrayFormName, onFormChanged]
+  );
   const handleAddRowsButton = useCallback(() => {
     if (currentRows.length >= MAX_ROWS_NUMBER) {
       return;
     }
     append(createRows(1));
   }, [append, createRows, currentRows.length]);
-  const fetchCount = useCallback(
-    (providedArrayFormName, index, source) => {
-      const row = getValues(providedArrayFormName)[index];
-      const isActivated = row[ACTIVATED];
-      const hasMonitoredBranches = row[MONITORED_BRANCHES]?.length > 0;
-      const hasInjections = row[INJECTIONS]?.length > 0 || row[HVDC_LINES]?.length > 0 || row[PSTS]?.length > 0;
-      if (source === "switch" && hasMonitoredBranches && hasInjections) {
-        if (isActivated) {
-          onChangeParams(row, providedArrayFormName, index);
-        } else {
-          onFormChanged(true);
-        }
-      }
-      if (source === "directory" && isActivated) {
-        if (hasMonitoredBranches && hasInjections) {
-          onChangeParams(row, providedArrayFormName, index);
-        } else if ((!hasMonitoredBranches || !hasInjections) && row.count === 0) {
-          onFormChanged(false);
-        } else if (!hasMonitoredBranches || !hasInjections) {
-          onFormChanged(true);
-        }
-      }
-    },
-    [onChangeParams, onFormChanged, getValues]
-  );
   const handleDeleteButton = useCallback(
     (index) => {
       const currentRowsValues = getValues(arrayFormName);
-      let isFormChanged = false;
       if (index >= 0 && index < currentRowsValues.length) {
-        if (currentRowsValues[index][COUNT] && currentRowsValues[index][ACTIVATED]) {
-          isFormChanged = true;
-        }
+        const wasValid = isValidSensiParameterRow(currentRowsValues[index]);
         remove(index);
-      }
-      if (isFormChanged) {
-        onFormChanged(true);
+        if (wasValid) {
+          validRowCountRef.current -= 1;
+          onFormChanged();
+        }
       }
     },
     [arrayFormName, getValues, onFormChanged, remove]
@@ -120,7 +110,7 @@ function SensitivityTable({
             index,
             handleDeleteButton,
             disableDelete,
-            fetchCount
+            handleRowChanged
           },
           row.id
         )) })

package/dist/components/parameters/sensi/table-cell.d.ts

@@ -4,5 +4,5 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-declare function EditableTableCell(arrayFormName: string, rowIndex: number, column: any, onRowChanged: (a: boolean, source: string) => void): import("react/jsx-runtime").JSX.Element;
+declare function EditableTableCell(arrayFormName: string, rowIndex: number, column: any, onRowChanged: () => void): import("react/jsx-runtime").JSX.Element;
 export default EditableTableCell;

package/dist/components/parameters/sensi/table-cell.js

@@ -32,12 +32,6 @@ import "uuid";
 import "../../inputs/reactQueryBuilder/PropertyValueEditor.js";
 import "react-querybuilder";
 function EditableTableCell(arrayFormName, rowIndex, column, onRowChanged) {
-  const handleDirectoryItemsChange = () => {
-    onRowChanged(true, "directory");
-  };
-  const handleSwitchInputChange = () => {
-    onRowChanged(true, "switch");
-  };
   return /* @__PURE__ */ jsxs(
     TableCell,
     {
@@ -55,7 +49,7 @@ function EditableTableCell(arrayFormName, rowIndex, column, onRowChanged) {
             hideErrorMessage: true,
             label: void 0,
             itemFilter: void 0,
-            onRowChanged: handleDirectoryItemsChange
+            onRowChanged
           }
         ),
         column.menuItems && /* @__PURE__ */ jsx(
@@ -67,7 +61,7 @@ function EditableTableCell(arrayFormName, rowIndex, column, onRowChanged) {
             fullWidth: true
           }
         ),
-        column.checkboxItems && /* @__PURE__ */ jsx("span", { onChange: handleSwitchInputChange, children: /* @__PURE__ */ jsx(SwitchInput, { name: `${arrayFormName}[${rowIndex}].${column.dataKey}` }) }),
+        column.checkboxItems && /* @__PURE__ */ jsx("span", { onChange: onRowChanged, children: /* @__PURE__ */ jsx(SwitchInput, { name: `${arrayFormName}[${rowIndex}].${column.dataKey}` }) }),
         column.floatItems && /* @__PURE__ */ jsx(FloatInput, { name: `${arrayFormName}[${rowIndex}].${column.dataKey}` }),
         column.textItems && /* @__PURE__ */ jsx(
           TextInput,

package/dist/components/parameters/sensi/table-row.d.ts

@@ -5,7 +5,7 @@ interface TableRowComponentProps {
     index: number;
     handleDeleteButton: (index: number) => void;
     disableDelete: boolean;
-    fetchCount: (a: string, b: number, c: string) => void;
+    handleRowChanged: (a: number) => void;
 }
-export declare function TableRowComponent({ arrayFormName, columnsDefinition, index, handleDeleteButton, disableDelete, fetchCount, }: Readonly<TableRowComponentProps>): import("react/jsx-runtime").JSX.Element;
+export declare function TableRowComponent({ arrayFormName, columnsDefinition, index, handleDeleteButton, disableDelete, handleRowChanged, }: Readonly<TableRowComponentProps>): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/parameters/sensi/table-row.js

@@ -10,21 +10,19 @@ function TableRowComponent({
   index,
   handleDeleteButton,
   disableDelete = false,
-  fetchCount
+  handleRowChanged
 }) {
   const [isHover, setIsHover] = useState(false);
   const intl = useIntl();
   function handleHover(enter) {
     return setIsHover(enter);
   }
-  const handleRowChanged = (isChanged, source) => {
-    if (isChanged) {
-      fetchCount(arrayFormName, index, source);
-    }
+  const handleCellChanged = () => {
+    handleRowChanged(index);
   };
   return /* @__PURE__ */ jsxs(TableRow, { onMouseEnter: () => handleHover(true), onMouseLeave: () => handleHover(false), children: [
     columnsDefinition.map(
-      (column) => EditableTableCell(arrayFormName, index, column, handleRowChanged)
+      (column) => EditableTableCell(arrayFormName, index, column, handleCellChanged)
     ),
     !disableDelete && /* @__PURE__ */ jsx(TableCell, { sx: { width: "5rem", textAlign: "center" }, children: isHover && /* @__PURE__ */ jsx(
       Tooltip,

package/dist/components/parameters/sensi/use-sensitivity-analysis-parameters.d.ts

@@ -1,10 +1,8 @@
 import { UseFormReturn } from 'react-hook-form';
 import { ObjectSchema } from 'yup';
-import { Dispatch, SetStateAction } from 'react';
 import { UUID } from 'node:crypto';
 import { ComputingType } from '../common';
-import { SensitivityAnalysisParametersInfos, UseParametersBackendReturnProps } from '../../../utils';
-type SubTabsValues = 'sensitivityInjectionsSet' | 'sensitivityInjection' | 'sensitivityHVDC' | 'sensitivityPST';
+import { FactorsCount, SensitivityAnalysisParametersInfos, UseParametersBackendReturnProps } from '../../../utils';
 export interface UseSensitivityAnalysisParametersReturn {
     formMethods: UseFormReturn<any>;
     formSchema: ObjectSchema<any>;
@@ -19,14 +17,13 @@ export interface UseSensitivityAnalysisParametersReturn {
     isStudyLinked: boolean;
     onSaveInline: (formData: Record<string, any>) => void;
     onSaveDialog: (formData: Record<string, any>) => void;
-    isMaxReached: boolean;
-    launchLoader: boolean;
-    initRowsCount: () => void;
-    onFormChanged: (formChanged: boolean) => void;
-    onChangeParams: (row: any, arrayFormName: SubTabsValues, index: number) => void;
+    isMaxResultsReached: boolean;
+    isMaxVariablesReached: boolean;
+    isLoading: boolean;
+    onFormChanged: () => void;
     emptyFormData: Record<string, unknown>;
-    analysisComputeComplexity: number;
-    setAnalysisComputeComplexity: Dispatch<SetStateAction<number>>;
+    factorsCount: FactorsCount;
+    resetFactorsCount: () => void;
 }
 type UseSensitivityAnalysisParametersFormProps = {
     name: string;

package/dist/components/parameters/sensi/use-sensitivity-analysis-parameters.js

@@ -17,7 +17,6 @@ import "localized-countries";
 import "localized-countries/data/fr";
 import "localized-countries/data/en";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
-import { PARAMETER_SENSI_NODES, PARAMETER_SENSI_PST, PARAMETER_SENSI_HVDC, PARAMETER_SENSI_INJECTION, PARAMETER_SENSI_INJECTIONS_SET, FLOW_VOLTAGE_SENSITIVITY_VALUE_THRESHOLD, ANGLE_FLOW_SENSITIVITY_VALUE_THRESHOLD, FLOW_FLOW_SENSITIVITY_VALUE_THRESHOLD, ACTIVATED, MONITORED_BRANCHES, INJECTIONS, PSTS, HVDC_LINES, COUNT, SENSI_INJECTIONS_SET, CONTINGENCIES, CONTAINER_NAME, CONTAINER_ID, EQUIPMENTS_IN_VOLTAGE_REGULATION, SUPERVISED_VOLTAGE_LEVELS, SENSITIVITY_TYPE, DISTRIBUTION_TYPE } from "./constants.js";
 import "../../inputs/reactHookForm/provider/CustomFormProvider.js";
 import "../../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
 import "../../dialogs/elementSaveDialog/ElementSaveDialog.js";
@@ -38,11 +37,11 @@ import "../../inputs/reactQueryBuilder/PropertyValueEditor.js";
 import "react-querybuilder";
 import "../common/widget/parameter-line-slider.js";
 import "../common/limitreductions/columns-definitions.js";
-import { getFormSchema, getSensiNodesformatNewParams, getSensiPstformatNewParams, getSensiHvdcformatNewParams, getSensiInjectionsformatNewParams, getSensiInjectionsSetformatNewParams, getGenericRowNewParams } from "./utils.js";
+import { getFormSchema, getSensiNodesformatNewParams, getSensiPstformatNewParams, getSensiHvdcformatNewParams, getSensiInjectionsformatNewParams, getSensiInjectionsSetformatNewParams, filterSensiParameterRows } from "./utils.js";
+import { DEFAULT_FACTOR_COUNT, PARAMETER_SENSI_NODES, PARAMETER_SENSI_PST, PARAMETER_SENSI_HVDC, PARAMETER_SENSI_INJECTION, PARAMETER_SENSI_INJECTIONS_SET, FLOW_VOLTAGE_SENSITIVITY_VALUE_THRESHOLD, ANGLE_FLOW_SENSITIVITY_VALUE_THRESHOLD, FLOW_FLOW_SENSITIVITY_VALUE_THRESHOLD, ACTIVATED, CONTINGENCIES, CONTAINER_NAME, CONTAINER_ID, EQUIPMENTS_IN_VOLTAGE_REGULATION, SUPERVISED_VOLTAGE_LEVELS, SENSITIVITY_TYPE, PSTS, MONITORED_BRANCHES, HVDC_LINES, INJECTIONS, DISTRIBUTION_TYPE, MAX_RESULTS_COUNT, MAX_VARIABLES_COUNT } from "./constants.js";
 import { getSensitivityAnalysisFactorsCount, setSensitivityAnalysisParameters } from "../../../services/sensitivity-analysis.js";
 import "../../filter/HeaderFilterForm.js";
 import { getNameElementEditorEmptyFormData } from "../common/name-element-editor/name-element-editor-utils.js";
-const numberMax = 5e5;
 const useSensitivityAnalysisParametersForm = ({
   studyUuid,
   currentNodeUuid,
@@ -55,8 +54,8 @@ const useSensitivityAnalysisParametersForm = ({
   const [providers, , , , , params, , updateParameters] = parametersBackend;
   const [sensitivityAnalysisParams, setSensitivityAnalysisParams] = useState(params);
   const { snackError } = useSnackMessage();
-  const [analysisComputeComplexity, setAnalysisComputeComplexity] = useState(0);
-  const [launchLoader, setLaunchLoader] = useState(false);
+  const [factorsCount, setFactorsCount] = useState(DEFAULT_FACTOR_COUNT);
+  const [isLoading, setIsLoading] = useState(false);
   const [isSubmitAction, setIsSubmitAction] = useState(false);
   const emptyFormData = useMemo(() => {
     return {
@@ -82,7 +81,7 @@ const useSensitivityAnalysisParametersForm = ({
     defaultValues: emptyFormData,
     resolver: yupResolver(formSchema)
   });
-  const { reset, getValues, setValue } = formMethods;
+  const { reset, getValues } = formMethods;
   const formattedProviders = Object.keys(providers).map((key) => ({
     id: key,
     label: providers[key]
@@ -100,72 +99,56 @@ const useSensitivityAnalysisParametersForm = ({
       ...getSensiNodesformatNewParams(newParams)
     };
   }, []);
-  const formatFilteredParams = useCallback((row) => {
-    return getGenericRowNewParams(row);
+  const resetFactorsCount = useCallback(() => {
+    setIsLoading(false);
+    setFactorsCount(DEFAULT_FACTOR_COUNT);
   }, []);
-  const getResultCount = useCallback(() => {
-    const values = getValues();
-    let totalResultCount = 0;
-    const tabsToCheck = [
-      "sensitivityInjectionsSet",
-      "sensitivityInjection",
-      "sensitivityHVDC",
-      "sensitivityPST"
-    ];
-    tabsToCheck.forEach((tab) => {
-      const tabToCheck = values[tab];
-      if (tabToCheck) {
-        const count = tabToCheck.filter((entry) => entry[ACTIVATED]).filter((entry) => entry[MONITORED_BRANCHES].length > 0).filter(
-          (entry) => entry[INJECTIONS]?.length > 0 || entry[PSTS]?.length > 0 || entry[HVDC_LINES]?.length > 0
-        ).map((entry) => entry[COUNT]).reduce((a, b) => a + b, 0);
-        totalResultCount += count;
-      }
+  const updateFactorCount = useCallback(() => {
+    if (!currentNodeUuid || !currentRootNetworkUuid) {
+      return;
+    }
+    const formValues = getValues();
+    const filteredInjectionsSet = filterSensiParameterRows(formValues[PARAMETER_SENSI_INJECTIONS_SET]);
+    const filteredInjection = filterSensiParameterRows(formValues[PARAMETER_SENSI_INJECTION]);
+    const filteredHvdc = filterSensiParameterRows(formValues[PARAMETER_SENSI_HVDC]);
+    const filteredPst = filterSensiParameterRows(formValues[PARAMETER_SENSI_PST]);
+    const filteredNodes = filterSensiParameterRows(formValues[PARAMETER_SENSI_NODES]);
+    const hasAnyEntries = filteredInjectionsSet.length > 0 || filteredInjection.length > 0 || filteredHvdc.length > 0 || filteredPst.length > 0 || filteredNodes.length > 0;
+    if (!hasAnyEntries) {
+      resetFactorsCount();
+      return;
+    }
+    const filteredFormValues = {
+      ...formValues,
+      [PARAMETER_SENSI_INJECTIONS_SET]: filteredInjectionsSet,
+      [PARAMETER_SENSI_INJECTION]: filteredInjection,
+      [PARAMETER_SENSI_HVDC]: filteredHvdc,
+      [PARAMETER_SENSI_PST]: filteredPst,
+      [PARAMETER_SENSI_NODES]: filteredNodes
+    };
+    setIsLoading(true);
+    getSensitivityAnalysisFactorsCount(
+      studyUuid,
+      currentNodeUuid,
+      currentRootNetworkUuid,
+      formatNewParams(filteredFormValues)
+    ).then((factorsCountResponse) => {
+      setFactorsCount(factorsCountResponse);
+      const timeoutId = setTimeout(() => {
+        setIsLoading(false);
+      }, 500);
+      return () => clearTimeout(timeoutId);
+    }).catch((error) => {
+      setIsLoading(false);
+      snackWithFallback(snackError, error, { headerId: "getSensitivityAnalysisFactorsCountError" });
     });
-    setAnalysisComputeComplexity(totalResultCount);
-    const timeoutId = setTimeout(() => {
-      setLaunchLoader(false);
-    }, 500);
-    return () => clearTimeout(timeoutId);
-  }, [getValues]);
-  const onFormChanged = useCallback(
-    (formChanged) => {
-      if (formChanged) {
-        setLaunchLoader(true);
-        getResultCount();
-      }
-    },
-    [getResultCount]
-  );
-  const onChangeParams = useCallback(
-    (row, arrayFormName, index) => {
-      if (!currentNodeUuid || !currentRootNetworkUuid) {
-        return;
-      }
-      setLaunchLoader(true);
-      getSensitivityAnalysisFactorsCount(
-        studyUuid,
-        currentNodeUuid,
-        currentRootNetworkUuid,
-        arrayFormName === SENSI_INJECTIONS_SET,
-        formatFilteredParams(row)
-      ).then((response) => {
-        response.text().then((value) => {
-          setValue(
-            `${arrayFormName}.${index}.${COUNT}`,
-            !Number.isNaN(Number(value)) ? parseInt(value, 10) : 0
-          );
-          getResultCount();
-        });
-      }).catch((error) => {
-        setLaunchLoader(false);
-        snackWithFallback(snackError, error, { headerId: "getSensitivityAnalysisFactorsCountError" });
-      });
-    },
-    [snackError, studyUuid, currentRootNetworkUuid, formatFilteredParams, setValue, getResultCount, currentNodeUuid]
-  );
+  }, [snackError, studyUuid, currentRootNetworkUuid, formatNewParams, currentNodeUuid, getValues, resetFactorsCount]);
+  const onFormChanged = useCallback(() => {
+    updateFactorCount();
+  }, [updateFactorCount]);
   const fromSensitivityAnalysisParamsDataToFormValues = useCallback(
     (parameters) => {
-      const values = {
+      return {
         [PROVIDER]: parameters[PROVIDER],
         [FLOW_FLOW_SENSITIVITY_VALUE_THRESHOLD]: parameters.flowFlowSensitivityValueThreshold,
         [ANGLE_FLOW_SENSITIVITY_VALUE_THRESHOLD]: parameters.angleFlowSensitivityValueThreshold,
@@ -191,8 +174,7 @@ const useSensitivityAnalysisParametersForm = ({
                 [FieldConstants.NAME]: sensiInjection[CONTAINER_NAME]
               };
             }) ?? [],
-            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false,
-            [COUNT]: 0
+            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false
           };
         }) ?? [],
         [PARAMETER_SENSI_INJECTION]: parameters.sensitivityInjection?.map((sensiInjections) => {
@@ -215,8 +197,7 @@ const useSensitivityAnalysisParametersForm = ({
                 [FieldConstants.NAME]: sensiInjection[CONTAINER_NAME]
               };
             }) ?? [],
-            [ACTIVATED]: sensiInjections[ACTIVATED] ?? false,
-            [COUNT]: 0
+            [ACTIVATED]: sensiInjections[ACTIVATED] ?? false
           };
         }) ?? [],
         [PARAMETER_SENSI_HVDC]: parameters.sensitivityHVDC?.map((sensiInjectionsSet) => {
@@ -240,8 +221,7 @@ const useSensitivityAnalysisParametersForm = ({
                 [FieldConstants.NAME]: sensiInjection[CONTAINER_NAME]
               };
             }) ?? [],
-            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false,
-            [COUNT]: 0
+            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false
           };
         }) ?? [],
         [PARAMETER_SENSI_PST]: parameters.sensitivityPST?.map((sensiInjectionsSet) => {
@@ -265,8 +245,7 @@ const useSensitivityAnalysisParametersForm = ({
                 [FieldConstants.NAME]: sensiInjection[CONTAINER_NAME]
               };
             }) ?? [],
-            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false,
-            [COUNT]: 0
+            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false
           };
         }) ?? [],
         [PARAMETER_SENSI_NODES]: parameters.sensitivityNodes?.map((sensiInjectionsSet) => {
@@ -289,38 +268,13 @@ const useSensitivityAnalysisParametersForm = ({
                 [FieldConstants.NAME]: sensiInjection[CONTAINER_NAME]
               };
             }) ?? [],
-            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false,
-            [COUNT]: 0
+            [ACTIVATED]: sensiInjectionsSet[ACTIVATED] ?? false
           };
         }) ?? []
       };
-      return values;
     },
     []
   );
-  const initRowsCount = useCallback(() => {
-    const handleEntries = (entries, parameter) => {
-      if (!entries) {
-        return;
-      }
-      const entriesWithIndices = entries.map((entry, index) => ({
-        entry,
-        index
-      }));
-      const filteredInitEntries = entries.filter(
-        (entry) => entry[ACTIVATED] && entry[MONITORED_BRANCHES].length > 0 && (entry[INJECTIONS]?.length > 0 || entry[PSTS]?.length > 0 || entry[HVDC_LINES]?.length > 0)
-      );
-      filteredInitEntries.forEach((entry) => {
-        const originalIndex = entriesWithIndices.findIndex((obj) => obj.entry === entry);
-        onChangeParams(entry, parameter, originalIndex);
-      });
-    };
-    const values = getValues();
-    handleEntries(values[PARAMETER_SENSI_INJECTIONS_SET], PARAMETER_SENSI_INJECTIONS_SET);
-    handleEntries(values[PARAMETER_SENSI_INJECTION], PARAMETER_SENSI_INJECTION);
-    handleEntries(values[PARAMETER_SENSI_HVDC], PARAMETER_SENSI_HVDC);
-    handleEntries(values[PARAMETER_SENSI_PST], PARAMETER_SENSI_PST);
-  }, [onChangeParams, getValues]);
   const onSaveInline = useCallback(
     (newParams) => {
       setIsSubmitAction(true);
@@ -328,12 +282,11 @@ const useSensitivityAnalysisParametersForm = ({
         const formattedParams = formatNewParams(newParams);
         setSensitivityAnalysisParams(formattedParams);
         updateParameters(formattedParams);
-        initRowsCount();
       }).catch((error) => {
         snackWithFallback(snackError, error, { headerId: "updateSensitivityAnalysisParametersError" });
       });
     },
-    [setSensitivityAnalysisParams, snackError, studyUuid, formatNewParams, initRowsCount, updateParameters]
+    [setSensitivityAnalysisParams, snackError, studyUuid, formatNewParams, updateParameters]
   );
   const onSaveDialog = useCallback(
     (formData) => {
@@ -355,22 +308,23 @@ const useSensitivityAnalysisParametersForm = ({
     if (sensitivityAnalysisParams) {
       reset(fromSensitivityAnalysisParamsDataToFormValues(sensitivityAnalysisParams));
       if (!isSubmitAction) {
-        initRowsCount();
+        onFormChanged();
       }
     }
   }, [
     fromSensitivityAnalysisParamsDataToFormValues,
     sensitivityAnalysisParams,
-    initRowsCount,
     isSubmitAction,
-    reset
+    reset,
+    onFormChanged
   ]);
   useEffect(() => {
     if (params) {
       reset(fromSensitivityAnalysisParamsDataToFormValues(params));
     }
   }, [params, reset, fromSensitivityAnalysisParamsDataToFormValues]);
-  const isMaxReached = useMemo(() => analysisComputeComplexity > numberMax, [analysisComputeComplexity]);
+  const isMaxResultsReached = useMemo(() => factorsCount.resultCount > MAX_RESULTS_COUNT, [factorsCount]);
+  const isMaxVariablesReached = useMemo(() => factorsCount.variableCount > MAX_VARIABLES_COUNT, [factorsCount]);
   const paramsLoaded = useMemo(() => !!params, [params]);
   return {
     formMethods,
@@ -383,14 +337,13 @@ const useSensitivityAnalysisParametersForm = ({
     isStudyLinked,
     onSaveInline,
     onSaveDialog,
-    isMaxReached,
-    launchLoader,
-    initRowsCount,
+    isMaxResultsReached,
+    isMaxVariablesReached,
+    isLoading,
     onFormChanged,
-    onChangeParams,
     emptyFormData,
-    analysisComputeComplexity,
-    setAnalysisComputeComplexity
+    factorsCount,
+    resetFactorsCount
   };
 };
 export {

package/dist/components/parameters/sensi/utils.d.ts

@@ -1,3 +1,4 @@
+import { FieldValues } from 'react-hook-form';
 import { default as yup } from '../../../utils/yupConfig';
 import { CONTINGENCIES, HVDC_LINES, INJECTIONS, MONITORED_BRANCHES, PSTS } from './constants';
 import { DistributionType, SensitivityType } from '../../../utils';
@@ -10,7 +11,6 @@ export declare const getSensiHVDCsFormSchema: () => {
             name: string;
         }[] | undefined;
         sensitivityType?: SensitivityType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -46,7 +46,6 @@ export declare const getSensiInjectionsFormSchema: () => {
             id: string;
             name: string;
         }[] | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -82,7 +81,6 @@ export declare const getSensiInjectionsSetFormSchema: () => {
             name: string;
         }[] | undefined;
         distributionType?: DistributionType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -155,7 +153,6 @@ export declare const getSensiNodesFormSchema: () => {
             id: string;
             name: string;
         }[] | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
     }[] | undefined, yup.AnyObject, "", "">;
 };
@@ -183,7 +180,6 @@ export declare const getSensiPSTsFormSchema: () => {
             name: string;
         }[] | undefined;
         sensitivityType?: SensitivityType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -213,6 +209,11 @@ export declare const getSensiPstformatNewParams: (newParams: SensitivityAnalysis
         activated: NonNullable<boolean | undefined>;
     }[] | undefined;
 };
+export declare const hasVariables: (row: any) => boolean;
+export declare const hasMonitoredEquipments: (row: any) => boolean;
+export declare const isActivatedSensiParameterRow: (entry: FieldValues) => any;
+export declare const isValidSensiParameterRow: (entry: FieldValues) => any;
+export declare const filterSensiParameterRows: (entries?: FieldValues[]) => FieldValues[];
 export declare const formSchema: yup.ObjectSchema<{
     sensitivityNodes: {
         contingencies?: {
@@ -227,7 +228,6 @@ export declare const formSchema: yup.ObjectSchema<{
             id: string;
             name: string;
         }[] | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
     }[] | undefined;
     sensitivityPST: {
@@ -236,7 +236,6 @@ export declare const formSchema: yup.ObjectSchema<{
             name: string;
         }[] | undefined;
         sensitivityType?: SensitivityType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -253,7 +252,6 @@ export declare const formSchema: yup.ObjectSchema<{
             name: string;
         }[] | undefined;
         sensitivityType?: SensitivityType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -269,7 +267,6 @@ export declare const formSchema: yup.ObjectSchema<{
             id: string;
             name: string;
         }[] | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -286,7 +283,6 @@ export declare const formSchema: yup.ObjectSchema<{
             name: string;
         }[] | undefined;
         distributionType?: DistributionType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -327,7 +323,6 @@ export declare const getFormSchema: (name: string | null) => yup.ObjectSchema<{
             id: string;
             name: string;
         }[] | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
     }[] | undefined;
     sensitivityPST: {
@@ -336,7 +331,6 @@ export declare const getFormSchema: (name: string | null) => yup.ObjectSchema<{
             name: string;
         }[] | undefined;
         sensitivityType?: SensitivityType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -353,7 +347,6 @@ export declare const getFormSchema: (name: string | null) => yup.ObjectSchema<{
             name: string;
         }[] | undefined;
         sensitivityType?: SensitivityType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -369,7 +362,6 @@ export declare const getFormSchema: (name: string | null) => yup.ObjectSchema<{
             id: string;
             name: string;
         }[] | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;
@@ -386,7 +378,6 @@ export declare const getFormSchema: (name: string | null) => yup.ObjectSchema<{
             name: string;
         }[] | undefined;
         distributionType?: DistributionType | undefined;
-        count?: number | null | undefined;
         activated: NonNullable<boolean | undefined>;
         monitoredBranches: {
             id: string;