feat: correct sort order for status

eug-vs · Jan 15, 2024 · efd45aa · efd45aa
1 parent f0e696d
commit efd45aa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -12,6 +12,15 @@ interface Props {
   };
 }
 
+const statusSortorder = [
+  "active",
+  "pending",
+  "waiting",
+  "recurring",
+  "completed",
+  "deleted",
+] as const;
+
 async function CmdOutput({ cmd }: { cmd: string }) {
   try {
     const { stdout, stderr } = await exec(cmd);
@@ -21,11 +30,16 @@ async function CmdOutput({ cmd }: { cmd: string }) {
       const parsed = taskSchema.array().parse(json);
       return (
         <section className="grid gap-4">
-          {_.orderBy(parsed, ["status", "urgency"], ["desc", "desc"]).map(
-            (task) => (
-              <TaskCard key={task.uuid} task={task} />
-            ),
-          )}
+          {_.orderBy(
+            parsed,
+            [
+              (item) => statusSortorder.findIndex((s) => s === item.status),
+              "urgency",
+            ],
+            ["asc", "desc"],
+          ).map((task) => (
+            <TaskCard key={task.uuid} task={task} />
+          ))}
         </section>
       );
     } catch (e) {

diff --git a/src/components/task-card.tsx b/src/components/task-card.tsx
@@ -103,7 +103,9 @@ export default function TaskCard({ task }: { task: Task }) {
             </Link>
           </div>
           <span className="flex gap-1 items-start">
-            {task.status === "pending" ? task.urgency.toFixed(2) : task.status}
+            {["pending", "active"].includes(task.status)
+              ? task.urgency.toFixed(2)
+              : task.status}
           </span>
         </CardTitle>
         <CardDescription>