@gridsuite/commons-ui 0.141.0 → 0.143.0

package/dist/components/parameters/loadflow/use-load-flow-parameters-form.js

@@ -1,9 +1,8 @@
 import { useForm } from "react-hook-form";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { useState, useCallback, useMemo, useEffect } from "react";
-import { TabValues, getDefaultSpecificParamsValues, getSpecificLoadFlowParametersFormSchema, getCommonLoadFlowParametersFormSchema, mapLimitReductions, setSpecificParameters, setLimitReductions } from "./load-flow-parameters-utils.js";
-import { ParameterType } from "../../../utils/types/parameters.type.js";
-import { PROVIDER } from "../common/constant.js";
+import { TabValues, getCommonLoadFlowParametersFormSchema, mapLimitReductions, setLimitReductions } from "./load-flow-parameters-utils.js";
+import { PROVIDER, SPECIFIC_PARAMETERS, COMMON_PARAMETERS, VERSION_PARAMETER } from "../common/constant.js";
 import "react/jsx-runtime";
 import "@mui/material";
 import "react-intl";
@@ -40,9 +39,10 @@ import "react-querybuilder";
 import "../common/widget/parameter-line-slider.js";
 import { getLimitReductionsFormSchema, LIMIT_REDUCTIONS_FORM } from "../common/limitreductions/columns-definitions.js";
 import { toFormValuesLimitReductions } from "../common/limitreductions/limit-reductions-form-util.js";
-import { PARAM_LIMIT_REDUCTION, SPECIFIC_PARAMETERS, COMMON_PARAMETERS, PARAM_PROVIDER_OPENLOADFLOW, VERSION_PARAMETER } from "./constants.js";
+import { PARAM_LIMIT_REDUCTION, PARAM_PROVIDER_OPENLOADFLOW } from "./constants.js";
 import "../../filter/HeaderFilterForm.js";
 import { getNameElementEditorSchema, getNameElementEditorEmptyFormData } from "../common/name-element-editor/name-element-editor-utils.js";
