@stevecastaneda/paseo-progress 0.1.6 → 0.1.7

package/client/panel.tsx

@@ -10,7 +10,7 @@ import { raised } from "./surfaces";
 import { When } from "./when";
 import React, { useEffect, useRef, useState } from "react";
 import { ActivityIndicator, Animated, Platform, Pressable, ScrollView, Text, View } from "react-native";
-import { finishedAtTop, shortTitle, type Activity, type Dashboard, type FileIssue, type ProgressSegment, type StuckItem, type Ticket } from "../shared/dashboard";
+import { finishedToFold, isFinished, shortTitle, type Activity, type Dashboard, type FileIssue, type ProgressSegment, type StuckItem, type Ticket } from "../shared/dashboard";
 import { PROGRESS_FILE, type TicketStatus } from "../shared/events";
 import { formatEstimate, formatMinutes, formatWorkDone, minutesSince } from "../shared/format";
 import { markPanelOpened } from "../shared/rpc";
@@ -416,26 +416,25 @@ function StuckSection({ colors, items, now }: { colors: Colors; items: StuckItem
 // the app session like the history tab.
 const finishedShown = new Map<string, boolean>();
 
-// Finished tickets at the top fold into one row, so the work still ahead is
-// near the top without scrolling (see finishedAtTop).
+// Finished tickets fold into one row at the top, so the work still ahead is
+// near the top without scrolling (see finishedToFold).
 function TicketList({ colors, dashboard, live, now, workspaceId, onOpen }: { colors: Colors; dashboard: Dashboard; live: boolean; now: number; workspaceId: string; onOpen(id: string): void }) {
   const [shown, setShown] = useState(() => finishedShown.get(workspaceId) ?? false);
   const toggle = () => {
     finishedShown.set(workspaceId, !shown);
     setShown(!shown);
   };
-  const folded = finishedAtTop(dashboard.tickets);
+  const finished = finishedToFold(dashboard.tickets);
   const row = (ticket: Ticket) => (
     <TicketRow key={ticket.id} colors={colors} ticket={ticket} live={live} now={now} onOpen={() => onOpen(ticket.id)}
       deliverables={dashboard.deliverables.filter((deliverable) => deliverable.ticketId === ticket.id).length} />
   );
-  if (!folded) return <>{dashboard.tickets.map(row)}</>;
-  const finished = dashboard.tickets.slice(0, folded);
+  if (!finished.length) return <>{dashboard.tickets.map(row)}</>;
   return (
     <>
       <FinishedRow colors={colors} tickets={finished} shown={shown} onPress={toggle} />
       {shown ? finished.map(row) : null}
-      {dashboard.tickets.slice(folded).map(row)}
+      {dashboard.tickets.filter((ticket) => !isFinished(ticket)).map(row)}
     </>
   );
 }

package/dist/shared/dashboard.js

@@ -328,15 +328,17 @@ export function shortTitle(title) {
     const index = title.indexOf(":");
     return index > 0 && index <= 24 ? title.slice(0, index) : title;
 }
-// How many tickets at the top of the list are finished (done or skipped), so
-// the panel can fold them into one row and the work still ahead sits near the
-// top. Only the leading run folds: a ticket finished out of order stays in
-// place, so the plan's order never looks shuffled. A single one isn't worth a
-// fold row. Once every ticket is finished nothing is ahead, and the whole list
-// is the record of the run, so nothing folds.
-export function finishedAtTop(tickets) {
-    const index = tickets.findIndex((ticket) => ticket.status !== "done" && ticket.status !== "skipped");
-    return index >= 2 ? index : 0;
+// The finished tickets (done or skipped) the panel folds into one row at the
+// top, in plan order, so the work still ahead sits near the top. A ticket
+// finished out of order folds too. A single one isn't worth a fold row. Once
+// every ticket is finished nothing is ahead, and the whole list is the record
+// of the run, so nothing folds.
+export function finishedToFold(tickets) {
+    const finished = tickets.filter(isFinished);
+    return finished.length >= 2 && finished.length < tickets.length ? finished : [];
+}
+export function isFinished(ticket) {
+    return ticket.status === "done" || ticket.status === "skipped";
 }
 function plural(count, noun) {
     return `${count} ${count === 1 ? noun : `${noun}s`}`;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@stevecastaneda/paseo-progress",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@stevecastaneda/paseo-progress",
-      "version": "0.1.6",
+      "version": "0.1.7",
       "license": "MIT",
       "dependencies": {
         "@getpaseo/client": "^0.9.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stevecastaneda/paseo-progress",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A live progress dashboard per worktree for Paseo, drawn from a file agents write with the paseo-progress command.",
   "license": "MIT",
   "author": "Steve Castaneda",

package/shared/dashboard.ts

@@ -449,15 +449,18 @@ export function shortTitle(title: string): string {
   return index > 0 && index <= 24 ? title.slice(0, index) : title;
 }
 
-// How many tickets at the top of the list are finished (done or skipped), so
-// the panel can fold them into one row and the work still ahead sits near the
-// top. Only the leading run folds: a ticket finished out of order stays in
-// place, so the plan's order never looks shuffled. A single one isn't worth a
-// fold row. Once every ticket is finished nothing is ahead, and the whole list
-// is the record of the run, so nothing folds.
-export function finishedAtTop(tickets: Ticket[]): number {
-  const index = tickets.findIndex((ticket) => ticket.status !== "done" && ticket.status !== "skipped");
-  return index >= 2 ? index : 0;
+// The finished tickets (done or skipped) the panel folds into one row at the
+// top, in plan order, so the work still ahead sits near the top. A ticket
+// finished out of order folds too. A single one isn't worth a fold row. Once
+// every ticket is finished nothing is ahead, and the whole list is the record
+// of the run, so nothing folds.
+export function finishedToFold(tickets: Ticket[]): Ticket[] {
+  const finished = tickets.filter(isFinished);
+  return finished.length >= 2 && finished.length < tickets.length ? finished : [];
+}
+
+export function isFinished(ticket: Ticket): boolean {
+  return ticket.status === "done" || ticket.status === "skipped";
 }
 
 function plural(count: number, noun: string): string {