@elisra-devops/docgen-data-provider 1.131.0 → 1.133.0

package/src/modules/JfrogDataProvider.ts

@@ -14,8 +14,11 @@ export default class JfrogDataProvider {
   }
 
   async getServiceConnectionUrlByConnectionId(teamProject: string, connectionId: string) {
-    let url = `${this.orgUrl}${teamProject}/_apis/serviceendpoint/endpoints/${connectionId}?api-version=6`;
+    let url = `${this.orgUrl}${teamProject}/_apis/serviceendpoint/endpoints/${connectionId}?api-version=7.1`;
     const serviceConnectionResponse = await TFSServices.getItemContent(url, this.tfsToken);
+    if (!serviceConnectionResponse?.url) {
+      throw new Error(`Service connection ${connectionId} returned no URL — identity may lack service-endpoint read permission`);
+    }
     logger.debug(`service connection url ${JSON.stringify(serviceConnectionResponse.url)}`);
     return serviceConnectionResponse.url;
   }
@@ -23,6 +26,11 @@ export default class JfrogDataProvider {
   async getCiDataFromJfrog(jfrogUrl: string, buildName: string, buildVersion: string): Promise<string> {
     let jfrogHeader: any = {};
     try {
+      if (!jfrogUrl) {
+        throw new Error(
+          `JFrog service connection URL is unresolved for build "${buildName}" — the caller identity may lack service-endpoint read permission`
+        );
+      }
       if (this.jfrogToken !== '') {
         jfrogHeader['Authorization'] = `Bearer ${this.jfrogToken}`;
       }
@@ -42,6 +50,9 @@ export default class JfrogDataProvider {
         this.jfrogToken !== ''
           ? await TFSServices.getJfrogRequest(getCiRequestUrl, jfrogHeader)
           : await TFSServices.getJfrogRequest(getCiRequestUrl);
+      if (!getCiResponse?.buildInfo?.url) {
+        throw new Error(`JFrog response for build "${buildName}${buildVersion}" is missing buildInfo.url`);
+      }
       logger.debug(`CI Url from JFROG: ${getCiResponse.buildInfo.url}`);
       return getCiResponse.buildInfo.url;
     } catch (err: any) {

package/src/modules/ResultDataProvider.ts

@@ -290,7 +290,8 @@ export default class ResultDataProvider {
     enableRunStepStatusFilter: boolean,
     linkedQueryRequest: any,
     errorFilterMode: string = 'none',
-    includeAllHistory: boolean = false
+    includeAllHistory: boolean = false,
+    useLatestTestCaseProperties: boolean = false
   ) {
     const fetchedTestResults: any[] = [];
     logger.debug(
@@ -322,7 +323,9 @@ export default class ResultDataProvider {
         projectName,
         selectedFields,
         isQueryMode,
-        includeAllHistory
+        includeAllHistory,
+        false,
+        useLatestTestCaseProperties
       );
       logger.debug(`Aligning steps with iterations for test reporter results`);
       const testReporterData = this.alignStepsWithIterationsTestReporter(
@@ -3656,10 +3659,16 @@ export default class ResultDataProvider {
     suiteTestCaseRevision: number,
     pointAsOfTimestamp: string,
     fallbackSnapshot: any,
-    expandAll: boolean
+    expandAll: boolean,
+    useLatestTestCaseProperties: boolean = false
   ): Promise<any | null> {
     let bestSnapshotWithoutSteps: any | null = null;
 
+    if (useLatestTestCaseProperties) {
+      const latest = await this.fetchWorkItemLatest(projectName, testCaseId, expandAll);
+      if (latest) return latest;
+    }
+
     if (pointAsOfTimestamp) {
       const asOfSnapshot = await this.fetchWorkItemByAsOf(
         projectName,
@@ -3721,14 +3730,15 @@ export default class ResultDataProvider {
     isQueryMode?: boolean,
     point?: any,
     includeAllHistory: boolean = false,
-    useRunlessAsOf: boolean = false
+    useRunlessAsOf: boolean = false,
+    useLatestTestCaseProperties: boolean = false
   ): Promise<any> {
     try {
       let filteredFields: any = {};
       let relatedRequirements: any[] = [];
       let relatedBugs: any[] = [];
       let relatedCRs: any[] = [];
-      if (runId === '0' || resultId === '0') {
+      if (useLatestTestCaseProperties || runId === '0' || resultId === '0') {
         if (!point) {
           logger.warn(`Invalid run result ${runId} or result ${resultId}`);
           return null;
@@ -3752,7 +3762,8 @@ export default class ResultDataProvider {
           suiteTestCaseRevision,
           pointAsOfTimestamp,
           fallbackSnapshot,
-          isTestReporter
+          isTestReporter,
+          useLatestTestCaseProperties
         );
         if (!testCaseData) {
           logger.warn(`Could not resolve test case ${point.testCaseId} for runless point fallback.`);
@@ -5465,7 +5476,8 @@ export default class ResultDataProvider {
     isQueryMode?: boolean,
     point?: any,
     includeAllHistory: boolean = false,
-    useRunlessAsOf: boolean = false
+    useRunlessAsOf: boolean = false,
+    useLatestTestCaseProperties: boolean = false
   ): Promise<any> {
     return this.fetchResultDataBasedOnWiBase(
       projectName,
@@ -5476,7 +5488,8 @@ export default class ResultDataProvider {
       isQueryMode,
       point,
       includeAllHistory,
-      useRunlessAsOf
+      useRunlessAsOf,
+      useLatestTestCaseProperties
     );
   }
 
@@ -5498,13 +5511,14 @@ export default class ResultDataProvider {
     selectedFields?: string[],
     isQueryMode?: boolean,
     includeAllHistory: boolean = false,
-    useRunlessAsOf: boolean = false
+    useRunlessAsOf: boolean = false,
+    useLatestTestCaseProperties: boolean = false
   ): Promise<any[]> {
     return this.fetchAllResultDataBase(
       testData,
       projectName,
       true,
-      (projectName, testSuiteId, point, selectedFields, isQueryMode, includeAllHistory, useRunlessAsOf) =>
+      (projectName, testSuiteId, point, selectedFields, isQueryMode, includeAllHistory, useRunlessAsOf, useLatestTestCaseProperties) =>
         this.fetchResultDataForTestReporter(
           projectName,
           testSuiteId,
@@ -5512,9 +5526,10 @@ export default class ResultDataProvider {
           selectedFields,
           isQueryMode,
           includeAllHistory,
-          useRunlessAsOf
+          useRunlessAsOf,
+          useLatestTestCaseProperties
         ),
-      [selectedFields, isQueryMode, includeAllHistory, useRunlessAsOf]
+      [selectedFields, isQueryMode, includeAllHistory, useRunlessAsOf, useLatestTestCaseProperties]
     );
   }
 
@@ -5673,13 +5688,14 @@ export default class ResultDataProvider {
     selectedFields?: string[],
     isQueryMode?: boolean,
     includeAllHistory: boolean = false,
-    useRunlessAsOf: boolean = false
+    useRunlessAsOf: boolean = false,
+    useLatestTestCaseProperties: boolean = false
   ) {
     return this.fetchResultDataBase(
       projectName,
       testSuiteId,
       point,
-      (project, runId, resultId, fields, isQueryMode, point, includeAllHistory, useRunlessAsOf) =>
+      (project, runId, resultId, fields, isQueryMode, point, includeAllHistory, useRunlessAsOf, useLatestTestCaseProperties) =>
         this.fetchResultDataBasedOnWiTestReporter(
           project,
           runId,
@@ -5688,7 +5704,8 @@ export default class ResultDataProvider {
           isQueryMode,
           point,
           includeAllHistory,
-          useRunlessAsOf
+          useRunlessAsOf,
+          useLatestTestCaseProperties
         ),
       (resultData, testSuiteId, point, selectedFields) => {
         const { lastRunId, lastResultId, configurationName, lastResultDetails } = point;

package/src/modules/TicketsDataProvider.ts

@@ -2365,7 +2365,7 @@ export default class TicketsDataProvider {
     const postBatch = (currentIds: any[]) =>
       this.withHistoricalApiVersionFallback('populate-workitems-batch', (apiVersion) =>
         TFSServices.getItemContent(this.appendApiVersion(baseUrl, apiVersion), this.token, 'post', {
-          $expand: 'Relations',
+          $expand: 'All',
           ids: currentIds,
         }),
       ).then(({ result }) => result);

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

@@ -33,7 +33,7 @@ describe('JfrogDataProvider', () => {
 
       // Assert
       expect(TFSServices.getItemContent).toHaveBeenCalledWith(
-        `${mockOrgUrl}${mockTeamProject}/_apis/serviceendpoint/endpoints/${mockConnectionId}?api-version=6`,
+        `${mockOrgUrl}${mockTeamProject}/_apis/serviceendpoint/endpoints/${mockConnectionId}?api-version=7.1`,
         mockTfsToken
       );
       expect(logger.debug).toHaveBeenCalledWith(`service connection url "${mockResponse.url}"`);

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

@@ -1129,8 +1129,8 @@ describe('GitDataProvider - GetItemsInCommitRange', () => {
     const mockPRsResponse = { count: 0, value: [] };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockPRsResponse);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }) // batch POST for work items
+      .mockResolvedValueOnce(mockPRsResponse);             // GetPullRequestsLinkedItemsInCommitRange (default: includePullRequestWorkItems=true)
 
     // Act
     const result = await gitDataProvider.GetItemsInCommitRange(projectId, repoId, commitRange, null, false);
@@ -1248,7 +1248,7 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
 
     (TFSServices.getItemContent as jest.Mock)
       .mockResolvedValueOnce(mockRepoData)
-      .mockResolvedValueOnce(mockPopulatedWI);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }); // batch POST for work items
 
     // Act
     const result = await gitDataProvider.getItemsForPipelineRange(
@@ -1320,8 +1320,7 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
 
     (TFSServices.getItemContent as jest.Mock)
       .mockResolvedValueOnce(mockRepoData)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockPopulatedWI);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }); // single batch POST (WI id=1 deduped)
 
     // Act
     const result = await gitDataProvider.getItemsForPipelineRange(
@@ -1361,8 +1360,8 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
     const mockPopulatedWI = { id: 42, fields: { 'System.Title': 'Cross-project WI' } };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockRepoDataNoCrossLink) // repo metadata call
-      .mockResolvedValueOnce(mockPopulatedWI);        // GetWorkItem call
+      .mockResolvedValueOnce(mockRepoDataNoCrossLink)        // repo metadata call
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }); // batch POST for work items
 
     const result = await gitDataProvider.getItemsForPipelineRange(
       pipelineTeamProject,
@@ -1373,10 +1372,12 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
 
     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
+    // batch POST URL contains the repo's projectId (cross-project-id)
     expect(TFSServices.getItemContent).toHaveBeenCalledWith(
       expect.stringContaining('cross-project-id'),
-      expect.any(String)
+      expect.any(String),
+      'post',
+      expect.objectContaining({ ids: expect.any(Array) })
     );
   });
 
@@ -1401,7 +1402,7 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
 
     (TFSServices.getItemContent as jest.Mock)
       .mockResolvedValueOnce(mockRepoDataEmpty)
-      .mockResolvedValueOnce(mockPopulatedWI);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }); // batch POST for work items
 
     const result = await gitDataProvider.getItemsForPipelineRange(
       pipelineTeamProject,
@@ -1412,10 +1413,12 @@ describe('GitDataProvider - getItemsForPipelineRange', () => {
 
     expect(result.commitChangesArray).toHaveLength(1);
     expect(result.commitChangesArray[0].workItem.id).toBe(99);
-    // GetWorkItem should have been called with the pipeline teamProject as fallback
+    // batch POST URL contains the fallback teamProject
     expect(TFSServices.getItemContent).toHaveBeenCalledWith(
       expect.stringContaining(pipelineTeamProject),
-      expect.any(String)
+      expect.any(String),
+      'post',
+      expect.objectContaining({ ids: expect.any(Array) })
     );
     expect(logger.warn).toHaveBeenCalledWith(
       expect.stringContaining(`falling back to pipeline teamProject=${pipelineTeamProject}`)
@@ -1774,9 +1777,9 @@ describe('GitDataProvider - createLinkedRelatedItemsForSVD (via GetItemsInCommit
     const mockPRsResponse = { count: 0, value: [] };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockRelatedWI)
-      .mockResolvedValueOnce(mockPRsResponse);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }) // batch POST for work items
+      .mockResolvedValueOnce(mockRelatedWI)                // GetWorkItemByUrl (linked relation)
+      .mockResolvedValueOnce(mockPRsResponse);             // GetPullRequestsLinkedItemsInCommitRange
 
     // Act
     const result = await gitDataProvider.GetItemsInCommitRange(
@@ -1826,8 +1829,8 @@ describe('GitDataProvider - createLinkedRelatedItemsForSVD (via GetItemsInCommit
     const mockPRsResponse = { count: 0, value: [] };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockPRsResponse);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }) // batch POST for work items
+      .mockResolvedValueOnce(mockPRsResponse);             // GetPullRequestsLinkedItemsInCommitRange
 
     // Act
     const result = await gitDataProvider.GetItemsInCommitRange(
@@ -1877,8 +1880,8 @@ describe('GitDataProvider - createLinkedRelatedItemsForSVD (via GetItemsInCommit
     const mockPRsResponse = { count: 0, value: [] };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockPRsResponse);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }) // batch POST for work items
+      .mockResolvedValueOnce(mockPRsResponse);             // GetPullRequestsLinkedItemsInCommitRange
 
     // Act
     const result = await gitDataProvider.GetItemsInCommitRange(
@@ -1936,9 +1939,9 @@ describe('GitDataProvider - createLinkedRelatedItemsForSVD (via GetItemsInCommit
     const mockPRsResponse = { count: 0, value: [] };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockRelatedWI)
-      .mockResolvedValueOnce(mockPRsResponse);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }) // batch POST for work items
+      .mockResolvedValueOnce(mockRelatedWI)                // GetWorkItemByUrl (linked relation)
+      .mockResolvedValueOnce(mockPRsResponse);             // GetPullRequestsLinkedItemsInCommitRange
 
     // Act
     const result = await gitDataProvider.GetItemsInCommitRange(
@@ -2105,9 +2108,8 @@ describe('GitDataProvider - duplicate work item removal', () => {
     const mockPRsResponse = { count: 0, value: [] };
 
     (TFSServices.getItemContent as jest.Mock)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockPopulatedWI)
-      .mockResolvedValueOnce(mockPRsResponse);
+      .mockResolvedValueOnce({ value: [mockPopulatedWI] }) // batch POST (WI id=1 deduped from 2 commits)
+      .mockResolvedValueOnce(mockPRsResponse);             // GetPullRequestsLinkedItemsInCommitRange
 
     // Act
     const result = await gitDataProvider.GetItemsInCommitRange(projectId, repoId, commitRange, null, false);