Merge branch 'main' into chore/checkstyle-validate-nonblocking

Author: paulushcgcj

frontend/Caddyfile

@@ -41,6 +41,10 @@
 		Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate"
 		X-Content-Type-Options "nosniff"
 		Strict-Transport-Security "max-age=31536000"
+		# connect-src must include the regional Cognito IdP host (cognito-idp.<region>.amazonaws.com):
+		# Amplify calls it for SILENT TOKEN REFRESH. Without it the browser blocks the refresh, the
+		# access/id token expires at its TTL, the next request 401s and the user is signed out
+		# mid-session. The Hosted UI domain below only covers the OAuth login redirect, not refresh.
 		Content-Security-Policy "default-src 'self' https://*.gov.bc.ca;
 			script-src 'self' https://*.gov.bc.ca;
 			style-src 'self' https://fonts.googleapis.com https://use.fontawesome.com 'unsafe-inline'; 
@@ -49,7 +53,7 @@
 			frame-ancestors 'self'; 
 			form-action 'self';
 			block-all-mixed-content;
-			connect-src 'self' https://*.gov.bc.ca wss://*.gov.bc.ca https://{$COGNITO_DOMAIN:lza-prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com};"
+			connect-src 'self' https://*.gov.bc.ca wss://*.gov.bc.ca https://{$COGNITO_DOMAIN:lza-prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com} https://cognito-idp.{$COGNITO_REGION:ca-central-1}.amazonaws.com;"
 		Referrer-Policy "same-origin"
 		Permissions-Policy "fullscreen=(self), camera=(), microphone=()"
 		Cross-Origin-Resource-Policy "same-origin"

frontend/src/components/core/ScheduleActions/index.tsx

