@elisra-devops/docgen-data-provider 1.113.0 → 1.116.0

package/src/modules/GitDataProvider.ts

@@ -492,11 +492,16 @@ export default class GitDataProvider {
       //First fetch the repo web url
       if (targetRepo.url) {
         const repoData = await TFSServices.getItemContent(targetRepo.url, this.token);
-        const repoWebUrl = repoData._links?.web.href;
-        const targetRepoProjectId = repoData.project?.id;
+        const repoWebUrl = repoData?._links?.web?.href;
+        const targetRepoProjectId = repoData?.project?.id;
         if (repoWebUrl) {
           targetRepo['url'] = repoWebUrl;
-          targetRepo['projectId'] = targetRepoProjectId ?? teamProject;
+        }
+        targetRepo['projectId'] = targetRepoProjectId ?? teamProject;
+        if (!targetRepoProjectId) {
+          logger.warn(
+            `getItemsForPipelineRange: repo response missing project.id for ${targetRepo.url}; falling back to pipeline teamProject=${teamProject}`
+          );
         }
       }
       //Then extend the commit information with the related WIs

package/src/modules/PipelinesDataProvider.ts

@@ -219,13 +219,15 @@ export default class PipelinesDataProvider {
   /**
    * Extracts the primary repository from a pipeline run details response.
    *
-   * Newer YAML runs expose repository resources as an array with a `self` entry, while some
-   * designer/classic pipeline responses expose the repository under `__designer_repo`.
+   * The ADO Pipelines Runs API returns resources.repositories as a named-key object where
+   * 'self' is the pipeline's own checkout (e.g. { self: {...}, AppRepo: {...} }). Some older
+   * in-process representations wrap it as an array ({ 0: { self: {...} } }) and classic/designer
+   * pipelines use __designer_repo.
    */
   private getPrimaryPipelineRepository(pipeline: any): any {
     const repositories = pipeline?.resources?.repositories;
     if (!repositories) return undefined;
-    return repositories[0]?.self || repositories.__designer_repo;
+    return repositories.self || repositories[0]?.self || repositories.__designer_repo;
   }
 
   /**
@@ -482,9 +484,13 @@ export default class PipelinesDataProvider {
     }
 
     const fromRepo =
-      fromPipeline.resources.repositories[0]?.self || fromPipeline.resources.repositories.__designer_repo;
+      fromPipeline.resources.repositories.self ||
+      fromPipeline.resources.repositories[0]?.self ||
+      fromPipeline.resources.repositories.__designer_repo;
     const targetRepo =
-      targetPipeline.resources.repositories[0]?.self || targetPipeline.resources.repositories.__designer_repo;
+      targetPipeline.resources.repositories.self ||
+      targetPipeline.resources.repositories[0]?.self ||
+      targetPipeline.resources.repositories.__designer_repo;
 
     if (!fromRepo?.repository?.id || !targetRepo?.repository?.id) {
       return false;

package/src/tests/modules/gitDataProvider.test.ts

@@ -1334,6 +1334,90 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
     // Assert - should only have 1 work item (no duplicates)
     expect(result.commitChangesArray).toHaveLength(1);
   });
+
+  it('cross-project repo: should resolve WIs using teamProject fallback when _links.web.href is missing', async () => {
+    // Real ADO cross-project resource-pipeline repos can return repo metadata without
+    // _links.web.href. Previously this left targetRepo.projectId undefined, causing
+    // GetWorkItem to call /{orgUrl}undefined/... and silently swallow the 404.
+    const pipelineTeamProject = 'TestProject-CMMI';
+    const extendedCommits = [
+      {
+        commit: {
+          commitId: 'abc1234',
+          workItems: [{ id: 42 }],
+          committer: { date: '2024-01-01', name: 'Dev' },
+          comment: 'cross-project fix',
+        },
+      },
+    ];
+    const targetRepo = { url: 'https://dev.azure.com/org/OtherProject/_apis/git/repositories/repo-id' };
+    const addedWorkItemByIdSet = new Set<number>();
+
+    // Repo lives in a different project; response has no _links.web.href
+    const mockRepoDataNoCrossLink = {
+      project: { id: 'cross-project-id' },
+      // no _links at all
+    };
+    const mockPopulatedWI = { id: 42, fields: { 'System.Title': 'Cross-project WI' } };
+
+    (TFSServices.getItemContent as jest.Mock)
+      .mockResolvedValueOnce(mockRepoDataNoCrossLink) // repo metadata call
+      .mockResolvedValueOnce(mockPopulatedWI);        // GetWorkItem call
+
+    const result = await gitDataProvider.getItemsForPipelineRange(
+      pipelineTeamProject,
+      extendedCommits,
+      targetRepo,
+      addedWorkItemByIdSet
+    );
+
+    expect(result.commitChangesArray).toHaveLength(1);
+    expect(result.commitChangesArray[0].workItem.id).toBe(42);
+    // GetWorkItem should have been called with the repo's own projectId from repoData.project.id
+    expect(TFSServices.getItemContent).toHaveBeenCalledWith(
+      expect.stringContaining('cross-project-id'),
+      expect.any(String)
+    );
+  });
+
+  it('cross-project repo: should fall back to teamProject when repoData.project.id is also missing', async () => {
+    const pipelineTeamProject = 'TestProject-CMMI';
+    const extendedCommits = [
+      {
+        commit: {
+          commitId: 'def5678',
+          workItems: [{ id: 99 }],
+          committer: { date: '2024-01-02', name: 'Dev' },
+          comment: 'fallback test',
+        },
+      },
+    ];
+    const targetRepo = { url: 'https://dev.azure.com/org/SomeProject/_apis/git/repositories/repo-id2' };
+    const addedWorkItemByIdSet = new Set<number>();
+
+    // Response with neither _links.web.href nor project.id
+    const mockRepoDataEmpty = {};
+    const mockPopulatedWI = { id: 99, fields: { 'System.Title': 'Fallback WI' } };
+
+    (TFSServices.getItemContent as jest.Mock)
+      .mockResolvedValueOnce(mockRepoDataEmpty)
+      .mockResolvedValueOnce(mockPopulatedWI);
+
+    const result = await gitDataProvider.getItemsForPipelineRange(
+      pipelineTeamProject,
+      extendedCommits,
+      targetRepo,
+      addedWorkItemByIdSet
+    );
+
+    expect(result.commitChangesArray).toHaveLength(1);
+    expect(result.commitChangesArray[0].workItem.id).toBe(99);
+    // GetWorkItem should have been called with the pipeline teamProject as fallback
+    expect(TFSServices.getItemContent).toHaveBeenCalledWith(
+      expect.stringContaining(pipelineTeamProject),
+      expect.any(String)
+    );
+  });
 });
 
 describe('GitDataProvider - GetItemsInPullRequestRange', () => {

package/src/tests/modules/pipelineDataProvider.test.ts

@@ -242,6 +242,37 @@ describe('PipelinesDataProvider', () => {
       // Assert
       expect(result).toBe(true);
     });
+
+    it('should resolve self from real ADO Runs API format (repositories.self, not repositories[0].self)', () => {
+      // Real ADO Pipelines Runs API returns repositories as a named-key object:
+      // { self: {...}, DevOpsTemplates: {...} } — NOT an array.
+      const fromPipeline = {
+        resources: {
+          repositories: {
+            self: {
+              repository: { id: 'repo1' },
+              version: 'v1',
+              refName: 'refs/heads/main',
+            },
+          },
+        },
+      } as unknown as PipelineRun;
+
+      const targetPipeline = {
+        resources: {
+          repositories: {
+            self: {
+              repository: { id: 'repo1' },
+              version: 'v2',
+              refName: 'refs/heads/main',
+            },
+          },
+        },
+      } as unknown as PipelineRun;
+
+      const result = invokeIsMatchingPipeline(fromPipeline, targetPipeline, false);
+      expect(result).toBe(true);
+    });
   });
 
   describe('getPipelineRunDetails', () => {