+import { getDefaultSpecificParamsValues, getSpecificParametersFormSchema, getAllSpecificParametersValues, formatSpecificParameters, setSpecificParameters } from "../common/utils.js";
 const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, parametersUuid, name, description) => {
   const [
     providers,
@@ -65,30 +65,21 @@ const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, param
   const handleTabChange = useCallback((event, newValue) => {
     setSelectedTab(newValue);
   }, []);
-  const specificParametersValues = useMemo(() => {
-    const specificParams = currentProvider ? specificParamsDescriptions?.[currentProvider] : void 0;
-    return getDefaultSpecificParamsValues(specificParams);
-  }, [currentProvider, specificParamsDescriptions]);
-  const specificParameters = useMemo(() => {
-    const specificParams = currentProvider ? specificParamsDescriptions?.[currentProvider] : void 0;
-    return specificParams?.map((param) => ({
-      name: param.name,
-      type: param.type,
-      label: param.label,
-      description: param.description,
-      possibleValues: param.possibleValues,
-      defaultValue: param.defaultValue
-    }));
+  const specificParametersDescriptionForProvider = useMemo(() => {
+    return currentProvider && specificParamsDescriptions ? specificParamsDescriptions[currentProvider] : [];
   }, [currentProvider, specificParamsDescriptions]);
+  const specificParametersDefaultValues = useMemo(() => {
+    return getDefaultSpecificParamsValues(specificParametersDescriptionForProvider);
+  }, [specificParametersDescriptionForProvider]);
   const formSchema = useMemo(() => {
     return yup.object({
       [PROVIDER]: yup.string().required(),
       [PARAM_LIMIT_REDUCTION]: yup.number().nullable(),
       ...getCommonLoadFlowParametersFormSchema().fields,
       ...getLimitReductionsFormSchema(limitReductionNumber).fields,
-      ...getSpecificLoadFlowParametersFormSchema(specificParameters).fields
+      ...getSpecificParametersFormSchema(specificParametersDescriptionForProvider).fields
     }).concat(getNameElementEditorSchema(name));
-  }, [name, limitReductionNumber, specificParameters]);
+  }, [name, limitReductionNumber, specificParametersDescriptionForProvider]);
   const formMethods = useForm({
     defaultValues: {
       ...getNameElementEditorEmptyFormData(name, description),
@@ -98,7 +89,7 @@ const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, param
         ...params?.commonParameters
       },
       [SPECIFIC_PARAMETERS]: {
-        ...specificParametersValues
+        ...specificParametersDefaultValues
       },
       [LIMIT_REDUCTIONS_FORM]: []
     },
@@ -125,17 +116,6 @@ const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, param
     },
     [defaultLimitReductions, params?.limitReductions, watchProvider]
   );
-  const getSpecificParametersPerProvider = (formData, _specificParametersValues) => {
-    return Object.keys(formData[SPECIFIC_PARAMETERS]).reduce(
-      (acc, key) => {
-        if (_specificParametersValues[key].toString() !== formData[SPECIFIC_PARAMETERS][key].toString()) {
-          acc[key] = formData[SPECIFIC_PARAMETERS][key].toString();
-        }
-        return acc;
-      },
-      {}
-    );
-  };
   const formatNewParams = useCallback(
     (formData) => {
       return {
@@ -146,32 +126,20 @@ const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, param
           // PowSyBl requires that "version" appears first
           ...formData[COMMON_PARAMETERS]
         },
-        specificParametersPerProvider: {
-          [formData.provider]: getSpecificParametersPerProvider(formData, specificParametersValues)
-        },
+        specificParametersPerProvider: specificParametersDefaultValues ? {
+          [formData.provider]: getAllSpecificParametersValues(
+            formData,
+            specificParametersDefaultValues
+          )
+        } : {},
         limitReductions: toLimitReductions(formData[LIMIT_REDUCTIONS_FORM])
       };
     },
-    [specificParametersValues, toLimitReductions]
+    [specificParametersDefaultValues, toLimitReductions]
   );
   const toLoadFlowFormValues = useCallback(
     (_params) => {
-      const specificParams = _params.provider ? specificParamsDescriptions?.[_params.provider] : void 0;
-      const specificParamsPerProvider = _params.specificParametersPerProvider[_params.provider];
-      const formatted = specificParams?.reduce((acc, param) => {
-        if (specificParamsPerProvider && Object.prototype.hasOwnProperty.call(specificParamsPerProvider, param.name)) {
-          if (param.type === ParameterType.BOOLEAN) {
-            acc[param.name] = specificParamsPerProvider[param.name] === "true";
-          } else if (param.type === ParameterType.STRING_LIST) {
-            acc[param.name] = specificParamsPerProvider[param.name] !== "" ? specificParamsPerProvider[param.name].split(",") : [];
-          } else {
-            acc[param.name] = specificParamsPerProvider[param.name];
-          }
-        } else {
-          acc[param.name] = getDefaultSpecificParamsValues([param])[param.name];
-        }
-        return acc;
-      }, {});
+      const specificParamsListForCurrentProvider = _params.specificParametersPerProvider[_params.provider];
       return {
         [PROVIDER]: _params.provider,
         [PARAM_LIMIT_REDUCTION]: _params.limitReduction,
@@ -179,12 +147,15 @@ const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, param
           ..._params.commonParameters
         },
         [SPECIFIC_PARAMETERS]: {
-          ...formatted
+          ...formatSpecificParameters(
+            specificParametersDescriptionForProvider,
+            specificParamsListForCurrentProvider
+          )
         },
         ...toFormValuesLimitReductions(_params.limitReductions)
       };
     },
