put X on dialogs

CamDavidsonPilon · CamDavidsonPilon · commit cad2abaa2210 · 2026-01-13T15:34:05.000-05:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,9 +4,30 @@ on:
     types: [published]
 
 jobs:
+  verify-frontend-build:
+    name: ✅ Verify frontend build is up to date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: 🏗 Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '20'
+      - name: 🧰 Install frontend dependencies
+        working-directory: frontend
+        run: |
+          npm ci
+      - name: 🧪 Build frontend and verify committed assets
+        run: |
+          make frontend-build
+          git diff --exit-code -- core/pioreactor/web/static
+
   build:
     name: 🔨 Build distribution
     runs-on: ubuntu-latest
+    needs: [verify-frontend-build]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -49,6 +70,7 @@ jobs:
   build-deps:
     name: 🔨 Build dependencies and upload
     runs-on: ubuntu-latest
+    needs: [verify-frontend-build]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -90,7 +112,7 @@ jobs:
   zip-asset-upload:
     name: 🤐 Zip assets and upload
     runs-on: ubuntu-latest
-    needs: [build, build-deps]
+    needs: [build, build-deps, verify-frontend-build]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -123,7 +145,7 @@ jobs:
   publish-on-pypi:
     name: 📦 Publish tagged releases to PyPI
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build, verify-frontend-build]
     steps:
       - name: ⬇ Download build result
         uses: actions/download-artifact@v4
@@ -138,7 +160,7 @@ jobs:
   notify-custopizer-build:
     name: 📧 Notify Pioreactor/CustoPizer
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build, verify-frontend-build]
     steps:
       - name: 👀 Determine version
         run: |
diff --git a/core/pioreactor/calibrations/session_flow.py b/core/pioreactor/calibrations/session_flow.py
@@ -406,7 +406,6 @@ def result(self, result: dict[str, Any]) -> CalibrationStep:
             step_id="complete",
             step_type="result",
             title="Calibration complete!",
-            body="Calibration(s) is set to Active and ready to be used.",
             metadata={"result": result},
         )
 
diff --git a/core/pioreactor/web/static/asset-manifest.json b/core/pioreactor/web/static/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/static/css/main.9c7a48b7.css",
-    "main.js": "/static/static/js/main.5fd7351c.js",
+    "main.js": "/static/static/js/main.8cc982bf.js",
     "static/media/pioreactor_cloud.webp": "/static/static/media/pioreactor_cloud.b15b29e435797dc69d76.webp",
     "static/media/roboto-all-500-normal.woff": "/static/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
     "static/media/roboto-all-700-normal.woff": "/static/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
@@ -30,10 +30,10 @@
     "static/media/roboto-greek-ext-700-normal.woff2": "/static/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
     "index.html": "/static/index.html",
     "main.9c7a48b7.css.map": "/static/static/css/main.9c7a48b7.css.map",
-    "main.5fd7351c.js.map": "/static/static/js/main.5fd7351c.js.map"
+    "main.8cc982bf.js.map": "/static/static/js/main.8cc982bf.js.map"
   },
   "entrypoints": [
     "static/css/main.9c7a48b7.css",
-    "static/js/main.5fd7351c.js"
+    "static/js/main.8cc982bf.js"
   ]
 }
