Skip to content

Commit 723cb59

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
coverage page
1 parent 717d812 commit 723cb59

File tree

6 files changed

+60
-44
lines changed

6 files changed

+60
-44
lines changed

‎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.0d8fee6b.js",
4+
"main.js": "/static/static/js/main.e4e759f0.js",
55
"static/media/roboto-all-500-normal.woff": "/static/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
66
"static/media/roboto-all-700-normal.woff": "/static/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
77
"static/media/roboto-all-400-normal.woff": "/static/static/media/roboto-all-400-normal.c5d001fa922fa66a147f.woff",
@@ -28,10 +28,10 @@
2828
"static/media/roboto-greek-ext-700-normal.woff2": "/static/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
2929
"index.html": "/static/index.html",
3030
"main.9c7a48b7.css.map": "/static/static/css/main.9c7a48b7.css.map",
31-
"main.0d8fee6b.js.map": "/static/static/js/main.0d8fee6b.js.map"
31+
"main.e4e759f0.js.map": "/static/static/js/main.e4e759f0.js.map"
3232
},
3333
"entrypoints": [
3434
"static/css/main.9c7a48b7.css",
35-
"static/js/main.0d8fee6b.js"
35+
"static/js/main.e4e759f0.js"
3636
]
3737
}

‎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.0d8fee6b.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.e4e759f0.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.0d8fee6b.js renamed to core/pioreactor/web/static/static/js/main.e4e759f0.js

Lines changed: 6 additions & 6 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.0d8fee6b.js.LICENSE.txt renamed to core/pioreactor/web/static/static/js/main.e4e759f0.js.LICENSE.txt

File renamed without changes.

core/pioreactor/web/static/static/js/main.0d8fee6b.js.map renamed to core/pioreactor/web/static/static/js/main.e4e759f0.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/CalibrationCoverage.jsx‎

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ import {
66
Chip,
77
CircularProgress,
88
Divider,
9+
IconButton,
910
Paper,
1011
Table,
1112
TableBody,
1213
TableCell,
1314
TableContainer,
1415
TableHead,
1516
TableRow,
17+
Tooltip,
1618
Typography,
1719
} from "@mui/material";
1820
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
21+
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
1922
import TuneIcon from "@mui/icons-material/Tune";
20-
import ArrowOutwardIcon from "@mui/icons-material/ArrowOutward";
21-
23+
import AddIcon from "@mui/icons-material/Add";
24+
import PlaylistAddCheckIcon from '@mui/icons-material/PlaylistAddCheck';
2225
import { fetchTaskResult } from "./utilities";
2326
import PioreactorIcon from "./components/PioreactorIcon";
2427
import {
@@ -46,38 +49,37 @@ function CoverageCell({ unit, device, cell, onNavigate }) {
4649
)}
4750

4851
{status === COVERAGE_STATUS.AVAILABLE_NOT_ACTIVE && hasLink && (
49-
<Button
50-
size="small"
51-
variant="text"
52-
53-
sx={{
54-
textTransform: "none",
55-
minWidth: 0,
56-
justifyContent: "flex-start",
57-
alignSelf: "flex-start",
58-
}}
59-
onClick={() => onNavigate(cell.detailPath)}
60-
aria-label={`Open calibrations for ${unit} ${device}`}
61-
>
62-
Available
63-
</Button>
52+
<Box sx={{ display: "flex", alignItems: "center", justifyContent: "flex-start", width: "100%" }}>
53+
<Typography component="span" variant="body2" color="text.secondary">
54+
Inactive
55+
</Typography>
56+
<Tooltip title="Choose a calibration to set active">
57+
<IconButton
58+
size="small"
59+
onClick={() => onNavigate(cell.detailPath)}
60+
aria-label={`Open calibrations for ${unit} ${device}`}
61+
>
62+
<ExpandMoreIcon fontSize="small" />
63+
</IconButton>
64+
</Tooltip>
65+
</Box>
6466
)}
6567

6668
{status === COVERAGE_STATUS.MISSING && (
67-
<Button
68-
size="small"
69-
variant="text"
70-
sx={{
71-
textTransform: "none",
72-
minWidth: 0,
73-
justifyContent: "flex-start",
74-
alignSelf: "flex-start",
75-
}}
76-
onClick={() => onNavigate(`/protocols/${unit}/${device}`)}
77-
aria-label={`Create calibration for ${unit} ${device}`}
78-
>
79-
Create a calibration
80-
</Button>
69+
<Box sx={{ display: "flex", alignItems: "center", justifyContent: "flex-start", width: "100%" }}>
70+
<Typography component="span" variant="body2" color="text.secondary">
71+
Missing
72+
</Typography>
73+
<Tooltip title="Create calibration">
74+
<IconButton
75+
size="small"
76+
onClick={() => onNavigate(`/protocols/${unit}/${device}`)}
77+
aria-label={`Create calibration for ${unit} ${device}`}
78+
>
79+
<AddIcon fontSize="inherit" />
80+
</IconButton>
81+
</Tooltip>
82+
</Box>
8183
)}
8284

8385
{status === COVERAGE_STATUS.UNKNOWN && (
@@ -169,7 +171,14 @@ function CalibrationCoverage(props) {
169171
<Table size="small" stickyHeader>
170172
<TableHead>
171173
<TableRow>
172-
<TableCell sx={{ minWidth: 180 }}>Pioreactor</TableCell>
174+
<TableCell
175+
sx={{
176+
minWidth: 180,
177+
backgroundColor: (theme) => theme.palette.action.hover,
178+
}}
179+
>
180+
Pioreactor
181+
</TableCell>
173182
{matrix.devices.map((device) => (
174183
<TableCell key={device} align="left" sx={{ minWidth: 180 }}>
175184
{device}
@@ -180,7 +189,13 @@ function CalibrationCoverage(props) {
180189
<TableBody>
181190
{matrix.units.map((unit) => (
182191
<TableRow key={unit} hover>
183-
<TableCell component="th" scope="row">
192+
<TableCell
193+
component="th"
194+
scope="row"
195+
sx={{
196+
backgroundColor: (theme) => theme.palette.action.hover,
197+
}}
198+
>
184199
<Chip
185200
size="small"
186201
icon={<PioreactorIcon />}
@@ -189,6 +204,7 @@ function CalibrationCoverage(props) {
189204
clickable
190205
component={Link}
191206
to={`/pioreactors/${unit}`}
207+
sx={{ "& .MuiChip-label": { fontWeight: 600 } }}
192208
/>
193209
</TableCell>
194210
{matrix.devices.map((device) => (

0 commit comments

Comments
 (0)