better proto flow

Author: CamDavidsonPilon

core/pioreactor/calibrations/protocols/od_fusion_standards.py

@@ -213,7 +213,6 @@ def render(self, ctx: SessionContext) -> CalibrationStep:
                 "You will need:\n"
                 "1. A Pioreactor XR.\n"
                 "2. A set of OD600 standards in Pioreactor vials (at least 10 mL each), with stir bars.\n"
-                "3. Multiple readings per standard."
             ),
         )
 
@@ -231,7 +230,7 @@ def render(self, ctx: SessionContext) -> CalibrationStep:
             ctx.data["default_name"] = default_name
         return steps.form(
             "Name this estimator",
-            "Choose a unique name for this fused OD estimator.",
+            "Choose a name for this fused OD estimator.",
             [fields.str("estimator_name", label="Estimator name", default=default_name)],
         )
 
@@ -334,7 +333,7 @@ def render(self, ctx: SessionContext) -> CalibrationStep:
         standard_index = int(ctx.data.get("standard_index", 1))
         step = steps.form(
             f"Record standard vial {standard_index}",
-            f"Enter the OD600 measurement for the vial {standard_index}.",
+            f"Enter the OD600 measurement for the standard vial {standard_index}.",
             [fields.float("od_value", label="OD600", minimum=0.0001)],
         )
         chart = _build_chart_metadata(ctx.data.get("records", []))
@@ -363,7 +362,7 @@ def render(self, ctx: SessionContext) -> CalibrationStep:
         standard_index = int(ctx.data.get("standard_index", 1))
         step = steps.action(
             f"Insert standard vial {standard_index} ({current}/{total})",
-            f"Place the standard vial {standard_index} with a stir bar into the Pioreactor.",
+            f"Place standard vial {standard_index} with a stir bar into the Pioreactor.",
         )
         step.metadata = {
             "image": {
@@ -388,7 +387,7 @@ def render(self, ctx: SessionContext) -> CalibrationStep:
         standard_index = int(ctx.data.get("standard_index", 1))
         step = steps.action(
             f"Recording standard vial {standard_index} ({current}/{total} complete)",
-            "We'll take an OD reading for this observation.",
+            "We'll next take an OD reading for this standard.",
         )
         chart = _build_chart_metadata(ctx.data.get("records", []))
         if chart is not None:

frontend/src/Pioreactors.jsx

@@ -414,6 +414,45 @@ function AssignPioreactors({ experiment, variant="text" }) {
     return differences;
   }
 
+  function getAssignmentDeltaCounts(delta) {
+    let assignedCount = 0;
+    let unassignedCount = 0;
+
+    for (const worker in delta) {
+      if (delta[worker].current && !delta[worker].initial) {
+        assignedCount += 1;
+      } else {
+        unassignedCount += 1;
+      }
+    }
+
+    return { assignedCount, unassignedCount };
+  }
+
+  function getAssignmentDeltaLabel(delta) {
+    const { assignedCount, unassignedCount } = getAssignmentDeltaCounts(delta);
+    const labelParts = [];
+    const totalCount = assignedCount + unassignedCount;
+
+    if (unassignedCount > 0) {
+      labelParts.push(`Unassign ${unassignedCount}`);
+    }
+
+    if (assignedCount > 0) {
+      labelParts.push(`Assign ${assignedCount}`);
+    }
+
+    if (labelParts.length === 0) {
+      return "No changes";
+    }
+
+    if (assignedCount > 0 && unassignedCount > 0) {
+      return `Update ${totalCount}`;
+    }
+
+    return labelParts.join(", ");
+  }
+
   const updateAssignments = async () => {
     const delta = compareObjects(assigned, initialAssigned);
     const promises = [];
@@ -480,6 +519,10 @@ function AssignPioreactors({ experiment, variant="text" }) {
     setSelectAll(allSelected ? true : (noneSelected ? false : null));
   }, [assigned, workers, experiment]);
 
+  const assignmentDelta = compareObjects(assigned, initialAssigned);
+  const assignmentDeltaCount = Object.keys(assignmentDelta).length;
+  const assignmentDeltaLabel = getAssignmentDeltaLabel(assignmentDelta);
+
   return (
     <React.Fragment>
       <Button variant={variant} style={{ textTransform: "none" }} onClick={handleClickOpen}>
@@ -514,7 +557,7 @@ function AssignPioreactors({ experiment, variant="text" }) {
         <DialogContent>
           <p>
             Assign and unassign Pioreactors to experiment{" "}
-            <Chip icon={<PlayCircleOutlinedIcon/>} size="small" label={experiment} clickable component={Link} onClick={() => selectExperiment(experiment)} data-experiment-name={experiment} />.
+            <Chip icon={<PlayCircleOutlinedIcon/>} size="small" label={experiment} />.
           </p>
           <FormControl sx={{ m: "auto" }} component="fieldset" variant="standard">
             <FormLabel component="legend">Pioreactors</FormLabel>
@@ -574,10 +617,10 @@ function AssignPioreactors({ experiment, variant="text" }) {
           <Button
             variant="contained"
             onClick={updateAssignments}
-            disabled={Object.keys(compareObjects(assigned, initialAssigned)).length === 0}
+            disabled={true && assignmentDeltaCount === 0}
             style={{ textTransform: "none" }}
           >
-            Update {Object.keys(compareObjects(assigned, initialAssigned)).length}
+            {assignmentDeltaLabel}
           </Button>
         </DialogActions>
       </Dialog>