@elisra-devops/docgen-data-provider 1.29.2 → 1.30.0

package/bin/modules/ResultDataProvider.d.ts

@@ -26,6 +26,7 @@ export default class ResultDataProvider {
     token: string;
     private limit;
     private testStepParserHelper;
+    private testToAssociatedItemMap;
     constructor(orgUrl: string, token: string);
     /**
      * Combines the results of test group result summary, test results summary, and detailed results summary into a single key-value pair array.
@@ -47,7 +48,7 @@ export default class ResultDataProvider {
      *
      * @throws Will log an error if any step in the process fails.
      */
-    getTestReporterResults(testPlanId: string, projectName: string, selectedSuiteIds: number[], selectedFields: string[], allowCrossTestPlan: boolean, enableRunTestCaseFilter: boolean, enableRunStepStatusFilter: boolean): Promise<any[] | undefined>;
+    getTestReporterResults(testPlanId: string, projectName: string, selectedSuiteIds: number[], selectedFields: string[], allowCrossTestPlan: boolean, enableRunTestCaseFilter: boolean, enableRunStepStatusFilter: boolean, linkedQueryRequest: any, errorFilterMode?: string): Promise<any[] | undefined>;
     /**
      * Mapping each attachment to a proper URL for downloading it
      * @param runResults Array of run results
@@ -100,8 +101,24 @@ export default class ResultDataProvider {
      * Fetches test cases by suite ID.
      */
     private fetchTestCasesBySuiteId;
+    /**
+     * Fetches result data based on the Work Item Test Reporter.
+     *
+     * This method retrieves detailed result data for a specific test run and result ID,
+     * including related work items, selected fields, and additional processing options.
+     *
+     * @param projectName - The name of the project containing the test run.
+     * @param runId - The unique identifier of the test run.
+     * @param resultId - The unique identifier of the test result.
+     * @param isTestReporter - (Optional) A flag indicating whether the result data is being fetched for the Test Reporter.
+     * @param selectedFields - (Optional) An array of field names to include in the result data.
+     * @param isQueryMode - (Optional) A flag indicating whether the result data is being fetched in query mode.
+     * @returns A promise that resolves to the fetched result data.
+     */
     private fetchResultDataBasedOnWiBase;
     private isNotRunStep;
+    private appendQueryRelations;
+    private appendLinkedRelations;
     /**
      * Fetches result data based on the specified work item (WI) details.
      *
@@ -281,7 +298,7 @@ export default class ResultDataProvider {
      *
      * @param testData - An array of test data objects to be processed.
      * @param iterations - An array of iteration objects to align with the test data.
-     * @param selectedFields - An array of selected fields to determine which properties to include in the result.
+     * @param selectedFields - An array of selected fields to determine which properties to include in the response.
      * @returns An array of structured result objects containing aligned test steps and iterations.
      *
      * The method uses a base alignment function and provides custom logic for:

package/bin/modules/ResultDataProvider.js

@@ -15,6 +15,7 @@ const DataProviderUtils_1 = require("../utils/DataProviderUtils");
 const tfs_1 = require("../helpers/tfs");
 const logger_1 = require("../utils/logger");
 const testStepParserHelper_1 = require("../utils/testStepParserHelper");
+const TicketsDataProvider_1 = require("./TicketsDataProvider");
 const pLimit = require('p-limit');
 /**
  * Provides methods to fetch, process, and summarize test data from Azure DevOps.
@@ -65,6 +66,7 @@ class ResultDataProvider {
         this.orgUrl = orgUrl;
         this.token = token;
         this.testStepParserHelper = new testStepParserHelper_1.default(orgUrl, token);
+        this.testToAssociatedItemMap = new Map();
     }
     /**
      * Combines the results of test group result summary, test results summary, and detailed results summary into a single key-value pair array.
@@ -184,11 +186,13 @@ class ResultDataProvider {
      *
      * @throws Will log an error if any step in the process fails.
      */
-    async getTestReporterResults(testPlanId, projectName, selectedSuiteIds, selectedFields, allowCrossTestPlan, enableRunTestCaseFilter, enableRunStepStatusFilter) {
+    async getTestReporterResults(testPlanId, projectName, selectedSuiteIds, selectedFields, allowCrossTestPlan, enableRunTestCaseFilter, enableRunStepStatusFilter, linkedQueryRequest, errorFilterMode = 'none') {
+        var _a;
         const fetchedTestResults = [];
         logger_1.default.debug(`Fetching test reporter results for test plan ID: ${testPlanId}, project name: ${projectName}`);
         logger_1.default.debug(`Selected suite IDs: ${selectedSuiteIds}`);
         try {
+            const ticketsDataProvider = new TicketsDataProvider_1.default(this.orgUrl, this.token);
             logger_1.default.debug(`Fetching Plan info for test plan ID: ${testPlanId}, project name: ${projectName}`);
             const plan = await this.fetchTestPlanName(testPlanId, projectName);
             logger_1.default.debug(`Fetching Test suites for test plan ID: ${testPlanId}, project name: ${projectName}`);
@@ -196,11 +200,37 @@ class ResultDataProvider {
             logger_1.default.debug(`Fetching test data for test plan ID: ${testPlanId}, project name: ${projectName}`);
             const testData = await this.fetchTestData(suites, projectName, testPlanId, allowCrossTestPlan);
             logger_1.default.debug(`Fetching Run results for test data, project name: ${projectName}`);
-            const runResults = await this.fetchAllResultDataTestReporter(testData, projectName, selectedFields);
+            const isQueryMode = linkedQueryRequest.linkedQueryMode === 'query';
+            if (isQueryMode) {
+                // Fetch associated items
+                await ticketsDataProvider.GetQueryResultsFromWiql(linkedQueryRequest.testAssociatedQuery.wiql.href, true, this.testToAssociatedItemMap);
+            }
+            const runResults = await this.fetchAllResultDataTestReporter(testData, projectName, selectedFields, isQueryMode);
             logger_1.default.debug(`Aligning steps with iterations for test reporter results`);
             const testReporterData = this.alignStepsWithIterationsTestReporter(testData, runResults, selectedFields, !enableRunTestCaseFilter);
             // Apply filters sequentially based on enabled flags
             let filteredResults = testReporterData;
+            //TODO: think of a way to filter out the fields that are not selected from this part of the code and not from the fetchAllResultDataTestReporter function
+            if (errorFilterMode !== 'none') {
+                const onlyFailedTestCaseCondition = (result) => { var _a, _b, _c; return result && ((_c = (_b = (_a = result.testCase) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.resultMessage) === null || _c === void 0 ? void 0 : _c.includes('Failed')); };
+                const onlyFailedTestStepsCondition = (result) => result && result.stepStatus === 'Failed';
+                switch (errorFilterMode) {
+                    case 'onlyTestCaseResult':
+                        logger_1.default.debug(`Filtering test reporter results for only test case result`);
+                        filteredResults = filteredResults.filter(onlyFailedTestCaseCondition);
+                        break;
+                    case 'onlyTestStepsResult':
+                        logger_1.default.debug(`Filtering test reporter results for only test steps result`);
+                        filteredResults = filteredResults.filter(onlyFailedTestStepsCondition);
+                        break;
+                    case 'both':
+                        logger_1.default.debug(`Filtering test reporter results for both test case and test steps result`);
+                        filteredResults = (_a = filteredResults === null || filteredResults === void 0 ? void 0 : filteredResults.filter(onlyFailedTestCaseCondition)) === null || _a === void 0 ? void 0 : _a.filter(onlyFailedTestStepsCondition);
+                        break;
+                    default:
+                        break;
+                }
+            }
             // filter: Test step run status
             if (enableRunStepStatusFilter) {
                 filteredResults = filteredResults.filter((result) => !this.isNotRunStep(result));
@@ -474,8 +504,22 @@ class ResultDataProvider {
         const { value: testCases } = await tfs_1.TFSServices.getItemContent(url, this.token);
         return testCases;
     }
-    async fetchResultDataBasedOnWiBase(projectName, runId, resultId, isTestReporter = false, selectedFields) {
-        var _a, _b, _c;
+    /**
+     * Fetches result data based on the Work Item Test Reporter.
+     *
+     * This method retrieves detailed result data for a specific test run and result ID,
+     * including related work items, selected fields, and additional processing options.
+     *
+     * @param projectName - The name of the project containing the test run.
+     * @param runId - The unique identifier of the test run.
+     * @param resultId - The unique identifier of the test result.
+     * @param isTestReporter - (Optional) A flag indicating whether the result data is being fetched for the Test Reporter.
+     * @param selectedFields - (Optional) An array of field names to include in the result data.
+     * @param isQueryMode - (Optional) A flag indicating whether the result data is being fetched in query mode.
+     * @returns A promise that resolves to the fetched result data.
+     */
+    async fetchResultDataBasedOnWiBase(projectName, runId, resultId, isTestReporter = false, selectedFields, isQueryMode) {
+        var _a, _b;
         try {
             if (runId === '0' || resultId === '0') {
                 logger_1.default.warn(`Invalid runId or resultId: ${runId}, ${resultId}`);
@@ -494,47 +538,24 @@ class ResultDataProvider {
             let relatedBugs = [];
             let relatedCRs = [];
             // Process selected fields if provided
-            if ((selectedFields === null || selectedFields === void 0 ? void 0 : selectedFields.length) && isTestReporter) {
-                const filtered = (_a = selectedFields === null || selectedFields === void 0 ? void 0 : selectedFields.filter((field) => field.includes('@testCaseWorkItemField'))) === null || _a === void 0 ? void 0 : _a.map((field) => field.split('@')[0]);
-                const selectedFieldSet = new Set(filtered);
-                if (selectedFieldSet.size !== 0) {
-                    // Process related requirements if needed
+            if (isTestReporter) {
+                // Process related requirements if needed
+                if (isQueryMode) {
+                    this.appendQueryRelations(resultData, relatedRequirements, relatedBugs, relatedCRs);
+                }
+                else {
+                    const filteredLinkedFields = (_a = selectedFields === null || selectedFields === void 0 ? void 0 : selectedFields.filter((field) => field.includes('@linked'))) === null || _a === void 0 ? void 0 : _a.map((field) => field.split('@')[0]);
+                    const selectedLinkedFieldSet = new Set(filteredLinkedFields);
                     const { relations } = wiByRevision;
                     if (relations) {
-                        for (const relation of relations) {
-                            if (((_b = relation.rel) === null || _b === void 0 ? void 0 : _b.includes('System.LinkTypes')) ||
-                                ((_c = relation.rel) === null || _c === void 0 ? void 0 : _c.includes('Microsoft.VSTS.Common.TestedBy'))) {
-                                const relatedUrl = relation.url;
-                                try {
-                                    const wi = await tfs_1.TFSServices.getItemContent(relatedUrl, this.token);
-                                    if (wi.fields['System.WorkItemType'] === 'Requirement') {
-                                        const { id, fields, _links } = wi;
-                                        const requirementTitle = fields['System.Title'];
-                                        const customerFieldKey = Object.keys(fields).find((key) => key.toLowerCase().includes('customer'));
-                                        const customerId = customerFieldKey ? fields[customerFieldKey] : undefined;
-                                        const url = _links.html.href;
-                                        relatedRequirements.push({ id, requirementTitle, customerId, url });
-                                    }
-                                    else if (wi.fields['System.WorkItemType'] === 'Bug') {
-                                        const { id, fields, _links } = wi;
-                                        const bugTitle = fields['System.Title'];
-                                        const url = _links.html.href;
-                                        relatedBugs.push({ id, bugTitle, url });
-                                    }
-                                    else if (wi.fields['System.WorkItemType'] === 'Change Request') {
-                                        const { id, fields, _links } = wi;
-                                        const crTitle = fields['System.Title'];
-                                        const url = _links.html.href;
-                                        relatedCRs.push({ id, crTitle, url });
-                                    }
-                                }
-                                catch (err) {
-                                    logger_1.default.error(`Could not append related work item to test case ${wiByRevision.id}: ${err.message}`);
-                                }
-                            }
-                        }
+                        await this.appendLinkedRelations(relations, relatedRequirements, relatedBugs, relatedCRs, wiByRevision, selectedLinkedFieldSet);
                     }
-                    // Filter fields based on selected field set
+                    selectedLinkedFieldSet.clear();
+                }
+                const filteredTestCaseFields = (_b = selectedFields === null || selectedFields === void 0 ? void 0 : selectedFields.filter((field) => field.includes('@testCaseWorkItemField'))) === null || _b === void 0 ? void 0 : _b.map((field) => field.split('@')[0]);
+                const selectedFieldSet = new Set(filteredTestCaseFields);
+                // Filter fields based on selected field set
+                if (selectedFieldSet.size !== 0) {
                     filteredFields = Object.keys(wiByRevision.fields)
                         .filter((key) => selectedFieldSet.has(key))
                         .reduce((obj, key) => {
@@ -543,6 +564,7 @@ class ResultDataProvider {
                         return obj;
                     }, {});
                 }
+                selectedFieldSet.clear();
             }
             return Object.assign(Object.assign({}, resultData), { stepsResultXml: wiByRevision.fields['Microsoft.VSTS.TCM.Steps'] || undefined, analysisAttachments, testCaseRevision: resultData.testCaseRevision, filteredFields,
                 relatedRequirements,
@@ -557,6 +579,75 @@ class ResultDataProvider {
             return null;
         }
     }
+    appendQueryRelations(resultData, relatedRequirements, relatedBugs, relatedCRs) {
+        if (this.testToAssociatedItemMap.size !== 0) {
+            const relatedItemSet = this.testToAssociatedItemMap.get(Number(resultData.testCase.id));
+            if (relatedItemSet) {
+                for (const relatedItem of relatedItemSet) {
+                    const { id, fields, _links } = relatedItem;
+                    let url = '';
+                    switch (fields['System.WorkItemType']) {
+                        case 'Requirement':
+                            const requirementTitle = fields['System.Title'];
+                            url = _links.html.href;
+                            relatedRequirements.push({ id, requirementTitle, url });
+                            break;
+                        case 'Bug':
+                            const bugTitle = fields['System.Title'];
+                            url = _links.html.href;
+                            relatedBugs.push({ id, bugTitle, url });
+                            break;
+                        case 'Change Request':
+                            const crTitle = fields['System.Title'];
+                            url = _links.html.href;
+                            relatedCRs.push({ id, crTitle, url });
+                            break;
+                    }
+                }
+            }
+        }
+    }
+    async appendLinkedRelations(relations, relatedRequirements, relatedBugs, relatedCRs, wiByRevision, selectedLinkedFieldSet) {
+        var _a, _b;
+        for (const relation of relations) {
+            if (((_a = relation.rel) === null || _a === void 0 ? void 0 : _a.includes('System.LinkTypes')) ||
+                ((_b = relation.rel) === null || _b === void 0 ? void 0 : _b.includes('Microsoft.VSTS.Common.TestedBy'))) {
+                const relatedUrl = relation.url;
+                try {
+                    const wi = await tfs_1.TFSServices.getItemContent(relatedUrl, this.token);
+                    if (wi.fields['System.State'] === 'Closed') {
+                        continue;
+                    }
+                    if (selectedLinkedFieldSet.has('associatedRequirement') &&
+                        wi.fields['System.WorkItemType'] === 'Requirement') {
+                        const { id, fields, _links } = wi;
+                        const requirementTitle = fields['System.Title'];
+                        const customerFieldKey = Object.keys(fields).find((key) => key.toLowerCase().includes('customer'));
+                        const customerId = customerFieldKey ? fields[customerFieldKey] : undefined;
+                        const url = _links.html.href;
+                        relatedRequirements.push({ id, requirementTitle, customerId, url });
+                    }
+                    else if (selectedLinkedFieldSet.has('associatedBug') &&
+                        wi.fields['System.WorkItemType'] === 'Bug') {
+                        const { id, fields, _links } = wi;
+                        const bugTitle = fields['System.Title'];
+                        const url = _links.html.href;
+                        relatedBugs.push({ id, bugTitle, url });
+                    }
+                    else if (selectedLinkedFieldSet.has('associatedCR') &&
+                        wi.fields['System.WorkItemType'] === 'Change Request') {
+                        const { id, fields, _links } = wi;
+                        const crTitle = fields['System.Title'];
+                        const url = _links.html.href;
+                        relatedCRs.push({ id, crTitle, url });
+                    }
+                }
+                catch (err) {
+                    logger_1.default.error(`Could not append related work item to test case ${wiByRevision.id}: ${err.message}`);
+                }
+            }
+        }
+    }
     /**
      * Fetches result data based on the specified work item (WI) details.
      *
@@ -1216,8 +1307,8 @@ class ResultDataProvider {
      * @param selectedFields - (Optional) An array of field names to include in the result data.
      * @returns A promise that resolves to the fetched result data.
      */
-    async fetchResultDataBasedOnWiTestReporter(projectName, runId, resultId, selectedFields) {
-        return this.fetchResultDataBasedOnWiBase(projectName, runId, resultId, true, selectedFields);
+    async fetchResultDataBasedOnWiTestReporter(projectName, runId, resultId, selectedFields, isQueryMode) {
+        return this.fetchResultDataBasedOnWiBase(projectName, runId, resultId, true, selectedFields, isQueryMode);
     }
     /**
      * Fetches all result data for the test reporter by processing the provided test data.
@@ -1231,8 +1322,8 @@ class ResultDataProvider {
      * @param selectedFields - An optional array of field names to include in the result data.
      * @returns A promise that resolves to an array of processed result data.
      */
-    async fetchAllResultDataTestReporter(testData, projectName, selectedFields) {
-        return this.fetchAllResultDataBase(testData, projectName, (projectName, testSuiteId, point, selectedFields) => this.fetchResultDataForTestReporter(projectName, testSuiteId, point, selectedFields), [selectedFields]);
+    async fetchAllResultDataTestReporter(testData, projectName, selectedFields, isQueryMode) {
+        return this.fetchAllResultDataBase(testData, projectName, (projectName, testSuiteId, point, selectedFields, isQueryMode) => this.fetchResultDataForTestReporter(projectName, testSuiteId, point, selectedFields, isQueryMode), [selectedFields, isQueryMode]);
     }
     /**
      * Aligns test steps with iterations for the test reporter by processing test data and iterations
@@ -1240,7 +1331,7 @@ class ResultDataProvider {
      *
      * @param testData - An array of test data objects to be processed.
      * @param iterations - An array of iteration objects to align with the test data.
-     * @param selectedFields - An array of selected fields to determine which properties to include in the result.
+     * @param selectedFields - An array of selected fields to determine which properties to include in the response.
      * @returns An array of structured result objects containing aligned test steps and iterations.
      *
      * The method uses a base alignment function and provides custom logic for:
@@ -1258,33 +1349,20 @@ class ResultDataProvider {
                 fetchedTestCase.iteration.actionResults != null &&
                 filteredFields.size > 0,
             createResultObject: ({ testItem, point, fetchedTestCase, actionResult, filteredFields = new Set(), }) => {
-                var _a;
-                const baseObj = {
-                    suiteName: testItem.testGroupName,
-                    testCase: {
+                const baseObj = Object.assign({ suiteName: testItem.testGroupName, testCase: {
                         id: point.testCaseId,
                         title: point.testCaseName,
                         url: point.testCaseUrl,
                         result: fetchedTestCase.testCaseResult,
-                        comment: (_a = fetchedTestCase.iteration) === null || _a === void 0 ? void 0 : _a.comment,
-                    },
-                    priority: fetchedTestCase.priority,
-                    runBy: fetchedTestCase.runBy,
-                    activatedBy: fetchedTestCase.activatedBy,
-                    assignedTo: fetchedTestCase.assignedTo,
-                    subSystem: fetchedTestCase.subSystem,
-                    failureType: fetchedTestCase.failureType,
-                    automationStatus: fetchedTestCase.automationStatus,
-                    executionDate: fetchedTestCase.executionDate,
-                    configurationName: fetchedTestCase.configurationName,
-                    errorMessage: fetchedTestCase.errorMessage,
-                    relatedRequirements: fetchedTestCase.relatedRequirements,
-                    relatedBugs: fetchedTestCase.relatedBugs,
-                    relatedCRs: fetchedTestCase.relatedCRs,
-                };
+                        comment: fetchedTestCase.comment,
+                    }, priority: fetchedTestCase.priority, runBy: fetchedTestCase.runBy, activatedBy: fetchedTestCase.activatedBy, failureType: fetchedTestCase.failureType, executionDate: fetchedTestCase.executionDate, configurationName: fetchedTestCase.configurationName, errorMessage: fetchedTestCase.errorMessage, relatedRequirements: fetchedTestCase.relatedRequirements, relatedBugs: fetchedTestCase.relatedBugs, relatedCRs: fetchedTestCase.relatedCRs }, fetchedTestCase.customFields);
                 // If we have action results, add step-specific properties
                 if (actionResult) {
-                    return Object.assign(Object.assign({}, baseObj), { stepNo: actionResult.stepPosition, stepAction: filteredFields.has('includeSteps') ? actionResult.action : undefined, stepExpected: filteredFields.has('includeSteps') ? actionResult.expected : undefined, stepStatus: filteredFields.has('stepRunStatus')
+                    return Object.assign(Object.assign({}, baseObj), { stepNo: filteredFields.has('includeSteps') ||
+                            filteredFields.has('stepRunStatus') ||
+                            filteredFields.has('testStepComment')
+                            ? actionResult.stepPosition
+                            : undefined, stepAction: filteredFields.has('includeSteps') ? actionResult.action : undefined, stepExpected: filteredFields.has('includeSteps') ? actionResult.expected : undefined, stepStatus: filteredFields.has('stepRunStatus')
                             ? this.convertUnspecifiedRunStatus(actionResult)
                             : undefined, stepComments: filteredFields.has('testStepComment') ? actionResult.errorMessage : undefined });
                 }
@@ -1304,8 +1382,8 @@ class ResultDataProvider {
      * @returns A promise that resolves to the formatted result data object containing details about the test case,
      *          test suite, last run, iteration, and other selected fields.
      */
-    async fetchResultDataForTestReporter(projectName, testSuiteId, point, selectedFields) {
-        return this.fetchResultDataBase(projectName, testSuiteId, point, (project, runId, resultId, fields) => this.fetchResultDataBasedOnWiTestReporter(project, runId, resultId, fields), (resultData, testSuiteId, point, selectedFields) => {
+    async fetchResultDataForTestReporter(projectName, testSuiteId, point, selectedFields, isQueryMode) {
+        return this.fetchResultDataBase(projectName, testSuiteId, point, (project, runId, resultId, fields, isQueryMode) => this.fetchResultDataBasedOnWiTestReporter(project, runId, resultId, fields, isQueryMode), (resultData, testSuiteId, point, selectedFields) => {
             var _a, _b;
             const { lastRunId, lastResultId, configurationName, lastResultDetails } = point;
             try {
@@ -1322,24 +1400,36 @@ class ResultDataProvider {
                     iteration,
                     testCaseRevision: resultData.testCaseRevision,
                     resolution: resultData.resolutionState,
-                    automationStatus: resultData.filteredFields['Microsoft.VSTS.TCM.AutomationStatus'] || undefined,
-                    analysisAttachments: resultData.analysisAttachments,
                     failureType: undefined,
-                    comment: undefined,
                     priority: undefined,
-                    assignedTo: resultData.filteredFields['System.AssignedTo'],
-                    subSystem: resultData.filteredFields['Custom.SubSystem'],
                     runBy: undefined,
                     executionDate: undefined,
                     testCaseResult: undefined,
+                    comment: undefined,
                     errorMessage: undefined,
                     configurationName: undefined,
-                    relatedRequirements: undefined,
-                    relatedBugs: undefined,
-                    relatedCRs: undefined,
+                    relatedRequirements: resultData.relatedRequirements || undefined,
+                    relatedBugs: resultData.relatedBugs || undefined,
+                    relatedCRs: resultData.relatedCRs || undefined,
                     lastRunResult: undefined,
+                    customFields: {}, // Create an object to store custom fields
                 };
-                const filteredFields = (_a = selectedFields === null || selectedFields === void 0 ? void 0 : selectedFields.filter((field) => field.includes('@runResultField') || field.includes('@linked'))) === null || _a === void 0 ? void 0 : _a.map((field) => field.split('@')[0]);
+                // Process all custom fields from resultData.filteredFields
+                if (resultData.filteredFields) {
+                    for (const [fieldName, fieldValue] of Object.entries(resultData.filteredFields)) {
+                        if (fieldValue !== undefined && fieldValue !== null) {
+                            // Convert Microsoft.VSTS.TCM.AutomationStatus to automationStatus
+                            // or System.AssignedTo to assignedTo
+                            const nameParts = fieldName.split('.');
+                            let propertyName = nameParts[nameParts.length - 1];
+                            // Convert to camelCase (first letter lowercase)
+                            propertyName = propertyName.charAt(0).toLowerCase() + propertyName.slice(1);
+                            // Add to customFields object
+                            resultDataResponse.customFields[propertyName] = fieldValue;
+                        }
+                    }
+                }
+                const filteredFields = (_a = selectedFields === null || selectedFields === void 0 ? void 0 : selectedFields.filter((field) => field.includes('@runResultField'))) === null || _a === void 0 ? void 0 : _a.map((field) => field.split('@')[0]);
                 if (filteredFields && filteredFields.length > 0) {
                     for (const field of filteredFields) {
                         switch (field) {
@@ -1362,13 +1452,12 @@ class ResultDataProvider {
                                         url: `${this.orgUrl}${projectName}/_testManagement/runs?runId=${lastRunId}&_a=resultSummary&resultId=${lastResultId}`,
                                     };
                                 }
+                            case 'testCaseComment':
+                                resultDataResponse.comment = iteration === null || iteration === void 0 ? void 0 : iteration.comment;
                                 break;
                             case 'failureType':
                                 resultDataResponse.failureType = resultData.failureType;
                                 break;
-                            case 'testCaseComment':
-                                resultDataResponse.comment = resultData.comment || undefined;
-                                break;
                             case 'runBy':
                                 const runBy = lastResultDetails.runBy.displayName;
                                 resultDataResponse.runBy = runBy;
@@ -1379,15 +1468,6 @@ class ResultDataProvider {
                             case 'configurationName':
                                 resultDataResponse.configurationName = configurationName;
                                 break;
-                            case 'associatedRequirement':
-                                resultDataResponse.relatedRequirements = resultData.relatedRequirements;
-                                break;
-                            case 'associatedBug':
-                                resultDataResponse.relatedBugs = resultData.relatedBugs;
-                                break;
-                            case 'associatedCR':
-                                resultDataResponse.relatedCRs = resultData.relatedCRs;
-                                break;
                             default:
                                 logger_1.default.debug(`Field ${field} not handled`);
                                 break;
@@ -1401,7 +1481,7 @@ class ResultDataProvider {
                 logger_1.default.error(`Error stack: ${err.stack}`);
                 return null;
             }
-        }, [selectedFields]);
+        }, [selectedFields, isQueryMode]);
     }
 }
 exports.default = ResultDataProvider;