[eas-cli] [ENG-10146] Allow submission of builds in progress

packages/eas-cli/src/submit/ArchiveSource.ts

@@ -344,6 +344,7 @@
     gitCommitMessage,
     channel,
     message,
+    status,
   } = build;
   const buildDate = new Date(updatedAt);
 
@@ -368,6 +369,7 @@
         ? chalk.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
         : null,
     },
+    { name: 'Status', value: status.replace('_', ' ').toLowerCase() }
   ];
 
   const filteredDescriptionArray: string[] = descriptionItems

packages/eas-cli/src/submit/__tests__/ArchiveSource-test.ts

@@ -7,6 +7,7 @@
 import {
   AppPlatform,
   BuildFragment,
+  BuildStatus,
   SubmissionArchiveSourceType,
   UploadSessionType,
 } from '../../graphql/generated';
@@ -41,6 +42,17 @@
   appVersion: '1.2.3',
   platform: AppPlatform.Android,
   updatedAt: Date.now(),
+  status: BuildStatus.Finished,
+};
+const MOCK_IN_PROGRESS_BUILD_FRAGMENT: Partial<BuildFragment> = {
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  status: BuildStatus.InProgress,
 };
 
 const SOURCE_STUB_INPUT = {
@@ -246,7 +258,7 @@
     expect(archive.sourceType).toBe(ArchiveSourceType.url);
   });
 
-  it('handles build-list-select source', async () => {
+  it('handles build-list-select source for finished builds', async () => {
     const projectId = uuidv4();
     jest
       .mocked(getRecentBuildsForSubmissionAsync)
@@ -269,6 +281,52 @@
     expect(archive.sourceType).toBe(ArchiveSourceType.build);
   });
 
+  it('handles build-list-select source for in-progress builds', async () => {
+    const projectId = uuidv4();
+    jest
+      .mocked(getRecentBuildsForSubmissionAsync)
+      .mockResolvedValueOnce([MOCK_IN_PROGRESS_BUILD_FRAGMENT as BuildFragment]);
+    jest.mocked(promptAsync).mockResolvedValueOnce({ selectedBuild: MOCK_IN_PROGRESS_BUILD_FRAGMENT });
+
+    const archive = await getArchiveAsync(
+      { ...SOURCE_STUB_INPUT, graphqlClient, projectId },
+      {
+        sourceType: ArchiveSourceType.buildList,
+      }
+    );
+
+    expect(getRecentBuildsForSubmissionAsync).toBeCalledWith(
+      graphqlClient,
+      toAppPlatform(SOURCE_STUB_INPUT.platform),
+      projectId,
+      { limit: BUILD_LIST_ITEM_COUNT }
+    );
+    expect(archive.sourceType).toBe(ArchiveSourceType.build);
+  });
+
+  it('handles build-list-select source for both finished and in-progress builds', async () => {
+    const projectId = uuidv4();
+    jest
+      .mocked(getRecentBuildsForSubmissionAsync)
+      .mockResolvedValueOnce([MOCK_IN_PROGRESS_BUILD_FRAGMENT as BuildFragment, MOCK_BUILD_FRAGMENT as BuildFragment]);
+    jest.mocked(promptAsync).mockResolvedValueOnce({ selectedBuild: MOCK_BUILD_FRAGMENT });
+
+    const archive = await getArchiveAsync(
+      { ...SOURCE_STUB_INPUT, graphqlClient, projectId },
+      {
+        sourceType: ArchiveSourceType.buildList,
+      }
+    );
+
+    expect(getRecentBuildsForSubmissionAsync).toBeCalledWith(
+      graphqlClient,
+      toAppPlatform(SOURCE_STUB_INPUT.platform),
+      projectId,
+      { limit: BUILD_LIST_ITEM_COUNT }
+    );
+    expect(archive.sourceType).toBe(ArchiveSourceType.build);
+  });
+
   it('prompts again if all builds have expired', async () => {
     jest.mocked(getRecentBuildsForSubmissionAsync).mockResolvedValueOnce([
       {

packages/eas-cli/src/submit/utils/__tests__/builds-test.ts

@@ -0,0 +1,110 @@
+import { getRecentBuildsForSubmissionAsync } from '../builds';
+import { v4 as uuidv4 } from 'uuid';
+import { AppPlatform, BuildFragment, BuildStatus, SubmissionArchiveSourceType } from '../../../graphql/generated';
+import { BuildQuery } from "../../../graphql/queries/BuildQuery";
+import { ExpoGraphqlClient } from "../../../commandUtils/context/contextUtils/createGraphqlClient";
+
+jest.mock('../../../graphql/queries/BuildQuery', () => ({
+  BuildQuery: {
+    viewBuildsOnAppAsync: jest.fn(),
+  },
+}));
+
+const ARCHIVE_SOURCE = {
+  type: SubmissionArchiveSourceType.Url,
+  url: 'https://url.to/archive.tar.gz',
+};
+
+const MOCK_BUILD_FRAGMENTS: Partial<BuildFragment>[] = Array(5).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  status: BuildStatus.Finished,
+}));
+const MOCK_IN_PROGRESS_BUILD_FRAGMENTS: Partial<BuildFragment>[] = Array(5).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  status: BuildStatus.InProgress,
+}));
+
+describe(getRecentBuildsForSubmissionAsync, () => {
+  let graphqlClient: ExpoGraphqlClient;
+
+  beforeEach(() => {
+    graphqlClient = {} as any as ExpoGraphqlClient;
+  });
+
+  it('returns finished builds if there are no in-progress builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest.mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(MOCK_BUILD_FRAGMENTS.slice(0, limit) as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit },
+    )
+
+    expect(result).toMatchObject(MOCK_BUILD_FRAGMENTS.slice(0, limit));
+  });
+  it('returns in-progress builds if there are no finished builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest.mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(0, limit) as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit },
+    )
+
+    expect(result).toMatchObject(MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(0, limit));
+  });
+  it('returns in-progress builds if there are finished builds, but in-progress ones fill the limit', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest.mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(0, limit) as BuildFragment[])
+      .mockResolvedValueOnce(MOCK_BUILD_FRAGMENTS.slice(0, limit) as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit },
+    )
+
+    expect(result).toMatchObject(MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(0, limit));
+  });
+  it('returns in-progress and finished builds if in-progress ones don\'t fill the limit', async () => {
+    const appId = uuidv4();
+    const limit = 4;
+    jest.mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(0, 2) as BuildFragment[])
+      .mockResolvedValueOnce(MOCK_BUILD_FRAGMENTS.slice(0, 2) as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit },
+    )
+
+    expect(result).toMatchObject(MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(0, 2).concat(MOCK_BUILD_FRAGMENTS.slice(0, 2)));
+  });
+});

packages/eas-cli/src/submit/utils/builds.ts

@@ -8,14 +8,29 @@ export async function getRecentBuildsForSubmissionAsync(
   appId: string,
   { limit = 1 }: { limit?: number } = {}
 ): Promise<BuildFragment[]> {
-  return await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+  const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
     appId,
     limit,
     offset: 0,
     filter: {
       platform,
       distribution: DistributionType.Store,
-      status: BuildStatus.Finished,
+      status: BuildStatus.InProgress,
     },
   });
+  const remainingLimit = limit - builds.length;
+  if (remainingLimit > 0) {
+    const finishedBuilds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      appId,
+      limit: remainingLimit,
+      offset: 0,
+      filter: {
+        platform,
+        distribution: DistributionType.Store,
+        status: BuildStatus.Finished,
+      },
+    });
+    builds.push(...finishedBuilds);
+  }
+  return builds;
 }