diff --git a/core/pioreactor/web/static/index.html b/core/pioreactor/web/static/index.html
@@ -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.5fd7351c.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!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.8cc982bf.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
diff --git a/core/pioreactor/web/static/static/js/main.8cc982bf.js b/core/pioreactor/web/static/static/js/main.8cc982bf.js
diff --git a/core/pioreactor/web/static/static/js/main.8cc982bf.js.LICENSE.txt b/core/pioreactor/web/static/static/js/main.8cc982bf.js.LICENSE.txt
diff --git a/core/pioreactor/web/static/static/js/main.8cc982bf.js.map b/core/pioreactor/web/static/static/js/main.8cc982bf.js.map
diff --git a/core/pioreactor/web/static/svgs/calibration-complete.svg b/core/pioreactor/web/static/svgs/calibration-complete.svg
@@ -0,0 +1,25 @@
+<svg width="240" height="240" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <title>calibration complete</title>
+  <g stroke="#111111" stroke-linecap="round" stroke-linejoin="round">
+    <circle cx="100" cy="106" r="62" fill="none" stroke-width="4" />
+    <path
+      d="M170 26 L176 44 L194 50 L176 56 L170 74 L164 56 L146 50 L164 44 Z"
+      fill="#f7f1c7"
+      stroke-width="3"
+    />
+    <path
+      d="M32 130 L36 140 L46 144 L36 148 L32 158 L28 148 L18 144 L28 140 Z"
+      fill="#e7f6ff"
+      stroke-width="3"
+    />
+  </g>
+  <g
+    transform="translate(100 106) scale(3.6) translate(-8.4 -9.45)"
+    stroke="#111111"
+    stroke-width="1.2"
+    fill="none"
+  >
+    <path d="M1.4,18.9 L1.4,14.7 L0,14.7 L0,11.2 L2.799,11.2 L2.8,0 L14,0 L13.999,11.2 L16.8,11.2 L16.8,14.7 L15.399,14.7 L15.4,18.9 L1.4,18.9 Z" />
+    <circle cx="8.4" cy="13.3" r="2.1" />
+  </g>
+</svg>
diff --git a/frontend/public/svgs/calibration-complete.svg b/frontend/public/svgs/calibration-complete.svg
@@ -0,0 +1,25 @@
+<svg width="240" height="240" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <title>calibration complete</title>
+  <g stroke="#111111" stroke-linecap="round" stroke-linejoin="round">
+    <circle cx="100" cy="106" r="62" fill="none" stroke-width="4" />
+    <path
+      d="M170 26 L176 44 L194 50 L176 56 L170 74 L164 56 L146 50 L164 44 Z"
+      fill="#f7f1c7"
+      stroke-width="3"
+    />
+    <path
+      d="M32 130 L36 140 L46 144 L36 148 L32 158 L28 148 L18 144 L28 140 Z"
+      fill="#e7f6ff"
+      stroke-width="3"
+    />
+  </g>
+  <g
+    transform="translate(100 106) scale(3.6) translate(-8.4 -9.45)"
+    stroke="#111111"
+    stroke-width="1.2"
+    fill="none"
+  >
+    <path d="M1.4,18.9 L1.4,14.7 L0,14.7 L0,11.2 L2.799,11.2 L2.8,0 L14,0 L13.999,11.2 L16.8,11.2 L16.8,14.7 L15.399,14.7 L15.4,18.9 L1.4,18.9 Z" />
+    <circle cx="8.4" cy="13.3" r="2.1" />
+  </g>
+</svg>
diff --git a/frontend/src/CreateExperimentProfile.jsx b/frontend/src/CreateExperimentProfile.jsx
@@ -23,7 +23,9 @@ import CapabilitiesPanel from './components/CapabilitiesPanel';
 import Dialog from '@mui/material/Dialog';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
+import IconButton from '@mui/material/IconButton';
 import SearchIcon from '@mui/icons-material/Search';
