Skip to content

Commit 51b673b

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
updatES
1 parent 118dc54 commit 51b673b

File tree

10 files changed

+18
-27
lines changed

10 files changed

+18
-27
lines changed

‎core/pioreactor/calibrations/protocols/pump_duration_based.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- coding: utf-8 -*-
22
import uuid
3+
from configparser import NoOptionError
34
from typing import Callable
45
from typing import cast
56
from typing import ClassVar
@@ -139,7 +140,7 @@ def _execute_pump_for_calibration(
139140
def start_duration_based_session(pump_device: PumpCalibrationDevices) -> CalibrationSession:
140141
try:
141142
channel_pump_is_configured_for = config.get("PWM_reverse", pump_device.removesuffix("_pump"))
142-
except KeyError as exc:
143+
except NoOptionError as exc:
143144
raise ValueError(f"{pump_device} is not present in config.ini. Add it to the [PWM] section.") from exc
144145

145146
session_id = str(uuid.uuid4())

‎core/pioreactor/web/api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@ def start_calibration_session(pioreactor_unit: str) -> ResponseReturnValue:
15401540
detail = _extract_unit_api_error(response)
15411541
if detail:
15421542
publish_to_error_log(f"{exc}: {detail}", "start_calibration_session")
1543-
abort_with(502, f"Starting calibration session failed on {pioreactor_unit}: {detail}")
1543+
abort_with(502, f"{detail}")
15441544
if response is not None:
15451545
abort_with(
15461546
502,

‎core/pioreactor/web/static/asset-manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
33
"main.css": "/static/static/css/main.9c7a48b7.css",
4-
"main.js": "/static/static/js/main.a80cf20e.js",
4+
"main.js": "/static/static/js/main.ffc41f89.js",
55
"static/media/pioreactor_cloud.webp": "/static/static/media/pioreactor_cloud.b15b29e435797dc69d76.webp",
66
"static/media/roboto-all-500-normal.woff": "/static/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
77
"static/media/roboto-all-700-normal.woff": "/static/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
@@ -30,10 +30,10 @@
3030
"static/media/roboto-greek-ext-700-normal.woff2": "/static/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
3131
"index.html": "/static/index.html",
3232
"main.9c7a48b7.css.map": "/static/static/css/main.9c7a48b7.css.map",
33-
"main.a80cf20e.js.map": "/static/static/js/main.a80cf20e.js.map"
33+
"main.ffc41f89.js.map": "/static/static/js/main.ffc41f89.js.map"
3434
},
3535
"entrypoints": [
3636
"static/css/main.9c7a48b7.css",
37-
"static/js/main.a80cf20e.js"
37+
"static/js/main.ffc41f89.js"
3838
]
3939
}

‎core/pioreactor/web/static/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/static/logo192.png"/><link rel="manifest" href="/static/manifest.json"/><script defer="defer" src="/static/static/js/main.a80cf20e.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/static/logo192.png"/><link rel="manifest" href="/static/manifest.json"/><script defer="defer" src="/static/static/js/main.ffc41f89.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

core/pioreactor/web/static/static/js/main.a80cf20e.js renamed to core/pioreactor/web/static/static/js/main.ffc41f89.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/pioreactor/web/static/static/js/main.a80cf20e.js.LICENSE.txt renamed to core/pioreactor/web/static/static/js/main.ffc41f89.js.LICENSE.txt

File renamed without changes.

core/pioreactor/web/static/static/js/main.a80cf20e.js.map renamed to core/pioreactor/web/static/static/js/main.ffc41f89.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/src/Calibrations.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,19 +388,19 @@ function CalibrationData() {
388388
}
389389
return false;
390390
}).sort((a, b) => {
391-
const unitCmp = a.pioreactor_unit.localeCompare(b.pioreactor_unit);
392-
if (unitCmp !== 0) return unitCmp;
393-
394391
const aDate = dayjs(a.created_at);
395392
const bDate = dayjs(b.created_at);
396393

397394
const aTime = aDate.isValid() ? aDate.valueOf() : 0;
398395
const bTime = bDate.isValid() ? bDate.valueOf() : 0;
399396

400397
if (aTime !== bTime) {
401-
return aTime - bTime; // oldest first within unit
398+
return bTime - aTime; // newest first
402399
}
403400

401+
const unitCmp = a.pioreactor_unit.localeCompare(b.pioreactor_unit);
402+
if (unitCmp !== 0) return unitCmp;
403+
404404
return a.calibration_name.localeCompare(b.calibration_name);
405405
});
406406
}, [isDataComplete, calibrationDataByDevice, selectedDevice, selectedUnit, onlyActive]);

‎frontend/src/Protocols.jsx‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,6 @@ function Protocols(props) {
206206
if (!selectedUnit) {
207207
return;
208208
}
209-
if (selectedUnit === "$broadcast") {
210-
setSnackbarMessage("Select a single Pioreactor to run a protocol.");
211-
setSnackbarOpen(true);
212-
return;
213-
}
214-
215209
setActiveSessionProtocol(protocol);
216210
};
217211

@@ -368,10 +362,6 @@ function Protocols(props) {
368362
setSnackbarMessage("Failed to abort calibration session.");
369363
setSnackbarOpen(true);
370364
}}
371-
onStartFailure={(message) => {
372-
setSnackbarMessage(message);
373-
setSnackbarOpen(true);
374-
}}
375365
/>
376366
</React.Fragment>
377367
);

‎frontend/src/components/VialIcon.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ function VialIcon(props) {
55
return (
66
<SvgIcon viewBox="-1 -1 13 22" strokeWidth="1.9" {...props}>
77
<rect
8-
x="0.56"
8+
x="0.86"
99
y="0.5"
10-
width="10.21"
10+
width="9.61"
1111
height="3.0"
1212
fill="currentColor"
1313
stroke="currentColor"

0 commit comments

Comments
 (0)