-    [specificParamsDescriptions]
+    [specificParametersDescriptionForProvider]
   );
   const paramsLoaded = useMemo(() => !!params && !!currentProvider, [currentProvider, params]);
   const formattedProviders = useMemo(() => {
@@ -266,7 +237,7 @@ const useLoadFlowParametersForm = (parametersBackend, enableDeveloperMode, param
     handleTabChange,
     tabIndexesWithError,
     formattedProviders,
-    specificParameters,
+    specificParametersDescriptionForProvider,
     defaultLimitReductions,
     toLoadFlowFormValues,
     formatNewParams,

package/dist/components/parameters/short-circuit/constants.d.ts

@@ -21,6 +21,8 @@ export declare const SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS = "withVSCConvert
 export declare const SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS = "withShuntCompensators";
 export declare const SHORT_CIRCUIT_WITH_NEUTRAL_POSITION = "withNeutralPosition";
 export declare const SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE = "initialVoltageProfileMode";
+export declare const SHORT_CIRCUIT_VOLTAGE_RANGES = "voltageRanges";
+export declare const SHORT_CIRCUIT_ONLY_STARTED_GENERATORS = "onlyStartedGenerators";
 export declare const intlPredefinedParametersOptions: () => {
     id: string;
     label: string;
@@ -35,3 +37,13 @@ export declare const intlInitialVoltageProfileMode: () => {
         label: string;
     };
 };
+export declare const onlyStartedGeneratorsOptions: {
+    ALL: {
+        id: string;
+        label: string;
+    };
+    STARTED: {
+        id: string;
+        label: string;
+    };
+};

package/dist/components/parameters/short-circuit/constants.js

@@ -17,6 +17,8 @@ const SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS = "withVSCConverterStations";
 const SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS = "withShuntCompensators";
 const SHORT_CIRCUIT_WITH_NEUTRAL_POSITION = "withNeutralPosition";
 const SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE = "initialVoltageProfileMode";
+const SHORT_CIRCUIT_VOLTAGE_RANGES = "voltageRanges";
+const SHORT_CIRCUIT_ONLY_STARTED_GENERATORS = "onlyStartedGenerators";
 const intlPredefinedParametersOptions = () => [
   {
     id: "ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP",
@@ -43,16 +45,29 @@ const intlInitialVoltageProfileMode = () => {
     }
   };
 };
+const onlyStartedGeneratorsOptions = {
+  ALL: {
+    id: "false",
+    label: "ShortCircuitAllLabel"
+  },
+  STARTED: {
+    id: "true",
+    label: "ShortCircuitStartedLabel"
+  }
+};
 export {
   InitialVoltage,
   PredefinedParameters,
   SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE,
+  SHORT_CIRCUIT_ONLY_STARTED_GENERATORS,
   SHORT_CIRCUIT_PREDEFINED_PARAMS,
+  SHORT_CIRCUIT_VOLTAGE_RANGES,
   SHORT_CIRCUIT_WITH_FEEDER_RESULT,
   SHORT_CIRCUIT_WITH_LOADS,
   SHORT_CIRCUIT_WITH_NEUTRAL_POSITION,
   SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS,
   SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS,
   intlInitialVoltageProfileMode,
-  intlPredefinedParametersOptions
+  intlPredefinedParametersOptions,
+  onlyStartedGeneratorsOptions
 };

package/dist/components/parameters/short-circuit/index.js

@@ -1,11 +1,13 @@
-import { InitialVoltage, PredefinedParameters, SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE, SHORT_CIRCUIT_PREDEFINED_PARAMS, SHORT_CIRCUIT_WITH_FEEDER_RESULT, SHORT_CIRCUIT_WITH_LOADS, SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, intlInitialVoltageProfileMode, intlPredefinedParametersOptions } from "./constants.js";
+import { InitialVoltage, PredefinedParameters, SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE, SHORT_CIRCUIT_ONLY_STARTED_GENERATORS, SHORT_CIRCUIT_PREDEFINED_PARAMS, SHORT_CIRCUIT_VOLTAGE_RANGES, SHORT_CIRCUIT_WITH_FEEDER_RESULT, SHORT_CIRCUIT_WITH_LOADS, SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, intlInitialVoltageProfileMode, intlPredefinedParametersOptions, onlyStartedGeneratorsOptions } from "./constants.js";
 import { ShortCircuitParametersInLine } from "./short-circuit-parameters-inline.js";
 import { ShortCircuitParametersEditionDialog } from "./short-circuit-parameters-dialog.js";
 export {
   InitialVoltage,
   PredefinedParameters,
   SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE,
+  SHORT_CIRCUIT_ONLY_STARTED_GENERATORS,
   SHORT_CIRCUIT_PREDEFINED_PARAMS,
+  SHORT_CIRCUIT_VOLTAGE_RANGES,
   SHORT_CIRCUIT_WITH_FEEDER_RESULT,
   SHORT_CIRCUIT_WITH_LOADS,
   SHORT_CIRCUIT_WITH_NEUTRAL_POSITION,
@@ -14,5 +16,6 @@ export {
   ShortCircuitParametersEditionDialog,
   ShortCircuitParametersInLine,
   intlInitialVoltageProfileMode,
-  intlPredefinedParametersOptions
+  intlPredefinedParametersOptions,
+  onlyStartedGeneratorsOptions
 };

package/dist/components/parameters/short-circuit/short-circuit-fields.js

@@ -1,10 +1,10 @@
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { useState, useMemo, useEffect } from "react";
 import { Grid } from "@mui/material";
 import { green, red } from "@mui/material/colors";
 import { Lens } from "@mui/icons-material";
 import { useWatch, useFormContext } from "react-hook-form";
-import { SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE, SHORT_CIRCUIT_PREDEFINED_PARAMS, SHORT_CIRCUIT_WITH_LOADS, SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, intlPredefinedParametersOptions, PredefinedParameters, intlInitialVoltageProfileMode, InitialVoltage, SHORT_CIRCUIT_WITH_FEEDER_RESULT } from "./constants.js";
+import { SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE, SHORT_CIRCUIT_PREDEFINED_PARAMS, SHORT_CIRCUIT_WITH_LOADS, SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, intlPredefinedParametersOptions, PredefinedParameters, intlInitialVoltageProfileMode, SHORT_CIRCUIT_ONLY_STARTED_GENERATORS, onlyStartedGeneratorsOptions, InitialVoltage, SHORT_CIRCUIT_WITH_FEEDER_RESULT } from "./constants.js";
 import { VoltageTable } from "./short-circuit-voltage-table.js";
 import GridItem from "../../grid/grid-item.js";
 import GridSection from "../../grid/grid-section.js";
@@ -37,6 +37,11 @@ import "../../inputs/reactQueryBuilder/CustomReactQueryBuilder.js";
 import "uuid";
 import "../../inputs/reactQueryBuilder/PropertyValueEditor.js";
 import "react-querybuilder";
+import { COMMON_PARAMETERS, SPECIFIC_PARAMETERS } from "../common/constant.js";
+import "../../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
+import "../../dialogs/elementSaveDialog/ElementSaveDialog.js";
+import "../common/widget/parameter-line-slider.js";
+import "../common/limitreductions/columns-definitions.js";
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["SUCCESS"] = "SUCCESS";
   Status2["ERROR"] = "ERROR";
@@ -48,23 +53,30 @@ function ShortCircuitFields({ resetAll, enableDeveloperMode = true }) {
     /* SUCCESS */
   );
   const watchInitialVoltageProfileMode = useWatch({
-    name: SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE
+    name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE}`
   });
   const watchPredefinedParams = useWatch({
     name: SHORT_CIRCUIT_PREDEFINED_PARAMS
   });
   const watchLoads = useWatch({
-    name: SHORT_CIRCUIT_WITH_LOADS
+    name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_LOADS}`
   });
   const watchShuntCompensators = useWatch({
-    name: SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS
+    name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS}`
   });
   const watchVSC = useWatch({
-    name: SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS
+    name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS}`
   });
   const watchNeutralPosition = useWatch({
-    name: SHORT_CIRCUIT_WITH_NEUTRAL_POSITION
+    name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_NEUTRAL_POSITION}`
   });
+  const watchSpecificParameters = useWatch({
+    name: `${SPECIFIC_PARAMETERS}`
+  });
+  const isThereSpecificParameters = useMemo(
+    () => Object.keys(watchSpecificParameters).length > 0 && watchSpecificParameters.constructor === Object,
+    [watchSpecificParameters]
+  );
   const isIccMinFeaturesDefaultConfiguration = useMemo(() => {
     return !watchLoads && !watchShuntCompensators && !watchVSC && !watchNeutralPosition;
   }, [watchLoads, watchShuntCompensators, watchVSC, watchNeutralPosition]);
@@ -104,7 +116,7 @@ function ShortCircuitFields({ resetAll, enableDeveloperMode = true }) {
   }, [enableDeveloperMode, watchPredefinedParams, setValue]);
   const feederResult = /* @__PURE__ */ jsxs(Grid, { container: true, alignItems: "center", spacing: 2, direction: "row", children: [
     /* @__PURE__ */ jsx(Grid, { item: true, xs: 10, children: /* @__PURE__ */ jsx(FieldLabel, { label: "descWithFeederResult" }) }),
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 2, children: /* @__PURE__ */ jsx(SwitchInput, { name: SHORT_CIRCUIT_WITH_FEEDER_RESULT }) })
+    /* @__PURE__ */ jsx(Grid, { item: true, xs: 2, children: /* @__PURE__ */ jsx(SwitchInput, { name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_FEEDER_RESULT}` }) })
   ] });
   const predefinedParameters = /* @__PURE__ */ jsx(
     MuiSelectInput,
@@ -118,14 +130,39 @@ function ShortCircuitFields({ resetAll, enableDeveloperMode = true }) {
   const initialVoltageProfileModeField = /* @__PURE__ */ jsx(
     RadioInput,
     {
-      name: SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE,
+      name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE}`,
       options: Object.values(initialVoltageProfileMode)
     }
   );
-  const loads = /* @__PURE__ */ jsx(CheckboxInput, { name: SHORT_CIRCUIT_WITH_LOADS, label: "shortCircuitLoads" });
-  const vsc = /* @__PURE__ */ jsx(CheckboxInput, { name: SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, label: "shortCircuitHvdc" });
-  const shuntCompensators = /* @__PURE__ */ jsx(CheckboxInput, { name: SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, label: "shortCircuitShuntCompensators" });
-  const neutralPosition = /* @__PURE__ */ jsx(CheckboxInput, { name: SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, label: "shortCircuitNeutralPosition" });
+  const loads = /* @__PURE__ */ jsx(CheckboxInput, { name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_LOADS}`, label: "shortCircuitLoads" });
+  const vsc = /* @__PURE__ */ jsx(
+    CheckboxInput,
+    {
+      name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS}`,
+      label: "shortCircuitHvdc"
+    }
+  );
+  const shuntCompensators = /* @__PURE__ */ jsx(
+    CheckboxInput,
+    {
+      name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS}`,
+      label: "shortCircuitShuntCompensators"
+    }
+  );
+  const neutralPosition = /* @__PURE__ */ jsx(
+    CheckboxInput,
+    {
+      name: `${COMMON_PARAMETERS}.${SHORT_CIRCUIT_WITH_NEUTRAL_POSITION}`,
+      label: "shortCircuitNeutralPosition"
+    }
+  );
+  const onlyStartedGenerators = /* @__PURE__ */ jsx(
+    RadioInput,
+    {
+      name: `${SPECIFIC_PARAMETERS}.${SHORT_CIRCUIT_ONLY_STARTED_GENERATORS}`,
+      options: Object.values(onlyStartedGeneratorsOptions)
+    }
+  );
   useEffect(() => {
     const isIccMaxWithNominalVoltageMap = watchPredefinedParams === PredefinedParameters.ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP;
     const isIccMinWithNominal = watchPredefinedParams === PredefinedParameters.ICC_MIN_WITH_NOMINAL_VOLTAGE_MAP;
@@ -165,7 +202,11 @@ function ShortCircuitFields({ resetAll, enableDeveloperMode = true }) {
     ] }),
     /* @__PURE__ */ jsx(GridSection, { title: "ShortCircuitVoltageProfileMode", heading: 4 }),
     /* @__PURE__ */ jsx(Grid, { container: true, children: /* @__PURE__ */ jsx(GridItem, { size: 12, children: initialVoltageProfileModeField }) }),
