refactor: centralize number formatting with locale-aware utility

This commit is contained in:
2026-01-29 17:53:38 -06:00
parent d2985f98ce
commit 7a1cd2a39b
9 changed files with 53 additions and 30 deletions
+4 -4
View File
@@ -13,7 +13,7 @@ import {
} from "$lib/course"; } from "$lib/course";
import { themeStore } from "$lib/stores/theme.svelte"; import { themeStore } from "$lib/stores/theme.svelte";
import { useClipboard } from "$lib/composables/useClipboard.svelte"; import { useClipboard } from "$lib/composables/useClipboard.svelte";
import { cn, tooltipContentClass } from "$lib/utils"; import { cn, tooltipContentClass, formatNumber } from "$lib/utils";
import { Tooltip } from "bits-ui"; import { Tooltip } from "bits-ui";
import SimpleTooltip from "./SimpleTooltip.svelte"; import SimpleTooltip from "./SimpleTooltip.svelte";
import { Info, Copy, Check, Star, Triangle, ExternalLink } from "@lucide/svelte"; import { Info, Copy, Check, Star, Triangle, ExternalLink } from "@lucide/svelte";
@@ -275,7 +275,7 @@ const clipboard = useClipboard();
</span> </span>
{#if course.crossListCount != null && course.crossListCapacity != null} {#if course.crossListCount != null && course.crossListCapacity != null}
<span class="text-muted-foreground text-xs"> <span class="text-muted-foreground text-xs">
{course.crossListCount}/{course.crossListCapacity} {formatNumber(course.crossListCount)}/{formatNumber(course.crossListCapacity)}
</span> </span>
{/if} {/if}
</span> </span>
@@ -285,7 +285,7 @@ const clipboard = useClipboard();
>{course.crossList}</span >{course.crossList}</span
> >
{#if course.crossListCount != null && course.crossListCapacity != null} {#if course.crossListCount != null && course.crossListCapacity != null}
{course.crossListCount} enrolled across {course.crossListCapacity} {formatNumber(course.crossListCount)} enrolled across {formatNumber(course.crossListCapacity)}
shared seats shared seats
{/if} {/if}
</Tooltip.Content> </Tooltip.Content>
@@ -298,7 +298,7 @@ const clipboard = useClipboard();
<div> <div>
<h4 class="text-sm text-foreground mb-2">Waitlist</h4> <h4 class="text-sm text-foreground mb-2">Waitlist</h4>
<span class="text-2foreground" <span class="text-2foreground"
>{course.waitCount} / {course.waitCapacity}</span >{formatNumber(course.waitCount)} / {formatNumber(course.waitCapacity)}</span
> >
</div> </div>
{/if} {/if}
+7 -7
View File
@@ -46,7 +46,7 @@ import {
ExternalLink, ExternalLink,
} from "@lucide/svelte"; } from "@lucide/svelte";
import { DropdownMenu, ContextMenu, Tooltip } from "bits-ui"; import { DropdownMenu, ContextMenu, Tooltip } from "bits-ui";
import { cn, tooltipContentClass } from "$lib/utils"; import { cn, tooltipContentClass, formatNumber } from "$lib/utils";
import SimpleTooltip from "./SimpleTooltip.svelte"; import SimpleTooltip from "./SimpleTooltip.svelte";
let { let {
@@ -577,7 +577,7 @@ const table = createSvelteTable({
> >
{ratingData.rating.toFixed( {ratingData.rating.toFixed(
1, 1,
)}/5 · {ratingData.count} )}/5 · {formatNumber(ratingData.count)}
ratings ratings
{#if (ratingData.count ?? 0) < RMP_CONFIDENCE_THRESHOLD} {#if (ratingData.count ?? 0) < RMP_CONFIDENCE_THRESHOLD}
(low) (low)
@@ -701,11 +701,11 @@ const table = createSvelteTable({
class="py-2 px-2 text-right whitespace-nowrap" class="py-2 px-2 text-right whitespace-nowrap"
> >
<SimpleTooltip <SimpleTooltip
text="{openSeats( text="{formatNumber(openSeats(
course, course,
)} of {course.maxEnrollment} seats open, {course.enrollment} enrolled{course.waitCount > ))} of {formatNumber(course.maxEnrollment)} seats open, {formatNumber(course.enrollment)} enrolled{course.waitCount >
0 0
? `, ${course.waitCount} waitlisted` ? `, ${formatNumber(course.waitCount)} waitlisted`
: ''}" : ''}"
delay={200} delay={200}
side="left" side="left"
@@ -729,8 +729,8 @@ const table = createSvelteTable({
> >
<span <span
class="text-muted-foreground/60 tabular-nums" class="text-muted-foreground/60 tabular-nums"
>{course.enrollment}/{course.maxEnrollment}{#if course.waitCount > 0} >{formatNumber(course.enrollment)}/{formatNumber(course.maxEnrollment)}{#if course.waitCount > 0}
· WL {course.waitCount}/{course.waitCapacity}{/if}</span · WL {formatNumber(course.waitCount)}/{formatNumber(course.waitCapacity)}{/if}</span
> >
</span> </span>
</SimpleTooltip> </SimpleTooltip>
+5 -4
View File
@@ -2,6 +2,7 @@
import { Select } from "bits-ui"; import { Select } from "bits-ui";
import { ChevronUp, ChevronDown } from "@lucide/svelte"; import { ChevronUp, ChevronDown } from "@lucide/svelte";
import type { Action } from "svelte/action"; import type { Action } from "svelte/action";
import { formatNumber } from "$lib/utils";
const slideIn: Action<HTMLElement, number> = (node, direction) => { const slideIn: Action<HTMLElement, number> = (node, direction) => {
if (direction !== 0) { if (direction !== 0) {
@@ -59,11 +60,11 @@ const selectValue = $derived(String(currentPage));
</script> </script>
{#if totalCount > 0 && totalPages > 1} {#if totalCount > 0 && totalPages > 1}
<div class="flex items-center text-sm"> <div class="flex items-start text-xs -mt-3 pl-2">
<!-- Left zone: result count --> <!-- Left zone: result count -->
<div class="flex-1"> <div class="flex-1">
<span class="text-muted-foreground"> <span class="text-muted-foreground">
Showing {start}&ndash;{end} of {totalCount} courses Showing {formatNumber(start)}&ndash;{formatNumber(end)} of {formatNumber(totalCount)} courses
</span> </span>
</div> </div>
@@ -158,9 +159,9 @@ const selectValue = $derived(String(currentPage));
</div> </div>
{:else if totalCount > 0} {:else if totalCount > 0}
<!-- Single page: just show the count, no pagination controls --> <!-- Single page: just show the count, no pagination controls -->
<div class="flex items-center text-sm"> <div class="flex items-start text-xs -mt-3 pl-2">
<span class="text-muted-foreground"> <span class="text-muted-foreground">
Showing {start}&ndash;{end} of {totalCount} courses Showing {formatNumber(start)}&ndash;{formatNumber(end)} of {formatNumber(totalCount)} courses
</span> </span>
</div> </div>
{/if} {/if}
+2 -1
View File
@@ -2,6 +2,7 @@
import { onMount } from "svelte"; import { onMount } from "svelte";
import SimpleTooltip from "$lib/components/SimpleTooltip.svelte"; import SimpleTooltip from "$lib/components/SimpleTooltip.svelte";
import { relativeTime } from "$lib/time"; import { relativeTime } from "$lib/time";
import { formatNumber } from "$lib/utils";
export interface SearchMeta { export interface SearchMeta {
totalCount: number; totalCount: number;
@@ -26,7 +27,7 @@ let formattedTime = $derived(
let relativeTimeResult = $derived(meta ? relativeTime(meta.timestamp, now) : null); let relativeTimeResult = $derived(meta ? relativeTime(meta.timestamp, now) : null);
let relativeTimeText = $derived(relativeTimeResult?.text ?? ""); let relativeTimeText = $derived(relativeTimeResult?.text ?? "");
let countLabel = $derived(meta ? meta.totalCount.toLocaleString() : ""); let countLabel = $derived(meta ? formatNumber(meta.totalCount) : "");
let resultNoun = $derived(meta ? (meta.totalCount !== 1 ? "results" : "result") : ""); let resultNoun = $derived(meta ? (meta.totalCount !== 1 ? "results" : "result") : "");
let durationLabel = $derived(meta ? `${Math.round(meta.durationMs)}ms` : ""); let durationLabel = $derived(meta ? `${Math.round(meta.durationMs)}ms` : "");
@@ -3,6 +3,7 @@ import { Combobox } from "bits-ui";
import { Check, ChevronsUpDown } from "@lucide/svelte"; import { Check, ChevronsUpDown } from "@lucide/svelte";
import { fly } from "svelte/transition"; import { fly } from "svelte/transition";
import type { Subject } from "$lib/api"; import type { Subject } from "$lib/api";
import { formatNumber } from "$lib/utils";
let { let {
subjects, subjects,
@@ -92,7 +93,7 @@ $effect(() => {
</span> </span>
{/each} {/each}
{#if !open && overflowCount > 0} {#if !open && overflowCount > 0}
<span class="text-xs text-muted-foreground shrink-0">+{overflowCount}</span> <span class="text-xs text-muted-foreground shrink-0">+{formatNumber(overflowCount)}</span>
{/if} {/if}
{/if} {/if}
<Combobox.Input <Combobox.Input
+23
View File
@@ -8,3 +8,26 @@ export function cn(...inputs: ClassValue[]) {
/** Shared tooltip content styling for bits-ui Tooltip.Content */ /** Shared tooltip content styling for bits-ui Tooltip.Content */
export const tooltipContentClass = export const tooltipContentClass =
"z-50 bg-card text-card-foreground text-xs border border-border rounded-md px-2.5 py-1.5 shadow-md max-w-72"; "z-50 bg-card text-card-foreground text-xs border border-border rounded-md px-2.5 py-1.5 shadow-md max-w-72";
export interface FormatNumberOptions {
/** Include sign for positive numbers (default: false) */
sign?: boolean;
/** Maximum fraction digits (default: 0 for integers) */
maximumFractionDigits?: number;
}
/**
* Format a number with locale-aware thousands separators.
* Uses browser locale via Intl.NumberFormat.
*/
export function formatNumber(num: number, options: FormatNumberOptions = {}): string {
const { sign = false, maximumFractionDigits = 0 } = options;
const formatted = new Intl.NumberFormat(undefined, {
maximumFractionDigits,
}).format(num);
if (sign && num >= 0) {
return `+${formatted}`;
}
return formatted;
}
+5 -4
View File
@@ -1,6 +1,7 @@
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte"; import { onMount } from "svelte";
import { client, type AdminStatus } from "$lib/api"; import { client, type AdminStatus } from "$lib/api";
import { formatNumber } from "$lib/utils";
let status = $state<AdminStatus | null>(null); let status = $state<AdminStatus | null>(null);
let error = $state<string | null>(null); let error = $state<string | null>(null);
@@ -24,19 +25,19 @@ onMount(async () => {
<div class="grid grid-cols-2 gap-4 lg:grid-cols-4"> <div class="grid grid-cols-2 gap-4 lg:grid-cols-4">
<div class="bg-card border-border rounded-lg border p-4"> <div class="bg-card border-border rounded-lg border p-4">
<p class="text-muted-foreground text-sm">Users</p> <p class="text-muted-foreground text-sm">Users</p>
<p class="text-3xl font-bold">{status.userCount}</p> <p class="text-3xl font-bold">{formatNumber(status.userCount)}</p>
</div> </div>
<div class="bg-card border-border rounded-lg border p-4"> <div class="bg-card border-border rounded-lg border p-4">
<p class="text-muted-foreground text-sm">Active Sessions</p> <p class="text-muted-foreground text-sm">Active Sessions</p>
<p class="text-3xl font-bold">{status.sessionCount}</p> <p class="text-3xl font-bold">{formatNumber(status.sessionCount)}</p>
</div> </div>
<div class="bg-card border-border rounded-lg border p-4"> <div class="bg-card border-border rounded-lg border p-4">
<p class="text-muted-foreground text-sm">Courses</p> <p class="text-muted-foreground text-sm">Courses</p>
<p class="text-3xl font-bold">{status.courseCount}</p> <p class="text-3xl font-bold">{formatNumber(status.courseCount)}</p>
</div> </div>
<div class="bg-card border-border rounded-lg border p-4"> <div class="bg-card border-border rounded-lg border p-4">
<p class="text-muted-foreground text-sm">Scrape Jobs</p> <p class="text-muted-foreground text-sm">Scrape Jobs</p>
<p class="text-3xl font-bold">{status.scrapeJobCount}</p> <p class="text-3xl font-bold">{formatNumber(status.scrapeJobCount)}</p>
</div> </div>
</div> </div>
@@ -5,6 +5,7 @@ import { FlexRender, createSvelteTable } from "$lib/components/ui/data-table/ind
import { formatAbsoluteDate } from "$lib/date"; import { formatAbsoluteDate } from "$lib/date";
import { type DiffEntry, formatDiffPath, jsonDiff, tryParseJson } from "$lib/diff"; import { type DiffEntry, formatDiffPath, jsonDiff, tryParseJson } from "$lib/diff";
import { relativeTime } from "$lib/time"; import { relativeTime } from "$lib/time";
import { formatNumber } from "$lib/utils";
import { import {
AlertCircle, AlertCircle,
ArrowDown, ArrowDown,
@@ -139,9 +140,7 @@ function analyzeChange(entry: AuditLogEntry): ChangeAnalysis {
return { kind: "scalar", oldRaw: entry.oldValue, newRaw: entry.newValue, diffs: [], delta }; return { kind: "scalar", oldRaw: entry.oldValue, newRaw: entry.newValue, diffs: [], delta };
} }
function formatDelta(delta: number): string {
return delta >= 0 ? `+${delta}` : `${delta}`;
}
function stringify(val: unknown): string { function stringify(val: unknown): string {
if (val === undefined) return "∅"; if (val === undefined) return "∅";
@@ -351,7 +350,7 @@ const columnCount = columns.length;
{#if change.kind === "scalar"} {#if change.kind === "scalar"}
<span class="inline-flex items-center gap-1.5 text-sm"> <span class="inline-flex items-center gap-1.5 text-sm">
{#if change.delta !== null} {#if change.delta !== null}
<span class="text-foreground">{formatDelta(change.delta)}<span class="text-muted-foreground/60">,</span></span> <span class="text-foreground">{formatNumber(change.delta, { sign: true })}<span class="text-muted-foreground/60">,</span></span>
{/if} {/if}
<span class="text-red-400">{change.oldRaw}</span> <span class="text-red-400">{change.oldRaw}</span>
<span class="text-muted-foreground/60"></span> <span class="text-muted-foreground/60"></span>
@@ -378,7 +377,7 @@ const columnCount = columns.length;
<ChevronRight class="size-3.5 shrink-0" /> <ChevronRight class="size-3.5 shrink-0" />
{/if} {/if}
<span class="underline decoration-dotted underline-offset-2"> <span class="underline decoration-dotted underline-offset-2">
{change.diffs.length} fields changed {formatNumber(change.diffs.length)} fields changed
</span> </span>
</span> </span>
{/if} {/if}
+1 -4
View File
@@ -16,6 +16,7 @@ import SimpleTooltip from "$lib/components/SimpleTooltip.svelte";
import Footer from "$lib/components/Footer.svelte"; import Footer from "$lib/components/Footer.svelte";
import { type ServiceStatus, type ServiceInfo, type StatusResponse, client } from "$lib/api"; import { type ServiceStatus, type ServiceInfo, type StatusResponse, client } from "$lib/api";
import { relativeTime } from "$lib/time"; import { relativeTime } from "$lib/time";
import { formatNumber } from "$lib/utils";
const REFRESH_INTERVAL = import.meta.env.DEV ? 3000 : 30000; const REFRESH_INTERVAL = import.meta.env.DEV ? 3000 : 30000;
const REQUEST_TIMEOUT = 10000; const REQUEST_TIMEOUT = 10000;
@@ -105,10 +106,6 @@ const lastFetch = $derived(
const relativeLastFetchResult = $derived(lastFetch ? relativeTime(lastFetch, now) : null); const relativeLastFetchResult = $derived(lastFetch ? relativeTime(lastFetch, now) : null);
const relativeLastFetch = $derived(relativeLastFetchResult?.text ?? ""); const relativeLastFetch = $derived(relativeLastFetchResult?.text ?? "");
function formatNumber(num: number): string {
return num.toLocaleString();
}
onMount(() => { onMount(() => {
let timeoutId: ReturnType<typeof setTimeout> | null = null; let timeoutId: ReturnType<typeof setTimeout> | null = null;
let requestTimeoutId: ReturnType<typeof setTimeout> | null = null; let requestTimeoutId: ReturnType<typeof setTimeout> | null = null;