Function was moved state no longer available

Moved logic to DatacCollection and Characterisaiton where its used.
mxcube · Oct 10, 2023 · da38a21 · da38a21
1 parent 7c40a4e
commit da38a21
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/ui/src/components/Tasks/Characterisation.js b/ui/src/components/Tasks/Characterisation.js
@@ -490,6 +490,14 @@ export default connect((state) => {
 
   const { type } = state.taskForm.taskData;
   const { limits } = state.taskForm.defaultParameters[type.toLowerCase()];
+  const parameters = state.taskForm.taskData.parameters;
+
+  if (parseFloat(parameters.osc_range) === 0) {
+    parameters.osc_range =
+      state.taskForm.defaultParameters[
+        type.toLowerCase()
+      ].acq_parameters.osc_range;
+  }
 
   return {
     path: `${state.login.rootPath}/${subdir}`,
@@ -504,7 +512,7 @@ export default connect((state) => {
     use_min_dose: selector(state, 'use_min_dose'),
     use_min_time: selector(state, 'use_min_time'),
     initialValues: {
-      ...state.taskForm.taskData.parameters,
+      ...parameters,
       beam_size: state.sampleview.currentAperture,
       resolution:
         state.taskForm.sampleIds.constructor !== Array

diff --git a/ui/src/components/Tasks/DataCollection.js b/ui/src/components/Tasks/DataCollection.js
@@ -365,14 +365,22 @@ export default connect((state) => {
 
   const { type } = state.taskForm.taskData;
   const { limits } = state.taskForm.defaultParameters[type.toLowerCase()];
+  const parameters = state.taskForm.taskData.parameters;
+
+  if (parseFloat(parameters.osc_range) === 0) {
+    parameters.osc_range =
+      state.taskForm.defaultParameters[
+        type.toLowerCase()
+      ].acq_parameters.osc_range;
+  }
 
   return {
     path: `${state.login.rootPath}/${subdir}`,
     filename: fname,
     acqParametersLimits: limits,
     beamline: state.beamline,
     initialValues: {
-      ...state.taskForm.taskData.parameters,
+      ...parameters,
       beam_size: state.sampleview.currentAperture,
       resolution:
         state.taskForm.sampleIds.constructor !== Array

diff --git a/ui/src/components/Tasks/fields.js b/ui/src/components/Tasks/fields.js
@@ -11,13 +11,6 @@ export function getLastUsedParameters(type, newParams) {
   const parameters =
     lastParameters === null ? newParams : JSON.parse(lastParameters);
 
-  if (parseFloat(parameters.osc_range) === 0) {
-    parameters.osc_range =
-      state.taskForm.defaultParameters[
-        type.toLowerCase()
-      ].acq_parameters.osc_range;
-  }
-
   return parameters;
 }