fix(form): address remaining review findings

.github/workflows/ci.yml

@@ -16,9 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.x
+        with:
+          persist-credentials: false
 
-      - uses: actions/setup-python@v7
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.x
         with:
           python-version: "3.12"
 

src/server/templates/admin.js

@@ -81,8 +81,9 @@ function buildAddItemSelect(availableMeals) {
 
   availableMeals.forEach(m => {
     const opt = document.createElement('option');
+    const price = m.price || 0;
     opt.value = m.name;
-    opt.textContent = m.name + ' ($' + m.price.toFixed(2) + ')';
+    opt.textContent = m.name + ' ($' + price.toFixed(2) + ')';
     select.appendChild(opt);
   });
 

src/server/templates/form.js

@@ -31,16 +31,6 @@ let mealsListDelegationBound = false;
 
 window.googleCredential = null;
 
-function escapeHtml(str) {
-  if (!str) return '';
-  return String(str)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}
-
 function employeePrice(retail) {
   if (!retail) return 0;
   const bulkPrice = Math.round(retail * (1 - BULK_DISCOUNT / 100) * 100 + 1e-8) / 100;
@@ -48,7 +38,7 @@ function employeePrice(retail) {
   return empPrice;
 }
 
-window.FormUtils = { escapeHtml, employeePrice };
+window.FormUtils = { employeePrice };
 
 function syncGoogleCredential() {
   window.googleCredential = googleCredential;
@@ -374,33 +364,26 @@ async function submitOrder() {
 }
 
 async function loadRoster() {
+  let employees = ROSTER;
   try {
     const res = await fetch(ROSTER_URL);
     const data = await res.json();
-    const select = document.getElementById('emp-name');
+    employees = data.employees || ROSTER;
-    select.innerHTML = '<option value="">Select your name</option>';
+  } catch (e) {}
-    (data.employees || ROSTER).forEach(emp => {
+
-      const opt = document.createElement('option');
+  const select = document.getElementById('emp-name');
-      opt.value = emp.name;
+  select.innerHTML = '<option value="">Select your name</option>';
-      opt.dataset.email = emp.email;
+  employees.forEach(emp => {
-      opt.textContent = emp.name;
+    const opt = document.createElement('option');
-      select.appendChild(opt);
+    opt.value = emp.name;
-    });
+    opt.dataset.email = emp.email;
-    select.addEventListener('change', () => {
+    opt.textContent = emp.name;
-      const selected = select.options[select.selectedIndex];
+    select.appendChild(opt);
-      document.getElementById('emp-email').value = selected?.dataset?.email || '';
+  });
-    });
+  select.addEventListener('change', () => {
-  } catch (e) {
+    const selected = select.options[select.selectedIndex];
-    const select = document.getElementById('emp-name');
+    document.getElementById('emp-email').value = selected?.dataset?.email || '';
-    select.innerHTML = '<option value="">Select your name</option>';
+  });
-    ROSTER.forEach(emp => {
-      const opt = document.createElement('option');
-      opt.value = emp.name;
-      opt.dataset.email = emp.email;
-      opt.textContent = emp.name;
-      select.appendChild(opt);
-    });
-  }
 }
 
 function showClosedOverlay() {

tests/test_generate_form.py

@@ -206,33 +206,38 @@ class TestGenerateFormPlaywright:
                     "Chromium is required for form Playwright tests. "
                     "Run: playwright install --with-deps chromium"
                 ) from exc
-            page = browser.new_page()
+            try:
-            page.route(
+                page = browser.new_page()
-                "**/api/form-status/**",
+                page.route(
-                lambda route: route.fulfill(
+                    "**/api/form-status/**",
-                    status=200,
+                    lambda route: route.fulfill(
-                    content_type="application/json",
+                        status=200,
-                    body='{"status":"open"}',
+                        content_type="application/json",
-                ),
+                        body='{"status":"open"}',
-            )
-            page.route(
-                "**/api/roster**",
-                lambda route: route.fulfill(
-                    status=200,
-                    content_type="application/json",
-                    body=json.dumps(
-                        {
-                            "employees": [
-                                {"name": "Ada Lovelace", "email": "ada@example.com"}
-                            ]
-                        }
                     ),
-                ),
+                )
-            )
+                page.route(
-            page.goto(out.as_uri())
+                    "**/api/roster**",
-            page.wait_for_selector('[data-meal-index="0"]')
+                    lambda route: route.fulfill(
-            yield page
+                        status=200,
-            browser.close()
+                        content_type="application/json",
+                        body=json.dumps(
+                            {
+                                "employees": [
+                                    {
+                                        "name": "Ada Lovelace",
+                                        "email": "ada@example.com",
+                                    }
+                                ]
+                            }
+                        ),
+                    ),
+                )
+                page.goto(out.as_uri())
+                page.wait_for_selector('[data-meal-index="0"]')
+                yield page
+            finally:
+                browser.close()
 
     def test_admin_bundle_loads(self, browser_page):
         assert browser_page.evaluate("typeof window.loadWeekOrders") == "function"