-    /* @__PURE__ */ jsx(VoltageTable, { voltageProfileMode: watchInitialVoltageProfileMode })
+    /* @__PURE__ */ jsx(VoltageTable, { voltageProfileMode: watchInitialVoltageProfileMode }),
+    isThereSpecificParameters && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(GridSection, { title: "ShortCircuitStartedGeneratorsMode", heading: 4 }),
+      /* @__PURE__ */ jsx(Grid, { container: true, children: /* @__PURE__ */ jsx(GridItem, { size: 12, children: onlyStartedGenerators }) })
+    ] })
   ] });
 }
 export {

package/dist/components/parameters/short-circuit/short-circuit-parameters-dialog.d.ts

@@ -1,2 +1,4 @@
 import { ParametersEditionDialogProps } from '../common';
-export declare function ShortCircuitParametersEditionDialog({ id, open, onClose, titleId, name, description, activeDirectory, language, enableDeveloperMode, }: Readonly<ParametersEditionDialogProps>): import("react/jsx-runtime").JSX.Element;
+export declare function ShortCircuitParametersEditionDialog({ id, open, onClose, titleId, name, description, activeDirectory, user, language, enableDeveloperMode, }: Readonly<ParametersEditionDialogProps & {
+    enableDeveloperMode: boolean;
+}>): import("react/jsx-runtime").JSX.Element;

package/dist/components/parameters/short-circuit/short-circuit-parameters-dialog.js

@@ -13,11 +13,13 @@ import "notistack";
 import "../../../utils/conversionUtils.js";
 import "../../../utils/types/equipmentType.js";
 import "../../../utils/yupConfig.js";
+import { getShortCircuitSpecificParametersDescription, updateShortCircuitParameters, fetchShortCircuitParameters } from "../../../services/short-circuit-analysis.js";
 import { NameElementEditorForm } from "../common/name-element-editor/name-element-editor-form.js";
 import "../../overflowableText/OverflowableText.js";
 import "localized-countries";
 import "localized-countries/data/fr";
 import "localized-countries/data/en";
+import { useParametersBackend, OptionalServicesStatus } from "../../../hooks/use-parameters-backend.js";
 import "../../inputs/reactHookForm/provider/CustomFormProvider.js";
 import "yup";
 import "../../inputs/reactHookForm/agGridTable/BottomRightButtons.js";
@@ -34,6 +36,9 @@ import "../../inputs/reactQueryBuilder/PropertyValueEditor.js";
 import "react-querybuilder";
 import { useShortCircuitParametersForm } from "./use-short-circuit-parameters-form.js";
 import { ShortCircuitParametersForm } from "./short-circuit-parameters-form.js";
+import { ComputingType } from "../common/computing-type.js";
+import "../common/widget/parameter-line-slider.js";
+import "../common/limitreductions/columns-definitions.js";
 function ShortCircuitParametersEditionDialog({
   id,
   open,
@@ -42,15 +47,28 @@ function ShortCircuitParametersEditionDialog({
   name,
   description,
   activeDirectory,
+  user,
   language,
   enableDeveloperMode
 }) {
+  const parametersBackend = useParametersBackend(
+    user,
+    id,
+    ComputingType.SHORT_CIRCUIT,
+    OptionalServicesStatus.Up,
+    null,
+    null,
+    null,
+    null,
+    fetchShortCircuitParameters,
+    updateShortCircuitParameters,
+    getShortCircuitSpecificParametersDescription
+  );
   const shortCircuitMethods = useShortCircuitParametersForm({
+    parametersBackend,
     parametersUuid: id,
     name,
-    description,
-    studyUuid: null,
-    studyShortCircuitParameters: null
+    description
   });
   const {
     formState: { errors, dirtyFields }
@@ -62,6 +80,7 @@ function ShortCircuitParametersEditionDialog({
       open,
       onClose,
       onSave: shortCircuitMethods.onSaveDialog,
+      onValidationError: shortCircuitMethods.onValidationError,
       formSchema: shortCircuitMethods.formSchema,
       formMethods: shortCircuitMethods.formMethods,
       titleId,
@@ -72,6 +91,7 @@ function ShortCircuitParametersEditionDialog({
         ShortCircuitParametersForm,
         {
           shortCircuitMethods,
+          enableDeveloperMode,
           renderTitleFields: () => {
             return /* @__PURE__ */ jsx(
               NameElementEditorForm,
@@ -81,8 +101,7 @@ function ShortCircuitParametersEditionDialog({
                 elementType: ElementType.SHORT_CIRCUIT_PARAMETERS
               }
             );
-          },
-          enableDeveloperMode: enableDeveloperMode ?? false
+          }
         }
       )
     }

package/dist/components/parameters/short-circuit/short-circuit-parameters-form.js

@@ -35,7 +35,7 @@ function ShortCircuitParametersForm({
   renderActions,
   enableDeveloperMode
 }) {
-  const { formMethods, formSchema, paramsLoading, resetAll } = shortCircuitMethods;
+  const { formMethods, formSchema, paramsLoaded, resetAll } = shortCircuitMethods;
   return /* @__PURE__ */ jsx(CustomFormProvider, { validationSchema: formSchema, ...formMethods, removeOptional: true, children: /* @__PURE__ */ jsxs(
     Box,
     {
@@ -47,7 +47,7 @@ function ShortCircuitParametersForm({
       },
       children: [
         /* @__PURE__ */ jsx(Grid, { item: true, container: true, direction: "column", children: renderTitleFields?.() }),
-        paramsLoading ? /* @__PURE__ */ jsx(LinearProgress, {}) : /* @__PURE__ */ jsx(Grid, { sx: parametersStyles.scrollableGrid, children: /* @__PURE__ */ jsx(ShortCircuitFields, { enableDeveloperMode, resetAll }) }),
+        paramsLoaded ? /* @__PURE__ */ jsx(Grid, { sx: parametersStyles.scrollableGrid, children: /* @__PURE__ */ jsx(ShortCircuitFields, { enableDeveloperMode, resetAll }) }) : /* @__PURE__ */ jsx(LinearProgress, {}),
         /* @__PURE__ */ jsx(
           Grid,
           {

package/dist/components/parameters/short-circuit/short-circuit-parameters-inline.d.ts

@@ -1,8 +1,9 @@
 import { UUID } from 'node:crypto';
-import { ShortCircuitParametersInfos } from './short-circuit-parameters.type';
-export declare function ShortCircuitParametersInLine({ studyUuid, setHaveDirtyFields, shortCircuitParameters, enableDeveloperMode, }: Readonly<{
+import { UseParametersBackendReturnProps } from '../../../utils';
+import { ComputingType } from '../common';
+export declare function ShortCircuitParametersInLine({ studyUuid, setHaveDirtyFields, parametersBackend, enableDeveloperMode, }: Readonly<{
     studyUuid: UUID | null;
     setHaveDirtyFields: (isDirty: boolean) => void;
-    shortCircuitParameters: ShortCircuitParametersInfos | null;
+    parametersBackend: UseParametersBackendReturnProps<ComputingType.SHORT_CIRCUIT>;
     enableDeveloperMode: boolean;
 }>): import("react/jsx-runtime").JSX.Element;

package/dist/components/parameters/short-circuit/short-circuit-parameters-inline.js

@@ -8,6 +8,7 @@ import { snackWithFallback } from "../../../utils/error.js";
 import "@mui/icons-material";
 import { ElementType } from "../../../utils/types/elementType.js";
 import "../../../utils/yupConfig.js";
+import { fetchShortCircuitParameters } from "../../../services/short-circuit-analysis.js";
 import "localized-countries";
 import "localized-countries/data/fr";
 import "localized-countries/data/en";
@@ -34,60 +35,42 @@ import { LabelledButton } from "../common/parameters.js";
 import { CreateParameterDialog } from "../common/parameters-creation-dialog.js";
 import "../common/widget/parameter-line-slider.js";
 import "../common/limitreductions/columns-definitions.js";
-import { SHORT_CIRCUIT_WITH_FEEDER_RESULT, SHORT_CIRCUIT_PREDEFINED_PARAMS, SHORT_CIRCUIT_WITH_LOADS, SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE, InitialVoltage } from "./constants.js";
-import { fetchShortCircuitParameters } from "../../../services/short-circuit-analysis.js";
 import { ShortCircuitParametersForm } from "./short-circuit-parameters-form.js";
 import { useShortCircuitParametersForm } from "./use-short-circuit-parameters-form.js";
 function ShortCircuitParametersInLine({
   studyUuid,
   setHaveDirtyFields,
-  shortCircuitParameters,
+  parametersBackend,
   enableDeveloperMode
 }) {
   const shortCircuitMethods = useShortCircuitParametersForm({
+    parametersBackend,
     parametersUuid: null,
     name: null,
-    description: null,
-    studyUuid,
-    studyShortCircuitParameters: shortCircuitParameters
+    description: null
   });
   const intl = useIntl();
   const [openCreateParameterDialog, setOpenCreateParameterDialog] = useState(false);
   const [openSelectParameterDialog, setOpenSelectParameterDialog] = useState(false);
   const { snackError } = useSnackMessage();
-  const { getCurrentValues, formMethods } = shortCircuitMethods;
-  const { setValue, formState, handleSubmit } = formMethods;
-  const replaceFormValues = useCallback(
-    (param) => {
-      const dirty = { shouldDirty: true };
-      setValue(SHORT_CIRCUIT_WITH_FEEDER_RESULT, param.parameters.withFeederResult, dirty);
-      setValue(SHORT_CIRCUIT_PREDEFINED_PARAMS, param.predefinedParameters, dirty);
-      setValue(SHORT_CIRCUIT_WITH_LOADS, param.parameters.withLoads, dirty);
-      setValue(SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS, param.parameters.withVSCConverterStations, dirty);
-      setValue(SHORT_CIRCUIT_WITH_SHUNT_COMPENSATORS, param.parameters.withShuntCompensators, dirty);
-      setValue(SHORT_CIRCUIT_WITH_NEUTRAL_POSITION, !param.parameters.withNeutralPosition, dirty);
-      setValue(
-        SHORT_CIRCUIT_INITIAL_VOLTAGE_PROFILE_MODE,
-        param.parameters.initialVoltageProfileMode === InitialVoltage.CONFIGURED ? InitialVoltage.CEI909 : param.parameters.initialVoltageProfileMode,
-        dirty
-      );
-    },
-    [setValue]
-  );
+  const { formMethods } = shortCircuitMethods;
+  const { getValues, formState, handleSubmit, reset } = formMethods;
   const handleLoadParameters = useCallback(
     (newParams) => {
       if (newParams?.length) {
         setOpenSelectParameterDialog(false);
         const paramUuid = newParams[0].id;
         fetchShortCircuitParameters(paramUuid).then((parameters) => {
-          replaceFormValues(parameters);
+          reset(shortCircuitMethods.toShortCircuitFormValues(parameters), {
+            keepDefaultValues: true
+          });
         }).catch((error) => {
           snackWithFallback(snackError, error, { headerId: "paramsRetrievingError" });
         });
       }
       setOpenSelectParameterDialog(false);
     },
-    [snackError, replaceFormValues]
+    [snackError, shortCircuitMethods, reset]
   );
   useEffect(() => {
     setHaveDirtyFields(!!Object.keys(formState.dirtyFields).length);
@@ -108,7 +91,17 @@ function ShortCircuitParametersInLine({
               }
             ),
             /* @__PURE__ */ jsx(LabelledButton, { callback: () => setOpenCreateParameterDialog(true), label: "save" }),
-            /* @__PURE__ */ jsx(SubmitButton, { onClick: handleSubmit(shortCircuitMethods.onSaveInline), variant: "outlined", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "validate" }) })
+            /* @__PURE__ */ jsx(
+              SubmitButton,
+              {
+                onClick: handleSubmit(
+                  shortCircuitMethods.onSaveInline,
+                  shortCircuitMethods.onValidationError
+                ),
+                variant: "outlined",
+                children: /* @__PURE__ */ jsx(FormattedMessage, { id: "validate" })
+              }
+            )
           ] }),
           openCreateParameterDialog && /* @__PURE__ */ jsx(
             CreateParameterDialog,
@@ -116,7 +109,7 @@ function ShortCircuitParametersInLine({
               studyUuid,
               open: openCreateParameterDialog,
               onClose: () => setOpenCreateParameterDialog(false),
-              parameterValues: () => getCurrentValues(),
+              parameterValues: () => shortCircuitMethods.formatNewParams(getValues()),
               parameterFormatter: (newParams) => newParams,
               parameterType: ElementType.SHORT_CIRCUIT_PARAMETERS
             }

package/dist/components/parameters/short-circuit/short-circuit-parameters-utils.d.ts

@@ -0,0 +1,27 @@
+import { InitialVoltage, PredefinedParameters } from './constants';
+import { default as yup } from '../../../utils/yupConfig';
+import { SpecificParametersValues } from '../../../utils';
+export declare const getCommonShortCircuitParametersFormSchema: () => yup.ObjectSchema<{
+    commonParameters: {
+        withFeederResult: NonNullable<boolean | undefined>;
+        withLoads: NonNullable<boolean | undefined>;
+        withVSCConverterStations: NonNullable<boolean | undefined>;
+        withShuntCompensators: NonNullable<boolean | undefined>;
+        withNeutralPosition: NonNullable<boolean | undefined>;
+        initialVoltageProfileMode: NonNullable<InitialVoltage | undefined>;
+    };
+}, yup.AnyObject, {
+    commonParameters: {
+        withFeederResult: undefined;
+        withLoads: undefined;
+        withVSCConverterStations: undefined;
+        withShuntCompensators: undefined;
+        withNeutralPosition: undefined;
+        initialVoltageProfileMode: undefined;
+    };
+}, "">;
+export declare const resetSpecificParameters: (specificDefaultValues: SpecificParametersValues, predefinedParameter: PredefinedParameters) => {
+    onlyStartedGenerators: boolean;
+} | {
+    [x: string]: any;
+};