@ondrej-svec/hog 1.8.0 → 1.8.1

package/dist/cli.js

@@ -2337,7 +2337,16 @@ function navReducer(state, action) {
     case "SET_ITEMS": {
       const sections = [...new Set(action.items.map((i) => i.section))];
       const isFirstLoad = state.sections.length === 0;
-      const collapsedSections = isFirstLoad ? new Set(sections.filter((s) => s === "activity")) : state.collapsedSections;
+      let collapsedSections;
+      if (isFirstLoad) {
+        collapsedSections = new Set(sections.filter((s) => s === "activity"));
+      } else {
+        const validIds = /* @__PURE__ */ new Set([
+          ...sections,
+          ...action.items.filter((i) => i.type === "subHeader").map((i) => i.id)
+        ]);
+        collapsedSections = new Set([...state.collapsedSections].filter((id) => validIds.has(id)));
+      }
       const selectionValid = state.selectedId != null && action.items.some((i) => i.id === state.selectedId);
       if (!isFirstLoad && selectionValid && arraysEqual(sections, state.sections)) {
         return state.allItems === action.items ? state : { ...state, allItems: action.items };
@@ -4990,128 +4999,121 @@ function groupByStatus(issues) {
   }
   return groups;
 }
-function collectGroupIssues(statusGroup, byStatus) {
-  const issues = [];
-  for (const status of statusGroup.statuses) {
-    const list = byStatus.get(status);
-    if (list) issues.push(...list);
-  }
-  issues.sort((a, b) => issuePriorityRank(a) - issuePriorityRank(b));
-  return issues;
-}
-function buildNavItems(repos, tasks, activityCount) {
-  const items = [];
-  if (activityCount > 0) {
-    items.push({ id: "header:activity", section: "activity", type: "header" });
-  }
-  for (const rd of repos) {
-    items.push({ id: `header:${rd.repo.shortName}`, section: rd.repo.shortName, type: "header" });
+function buildBoardTree(repos, tasks, activity) {
+  const sections = repos.map((rd) => {
+    const sectionId = rd.repo.name;
+    if (rd.error) {
+      return { repo: rd.repo, sectionId, groups: [], error: rd.error };
+    }
     const statusGroupDefs = resolveStatusGroups(rd.statusOptions, rd.repo.statusGroups);
     const byStatus = groupByStatus(rd.issues);
-    const coveredStatuses = /* @__PURE__ */ new Set();
+    const coveredKeys = /* @__PURE__ */ new Set();
+    const groups = [];
     for (const sg of statusGroupDefs) {
-      const groupIssues = collectGroupIssues(sg, byStatus);
-      if (groupIssues.length === 0) continue;
-      const subId = `sub:${rd.repo.shortName}:${sg.label}`;
-      items.push({ id: subId, section: rd.repo.shortName, type: "subHeader" });
-      for (const issue of groupIssues) {
+      const issues = [];
+      for (const [status, statusIssues] of byStatus) {
+        if (sg.statuses.some((s) => s.toLowerCase().trim() === status.toLowerCase().trim())) {
+          issues.push(...statusIssues);
+        }
+      }
+      if (issues.length === 0) continue;
+      issues.sort((a, b) => issuePriorityRank(a) - issuePriorityRank(b));
+      groups.push({ label: sg.label, subId: `sub:${sectionId}:${sg.label}`, issues });
+      for (const s of sg.statuses) coveredKeys.add(s.toLowerCase().trim());
+    }
+    for (const [status, statusIssues] of byStatus) {
+      if (!(coveredKeys.has(status.toLowerCase().trim()) || isTerminalStatus(status))) {
+        groups.push({ label: status, subId: `sub:${sectionId}:${status}`, issues: statusIssues });
+      }
+    }
+    return { repo: rd.repo, sectionId, groups, error: null };
+  });
+  return { activity, sections, tasks };
+}
+function buildNavItems(tree) {
+  const items = [];
+  if (tree.activity.length > 0)
+    items.push({ id: "header:activity", section: "activity", type: "header" });
+  for (const { repo, sectionId, groups } of tree.sections) {
+    items.push({ id: `header:${sectionId}`, section: sectionId, type: "header" });
+    for (const group of groups) {
+      items.push({ id: group.subId, section: sectionId, type: "subHeader" });
+      for (const issue of group.issues) {
         items.push({
-          id: `gh:${rd.repo.name}:${issue.number}`,
-          section: rd.repo.shortName,
+          id: `gh:${repo.name}:${issue.number}`,
+          section: sectionId,
           type: "item",
-          subSection: subId
+          subSection: group.subId
         });
       }
-      for (const s of sg.statuses) coveredStatuses.add(s);
-    }
-    for (const [status, issues] of byStatus) {
-      if (!(coveredStatuses.has(status) || isTerminalStatus(status)) && issues.length > 0) {
-        const subId = `sub:${rd.repo.shortName}:${status}`;
-        items.push({ id: subId, section: rd.repo.shortName, type: "subHeader" });
-        for (const issue of issues) {
-          items.push({
-            id: `gh:${rd.repo.name}:${issue.number}`,
-            section: rd.repo.shortName,
-            type: "item",
-            subSection: subId
-          });
-        }
-      }
     }
   }
-  if (tasks.length > 0) {
+  if (tree.tasks.length > 0) {
     items.push({ id: "header:ticktick", section: "ticktick", type: "header" });
-    for (const task2 of tasks) {
+    for (const task2 of tree.tasks)
       items.push({ id: `tt:${task2.id}`, section: "ticktick", type: "item" });
-    }
   }
   return items;
 }
-function buildFlatRows(repos, tasks, activity, isCollapsed) {
+function buildFlatRows(tree, isCollapsed) {
   const rows = [];
-  if (activity.length > 0) {
+  if (tree.activity.length > 0) {
     const collapsed = isCollapsed("activity");
     rows.push({
       type: "sectionHeader",
       key: "header:activity",
       navId: "header:activity",
       label: "Recent Activity (24h)",
-      count: activity.length,
+      count: tree.activity.length,
       countLabel: "events",
       isCollapsed: collapsed
     });
     if (!collapsed) {
-      for (const [i, event] of activity.entries()) {
+      for (const [i, event] of tree.activity.entries()) {
         rows.push({ type: "activity", key: `act:${i}`, navId: null, event });
       }
     }
   }
-  for (const rd of repos) {
-    const { repo, issues, error: repoError } = rd;
-    const collapsed = isCollapsed(repo.shortName);
+  for (const { repo, sectionId, groups, error } of tree.sections) {
+    const collapsed = isCollapsed(sectionId);
+    const totalIssues = groups.reduce((s, g) => s + g.issues.length, 0);
     rows.push({
       type: "sectionHeader",
-      key: `header:${repo.shortName}`,
-      navId: `header:${repo.shortName}`,
+      key: `header:${sectionId}`,
+      navId: `header:${sectionId}`,
       label: repo.shortName,
-      count: issues.length,
+      // display label still shows shortName
+      count: totalIssues,
       countLabel: "issues",
       isCollapsed: collapsed
     });
     if (!collapsed) {
-      if (repoError) {
-        rows.push({ type: "error", key: `error:${repo.shortName}`, navId: null, text: repoError });
-      } else if (issues.length === 0) {
+      if (error) {
+        rows.push({ type: "error", key: `error:${sectionId}`, navId: null, text: error });
+      } else if (groups.length === 0) {
         rows.push({
           type: "subHeader",
-          key: `empty:${repo.shortName}`,
+          key: `empty:${sectionId}`,
           navId: null,
           text: "No open issues"
         });
       } else {
-        const statusGroupDefs = resolveStatusGroups(rd.statusOptions, rd.repo.statusGroups);
-        const byStatus = groupByStatus(issues);
-        const coveredStatuses = /* @__PURE__ */ new Set();
         let isFirstGroup = true;
-        for (const sg of statusGroupDefs) {
-          const groupIssues = collectGroupIssues(sg, byStatus);
-          if (groupIssues.length === 0) continue;
-          if (!isFirstGroup) {
-            rows.push({ type: "gap", key: `gap:${repo.shortName}:${sg.label}`, navId: null });
-          }
+        for (const group of groups) {
+          if (!isFirstGroup)
+            rows.push({ type: "gap", key: `gap:${sectionId}:${group.label}`, navId: null });
           isFirstGroup = false;
-          const subId = `sub:${repo.shortName}:${sg.label}`;
-          const subCollapsed = isCollapsed(subId);
+          const subCollapsed = isCollapsed(group.subId);
           rows.push({
             type: "subHeader",
-            key: subId,
-            navId: subId,
-            text: sg.label,
-            count: groupIssues.length,
+            key: group.subId,
+            navId: group.subId,
+            text: group.label,
+            count: group.issues.length,
             isCollapsed: subCollapsed
           });
           if (!subCollapsed) {
-            for (const issue of groupIssues) {
+            for (const issue of group.issues) {
               rows.push({
                 type: "issue",
                 key: `gh:${repo.name}:${issue.number}`,
@@ -5121,55 +5123,24 @@ function buildFlatRows(repos, tasks, activity, isCollapsed) {
               });
             }
           }
-          for (const s of sg.statuses) coveredStatuses.add(s);
-        }
-        for (const [status, groupIssues] of byStatus) {
-          if (!(coveredStatuses.has(status) || isTerminalStatus(status)) && groupIssues.length > 0) {
-            if (!isFirstGroup) {
-              rows.push({ type: "gap", key: `gap:${repo.shortName}:${status}`, navId: null });
-            }
-            isFirstGroup = false;
-            const subId = `sub:${repo.shortName}:${status}`;
-            const subCollapsed = isCollapsed(subId);
-            rows.push({
-              type: "subHeader",
-              key: subId,
-              navId: subId,
-              text: status,
-              count: groupIssues.length,
-              isCollapsed: subCollapsed
-            });
-            if (!subCollapsed) {
-              for (const issue of groupIssues) {
-                rows.push({
-                  type: "issue",
-                  key: `gh:${repo.name}:${issue.number}`,
-                  navId: `gh:${repo.name}:${issue.number}`,
-                  issue,
-                  repoName: repo.name
-                });
-              }
-            }
-          }
         }
       }
     }
   }
-  if (tasks.length > 0) {
+  if (tree.tasks.length > 0) {
     const collapsed = isCollapsed("ticktick");
     rows.push({
       type: "sectionHeader",
       key: "header:ticktick",
       navId: "header:ticktick",
       label: "Personal (TickTick)",
-      count: tasks.length,
+      count: tree.tasks.length,
       countLabel: "tasks",
       isCollapsed: collapsed
     });
     if (!collapsed) {
-      for (const task2 of tasks) {
+      for (const task2 of tree.tasks)
         rows.push({ type: "task", key: `tt:${task2.id}`, navId: `tt:${task2.id}`, task: task2 });
-      }
     }
   }
   return rows;
@@ -5263,10 +5234,11 @@ function Dashboard({ config: config2, options, activeProfile }) {
     const q = searchQuery.toLowerCase();
     return allTasks.filter((t) => t.title.toLowerCase().includes(q));
   }, [allTasks, searchQuery]);
-  const navItems = useMemo3(
-    () => buildNavItems(repos, tasks, allActivity.length),
-    [repos, tasks, allActivity.length]
+  const boardTree = useMemo3(
+    () => buildBoardTree(repos, tasks, allActivity),
+    [repos, tasks, allActivity]
   );
+  const navItems = useMemo3(() => buildNavItems(boardTree), [boardTree]);
   const nav = useNavigation(navItems);
   const getRepoForId = useCallback11((id) => {
     if (id.startsWith("gh:")) {
@@ -5418,8 +5390,8 @@ function Dashboard({ config: config2, options, activeProfile }) {
     termSize.rows - CHROME_ROWS - overlayBarRows - toastRows - logPaneRows
   );
   const flatRows = useMemo3(
-    () => buildFlatRows(repos, tasks, allActivity, nav.isCollapsed),
-    [repos, tasks, allActivity, nav.isCollapsed]
+    () => buildFlatRows(boardTree, nav.isCollapsed),
+    [boardTree, nav.isCollapsed]
   );
   const scrollRef = useRef13(0);
   const selectedRowIdx = useMemo3(
@@ -6951,7 +6923,7 @@ function resolveProjectId(projectId) {
   process.exit(1);
 }
 var program = new Command();
-program.name("hog").description("Personal command deck \u2014 unified task dashboard for GitHub Projects + TickTick").version("1.8.0").option("--json", "Force JSON output").option("--human", "Force human-readable output").hook("preAction", (thisCommand) => {
+program.name("hog").description("Personal command deck \u2014 unified task dashboard for GitHub Projects + TickTick").version("1.8.1").option("--json", "Force JSON output").option("--human", "Force human-readable output").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.json) setFormat("json");
   if (opts.human) setFormat("human");