@@ -6,7 +6,6 @@ type ScheduleActionsProps = {
   className: string
   editable: boolean
   saving: boolean
-  checking: boolean
   onSave: () => void
   onCheckStatus: () => void
   onDelete: () => void
@@ -28,7 +27,6 @@ const ScheduleActions: FC<ScheduleActionsProps> = ({
   className,
   editable,
   saving,
-  checking,
   onSave,
   onCheckStatus,
   onDelete,
@@ -38,12 +36,7 @@ const ScheduleActions: FC<ScheduleActionsProps> = ({
     <Button kind="primary" size="md" disabled={!editable || saving} onClick={onSave}>
       Save
     </Button>
-    <Button
-      kind="tertiary"
-      size="md"
-      disabled={!editable || saving || checking}
-      onClick={onCheckStatus}
-    >
+    <Button kind="tertiary" size="md" disabled={!editable || saving} onClick={onCheckStatus}>
       Check Status
     </Button>
     {showDelete && (

frontend/src/components/schedule1/__tests__/Schedule1.test.tsx

@@ -16,6 +16,22 @@ vi.mock('@tanstack/react-router', () => ({
 
 import Schedule1 from '@/components/schedule1'
 import MillYearProvider from '@/context/millYear/MillYearProvider'
+import useMillYear from '@/context/millYear/useMillYear'
+
+// Drives a mid-save mill/year change so the shared run() stale-response guard can be exercised
+// (Story 29.6). Module-level so it is not re-created per render (an @eslint-react rule forbids nested
+// component definitions).
+const StaleRaceHarness = () => {
+  const { setContext } = useMillYear()
+  return (
+    <>
+      <button type="button" onClick={() => setContext(999, 2020)}>
+        change
+      </button>
+      <Schedule1 />
+    </>
+  )
+}
 
 const URL = 'http://localhost:3000/api/v1/schedule1'
 
@@ -663,3 +679,57 @@ describe('Schedule1 Other Costs navigation (Story 2.5)', () => {
     expect(mockNavigate).toHaveBeenCalledWith({ to: '/schedule-1/other-costs' })
   })
 })
+
+describe('Schedule1 stale-response guard (Story 29.6)', () => {
+  test('a mill/year change mid-save does not apply the stale response (AC1)', async () => {
+    // The PUT is gated on an explicit release, not a wall-clock delay, so the "stale response settles
+    // after the context change" ordering holds under any CI load. Routing save through the shared
+    // useScheduleMutations run() gives Schedule 1 the isCurrent() guard it previously lacked.
+    let releasePut = () => {}
+    const putGate = new Promise<void>((resolve) => {
+      releasePut = resolve
+    })
+    server.use(
+      http.get(URL, ({ request }) =>
+        request.url.includes('millId=999')
+          ? HttpResponse.json({
+              ...schedule1Doc,
+              millId: 999,
+              year: 2020,
+              editable: false,
+              comments: 'Context 999/2020 loaded',
+            })
+          : HttpResponse.json(schedule1Doc),
+      ),
+      http.put(URL, async () => {
+        await putGate
+        return HttpResponse.json({
+          ...schedule1Doc,
+          message: { key: 'dataSavedSuccesfullyInfoMsg', text: 'Data saved successfully' },
+        })
+      }),
+    )
+
+    render(
+      <MillYearProvider initial={{ millId: 514, year: 2021 }}>
+        <StaleRaceHarness />
+      </MillYearProvider>,
+    )
+    const user = userEvent.setup()
+
+    // Editable 514 loaded → dispatch the save (PUT now in flight) → switch mill/year before it settles.
+    await screen.findByLabelText('Standing Tree to Loaded Truck cost')
+    await user.click(screen.getAllByRole('button', { name: /^save$/i })[0])
+    await user.click(screen.getByRole('button', { name: /change/i }))
+
+    // The new context's document has rendered (read-only 999/2020).
+    expect(await screen.findByText('Context 999/2020 loaded')).toBeInTheDocument()
+
+    // Release the stale PUT, let its chain settle, then confirm nothing from it landed on 999/2020.
+    releasePut()
+    await waitFor(() => {
+      expect(screen.queryByText('Data saved successfully')).not.toBeInTheDocument()
+      expect(screen.queryByLabelText('Standing Tree to Loaded Truck cost')).not.toBeInTheDocument()
+    })
+  })
+})

frontend/src/components/schedule1/index.tsx

@@ -3,7 +3,7 @@ import type Schedule1Response from '@/interfaces/Schedule1Response'
 import type { LineItem } from '@/interfaces/Schedule1Response'
 import type Schedule1Request from '@/interfaces/Schedule1Request'
 import type CheckStatusResponse from '@/interfaces/CheckStatusResponse'
-import { useCallback, useState } from 'react'
+import { useState } from 'react'
 import { useNavigate } from '@tanstack/react-router'
 import {
   Button,
@@ -21,11 +21,10 @@ import {
   TextArea,
   TextInput,
 } from '@carbon/react'
-import apiService from '@/service/api-service'
 import { WRITABLE_LINE_ITEM_CODES } from '@/interfaces/Schedule1Request'
-import useMillYear from '@/context/millYear/useMillYear'
+import { useScheduleContextGuard } from '@/hooks/useScheduleContextGuard'
 import { useScheduleDocument } from '@/hooks/useScheduleDocument'
-import { extractDetail } from '@/utils/error'
+import { useScheduleMutations } from '@/hooks/useScheduleMutations'
 import { fmtCurrency, fmtNumber, groupInput, numStrGroup, toNum } from '@/utils/number'
 import LoadingScreen from '@/components/core/LoadingScreen'
 import NotificationColumn from '@/components/core/NotificationColumn'
@@ -123,25 +122,30 @@ function buildRequest(doc: Schedule1Response, form: FieldValues): Schedule1Reque
 }
 
 const Schedule1: FC = () => {
-  const { millId, year } = useMillYear()
+  const { millId, year, contextMissing, isCurrent } = useScheduleContextGuard()
   const navigate = useNavigate()
-  const contextMissing = millId === null || year === null
 
-  const [saving, setSaving] = useState(false)
-  const [saveMessage, setSaveMessage] = useState<string | null>(null)
-  const [saveError, setSaveError] = useState<string | null>(null)
+  // Save/delete/check-status all run through the shared hook's guarded run() (Story 29.6): a stale
+  // in-flight write can no longer repaint a newly-switched mill/year. `saving` is the single in-flight
+  // lock for every write (it also gates Check Status), replacing the old separate save/checking locks.
+  const {
+    saving,
+    message: saveMessage,
+    actionError: saveError,
+    checkResult,
+    setMessage: setSaveMessage,
+    setActionError: setSaveError,
+    setCheckResult,
+    clearBanners,
+    resetBanners,
+    save,
+    remove,
+    checkStatus,
+  } = useScheduleMutations<CheckStatusResponse>({ path: '/v1/schedule1', millId, year, isCurrent })
+
   const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false)
   const [confirmNavOpen, setConfirmNavOpen] = useState(false)
   const [otherCostsBlockedOpen, setOtherCostsBlockedOpen] = useState(false)
-  const [checking, setChecking] = useState(false)
-  const [checkResult, setCheckResult] = useState<CheckStatusResponse | null>(null)
-
-  // Clear the save/check notifications whenever a fresh document loads (mill/year change).
-  const resetMessages = useCallback(() => {
-    setSaveMessage(null)
-    setSaveError(null)
-    setCheckResult(null)
-  }, [])
 
   const { data, setData, form, setForm, setField, errorDetail, isLoading } =
     useScheduleDocument<Schedule1Response>({
@@ -151,7 +155,7 @@ const Schedule1: FC = () => {
       contextMissing,
       seedForm,
       mapLoadError: mapLoadErrorDetail,
-      onReset: resetMessages,
+      onReset: resetBanners,
     })
 
   // Re-group a numeric field's value on blur, so it reads like the plain-text cells beside it. Only
@@ -177,44 +181,30 @@ const Schedule1: FC = () => {
       setSaveError('Please correct the highlighted fields before saving.')
       return
     }
-    setSaving(true)
-    setSaveMessage(null)
-    setSaveError(null)
-    setCheckResult(null) // a prior Check Status result is stale once the data changes
-    apiService
-      .getAxiosInstance()
-      .put<Schedule1Response>(
-        `/v1/schedule1?millId=${millId}&year=${year}`,
-        buildRequest(data, form),
-      )
-      .then((response) => {
-        setData(response.data)
-        setForm(seedForm(response.data))
+    clearBanners() // drop any prior banners incl. a now-stale Check Status result
+    save<Schedule1Response>(buildRequest(data, form), {
+      fallback: 'Schedule could not be saved.',
+      onSuccess: (doc) => {
+        setData(doc)
+        setForm(seedForm(doc))
         // SUC-001 verbatim from the API message field (AD-8), never hardcoded.
-        setSaveMessage(response.data.message?.text ?? null)
-      })
-      .catch((error: unknown) => {
-        // Keep the entered values (S23/S24); surface the API's verbatim ProblemDetail.detail.
-        setSaveError(extractDetail(error) || 'Schedule could not be saved.')
-      })
-      .finally(() => setSaving(false))
+        setSaveMessage(doc.message?.text ?? null)
+      },
+    })
   }
 
   const handleDelete = () => {
     if (saving) {
       return
     }
     setConfirmDeleteOpen(false)
-    setSaving(true)
-    setSaveMessage(null)
-    setSaveError(null)
-    setCheckResult(null) // the deleted schedule's check result is stale
-    apiService
-      .getAxiosInstance()
-      .delete<{ message?: { text?: string } }>(`/v1/schedule1?millId=${millId}&year=${year}`)
-      .then((response) => {
-        // Delete removed the summary; a re-GET would 404, so reset to an empty schedule in place
-        // (no re-fetch) and show SUC-002 from the API message.
+    clearBanners() // the deleted schedule's check result / save banner are stale
+    remove<{ message?: { text?: string } }>({
+      fallback: 'Unable to delete Schedule 1.',
+      // Delete removed the summary; a re-GET would 404, so reset to an empty schedule in place (no
+      // re-fetch) and show SUC-002 from the API message. This per-page empty-state lives at the call
+      // site (Story 29.6): single-doc Schedules 1/3 reset in place; list pages re-seed from a reload.
+      onSuccess: (resp) => {
         setData((prev) =>
           prev
             ? {
@@ -236,32 +226,20 @@ const Schedule1: FC = () => {
             : prev,
         )
         setForm({})
-        setSaveMessage(response.data?.message?.text ?? null)
-      })
-      .catch((error: unknown) => {
-        setSaveError(extractDetail(error) || 'Unable to delete Schedule 1.')
-      })
-      .finally(() => setSaving(false))
+        setSaveMessage(resp?.message?.text ?? null)
+      },
+    })
   }
 
   const handleCheckStatus = () => {
-    if (!data || checking || saving) {
+    if (!data || saving) {
       return
     }
-    setChecking(true)
-    setCheckResult(null)
-    setSaveError(null)
-    setSaveMessage(null) // don't leave a stale Save success banner beside a new check result
-    apiService
-      .getAxiosInstance()
-      .post<CheckStatusResponse>(`/v1/schedule1/check-status?millId=${millId}&year=${year}`)
-      .then((response) => {
-        setCheckResult(response.data)
-      })
-      .catch((error: unknown) => {
-        setSaveError(extractDetail(error) || 'Unable to check status.')
-      })
-      .finally(() => setChecking(false))
+    clearBanners() // don't leave a stale Save success banner beside a new check result
+    checkStatus<CheckStatusResponse>({
+      fallback: 'Unable to check status.',
+      onSuccess: setCheckResult,
+    })
   }
 
   const handleOtherCosts = () => {
@@ -541,7 +519,6 @@ const Schedule1: FC = () => {
       className="schedule-1__actions"
       editable={editable}
       saving={saving}
-      checking={checking}
       onSave={handleSave}
       onCheckStatus={handleCheckStatus}
       onDelete={() => setConfirmDeleteOpen(true)}

frontend/src/components/schedule11/index.tsx

@@ -30,7 +30,7 @@ import apiService from '@/service/api-service'
 import useMillYear from '@/context/millYear/useMillYear'
 import { useScheduleDocument } from '@/hooks/useScheduleDocument'
 import { extractDetail } from '@/utils/error'
-import { numStr } from '@/utils/number'
+import { numStr, numStrFixed } from '@/utils/number'
 import LoadingScreen from '@/components/core/LoadingScreen'
 import PageState from '@/components/core/PageState'
 import ScheduleTombstone from '@/components/core/ScheduleTombstone'
@@ -53,17 +53,12 @@ const BEC_CATALOGUE_PATH = '/v1/schedule11/biogeoclimatic-catalogue'
 const BEC_DEBOUNCE_MS = 250
 
 // Legacy display masks (AD-5 no recompute — the values are server-computed, this only formats them).
-// Null renders BLANK, never "0": a null total means "no contributors", which is meaningful.
-const mask = (value: number | null | undefined, minFrac: number, maxFrac: number): string =>
-  value === null || value === undefined
-    ? ''
-    : value.toLocaleString('en-US', {
-        minimumFractionDigits: minFrac,
-        maximumFractionDigits: maxFrac,
-      })
-const money = (value: number | null | undefined): string => mask(value, 0, 0) // #,###,##0
-const area = (value: number | null | undefined): string => mask(value, 1, 1) // #,###,##0.0
-const ratio = (value: number | null | undefined): string => mask(value, 2, 2) // #,###,##0.00
+// Delegate to the shared en-CA numStrFixed (Story 29.8): one locale app-wide, no local toLocaleString
+// copy. numStrFixed keeps the same contract — fixed decimals, and BLANK (never "0") on null, since a
+// null total means "no contributors", which is meaningful.
+const money = (value: number | null | undefined): string => numStrFixed(value, 0) // #,###,##0
+const area = (value: number | null | undefined): string => numStrFixed(value, 1) // #,###,##0.0
+const ratio = (value: number | null | undefined): string => numStrFixed(value, 2) // #,###,##0.00
 
 // Whole-dollar costs: legacy accepted fractional input (ILCRCostConverter BigDecimal parse) and
 // Oracle COST NUMBER(15) ROUNDED it on insert, while the modern Integer wire would silently

frontend/src/components/schedule11/validation.ts

@@ -5,6 +5,7 @@
 // the authoritative response.
 
 import type { BiogeoclimaticOption } from '@/interfaces/Schedule11Response'
+import { parseDecimalInput } from '@/utils/number'
 
 const LOCATION_MAX = 30
 const NET_AREA = { min: 0, max: 999_999.9 }
@@ -48,22 +49,10 @@ export interface LocationFormValues {
   comments: string
 }
 
-// Legacy JSF numeric fields (NAR, costs) bind through a US-locale DecimalFormat converter, so the
-// accepted syntax is: an optional leading '-', digits with optional comma grouping, and an optional
-// '.' fractional part — the same format the page DISPLAYS (the money/area masks in index.tsx). Native
-// Number() diverges both ways and must NOT be used here: it rejects grouped input the legacy app
-// accepts (`Number('1,000')` -> NaN) and silently accepts JS-only forms the legacy app never allowed
-// (`1e2` -> 100, `0x10` -> 16, `Infinity`). Parsing with an explicit format keeps both this advisory
-// gate AND the submitted body (index.tsx buildBody) faithful to legacy. Returns the numeric value, or
-// null when the string is blank or not a valid decimal in that format.
-const DECIMAL_INPUT = /^-?(\d{1,3}(,\d{3})+|\d+)(\.\d+)?$/
-export const parseDecimalInput = (raw: string): number | null => {
-  const trimmed = raw.trim()
-  if (trimmed === '' || !DECIMAL_INPUT.test(trimmed)) {
-    return null
-  }
-  return Number(trimmed.replace(/,/g, ''))
-}
+// The strict legacy-format decimal parser lives in @/utils/number (Story 29.8 consolidation — this
+// file's identical local copy was removed). Re-exported so callers importing it from this module keep
+// working; used below for the advisory NAR/cost gate.
+export { parseDecimalInput }
 
 const validateCost = (raw: string): string | undefined => {
   const trimmed = raw.trim()