+import CloseIcon from '@mui/icons-material/Close';
 
 function addQuotesToBrackets(input) {
     return input.replace(/(\${0}){{(.*?)}}/g, (match, p1, p2, offset, string) => {
@@ -240,7 +242,21 @@ function ProfilesContainer(){
         minHeight: '80%',
         maxHeight: '80%',
       }}}>
-        <DialogTitle>Search jobs and automations</DialogTitle>
+        <DialogTitle>
+          Search jobs and automations
+          <IconButton
+            aria-label="close"
+            onClick={() => setOpenCapabilities(false)}
+            sx={{
+              position: 'absolute',
+              right: 8,
+              top: 8,
+              color: (theme) => theme.palette.grey[500],
+            }}
+            size="large">
+            <CloseIcon />
+          </IconButton>
+        </DialogTitle>
         <DialogContent sx={{ height: '100%' }}>
           <CapabilitiesPanel />
         </DialogContent>
diff --git a/frontend/src/EditExperimentProfile.jsx b/frontend/src/EditExperimentProfile.jsx
@@ -22,7 +22,9 @@ import CapabilitiesPanel from './components/CapabilitiesPanel';
 import Dialog from '@mui/material/Dialog';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
+import IconButton from '@mui/material/IconButton';
 import SearchIcon from '@mui/icons-material/Search';
+import CloseIcon from '@mui/icons-material/Close';
 
 function addQuotesToBrackets(input) {
     return input.replace(/(\${0}){{(.*?)}}/g, (match, p1, p2, offset, string) => {
@@ -238,7 +240,21 @@ function ProfilesContainer(){
         minHeight: '80%',
         maxHeight: '80%',
       }}}>
-        <DialogTitle>Search jobs and automations</DialogTitle>
+        <DialogTitle>
+          Search jobs and automations
+          <IconButton
+            aria-label="close"
+            onClick={() => setOpenCapabilities(false)}
+            sx={{
+              position: 'absolute',
+              right: 8,
+              top: 8,
+              color: (theme) => theme.palette.grey[500],
+            }}
+            size="large">
+            <CloseIcon />
+          </IconButton>
+        </DialogTitle>
         <DialogContent sx={{ height: '100%' }}>
           <CapabilitiesPanel />
         </DialogContent>
diff --git a/frontend/src/SingleCalibrationPage.jsx b/frontend/src/SingleCalibrationPage.jsx
@@ -6,6 +6,7 @@ import Dialog from '@mui/material/Dialog';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import DialogActions from '@mui/material/DialogActions';
+import IconButton from '@mui/material/IconButton';
 import {fetchTaskResult, colors, ColorCycler} from "./utilities"
 import MuiLink from '@mui/material/Link';
 import Card from '@mui/material/Card';
@@ -33,6 +34,7 @@ import Chip from '@mui/material/Chip';
 import DoNotDisturbOnOutlinedIcon from '@mui/icons-material/DoNotDisturbOnOutlined';
 import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined';
 import DisplaySourceCode from "./components/DisplaySourceCode";
+import CloseIcon from '@mui/icons-material/Close';
 
 
 function formatPolynomial(coefficients) {
@@ -176,7 +178,21 @@ function ViewYamlSource({ pioreactorUnit, device, calibrationName }) {
         View YAML
       </Button>
       <Dialog open={open} onClose={handleClose} maxWidth="md" fullWidth>
-        <DialogTitle>YAML description for calibration {calibrationName}</DialogTitle>
+        <DialogTitle>
+          YAML description for calibration {calibrationName}
+          <IconButton
+            aria-label="close"
+            onClick={handleClose}
+            sx={{
+              position: 'absolute',
+              right: 8,
+              top: 8,
+              color: (theme) => theme.palette.grey[500],
+            }}
+            size="large">
+            <CloseIcon />
+          </IconButton>
+        </DialogTitle>
         <DialogContent>
           {loading ? (
             <Box textAlign="center" mt={2}><CircularProgress size={20} /></Box>
diff --git a/frontend/src/Updates.jsx b/frontend/src/Updates.jsx
@@ -26,11 +26,13 @@ import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
+import IconButton from '@mui/material/IconButton';
 import Alert from '@mui/material/Alert';
 import PioreactorsIcon from './components/PioreactorsIcon';
 import Select from '@mui/material/Select';
 import InputLabel from '@mui/material/InputLabel';
 import FormControl from '@mui/material/FormControl';
+import CloseIcon from '@mui/icons-material/Close';
 
 const VisuallyHiddenInput = styled('input')({
   clip: 'rect(0 0 0 0)',
@@ -156,6 +158,18 @@ function UploadArchiveAndConfirm(props) {
       >
         <DialogTitle id="alert-dialog-title">
           {props.title}
+          <IconButton
+            aria-label="close"
+            onClick={handleClose}
+            sx={{
+              position: 'absolute',
+              right: 8,
+              top: 8,
+              color: (theme) => theme.palette.grey[500],
+            }}
+            size="large">
+            <CloseIcon />
+          </IconButton>
         </DialogTitle>
         <DialogContent>
           <DialogContentText id="alert-dialog-description">
diff --git a/frontend/src/components/CalibrationSessionDialog.jsx b/frontend/src/components/CalibrationSessionDialog.jsx
@@ -450,9 +450,9 @@ export default function CalibrationSessionDialog({
             <CalibrationSessionChart chart={chartPayload} />
           </Box>
         )}
-        {sessionStep && (
+        {sessionStep && (sessionStep.body) && (
           <Typography variant="body2" sx={{ whiteSpace: "pre-line" }}>
-            {sessionStep.body || "Follow the instructions for this step."}
+            {sessionStep.body}
           </Typography>
         )}
         <Box sx={{width: "75%", mt: 1}}>
diff --git a/frontend/src/components/MissingWorkerModelModal.jsx b/frontend/src/components/MissingWorkerModelModal.jsx
@@ -3,6 +3,7 @@ import Dialog from "@mui/material/Dialog";
 import DialogTitle from "@mui/material/DialogTitle";
 import DialogContent from "@mui/material/DialogContent";
 import DialogActions from "@mui/material/DialogActions";
+import IconButton from "@mui/material/IconButton";
 import Button from "@mui/material/Button";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
@@ -17,6 +18,7 @@ import Snackbar from "@mui/material/Snackbar";
 import { styled } from "@mui/material/styles";
 import PioreactorIcon from "./PioreactorIcon";
 import ListSubheader from '@mui/material/ListSubheader';
+import CloseIcon from "@mui/icons-material/Close";
 
 
 const fetchJSON = async (endpoint) => {
@@ -221,7 +223,21 @@ const MissingWorkerModelModal = ({ triggerCheckKey = 0 }) => {
   return (
     <>
       <Dialog open={shouldDisplayDialog} onClose={() => {}} maxWidth="sm" fullWidth>
-        <DialogTitle>Update Pioreactor model</DialogTitle>
+        <DialogTitle>
+          Update Pioreactor model
+          <IconButton
+            aria-label="close"
+            onClick={() => setIsOpen(false)}
+            sx={{
+              position: "absolute",
+              right: 8,
+              top: 8,
+              color: (theme) => theme.palette.grey[500],
+            }}
+            size="large">
+            <CloseIcon />
+          </IconButton>
+        </DialogTitle>
         <DialogContent>
           {shouldDisplayDialog && (
             <Stack spacing={2}>
diff --git a/scripts/create_release.py b/scripts/create_release.py
@@ -160,6 +160,19 @@ def stage_if_exists(path: Path, dry_run: bool) -> None:
         subprocess.run(["git", "add", path.as_posix()], check=True)
 
 
+def ensure_frontend_build_is_up_to_date(dry_run: bool) -> None:
+    if dry_run:
+        print("DRY-RUN: would run make frontend-build and verify static assets are clean")
+        return
+    subprocess.run(["make", "frontend-build"], check=True)
+    result = subprocess.run(["git", "diff", "--exit-code", "--", "core/pioreactor/web/static"], check=False)
+    if result.returncode != 0:
+        raise RuntimeError(
+            "Frontend build output differs from committed assets. "
+            "Run `make frontend-build` and commit the changes."
+        )
+
+
 def parse_args(argv: list[str]) -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Automate production release git workflow.")
     parser.add_argument("--date", help="CalVer date in YY.M.D format", default=None)
@@ -184,6 +197,7 @@ def main(argv: list[str]) -> int:
 
         if not args.force:
             ensure_clean_working_tree()
+            ensure_frontend_build_is_up_to_date(dry_run=args.dry_run)
 
         print(f"Preparing production release for {calver}\n")
 

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,6 @@ def result(self, result: dict[str, Any]) -> CalibrationStep:`
`406`	`406`	`step_id="complete",`
`407`	`407`	`step_type="result",`
`408`	`408`	`title="Calibration complete!",`
`409`		`- body="Calibration(s) is set to Active and ready to be used.",`
`410`	`409`	`metadata={"result": result},`
`411`	`410`	`)`
`412`	`411`
Original file line number	Diff line number	Diff 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.5fd7351c.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.8cc982bf.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>