github-issue-tower-defence-management 1.116.8 → 1.117.0

package/src/adapter/entry-points/console/ui/src/features/console/lib/consoleApi.ts

@@ -3,6 +3,7 @@ import type {
   ConsoleComment,
   ConsoleCommit,
   ConsoleIssueState,
+  ConsoleMergeableStatus,
   ConsolePullRequestStatus,
   ConsoleRelatedPullRequest,
 } from '../logic/types';
@@ -136,6 +137,16 @@ const parseStringArray = (value: unknown): string[] =>
     ? value.filter((name): name is string => typeof name === 'string')
     : [];
 
+const parseMergeableStatus = (value: unknown): ConsoleMergeableStatus => {
+  if (value === 'MERGEABLE') {
+    return 'MERGEABLE';
+  }
+  if (value === 'CONFLICTING') {
+    return 'CONFLICTING';
+  }
+  return 'UNKNOWN';
+};
+
 const parseRelatedPrs = (payload: unknown): ConsoleRelatedPullRequest[] => {
   if (!isRecord(payload) || !Array.isArray(payload.relatedPullRequests)) {
     return [];
@@ -146,6 +157,7 @@ const parseRelatedPrs = (payload: unknown): ConsoleRelatedPullRequest[] => {
     createdAt: getString(pr.createdAt),
     isDraft: getBoolean(pr.isDraft),
     isConflicted: getBoolean(pr.isConflicted),
+    mergeableStatus: parseMergeableStatus(pr.mergeableStatus),
     isPassedAllCiJob: getBoolean(pr.isPassedAllCiJob),
     isCiStateSuccess: getBoolean(pr.isCiStateSuccess),
     isResolvedAllReviewComments: getBoolean(pr.isResolvedAllReviewComments),
@@ -160,6 +172,7 @@ const parsePullRequestStatus = (payload: unknown): ConsolePullRequestStatus => {
     return {
       found: false,
       isConflicted: false,
+      mergeableStatus: 'UNKNOWN',
       isPassedAllCiJob: false,
       isCiStateSuccess: false,
       isBranchOutOfDate: false,
@@ -170,6 +183,7 @@ const parsePullRequestStatus = (payload: unknown): ConsolePullRequestStatus => {
   return {
     found: true,
     isConflicted: getBoolean(status.isConflicted),
+    mergeableStatus: parseMergeableStatus(status.mergeableStatus),
     isPassedAllCiJob: getBoolean(status.isPassedAllCiJob),
     isCiStateSuccess: getBoolean(status.isCiStateSuccess),
     isBranchOutOfDate: getBoolean(status.isBranchOutOfDate),

package/src/adapter/entry-points/console/ui/src/features/console/lib/resourceCache.test.ts

@@ -37,6 +37,54 @@ describe('ResourceCache', () => {
     expect(await cache.load('k', 'u')).toBe('ok');
     expect(fetcher).toHaveBeenCalledTimes(2);
   });
+
+  it('prefetches into the cache and serves the next load from it', async () => {
+    const fetcher = jest.fn(async (url: string) => `value:${url}`);
+    const cache = new ResourceCache(fetcher);
+    cache.prefetch('k', 'u');
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(cache.peek('k')).toBe('value:u');
+    expect(await cache.load('k', 'u')).toBe('value:u');
+    expect(fetcher).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not prefetch a key that is already cached', async () => {
+    const fetcher = jest.fn(async (url: string) => `value:${url}`);
+    const cache = new ResourceCache(fetcher);
+    await cache.load('k', 'u');
+    cache.prefetch('k', 'u');
+    expect(fetcher).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not start a second prefetch while one is in flight', async () => {
+    const fetcher = jest.fn(() => new Promise<string>(() => {}));
+    const cache = new ResourceCache(fetcher);
+    cache.prefetch('k', 'u');
+    cache.prefetch('k', 'u');
+    expect(fetcher).toHaveBeenCalledTimes(1);
+  });
+
+  it('swallows prefetch errors and leaves the key uncached', async () => {
+    const fetcher = jest
+      .fn<Promise<string>, [string]>()
+      .mockRejectedValue(new Error('boom'));
+    const cache = new ResourceCache(fetcher);
+    cache.prefetch('k', 'u');
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(cache.peek('k')).toBeUndefined();
+  });
+
+  it('invalidate removes a cached value so the next load refetches', async () => {
+    const fetcher = jest.fn(async (url: string) => `value:${url}`);
+    const cache = new ResourceCache(fetcher);
+    await cache.load('k', 'u');
+    cache.invalidate('k');
+    expect(cache.peek('k')).toBeUndefined();
+    await cache.load('k', 'u');
+    expect(fetcher).toHaveBeenCalledTimes(2);
+  });
 });
 
 describe('runWithConcurrency', () => {

package/src/adapter/entry-points/console/ui/src/features/console/lib/resourceCache.ts

@@ -3,6 +3,7 @@ export type ResourceFetcher<T> = (url: string) => Promise<T>;
 export class ResourceCache<T> {
   private readonly cache = new Map<string, T>();
   private readonly inFlight = new Map<string, Promise<T>>();
+  private readonly prefetchInFlight = new Set<string>();
 
   constructor(private readonly fetcher: ResourceFetcher<T>) {}
 
@@ -30,6 +31,29 @@ export class ResourceCache<T> {
     this.inFlight.set(key, promise);
     return promise;
   };
+
+  prefetch = (key: string, url: string): void => {
+    if (
+      this.cache.has(key) ||
+      this.inFlight.has(key) ||
+      this.prefetchInFlight.has(key)
+    ) {
+      return;
+    }
+    this.prefetchInFlight.add(key);
+    this.fetcher(url)
+      .then((value) => {
+        this.cache.set(key, value);
+      })
+      .catch(() => {})
+      .finally(() => {
+        this.prefetchInFlight.delete(key);
+      });
+  };
+
+  invalidate = (key: string): void => {
+    this.cache.delete(key);
+  };
 }
 
 export const runWithConcurrency = async (

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

@@ -64,9 +64,12 @@ export type ConsoleIssueState = {
   title: string;
 };
 
+export type ConsoleMergeableStatus = 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN';
+
 export type ConsolePullRequestStatus = {
   found: boolean;
   isConflicted: boolean;
+  mergeableStatus: ConsoleMergeableStatus;
   isPassedAllCiJob: boolean;
   isCiStateSuccess: boolean;
   isBranchOutOfDate: boolean;
@@ -100,6 +103,7 @@ export type ConsoleRelatedPullRequest = {
   createdAt: string;
   isDraft: boolean;
   isConflicted: boolean;
+  mergeableStatus: ConsoleMergeableStatus;
   isPassedAllCiJob: boolean;
   isCiStateSuccess: boolean;
   isResolvedAllReviewComments: boolean;

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

@@ -44,6 +44,7 @@ const buildCaches = (overrides: CachesOverrides = {}): ConsoleCaches => {
     fetchPullRequestStatus: async () => ({
       found: true,
       isConflicted: false,
+      mergeableStatus: 'MERGEABLE' as const,
       isPassedAllCiJob: true,
       isCiStateSuccess: true,
       isBranchOutOfDate: false,

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

@@ -7,6 +7,7 @@ import {
 } from '../components/operations/ConsoleUndoToast';
 import { useConsoleActionQueue } from '../hooks/useConsoleActionQueue';
 import { useConsoleCaches } from '../hooks/useConsoleCaches';
+import { useConsoleDetailPrefetch } from '../hooks/useConsoleDetailPrefetch';
 import { useConsoleNavigation } from '../hooks/useConsoleNavigation';
 import { useConsoleOperations } from '../hooks/useConsoleOperations';
 import { useConsoleOverlay } from '../hooks/useConsoleOverlay';
@@ -78,7 +79,12 @@ export const ConsolePage = () => {
     navigation;
 
   const caches = useConsoleCaches();
-  const operations = useConsoleOperations(pjcode, activeTab, overlayState);
+  const operations = useConsoleOperations(
+    pjcode,
+    activeTab,
+    overlayState,
+    caches,
+  );
   const actionQueue = useConsoleActionQueue();
   const now = Date.now();
 
@@ -120,6 +126,8 @@ export const ConsolePage = () => {
     );
   }, [selectedItemKey, activeSnapshot]);
 
+  useConsoleDetailPrefetch(caches, selectedItem, pendingItems);
+
   useEffect(() => {
     if (selectedItemKey === null) {
       return;

package/src/adapter/entry-points/console/ui/src/features/console/testing/fixtures.ts

@@ -343,6 +343,7 @@ export const consoleRelatedPullRequestsFixture: ConsoleRelatedPullRequest[] = [
     createdAt: '2026-06-16T22:30:00.000Z',
     isDraft: false,
     isConflicted: false,
+    mergeableStatus: 'MERGEABLE',
     isPassedAllCiJob: true,
     isCiStateSuccess: true,
     isResolvedAllReviewComments: true,

package/src/adapter/entry-points/console/ui/src/index.css

@@ -351,6 +351,15 @@ body {
   opacity: 0.85;
 }
 
+.console-detail-mergeable-chip {
+  font-weight: 600;
+}
+
+.console-detail-mergeable-chip-unknown {
+  opacity: 0.7;
+  font-weight: 400;
+}
+
 .console-detail-labels {
   display: flex;
   flex-wrap: wrap;
@@ -655,7 +664,7 @@ body {
 }
 
 .console-op-button {
-  padding: 7px 16px;
+  padding: 9px 16px;
   border: 1px solid #30363d;
   border-radius: 6px;
   background: #21262d;