Merge branch 'main' into docs/flyway-test-fixture-strategy

Author: paulushcgcj

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

@@ -36,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}
-      onClick={onCheckStatus}
-    >
+    <Button kind="tertiary" size="md" disabled={!editable || saving} onClick={onCheckStatus}>
       Check Status
     </Button>
     {showDelete && (

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()

frontend/src/components/schedule2/__tests__/Schedule2.test.tsx

@@ -350,16 +350,11 @@ describe('Schedule2 page', () => {
   })
 
   test('stale PUT is ignored when context changes before it settles (Story 29.6)', async () => {
-    let putGate: (v: unknown) => void = () => {}
-    const putPromise = new Promise((resolve) => {
-      putGate = resolve
-    })
     let releasePut = () => {}
     const releasePromise = new Promise<void>((resolve) => {
       releasePut = resolve
     })
 
-    let putCalled = false
     server.use(
       http.get(URL, ({ request }) =>
         new window.URL(request.url).searchParams.get('millId') === '999'
@@ -373,8 +368,6 @@ describe('Schedule2 page', () => {
           : HttpResponse.json(schedule2Doc),
       ),
       http.put(URL, async () => {
-        putCalled = true
-        putGate(null)
         await releasePromise
         return HttpResponse.json({
           ...schedule2Doc,
@@ -385,6 +378,7 @@ describe('Schedule2 page', () => {
 
     render(
       <MillYearProvider initial={{ millId: 514, year: 2021 }}>
+        {/* eslint-disable-next-line @typescript-eslint/no-use-before-define */}
         <StaleRaceHarness />
       </MillYearProvider>,
     )

frontend/src/components/schedule3/__tests__/Schedule3.test.tsx

@@ -434,16 +434,11 @@ describe('Schedule3 sub-page navigation (AC6)', () => {
   })
 
   test('stale PUT is ignored when context changes before it settles (Story 29.6)', async () => {
-    let putGate: (v: unknown) => void = () => {}
-    const putPromise = new Promise((resolve) => {
-      putGate = resolve
-    })
     let releasePut = () => {}
     const releasePromise = new Promise<void>((resolve) => {
       releasePut = resolve
     })
 
-    let putCalled = false
     server.use(
       http.get(URL, ({ request }) =>
         new window.URL(request.url).searchParams.get('millId') === '999'
@@ -457,8 +452,6 @@ describe('Schedule3 sub-page navigation (AC6)', () => {
           : HttpResponse.json(schedule3Doc),
       ),
       http.put(URL, async () => {
-        putCalled = true
-        putGate(null)
         await releasePromise
         return HttpResponse.json({
           ...schedule3Doc,
@@ -469,6 +462,7 @@ describe('Schedule3 sub-page navigation (AC6)', () => {
 
     render(
       <MillYearProvider initial={{ millId: 514, year: 2021 }}>
+        {/* eslint-disable-next-line @typescript-eslint/no-use-before-define */}
         <StaleRaceHarness />
       </MillYearProvider>,
     )

frontend/src/components/schedule4/__tests__/Schedule4.test.tsx

@@ -786,16 +786,11 @@ describe('Schedule4 context, load + write error, edit, delete and status paths',
   })
 
   test('stale PUT is ignored when context changes before it settles (Story 29.6)', async () => {
-    let putGate: (v: unknown) => void = () => {}
-    const putPromise = new Promise((resolve) => {
-      putGate = resolve
-    })
     let releasePut = () => {}
     const releasePromise = new Promise<void>((resolve) => {
       releasePut = resolve
     })
 
-    let putCalled = false
     server.use(
       http.get(URL, ({ request }) =>
         new window.URL(request.url).searchParams.get('millId') === '999'
@@ -804,14 +799,21 @@ describe('Schedule4 context, load + write error, edit, delete and status paths',
                 millId: 999,
                 year: 2020,
                 editable: false,
-                locations: [{ id: 999, revisionCount: 1, name: 'Context 999/2020 loaded', comments: null, categories: [], subPageRows: [] }],
+                locations: [
+                  {
+                    id: 999,
+                    revisionCount: 1,
+                    name: 'Context 999/2020 loaded',
+                    comments: null,
+                    categories: [],
+                    subPageRows: [],
+                  },
+                ],
               }),
             )
           : HttpResponse.json(doc()),
       ),
       http.put(LOCATIONS_URL, async () => {
-        putCalled = true
-        putGate(null)
         await releasePromise
         return HttpResponse.json({
           ...doc(),
@@ -827,6 +829,7 @@ describe('Schedule4 context, load + write error, edit, delete and status paths',
       validateSearch: realScheduleRoute.options.validateSearch,
       component: () => (
         <MillYearProvider initial={{ millId: 514, year: 2021 }}>
+          {/* eslint-disable-next-line @typescript-eslint/no-use-before-define */}
           <StaleRaceHarness />
         </MillYearProvider>
       ),