fixed bugs

Author: Edwin Chan

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
           cache: npm
       - uses: astral-sh/setup-uv@v5
       - run: npm ci
-      - run: npx prisma migrate deploy
+      - run: npx prisma db push
       - run: npm run db:seed
       - run: npm run lint
       - run: npm run typecheck
@@ -75,4 +75,3 @@ jobs:
           curl -fsS http://localhost:3001 >/dev/null
 
           BU_NAME=dbsmo-ci BU_CDP_URL=http://127.0.0.1:9222 BASE_URL=http://localhost:3001 browser-harness -c 'exec(open("tests/browser_harness_smoke.py").read())'
-          fi

app/admin/create/page.tsx

@@ -29,7 +29,7 @@ type ContentFormat = "LATEX" | "HTML";
 
 interface ProblemEntry {
   id: string;
-  number: string;
+  number: number;
   statement: string;
   contentFormat: ContentFormat;
   answerType: AnswerType;
@@ -57,7 +57,7 @@ function uid() {
 function emptyProblem(n: number | string): ProblemEntry {
   return {
     id: uid(),
-    number: String(n),
+    number: typeof n === "number" ? n : Number(n) || 1,
     statement: "",
     contentFormat: "LATEX",
     answerType: "INTEGER",
@@ -532,9 +532,10 @@ export default function CreateSetPage() {
               <div className="problem-number" style={{ display: "flex", alignItems: "center", gap: 8 }}>
                 <GripVertical size={14} className="grip-icon" />
                 <input
-                  type="text"
+                  type="number"
+                  min={1}
                   value={p.number}
-                  onChange={(e) => updateProblem(p.id, "number", e.target.value)}
+                  onChange={(e) => updateProblem(p.id, "number", Number(e.target.value))}
                   style={{
                     width: 60,
                     padding: "4px 8px",

app/admin/sets/[id]/set-edit-form.tsx

@@ -24,7 +24,7 @@ import { DeleteSetButton } from "../delete-set-button";
 
 type ProblemData = {
   id: string;
-  number: string;
+  number: number;
   statement: string;
   contentFormat: "LATEX" | "HTML";
   answerKey: string;
@@ -84,7 +84,7 @@ function toggleTagInCsv(csv: string, tag: string): string {
 function newProblem(number: number | string) {
   return {
     id: `new-${Math.random().toString(36).slice(2, 10)}`,
-    number: String(number),
+    number: typeof number === "number" ? number : Number(number) || 1,
     statement: "",
     contentFormat: "LATEX" as const,
     answerKey: "",
@@ -572,9 +572,10 @@ export function SetEditForm({ set }: { set: SetData }) {
                     )}
                     <div className="problem-number" style={{ display: "flex", alignItems: "center", gap: 8 }}>
                       <input
-                        type="text"
+                        type="number"
+                        min={1}
                         value={problem.number}
-                        onChange={(e) => updateProblem(problem.id, "number", e.target.value)}
+                        onChange={(e) => updateProblem(problem.id, "number", Number(e.target.value))}
                         onClick={(e) => e.stopPropagation()}
                         style={{
                           width: 60,

app/admin/sets/page.tsx

@@ -6,15 +6,19 @@ import { prisma } from "@/lib/db";
 import { authOptions } from "@/lib/auth";
 import { hasPermission } from "@/lib/permissions";
 import { statusLabel, statusColor } from "@/lib/visibility";
+import { compareProblemSetRecords } from "@/lib/problem-set-order";
 import { DeleteSetButton } from "./delete-set-button";
 
 export const dynamic = "force-dynamic";
 
 type AdminSetsSearchParams = Promise<{
   page?: string;
   q?: string;
+  status?: string;
 }>;
 
+type SetStatusFilter = "all" | "PUBLISHED" | "DRAFT" | "ARCHIVED";
+
 export default async function AdminSetsPage({
   searchParams,
 }: {
@@ -27,17 +31,27 @@ export default async function AdminSetsPage({
   const params = (await searchParams) ?? {};
   const query = params.q?.trim() ?? "";
   const normalizedQuery = query.toLowerCase();
+  const statusFilter: SetStatusFilter =
+    params.status === "published"
+      ? "PUBLISHED"
+      : params.status === "draft"
+        ? "DRAFT"
+        : params.status === "archived"
+          ? "ARCHIVED"
+          : "all";
   const currentPage = Math.max(1, Number(params.page ?? "1") || 1);
   const pageSize = 25;
 
   const sets = await prisma.problemSet.findMany({
-    orderBy: { order: "asc" },
+    orderBy: { createdAt: "asc" },
     include: {
       _count: { select: { problems: true } },
     },
   });
 
-  const visibleSets = sets.filter((set) => {
+  const orderedSets = [...sets].sort(compareProblemSetRecords);
+  const visibleSets = orderedSets.filter((set) => {
+    if (statusFilter !== "all" && set.status !== statusFilter) return false;
     if (!normalizedQuery) return true;
     return [set.title, set.slug, String(set.order), ...set.topicTags, set.status]
       .join(" ")
@@ -48,14 +62,24 @@ export default async function AdminSetsPage({
   const safePage = Math.min(currentPage, totalPages);
   const paginatedSets = visibleSets.slice((safePage - 1) * pageSize, safePage * pageSize);
 
-  function setsHref(page: number) {
+  function setsHref(next: { page?: number; status?: SetStatusFilter } = {}) {
     const urlParams = new URLSearchParams();
+    const nextPage = next.page ?? safePage;
+    const nextStatus = next.status ?? statusFilter;
     if (query) urlParams.set("q", query);
-    if (page > 1) urlParams.set("page", String(page));
+    if (nextStatus !== "all") urlParams.set("status", nextStatus.toLowerCase());
+    if (nextPage > 1) urlParams.set("page", String(nextPage));
     const suffix = urlParams.toString();
     return suffix ? `/admin/sets?${suffix}` : "/admin/sets";
   }
 
+  const statusOptions: Array<{ label: string; value: SetStatusFilter }> = [
+    { label: "All", value: "all" },
+    { label: "Published", value: "PUBLISHED" },
+    { label: "Draft", value: "DRAFT" },
+    { label: "Archived", value: "ARCHIVED" },
+  ];
+
   return (
     <main className="single-page">
       <div className="background-layers" aria-hidden="true">
@@ -90,6 +114,9 @@ export default async function AdminSetsPage({
             name="q"
             placeholder="Search sets by title, slug, order, tag, or status"
           />
+          {statusFilter !== "all" ? (
+            <input name="status" type="hidden" value={statusFilter.toLowerCase()} />
+          ) : null}
           <button className="secondary-action compact" type="submit">
             Search
           </button>
@@ -100,6 +127,21 @@ export default async function AdminSetsPage({
           ) : null}
         </form>
 
+        <section className="admin-set-filter-bar" aria-label="Problem set status filters">
+          <span className="leaderboard-control-label">Status</span>
+          <div className="segmented-control">
+            {statusOptions.map((option) => (
+              <Link
+                className={`segmented-button${statusFilter === option.value ? " active" : ""}`}
+                href={setsHref({ page: 1, status: option.value })}
+                key={option.value}
+              >
+                {option.label}
+              </Link>
+            ))}
+          </div>
+        </section>
+
         {visibleSets.length === 0 ? (
           <section className="panel empty-state">
             <FileJson size={42} />
@@ -120,7 +162,9 @@ export default async function AdminSetsPage({
           <section className="panel table-panel">
             <div className="panel-header">
               <div>
-                <p className="eyebrow">All sets</p>
+                <p className="eyebrow">
+                  {statusFilter === "all" ? "All sets" : `${statusFilter.toLowerCase()} sets`}
+                </p>
                 <h2>
                   {visibleSets.length} problem set{visibleSets.length !== 1 ? "s" : ""}
                 </h2>
@@ -188,7 +232,7 @@ export default async function AdminSetsPage({
               <div className="pagination-row">
                 <Link
                   className="secondary-action compact"
-                  href={setsHref(Math.max(1, safePage - 1))}
+                  href={setsHref({ page: Math.max(1, safePage - 1) })}
                 >
                   Previous
                 </Link>
@@ -197,7 +241,7 @@ export default async function AdminSetsPage({
                 </span>
                 <Link
                   className="secondary-action compact"
-                  href={setsHref(Math.min(totalPages, safePage + 1))}
+                  href={setsHref({ page: Math.min(totalPages, safePage + 1) })}
                 >
                   Next
                 </Link>

app/api/admin/create-set/route.ts

@@ -5,6 +5,7 @@ import { authOptions } from "@/lib/auth";
 import { normalizeTagList } from "@/lib/problem-tags";
 import { storeUploadedPdf, type UploadedPdfPayload } from "@/lib/uploaded-pdf";
 import { recordAuditLog } from "@/lib/audit";
+import { nextProblemSetOrder } from "@/lib/problem-set-order";
 import {
   assertUniqueProblemNumbers,
   createProblemSetAuthoringSchema,
@@ -67,12 +68,8 @@ export async function POST(req: Request) {
     if (!finalOrder) {
       const existingSets = await prisma.problemSet.findMany({
         select: { order: true },
-        orderBy: { order: "desc" },
-        take: 1,
       });
-      const maxOrder = existingSets[0]?.order ?? "0";
-      const parsed = parseInt(maxOrder, 10);
-      finalOrder = String((Number.isFinite(parsed) ? parsed : 0) + 1);
+      finalOrder = nextProblemSetOrder(existingSets.map((set) => set.order));
     }
 
     let problemFileId: string | null = null;

app/api/submit/report/route.ts

@@ -24,8 +24,13 @@ export async function POST(req: Request) {
 
     let problemId = null;
     if (problemNumber) {
+      const parsedProblemNumber = Number(problemNumber);
+      if (!Number.isInteger(parsedProblemNumber) || parsedProblemNumber <= 0) {
+        return NextResponse.json({ error: "Invalid problem number" }, { status: 400 });
+      }
+
       const problem = await prisma.problem.findUnique({
-        where: { problemSetId_number: { problemSetId, number: String(problemNumber) } },
+        where: { problemSetId_number: { problemSetId, number: parsedProblemNumber } },
       });
       if (problem) {
         problemId = problem.id;

app/dashboard/page.tsx

@@ -30,6 +30,7 @@ import { profilePathFromEmail } from "@/lib/user-profile";
 import { computeBestAverageScore } from "@/lib/analytics";
 import { normalizeTagList } from "@/lib/problem-tags";
 import { hasPermission } from "@/lib/permissions";
+import { compareProblemSetRecords } from "@/lib/problem-set-order";
 
 export const dynamic = "force-dynamic";
 
@@ -64,7 +65,7 @@ export default async function DashboardPage() {
       },
     }),
     prisma.problemSet.findMany({
-      orderBy: [{ order: "asc" }, { createdAt: "asc" }],
+      orderBy: { createdAt: "asc" },
       include: {
         _count: { select: { problems: true, attempts: true, feedback: true } },
       },
@@ -102,8 +103,9 @@ export default async function DashboardPage() {
     redirect("/");
   }
 
-  const visibleSets =
-    currentUser.role === "ADMIN" ? allSets : allSets.filter((set) => isVisibleToStudent(set));
+  const visibleSets = (
+    currentUser.role === "ADMIN" ? allSets : allSets.filter((set) => isVisibleToStudent(set))
+  ).sort(compareProblemSetRecords);
   const canManageContent = hasPermission(currentUser.role, "admin:content");
   const canViewStudents = hasPermission(currentUser.role, "admin:users");
   const canViewAnalytics = hasPermission(currentUser.role, "admin:analytics");

app/globals.css

@@ -182,7 +182,7 @@ table {
 }
 
 .page-frame {
-  width: min(1180px, calc(100% - 48px));
+  width: min(1200px, calc(100% - 48px));
   margin: 0 auto;
   padding: 28px 0;
 }
@@ -1592,6 +1592,17 @@ html:not(.light) .answer-cell input {
     padding: 18px;
   }
 
+  .create-set-shell,
+  .settings-shell,
+  .users-shell,
+  .profile-shell,
+  .leaderboard-shell,
+  .problem-hub-shell {
+    width: 100%;
+    padding-right: 18px;
+    padding-left: 18px;
+  }
+
   .topbar {
     align-items: flex-start;
     flex-direction: column;
@@ -2990,7 +3001,8 @@ html.dark .confetti-triangles span {
 /* ── Create Problem Set GUI ──────────────────────────── */
 
 .create-set-shell {
-  max-width: 960px;
+  width: min(1200px, calc(100% - 48px));
+  max-width: none;
   margin: 0 auto;
   padding: 2rem 1.5rem 6rem;
 }
@@ -3358,7 +3370,8 @@ html.dark .confetti-triangles span {
 /* ── Settings page ───────────────────────────────────── */
 
 .settings-shell {
-  max-width: 640px;
+  width: min(1200px, calc(100% - 48px));
+  max-width: none;
   margin: 0 auto;
   padding: 2rem 1.5rem 4rem;
 }
@@ -3589,7 +3602,8 @@ html.dark .theme-choice-button.active {
 /* ── Users list page ─────────────────────────────────── */
 
 .users-shell {
-  max-width: 960px;
+  width: min(1200px, calc(100% - 48px));
+  max-width: none;
   margin: 0 auto;
   padding: 2rem 1.5rem 4rem;
 }
@@ -3722,7 +3736,8 @@ html.dark .theme-choice-button.active {
 /* ── User profile page ───────────────────────────────── */
 
 .profile-shell {
-  max-width: 720px;
+  width: min(1200px, calc(100% - 48px));
+  max-width: none;
   margin: 0 auto;
   padding: 2rem 1.5rem 4rem;
 }
@@ -4068,7 +4083,8 @@ html.dark .theme-choice-button.active {
 /* ── Leaderboard page ────────────────────────────────── */
 
 .leaderboard-shell {
-  max-width: 960px;
+  width: min(1200px, calc(100% - 48px));
+  max-width: none;
   margin: 0 auto;
   padding: 2rem 1.5rem 4rem;
 }
@@ -4372,11 +4388,20 @@ html.dark .theme-choice-button.active {
 /* ── Problem-set hub page ─────────────────────────────── */
 
 .problem-hub-shell {
-  max-width: 1200px;
+  width: min(1200px, calc(100% - 48px));
+  max-width: none;
   margin: 0 auto;
   padding: 2rem 1.5rem 4rem;
 }
 
+.admin-set-filter-bar {
+  display: flex;
+  align-items: center;
+  gap: 0.85rem;
+  flex-wrap: wrap;
+  margin-bottom: 1rem;
+}
+
 .problem-hub-header {
   display: flex;
   align-items: flex-start;

app/practice/page.tsx

@@ -150,7 +150,7 @@ export default function PracticePage() {
         <span className="bg-spark bg-spark-one" />
       </div>
 
-      <div className="page-frame" style={{ maxWidth: 800, margin: "0 auto" }}>
+      <div className="page-frame">
         <header className="topbar standalone">
           <div>
             <p className="eyebrow">Training</p>