Merge branch 'main' into fix-extra-trial

Author: katconnors

src/backend/db/migrations/4_add-created-at-on-tasks.sql

@@ -0,0 +1,7 @@
+-- Each task should have a created_at date so that we can sort by assigned date
+-- NOTE: This relies on the assigned date never changing; if the app allows changes, we will likely want create a dedicated assigned_on date in addition to (or instead of) this column 
+ALTER TABLE task
+ADD COLUMN created_at TIMESTAMPTZ NOT NULL DEFAULT NOW();
+
+-- Add index to allow easy queries of tasks by date
+CREATE INDEX idx_created_at ON task(created_at);

src/backend/db/zapatos/schema.d.ts

@@ -83,6 +83,7 @@ export const para = router({
         "task.due_date",
         "task.seen",
         "task.trial_count",
+        "task.created_at",
 
         eb
           .selectFrom("trial_data")

src/backend/routers/para.ts

@@ -122,13 +122,9 @@ function Benchmarks() {
                 <FilterAlt /> Filter <KeyboardArrowDown />
               </span>
 
-              {
-                // TODO: replace simple sort pill w/this sort pill placeholder
-                /*
-              TODO: replace simple sort pill w/this sort pill placeholder
-
-              Sort Pill Placeholder
-              <span
+              {/* simple sort pill POC (TODO: add `<KeyboardArrowDown/>` if dropdown needed) */}
+              <button
+                onClick={() => handleSort("created_at")}
                 className={`${$button.pilled}`}
                 style={{
                   display: "flex",
@@ -137,10 +133,8 @@ function Benchmarks() {
                   gap: "4px",
                 }}
               >
-                <Sort /> Sort <KeyboardArrowDown />
-              </span>
-              */
-              }
+                <Sort /> Sort by date
+              </button>
 
               {/* simple sort pill POC (see TODO above) */}
               <button

src/pages/benchmarks/index.tsx

@@ -5,7 +5,7 @@ export type Benchmark = SelectableForTable<"benchmark">;
 export type ChangeEvent = React.ChangeEvent<HTMLInputElement>;
 export type FormEvent = React.FormEvent<HTMLFormElement>;
 
-export type SortProperty = "first_name";
+export type SortProperty = "first_name" | "created_at";
 export type SortDirection = "asc" | "desc";
 
 export interface TaskData {
@@ -21,4 +21,5 @@ export interface TaskData {
   trial_count: number | null;
   seen: boolean;
   completed_trials: string | number | bigint | null;
+  created_at: Date;
 }