@gridsuite/commons-ui 0.247.0 → 0.248.0

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

@@ -77,7 +77,7 @@ function ExpertFilterForm({ isEditing }) {
   const openConfirmationPopup = useCallback(() => {
     return formatQuery(getValues(EXPERT_FILTER_QUERY), "json_without_ids") !== formatQuery(defaultQuery, "json_without_ids");
   }, [getValues]);
-  const handleResetOnConfirmation = useCallback(() => {
+  const resetOnTypeChange = useCallback(() => {
     setValue(EXPERT_FILTER_QUERY, defaultQuery);
   }, [setValue]);
   const watchEquipmentType = useWatch({
@@ -102,7 +102,7 @@ function ExpertFilterForm({ isEditing }) {
         options: Object.values(EXPERT_FILTER_EQUIPMENTS),
         label: "equipmentType",
         shouldOpenPopup: openConfirmationPopup,
-        resetOnConfirmation: handleResetOnConfirmation,
+        onValueChange: resetOnTypeChange,
         message: "changeTypeMessage",
         validateButtonLabel: "button.changeType",
         sx: filterStyles.textField,

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

@@ -151,10 +151,6 @@ function ExplicitNamingFilterForm({
   const [selectedFile, setSelectedFile] = useState();
   const [fileErrorMessage, setFileErrorMessage] = useState();
   const tableRef = useRef(null);
-  useEffect(() => {
-    setSelectedFile(void 0);
-    setFileErrorMessage(void 0);
-  }, [watchEquipmentType]);
   const getTemplateData = useCallback(() => [csvFileHeaders], [csvFileHeaders]);
   const getTableData = useCallback(() => {
     const rows = getValues(FILTER_EQUIPMENTS_ATTRIBUTES) ?? [];
@@ -170,7 +166,9 @@ function ExplicitNamingFilterForm({
       (row) => row[DISTRIBUTION_KEY] || row[FieldConstants.EQUIPMENT_ID]
     );
   };
-  const handleResetOnConfirmation = () => {
+  const resetOnTypeChange = () => {
+    setSelectedFile(void 0);
+    setFileErrorMessage(void 0);
     setValue(FILTER_EQUIPMENTS_ATTRIBUTES, makeDefaultTableRows());
   };
   const onStudySelected = (studyUuid) => {
@@ -204,7 +202,7 @@ function ExplicitNamingFilterForm({
               disabled: !!sourceFilterForExplicitNamingConversion || isEditing && !isDeveloperMode,
               label: "equipmentType",
               shouldOpenPopup: openConfirmationPopup,
-              resetOnConfirmation: handleResetOnConfirmation,
+              onValueChange: resetOnTypeChange,
               message: "changeTypeMessage",
               validateButtonLabel: "button.changeType",
               sx: { width: 400, maxWidth: "100%" },

package/dist/components/ui/reactHookForm/selectInputs/InputWithPopupConfirmation.d.ts

@@ -1,3 +1,3 @@
 export declare function InputWithPopupConfirmation({ Input, name, shouldOpenPopup, // condition to open popup confirmation
-resetOnConfirmation, // function to reset values in your form on confirmation,
+onValueChange, // function applying the changes on EVERY value change, be it confirmed through the popup or not
 message, validateButtonLabel, ...props }: any): import("react").JSX.Element;

package/dist/components/ui/reactHookForm/selectInputs/InputWithPopupConfirmation.js

@@ -7,8 +7,8 @@ function InputWithPopupConfirmation({
   name,
   shouldOpenPopup,
   // condition to open popup confirmation
-  resetOnConfirmation,
-  // function to reset values in your form on confirmation,
+  onValueChange,
+  // function applying the changes on EVERY value change, be it confirmed through the popup or not
   message,
   validateButtonLabel,
   ...props
@@ -25,11 +25,12 @@ function InputWithPopupConfirmation({
       setOpenPopup(true);
       setNewValue(value);
     } else {
+      onValueChange?.();
       onChange(value);
     }
   };
   const handlePopupConfirmation = () => {
-    resetOnConfirmation?.();
+    onValueChange?.();
     onChange(newValue);
     setOpenPopup(false);
   };

package/dist/features/network-modifications/common/currentLimits/LimitsPane.js

@@ -112,16 +112,17 @@ function LimitsPane({
     }
     return null;
   };
-  const handlePopupConfirmation = () => {
-    const resetOLGs = mapServerLimitsGroupsToFormInfos(
+  const resetOLGs = () => {
+    const networkOLGs = mapServerLimitsGroupsToFormInfos(
       equipmentToModify?.currentLimits ?? []
     );
     const currentValues = getValues();
     reset(
       {
         ...currentValues,
-        [FieldConstants.LIMITS]: {
-          [FieldConstants.OPERATIONAL_LIMITS_GROUPS]: resetOLGs,
+        [id]: {
+          ...currentValues[id],
+          [FieldConstants.OPERATIONAL_LIMITS_GROUPS]: networkOLGs,
           [FieldConstants.ENABLE_OLG_MODIFICATION]: false
         }
       },
@@ -161,7 +162,7 @@ function LimitsPane({
               name: `${id}.${FieldConstants.ENABLE_OLG_MODIFICATION}`,
               label: olgEditable ? "Edit" : "View",
               shouldOpenPopup: () => olgEditable,
-              resetOnConfirmation: handlePopupConfirmation,
+              onValueChange: resetOLGs,
               message: "disableOLGedition",
               validateButtonLabel: "validate"
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.247.0",
+    "version": "0.248.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",