Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions apps/web/src/lib/api.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
/**
* API client utilities for the web app.
*
* BUG: imports `useThrottle` from @e2e/utils, but that hook was renamed to
* `useDebounce`. This causes a TypeScript error and a runtime crash.
*
* Fix: change the import to `useDebounce`.
*/

// BUG: useThrottle no longer exists — was renamed to useDebounce
import { useThrottle } from "@e2e/utils"
import { formatDate, formatAUD } from "@e2e/utils"
import { useDebounce, formatDate, formatAUD } from "@e2e/utils"

export const BASE_URL = process.env.API_URL ?? "http://localhost:3000"

Expand All @@ -28,5 +21,5 @@ export async function fetchPosts() {
// Re-export formatting utilities used throughout the app
export { formatDate, formatAUD }

// Re-export the debounce hook (currently broken import)
export { useThrottle as useSearchDebounce }
// Re-export the debounce hook under the app-facing name
export { useDebounce as useSearchDebounce }
28 changes: 20 additions & 8 deletions packages/ui/src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ type Props = {
/**
* Button component.
*
* BUG: When `iconOnly` is true, the button renders without visible text.
* An `aria-label` is required for screen reader accessibility (WCAG 2.1 SC 4.1.2),
* but the component does not enforce or warn about its absence.
* Icon-only buttons render no visible text, so they need an explicit
* `aria-label` to expose an accessible name (WCAG 2.2 SC 4.1.2 Name, Role,
* Value). When one is not supplied we fall back to string `children` if
* present, then to a generic label, and warn in development.
*
* The test in Button.test.tsx checks that an icon-only button has an accessible name.
* Fix: throw/warn in development when `iconOnly && !aria-label`, or always render
* the aria-label attribute when iconOnly is true.
* For text buttons the resolved label is normally `undefined`, so React omits
* the attribute entirely and the visible text remains the accessible name.
*/
export function Button({
children,
Expand All @@ -34,13 +34,25 @@ export function Button({
onClick,
"aria-label": ariaLabel,
}: Props) {
const textChild = typeof children === "string" && children.length > 0 ? children : undefined
const resolvedLabel = iconOnly ? (ariaLabel ?? textChild ?? "Button") : ariaLabel

if (
typeof process !== "undefined" &&
process.env.NODE_ENV !== "production" &&
iconOnly &&
!ariaLabel &&
!textChild
) {
console.warn("Button: `iconOnly` requires an explicit `aria-label` to meet WCAG 2.2 SC 4.1.2.")
}

return (
<button
className={`btn btn-${variant}`}
disabled={disabled}
onClick={onClick}
// BUG: aria-label is not applied when iconOnly is true and no ariaLabel is passed
// The component should enforce aria-label for icon-only buttons
aria-label={resolvedLabel}
>
{icon && <span className="btn-icon">{icon}</span>}
{!iconOnly && children}
Expand Down
32 changes: 17 additions & 15 deletions packages/ui/src/components/DataTable/DataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,28 @@ type Props<T extends Record<string, unknown>> = {
/**
* DataTable with client-side sorting.
*
* BUG: The sort handler has a stale closure — it captures `sortDir` at the
* time the handler is created, so toggling sort direction does not work
* correctly after the first click. The second click always sorts in the same
* direction as the first.
* Clicking a sortable column header sorts by it ascending; clicking the same
* header again toggles the direction.
*
* Fix: use the functional form of setState — `setSortDir(prev => ...)` —
* so the toggle always reads the current value.
* Sort key and direction are held in a single state object and updated through
* one functional updater. They must be derived together: deciding whether a
* click is a "new column" or a "toggle" depends on the current key, so reading
* either value from the render closure would drop an update whenever two
* clicks are batched into the same render pass.
*/
type SortState<T> = {
key: keyof T | null
dir: SortDir
}

export function DataTable<T extends Record<string, unknown>>({ data, columns }: Props<T>) {
const [sortKey, setSortKey] = useState<keyof T | null>(null)
const [sortDir, setSortDir] = useState<SortDir>("asc")
const [sort, setSort] = useState<SortState<T>>({ key: null, dir: "asc" })
const { key: sortKey, dir: sortDir } = sort

// BUG: stale closure — sortDir is captured at handler creation time
const handleSort = (key: keyof T) => {
if (sortKey === key) {
setSortDir(sortDir === "asc" ? "desc" : "asc") // BUG: reads stale sortDir
} else {
setSortKey(key)
setSortDir("asc")
}
setSort((prev) =>
prev.key === key ? { key, dir: prev.dir === "asc" ? "desc" : "asc" } : { key, dir: "asc" },
)
}

const sorted = sortKey
Expand Down
39 changes: 27 additions & 12 deletions packages/utils/src/format/date.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,41 @@
/**
* Date formatting utilities.
*
* BUG: formatDate passes `'en-AU'` as the locale but then uses a US-style
* format string option (`month: 'numeric'` before `day: 'numeric'`), which
* produces MM/DD/YYYY output instead of DD/MM/YYYY for Australian dates.
* Output is day-first and anchored to Australian Eastern time, so formatting
* does not vary with the host timezone.
*
* Fix: use `dateStyle: 'short'` with `'en-AU'` locale, which correctly
* produces DD/MM/YYYY, or explicitly set `day: 'numeric', month: 'numeric', year: 'numeric'`
* and rely on the locale to order them correctly.
* Note on the locale: `en-GB` is used deliberately, not `en-AU`. Both are
* day-first, but ICU resolves the en-AU numeric date skeleton to the pattern
* `dd/MM/y`, which zero-pads the day regardless of `day: "numeric"` — giving
* `01/03/2024`. `en-GB` honours `day: "numeric"` and yields `1/03/2024`.
* Do not "correct" this to en-AU; that reintroduces the leading zero.
*/
export function formatDate(date: Date): string {
// BUG: explicit field order overrides locale ordering — produces M/D/YYYY not D/M/YYYY
return new Intl.DateTimeFormat("en-AU", {
month: "numeric",
return new Intl.DateTimeFormat("en-GB", {
day: "numeric",
month: "2-digit",
year: "numeric",
timeZone: "Australia/Sydney",
}).format(date)
}

/**
* As `formatDate`, plus a short 12-hour time.
*
* The date fields mirror `formatDate` exactly (same locale and options) so the
* two helpers never disagree on how a date is rendered. Note that `timeStyle`
* cannot be combined with individual date fields — Intl throws a TypeError —
* so the time is spelled out as `hour`/`minute`, with `hour12` pinned to keep
* the `2:30 pm` form regardless of what the locale would otherwise resolve to.
*/
export function formatDateTime(date: Date): string {
return new Intl.DateTimeFormat("en-AU", {
dateStyle: "short",
timeStyle: "short",
return new Intl.DateTimeFormat("en-GB", {
day: "numeric",
month: "2-digit",
year: "numeric",
hour: "numeric",
minute: "2-digit",
hour12: true,
timeZone: "Australia/Sydney",
}).format(date)
}
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
"jsx": "react-jsx",
"strict": true,
"skipLibCheck": true,
"types": ["bun-types"],
"paths": {
"@e2e/ui": ["./packages/ui/src/index.ts"],
"@e2e/utils": ["./packages/utils/src/index.ts"]
}
},
"include": ["packages/*/src/**/*", "packages/*/test/**/*", "apps/*/src/**/*"]
"include": ["packages/*/src/**/*", "packages/*/test/**/*", "apps/*/src/**/*", "apps/*/test/**/*"]
}