github-issue-tower-defence-management 1.122.1 → 1.122.3

package/src/adapter/entry-points/console/ui/src/features/console/logic/overlay.ts

@@ -30,23 +30,6 @@ export const filterPendingItems = (
     (item) => !isOverlayEntryActed(overlay[overlayKeyForItem(item)]),
   );
 
-export const tabIgnoresDoneOverlay = (tab: ConsoleTabName): boolean =>
-  tab === 'workflow-blocker';
-
-export const countTabPendingItems = (
-  items: ConsoleListItem[],
-  overlay: ConsoleOverlay,
-  tab: ConsoleTabName,
-): number =>
-  tabIgnoresDoneOverlay(tab) ? items.length : countPendingItems(items, overlay);
-
-export const filterTabPendingItems = (
-  items: ConsoleListItem[],
-  overlay: ConsoleOverlay,
-  tab: ConsoleTabName,
-): ConsoleListItem[] =>
-  tabIgnoresDoneOverlay(tab) ? items : filterPendingItems(items, overlay);
-
 export const writeOverlayEntry = (
   overlay: ConsoleOverlay,
   key: string,

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsolePage.test.tsx

@@ -255,7 +255,7 @@ describe('ConsolePage', () => {
     expect(queryByText('project: umino')).toBeNull();
   });
 
-  it('keeps the workflow-blocker tab visible and lists its items even when every item is marked done in the overlay', async () => {
+  it('removes a processed workflow-blocker item from the list and decrements its tab badge, like every other tab', async () => {
     const blockerItems = [
       {
         number: 701,
@@ -311,7 +311,6 @@ describe('ConsolePage', () => {
       'pv_overlay_umino',
       JSON.stringify({
         PVTI_B1: { ts: 1, mode: 'workflow-blocker', done: true },
-        PVTI_B2: { ts: 1, mode: 'workflow-blocker', done: true },
       }),
     );
     window.history.replaceState(
@@ -320,17 +319,17 @@ describe('ConsolePage', () => {
       '/projects/umino/workflow-blocker?k=token',
     );
 
-    const { getByText } = render(<ConsolePage />);
+    const { getByText, queryByText } = render(<ConsolePage />);
     await waitFor(() => {
-      expect(getByText('Blocked deployment task')).toBeInTheDocument();
+      expect(getByText('Blocked rollout task')).toBeInTheDocument();
     });
-    expect(getByText('Blocked rollout task')).toBeInTheDocument();
+    expect(queryByText('Blocked deployment task')).toBeNull();
     const blockerTab = within(tabBar())
       .getByText('Workflow Blocker')
       .closest('a');
     expect(blockerTab).not.toBeNull();
     expect(blockerTab?.querySelector('.console-tab-badge')?.textContent).toBe(
-      '2',
+      '1',
     );
   });
 

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsolePage.tsx

@@ -26,8 +26,8 @@ import {
   previousPendingKeyBefore,
 } from '../logic/navigation';
 import {
-  countTabPendingItems,
-  filterTabPendingItems,
+  countPendingItems,
+  filterPendingItems,
   overlayKeyForItem,
 } from '../logic/overlay';
 import type { ConsoleSwipeDirection } from '../logic/swipe';
@@ -65,10 +65,9 @@ export const ConsolePage = () => {
       if (snapshot === null) {
         continue;
       }
-      result[tab.name] = countTabPendingItems(
+      result[tab.name] = countPendingItems(
         snapshot.items,
         overlayState.overlay,
-        tab.name,
       );
     }
     return result;
@@ -93,12 +92,8 @@ export const ConsolePage = () => {
     if (activeSnapshot === null) {
       return [];
     }
-    return filterTabPendingItems(
-      activeSnapshot.items,
-      overlayState.overlay,
-      activeTab,
-    );
-  }, [activeSnapshot, overlayState.overlay, activeTab]);
+    return filterPendingItems(activeSnapshot.items, overlayState.overlay);
+  }, [activeSnapshot, overlayState.overlay]);
 
   const orderedPendingKeys = useMemo(
     () => pendingItems.map((item) => overlayKeyForItem(item)),