fix: prevent race conditions when setting some scenario parameters state

Cosmo-Tech · Mar 4, 2022 · 7277ab9 · 7277ab9
1 parent bb27eaf
commit 7277ab9
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 34 deletions.
diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicDateInputFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicDateInputFactory.js
@@ -18,10 +18,10 @@ const create = (t, parameterData, parametersState, setParametersState, editMode)
   };
 
   function setValue(newValue) {
-    setParametersState({
-      ...parametersState,
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterData.id]: newValue,
-    });
+    }));
   }
 
   return (

diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicEnumInputFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicEnumInputFactory.js
@@ -20,10 +20,10 @@ const create = (t, parameterData, parametersState, setParametersState, editMode)
   }
 
   function setValue(newValue) {
-    setParametersState({
-      ...parametersState,
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterData.id]: newValue,
-    });
+    }));
   }
 
   return (

diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicNumberInputFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicNumberInputFactory.js
@@ -32,10 +32,10 @@ const create = (t, parameterData, parametersState, setParametersState, editMode)
   };
 
   function setValue(newValue) {
-    setParametersState({
-      ...parametersState,
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterData.id]: newValue,
-    });
+    }));
   }
 
   let value = parametersState[parameterData.id];

diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicTextInputFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicTextInputFactory.js
@@ -11,10 +11,10 @@ const create = (t, parameterData, parametersState, setParametersState, editMode)
   };
 
   function setValue(newValue) {
-    setParametersState({
-      ...parametersState,
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterData.id]: newValue,
-    });
+    }));
   }
 
   return (

diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicToggleInputFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/BasicToggleInputFactory.js
@@ -11,10 +11,10 @@ const create = (t, parameterData, parametersState, setParametersState, editMode)
   };
 
   function setValue(newValue) {
-    setParametersState({
-      ...parametersState,
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterData.id]: newValue,
-    });
+    }));
   }
 
   return (

diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/TableFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/TableFactory.js
@@ -35,20 +35,23 @@ const create = (t, datasets, parameterMetadata, parametersState, setParametersSt
   const dateFormat = parameterMetadata.dateFormat || DEFAULT_DATE_FORMAT;
   const options = { dateFormat: dateFormat };
 
-  const setParameterInState = (newValue) => {
-    setParametersState({
-      ...parametersState,
+  function setParameterInState(newValue) {
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterId]: newValue,
-    });
-  };
+    }));
+  }
 
-  const setClientFileDescriptorStatuses = (newFileStatus, newTableDataStatus) => {
-    setParameterInState({
-      ...parameter,
-      status: newFileStatus,
-      tableDataStatus: newTableDataStatus,
-    });
-  };
+  function setClientFileDescriptorStatuses(newFileStatus, newTableDataStatus) {
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
+      [parameterId]: {
+        ...currentParametersState[parameterId],
+        status: newFileStatus,
+        tableDataStatus: newTableDataStatus,
+      },
+    }));
+  }
 
   const _checkForLock = () => {
     if (create.downloadLocked === undefined) {

diff --git a/src/utils/scenarioParameters/factories/inputComponentsFactories/UploadFileFactory.js b/src/utils/scenarioParameters/factories/inputComponentsFactories/UploadFileFactory.js
@@ -11,17 +11,20 @@ const create = (t, datasets, parameterData, parametersState, setParametersState,
   const datasetId = parameter.id;
 
   function setParameterInState(newValue) {
-    setParametersState({
-      ...parametersState,
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
       [parameterId]: newValue,
-    });
+    }));
   }
 
   function setClientFileDescriptorStatus(newStatus) {
-    setParameterInState({
-      ...parameter,
-      status: newStatus,
-    });
+    setParametersState((currentParametersState) => ({
+      ...currentParametersState,
+      [parameterId]: {
+        ...currentParametersState[parameterId],
+        status: newStatus,
+      },
+    }));
   }
 
   const labels = {