github-issue-tower-defence-management 1.112.6 → 1.113.0

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestDetail.test.tsx

@@ -38,6 +38,52 @@ describe('ConsolePullRequestDetail', () => {
     expect(getByText('27 files')).toBeInTheDocument();
   });
 
+  it('renders the CI status badge derived from the pull request fields', () => {
+    const { getByText } = render(
+      <ConsolePullRequestDetail
+        pullRequest={pullRequest}
+        body={pullRequest.summary?.body ?? ''}
+        bodyIsLoading={false}
+        files={consoleChangedFilesFixture}
+        filesAreLoading={false}
+        filesError={null}
+        commits={consoleCommitsFixture}
+        commitsAreLoading={false}
+        commitsError={null}
+        now={now}
+      />,
+    );
+    expect(getByText('CI passing')).toBeInTheDocument();
+  });
+
+  it('renders failing CI, conflict and out-of-date badges for an unhealthy pull request', () => {
+    const { getByText } = render(
+      <ConsolePullRequestDetail
+        pullRequest={{
+          ...pullRequest,
+          isConflicted: true,
+          isPassedAllCiJob: false,
+          isCiStateSuccess: false,
+          isBranchOutOfDate: true,
+          missingRequiredCheckNames: ['build'],
+        }}
+        body={pullRequest.summary?.body ?? ''}
+        bodyIsLoading={false}
+        files={consoleChangedFilesFixture}
+        filesAreLoading={false}
+        filesError={null}
+        commits={consoleCommitsFixture}
+        commitsAreLoading={false}
+        commitsError={null}
+        now={now}
+      />,
+    );
+    expect(getByText('CI failing')).toBeInTheDocument();
+    expect(getByText(/missing: build/)).toBeInTheDocument();
+    expect(getByText('Conflict')).toBeInTheDocument();
+    expect(getByText('Out of date')).toBeInTheDocument();
+  });
+
   it('renders a copy URL button for the pull request url', () => {
     const { getByRole } = render(
       <ConsolePullRequestDetail

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestDetail.tsx

@@ -10,6 +10,7 @@ import { ConsoleChangedFileList } from './ConsoleChangedFileList';
 import { ConsoleCommitList } from './ConsoleCommitList';
 import { ConsoleCopyUrlButton } from './ConsoleCopyUrlButton';
 import type { ConsoleAddInlineComment } from './ConsoleFileDiff';
+import { ConsolePullRequestStatusBadges } from './ConsolePullRequestStatusBadges';
 
 export type ConsolePullRequestSectionProps = {
   pullRequest: ConsoleRelatedPullRequest;
@@ -59,6 +60,13 @@ export const ConsolePullRequestDetail = ({
         {pullRequest.isDraft && (
           <span className="console-pr-section-state">draft</span>
         )}
+        <ConsolePullRequestStatusBadges
+          isConflicted={pullRequest.isConflicted}
+          isPassedAllCiJob={pullRequest.isPassedAllCiJob}
+          isCiStateSuccess={pullRequest.isCiStateSuccess}
+          isBranchOutOfDate={pullRequest.isBranchOutOfDate}
+          missingRequiredCheckNames={pullRequest.missingRequiredCheckNames}
+        />
         <ConsoleCopyUrlButton url={pullRequest.url} label="Copy PR URL" />
         <div className="console-pr-statbar">
           {pullRequest.branchName !== null && (

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestStatusBadges.stories.tsx

@@ -0,0 +1,41 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { ConsolePullRequestStatusBadges } from './ConsolePullRequestStatusBadges';
+
+const meta: Meta<typeof ConsolePullRequestStatusBadges> = {
+  title: 'Console/ConsolePullRequestStatusBadges',
+  component: ConsolePullRequestStatusBadges,
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ConsolePullRequestStatusBadges>;
+
+export const Passing: Story = {
+  args: {
+    isConflicted: false,
+    isPassedAllCiJob: true,
+    isCiStateSuccess: true,
+    isBranchOutOfDate: false,
+    missingRequiredCheckNames: [],
+  },
+};
+
+export const FailingWithMissingChecks: Story = {
+  args: {
+    isConflicted: false,
+    isPassedAllCiJob: false,
+    isCiStateSuccess: false,
+    isBranchOutOfDate: false,
+    missingRequiredCheckNames: ['build', 'test'],
+  },
+};
+
+export const ConflictedAndOutOfDate: Story = {
+  args: {
+    isConflicted: true,
+    isPassedAllCiJob: false,
+    isCiStateSuccess: false,
+    isBranchOutOfDate: true,
+    missingRequiredCheckNames: ['build', 'test'],
+  },
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestStatusBadges.test.tsx

@@ -0,0 +1,72 @@
+import { render } from '@testing-library/react';
+import { ConsolePullRequestStatusBadges } from './ConsolePullRequestStatusBadges';
+
+describe('ConsolePullRequestStatusBadges', () => {
+  it('renders a passing CI badge when all CI jobs passed and the CI state is success', () => {
+    const { getByText, queryByText } = render(
+      <ConsolePullRequestStatusBadges
+        isConflicted={false}
+        isPassedAllCiJob={true}
+        isCiStateSuccess={true}
+        isBranchOutOfDate={false}
+        missingRequiredCheckNames={[]}
+      />,
+    );
+    expect(getByText('CI passing')).toBeInTheDocument();
+    expect(queryByText('Conflict')).toBeNull();
+    expect(queryByText('Out of date')).toBeNull();
+  });
+
+  it('renders a failing CI badge with missing required checks', () => {
+    const { getByText } = render(
+      <ConsolePullRequestStatusBadges
+        isConflicted={false}
+        isPassedAllCiJob={false}
+        isCiStateSuccess={true}
+        isBranchOutOfDate={false}
+        missingRequiredCheckNames={['build', 'test']}
+      />,
+    );
+    expect(getByText('CI failing')).toBeInTheDocument();
+    expect(getByText(/missing: build, test/)).toBeInTheDocument();
+  });
+
+  it('renders the conflict badge when the pull request is conflicted', () => {
+    const { getByText } = render(
+      <ConsolePullRequestStatusBadges
+        isConflicted={true}
+        isPassedAllCiJob={true}
+        isCiStateSuccess={true}
+        isBranchOutOfDate={false}
+        missingRequiredCheckNames={[]}
+      />,
+    );
+    expect(getByText('Conflict')).toBeInTheDocument();
+  });
+
+  it('renders the out-of-date badge when the branch is behind the base branch', () => {
+    const { getByText } = render(
+      <ConsolePullRequestStatusBadges
+        isConflicted={false}
+        isPassedAllCiJob={true}
+        isCiStateSuccess={true}
+        isBranchOutOfDate={true}
+        missingRequiredCheckNames={[]}
+      />,
+    );
+    expect(getByText('Out of date')).toBeInTheDocument();
+  });
+
+  it('treats a successful CI state but unfinished jobs as failing', () => {
+    const { getByText } = render(
+      <ConsolePullRequestStatusBadges
+        isConflicted={false}
+        isPassedAllCiJob={false}
+        isCiStateSuccess={true}
+        isBranchOutOfDate={false}
+        missingRequiredCheckNames={[]}
+      />,
+    );
+    expect(getByText('CI failing')).toBeInTheDocument();
+  });
+});

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestStatusBadges.tsx

@@ -0,0 +1,71 @@
+import { colorFromEnum } from '../../logic/colors';
+import type { ConsoleColor } from '../../logic/types';
+
+export type ConsolePullRequestStatusBadgesProps = {
+  isConflicted: boolean;
+  isPassedAllCiJob: boolean;
+  isCiStateSuccess: boolean;
+  isBranchOutOfDate: boolean;
+  missingRequiredCheckNames: string[];
+};
+
+const badgeStyle = (color: ConsoleColor) => {
+  const palette = colorFromEnum(color);
+  return {
+    color: palette.fg,
+    borderColor: palette.border,
+    backgroundColor: palette.bg,
+  };
+};
+
+export const ConsolePullRequestStatusBadges = ({
+  isConflicted,
+  isPassedAllCiJob,
+  isCiStateSuccess,
+  isBranchOutOfDate,
+  missingRequiredCheckNames,
+}: ConsolePullRequestStatusBadgesProps) => {
+  const ciPassing = isPassedAllCiJob && isCiStateSuccess;
+  const ciColor: ConsoleColor = ciPassing ? 'GREEN' : 'RED';
+  const ciLabel = ciPassing ? 'CI passing' : 'CI failing';
+  const missingChecksLabel =
+    !ciPassing && missingRequiredCheckNames.length > 0
+      ? `missing: ${missingRequiredCheckNames.join(', ')}`
+      : null;
+
+  return (
+    <span className="console-detail-pr-status">
+      <span
+        className="console-detail-status-chip console-detail-ci-chip"
+        style={badgeStyle(ciColor)}
+        title={missingChecksLabel ?? ciLabel}
+      >
+        {ciLabel}
+        {missingChecksLabel !== null && (
+          <span className="console-detail-ci-missing">
+            {' '}
+            ({missingChecksLabel})
+          </span>
+        )}
+      </span>
+      {isConflicted && (
+        <span
+          className="console-detail-status-chip console-detail-conflict-chip"
+          style={badgeStyle('RED')}
+          title="This pull request has merge conflicts"
+        >
+          Conflict
+        </span>
+      )}
+      {isBranchOutOfDate && (
+        <span
+          className="console-detail-status-chip console-detail-outofdate-chip"
+          style={badgeStyle('YELLOW')}
+          title="This branch is out of date with the base branch"
+        >
+          Out of date
+        </span>
+      )}
+    </span>
+  );
+};

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleCaches.ts

@@ -9,6 +9,7 @@ import type {
   ConsoleComment,
   ConsoleCommit,
   ConsoleIssueState,
+  ConsolePullRequestStatus,
   ConsoleRelatedPullRequest,
 } from '../logic/types';
 import { useConsoleToken } from './useConsoleToken';
@@ -20,6 +21,7 @@ export type ConsoleCaches = {
   commits: ResourceCache<ConsoleCommit[]>;
   relatedPrs: ResourceCache<ConsoleRelatedPullRequest[]>;
   state: ResourceCache<ConsoleIssueState>;
+  prStatus: ResourceCache<ConsolePullRequestStatus>;
   client: ConsoleApiClient;
 };
 
@@ -37,6 +39,9 @@ export const useConsoleCaches = (): ConsoleCaches => {
         client.fetchRelatedPrs,
       ),
       state: new ResourceCache<ConsoleIssueState>(client.fetchIssueState),
+      prStatus: new ResourceCache<ConsolePullRequestStatus>(
+        client.fetchPullRequestStatus,
+      ),
     };
   }, [appendToken]);
 };

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleItemDetailData.test.ts

@@ -6,6 +6,7 @@ import type {
   ConsoleCommit,
   ConsoleIssueState,
   ConsoleListItem,
+  ConsolePullRequestStatus,
   ConsoleRelatedPullRequest,
 } from '../logic/types';
 import type { ConsoleCaches } from './useConsoleCaches';
@@ -63,6 +64,14 @@ const buildCaches = (related: ConsoleRelatedPullRequest[]): ConsoleCaches => {
       merged: false,
       isPullRequest: true,
     }),
+    fetchPullRequestStatus: async (): Promise<ConsolePullRequestStatus> => ({
+      found: true,
+      isConflicted: true,
+      isPassedAllCiJob: false,
+      isCiStateSuccess: false,
+      isBranchOutOfDate: true,
+      missingRequiredCheckNames: ['build'],
+    }),
   };
   return {
     client,
@@ -72,6 +81,7 @@ const buildCaches = (related: ConsoleRelatedPullRequest[]): ConsoleCaches => {
     commits: new ResourceCache(client.fetchPrCommits),
     relatedPrs: new ResourceCache(client.fetchRelatedPrs),
     state: new ResourceCache(client.fetchIssueState),
+    prStatus: new ResourceCache(client.fetchPullRequestStatus),
   };
 };
 
@@ -85,9 +95,19 @@ describe('useConsoleItemDetailData', () => {
       expect(result.current.body).toBe('body');
       expect(result.current.files.length).toBe(1);
       expect(result.current.commits.length).toBe(1);
+      expect(result.current.pullRequestStatus?.found).toBe(true);
+      expect(result.current.pullRequestStatus?.isConflicted).toBe(true);
     });
   });
 
+  it('does not expose pull request status for an issue item', () => {
+    const caches = buildCaches([]);
+    const { result } = renderHook(() =>
+      useConsoleItemDetailData(caches, issueItem),
+    );
+    expect(result.current.pullRequestStatus).toBeNull();
+  });
+
   it('loads related pull request views for an issue item', async () => {
     const related: ConsoleRelatedPullRequest[] = [
       {

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleItemDetailData.ts

@@ -6,6 +6,7 @@ import type {
   ConsoleCommit,
   ConsoleIssueState,
   ConsoleListItem,
+  ConsolePullRequestStatus,
   ConsoleRelatedPullRequest,
 } from '../logic/types';
 import type { ConsoleCaches } from './useConsoleCaches';
@@ -20,6 +21,14 @@ const DEFAULT_STATE: ConsoleIssueState = {
   merged: false,
   isPullRequest: false,
 };
+const DEFAULT_PR_STATUS: ConsolePullRequestStatus = {
+  found: false,
+  isConflicted: false,
+  isPassedAllCiJob: false,
+  isCiStateSuccess: false,
+  isBranchOutOfDate: false,
+  missingRequiredCheckNames: [],
+};
 
 export type ConsoleItemDetailData = {
   state: ConsoleIssueState | null;
@@ -35,6 +44,7 @@ export type ConsoleItemDetailData = {
   commits: ConsoleCommit[];
   commitsAreLoading: boolean;
   commitsError: string | null;
+  pullRequestStatus: ConsolePullRequestStatus | null;
   relatedPullRequests: ConsoleRelatedPullRequestView[];
 };
 
@@ -66,6 +76,12 @@ export const useConsoleItemDetailData = (
     isPr ? url : null,
     EMPTY_COMMITS,
   );
+  const prStatus = useConsoleResource(
+    caches.prStatus,
+    isPr ? key : null,
+    isPr ? url : null,
+    DEFAULT_PR_STATUS,
+  );
   const relatedPrs = useConsoleResource(
     caches.relatedPrs,
     !isPr ? key : null,
@@ -162,6 +178,7 @@ export const useConsoleItemDetailData = (
     commits: commits.data,
     commitsAreLoading: commits.isLoading,
     commitsError: commits.error,
+    pullRequestStatus: isPr ? prStatus.data : null,
     relatedPullRequests: relatedViews,
   };
 };

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

@@ -48,6 +48,7 @@ describe('createConsoleApiClient', () => {
     readers.push((url) => client.fetchPrCommits(url));
     readers.push((url) => client.fetchRelatedPrs(url));
     readers.push((url) => client.fetchIssueState(url));
+    readers.push((url) => client.fetchPullRequestStatus(url));
     const expectedPaths = [
       '/api/itembody',
       '/api/comments',
@@ -55,6 +56,7 @@ describe('createConsoleApiClient', () => {
       '/api/prcommits',
       '/api/relatedprs',
       '/api/issuetitle',
+      '/api/pullrequeststatus',
     ];
     for (let index = 0; index < readers.length; index += 1) {
       const fetchMock = mockFetchOnce({});
@@ -161,6 +163,45 @@ describe('createConsoleApiClient', () => {
     expect(related[0].missingRequiredCheckNames).toEqual(['build']);
   });
 
+  it('parses the pull request status when found', async () => {
+    mockFetchOnce({
+      found: true,
+      status: {
+        isConflicted: true,
+        isPassedAllCiJob: false,
+        isCiStateSuccess: false,
+        isBranchOutOfDate: true,
+        missingRequiredCheckNames: ['build', 'test'],
+      },
+    });
+    const client = createConsoleApiClient(appendToken);
+    expect(
+      await client.fetchPullRequestStatus('https://github.com/o/r/pull/1'),
+    ).toEqual({
+      found: true,
+      isConflicted: true,
+      isPassedAllCiJob: false,
+      isCiStateSuccess: false,
+      isBranchOutOfDate: true,
+      missingRequiredCheckNames: ['build', 'test'],
+    });
+  });
+
+  it('returns a not-found pull request status when the server reports none', async () => {
+    mockFetchOnce({ found: false, status: null });
+    const client = createConsoleApiClient(appendToken);
+    expect(
+      await client.fetchPullRequestStatus('https://github.com/o/r/pull/1'),
+    ).toEqual({
+      found: false,
+      isConflicted: false,
+      isPassedAllCiJob: false,
+      isCiStateSuccess: false,
+      isBranchOutOfDate: false,
+      missingRequiredCheckNames: [],
+    });
+  });
+
   it('throws on a non-ok response', async () => {
     mockFetchOnce({}, false);
     const client = createConsoleApiClient(appendToken);

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

@@ -3,6 +3,7 @@ import type {
   ConsoleComment,
   ConsoleCommit,
   ConsoleIssueState,
+  ConsolePullRequestStatus,
   ConsoleRelatedPullRequest,
 } from '../logic/types';
 
@@ -13,6 +14,7 @@ export type ConsoleApiClient = {
   fetchPrCommits: (url: string) => Promise<ConsoleCommit[]>;
   fetchRelatedPrs: (url: string) => Promise<ConsoleRelatedPullRequest[]>;
   fetchIssueState: (url: string) => Promise<ConsoleIssueState>;
+  fetchPullRequestStatus: (url: string) => Promise<ConsolePullRequestStatus>;
 };
 
 export type ConsoleReviewRequest = {
@@ -129,6 +131,11 @@ const parseSummary = (value: unknown): ConsoleRelatedPullRequest['summary'] => {
   };
 };
 
+const parseStringArray = (value: unknown): string[] =>
+  Array.isArray(value)
+    ? value.filter((name): name is string => typeof name === 'string')
+    : [];
+
 const parseRelatedPrs = (payload: unknown): ConsoleRelatedPullRequest[] => {
   if (!isRecord(payload) || !Array.isArray(payload.relatedPullRequests)) {
     return [];
@@ -143,15 +150,35 @@ const parseRelatedPrs = (payload: unknown): ConsoleRelatedPullRequest[] => {
     isCiStateSuccess: getBoolean(pr.isCiStateSuccess),
     isResolvedAllReviewComments: getBoolean(pr.isResolvedAllReviewComments),
     isBranchOutOfDate: getBoolean(pr.isBranchOutOfDate),
-    missingRequiredCheckNames: Array.isArray(pr.missingRequiredCheckNames)
-      ? pr.missingRequiredCheckNames.filter(
-          (name): name is string => typeof name === 'string',
-        )
-      : [],
+    missingRequiredCheckNames: parseStringArray(pr.missingRequiredCheckNames),
     summary: parseSummary(pr.summary),
   }));
 };
 
+const parsePullRequestStatus = (payload: unknown): ConsolePullRequestStatus => {
+  if (!isRecord(payload) || !isRecord(payload.status)) {
+    return {
+      found: false,
+      isConflicted: false,
+      isPassedAllCiJob: false,
+      isCiStateSuccess: false,
+      isBranchOutOfDate: false,
+      missingRequiredCheckNames: [],
+    };
+  }
+  const status = payload.status;
+  return {
+    found: true,
+    isConflicted: getBoolean(status.isConflicted),
+    isPassedAllCiJob: getBoolean(status.isPassedAllCiJob),
+    isCiStateSuccess: getBoolean(status.isCiStateSuccess),
+    isBranchOutOfDate: getBoolean(status.isBranchOutOfDate),
+    missingRequiredCheckNames: parseStringArray(
+      status.missingRequiredCheckNames,
+    ),
+  };
+};
+
 const parseState = (payload: unknown): ConsoleIssueState => {
   if (!isRecord(payload)) {
     return { state: 'open', merged: false, isPullRequest: false };
@@ -180,6 +207,10 @@ export const createConsoleApiClient = (
     parseRelatedPrs(await requestJson(appendToken, '/api/relatedprs', url)),
   fetchIssueState: async (url) =>
     parseState(await requestJson(appendToken, '/api/issuetitle', url)),
+  fetchPullRequestStatus: async (url) =>
+    parsePullRequestStatus(
+      await requestJson(appendToken, '/api/pullrequeststatus', url),
+    ),
 });
 
 const readOperationErrorReason = async (

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

@@ -63,6 +63,15 @@ export type ConsoleIssueState = {
   isPullRequest: boolean;
 };
 
+export type ConsolePullRequestStatus = {
+  found: boolean;
+  isConflicted: boolean;
+  isPassedAllCiJob: boolean;
+  isCiStateSuccess: boolean;
+  isBranchOutOfDate: boolean;
+  missingRequiredCheckNames: string[];
+};
+
 export type ConsoleComment = {
   author: string;
   body: string;

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

@@ -40,6 +40,14 @@ const buildCaches = (overrides: CachesOverrides = {}): ConsoleCaches => {
       merged: false,
       isPullRequest: true,
     }),
+    fetchPullRequestStatus: async () => ({
+      found: true,
+      isConflicted: false,
+      isPassedAllCiJob: true,
+      isCiStateSuccess: true,
+      isBranchOutOfDate: false,
+      missingRequiredCheckNames: [],
+    }),
   };
   return {
     client,
@@ -49,6 +57,7 @@ const buildCaches = (overrides: CachesOverrides = {}): ConsoleCaches => {
     commits: new ResourceCache(client.fetchPrCommits),
     relatedPrs: new ResourceCache(client.fetchRelatedPrs),
     state: new ResourceCache(client.fetchIssueState),
+    prStatus: new ResourceCache(client.fetchPullRequestStatus),
   };
 };
 

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

@@ -150,6 +150,7 @@ export const ConsoleItemDetailContainer = ({
       commits={detail.commits}
       commitsAreLoading={detail.commitsAreLoading}
       commitsError={detail.commitsError}
+      pullRequestStatus={detail.pullRequestStatus}
       relatedPullRequests={detail.relatedPullRequests}
       now={now}
       buildImageProxyUrl={resolveImageProxyUrl}

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

@@ -335,6 +335,18 @@ body {
   font-size: 0.75rem;
 }
 
+.console-detail-pr-status {
+  display: inline-flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 6px;
+}
+
+.console-detail-ci-missing {
+  font-weight: 400;
+  opacity: 0.85;
+}
+
 .console-detail-labels {
   display: flex;
   flex-wrap: wrap;