@elisra-devops/docgen-data-provider 1.109.1 → 1.110.0

package/bin/modules/TicketsDataProvider.d.ts

@@ -105,6 +105,8 @@ export default class TicketsDataProvider {
      * OneHop/tree queries are intentionally excluded for this picker.
      */
     private fetchFlatUpstreamQueries;
+    private fetchCustomerRequirementQueries;
+    private structureCustomerRequirementQueries;
     private fetchSrsQueries;
     private fetchSysRsQueries;
     /**

package/bin/modules/TicketsDataProvider.js

@@ -27,7 +27,7 @@ const HISTORICAL_WORK_ITEM_FIELDS = [
     'Custom.TestPhase',
 ];
 /** Default fields fetched per work item in tree/flat query parsing. */
-const WI_DEFAULT_FIELDS = 'System.Description,System.Title,Microsoft.VSTS.TCM.ReproSteps,Microsoft.VSTS.CMMI.Symptom';
+const WI_DEFAULT_FIELDS = 'System.Description,System.Title,System.WorkItemType,Microsoft.VSTS.TCM.ReproSteps,Microsoft.VSTS.CMMI.Symptom';
 class TicketsDataProvider {
     constructor(orgUrl, token) {
         this.orgUrl = '';
@@ -532,6 +532,42 @@ class TicketsDataProvider {
         const { tree1: systemRequirementsQueryTree } = await this.structureFetchedQueries(queries, false, null, allowedTypes, [], undefined, undefined, false, excludedFolderNames, true, false);
         return { systemRequirementsQueryTree };
     }
+    async fetchCustomerRequirementQueries(queries) {
+        const systemRequirementsQueryTree = await this.structureCustomerRequirementQueries(queries);
+        return { systemRequirementsQueryTree };
+    }
+    async structureCustomerRequirementQueries(rootQuery, parentId = null) {
+        try {
+            if (!(rootQuery === null || rootQuery === void 0 ? void 0 : rootQuery.hasChildren)) {
+                const isExecutableQuery = !(rootQuery === null || rootQuery === void 0 ? void 0 : rootQuery.isFolder) && ['flat', 'tree', 'oneHop'].includes(rootQuery === null || rootQuery === void 0 ? void 0 : rootQuery.queryType);
+                return isExecutableQuery ? this.buildQueryNode(rootQuery, parentId) : null;
+            }
+            if (!rootQuery.children) {
+                const queryUrl = `${rootQuery.url}?$depth=2&$expand=all`;
+                const currentQuery = await tfs_1.TFSServices.getItemContent(queryUrl, this.token);
+                if (!currentQuery) {
+                    return null;
+                }
+                return await this.structureCustomerRequirementQueries(currentQuery, currentQuery.id);
+            }
+            const childResults = await Promise.all(rootQuery.children.map((child) => this.structureCustomerRequirementQueries(child, rootQuery.id)));
+            const children = childResults.filter((child) => child !== null);
+            return children.length > 0
+                ? {
+                    id: rootQuery.id,
+                    pId: parentId,
+                    value: rootQuery.name,
+                    title: rootQuery.name,
+                    children,
+                }
+                : null;
+        }
+        catch (err) {
+            logger_1.default.error(`Error occurred while constructing the customer query list ${err.message} with query ${JSON.stringify(rootQuery)}`);
+            logger_1.default.error(`Error stack ${err.message}`);
+            return null;
+        }
+    }
     async fetchSrsQueries(rootQueries) {
         const srsFolder = await this.findQueryFolderByName(rootQueries, 'srs');
         if (!srsFolder) {
@@ -561,37 +597,30 @@ class TicketsDataProvider {
     async fetchSysRsQueries(rootQueries) {
         const { root: sysRsRoot, found: sysRsRootFound } = await this.getDocTypeRoot(rootQueries, 'sysrs');
         logger_1.default.debug(`[GetSharedQueries][sysrs] using ${sysRsRootFound ? 'dedicated folder' : 'root queries'}`);
-        const systemToCustomerFolderNames = [
-            'system to customer',
-            'system-to-customer',
-            'system customer',
-            'subsystem to system',
-            'customer to system',
-        ];
         const systemToSubsystemFolderNames = ['system to subsystem', 'system-to-subsystem', 'system subsystem'];
-        const systemRequirementsQueries = await this.fetchSystemRequirementQueries(sysRsRoot, [
-            ...systemToCustomerFolderNames,
-            ...systemToSubsystemFolderNames,
-        ]);
-        const systemToCustomerFolder = await this.findChildFolderByPossibleNames(sysRsRoot, systemToCustomerFolderNames);
+        const systemRequirementsQueries = await this.fetchSystemRequirementQueries(sysRsRoot, systemToSubsystemFolderNames);
         const systemToSubsystemFolder = await this.findChildFolderByPossibleNames(sysRsRoot, systemToSubsystemFolderNames);
-        const subsystemToSystemRequirementsQueries = await this.fetchRequirementsTraceQueriesForFolder(systemToCustomerFolder);
         const systemToSubsystemRequirementsQueries = await this.fetchRequirementsTraceQueriesForFolder(systemToSubsystemFolder);
-        // Customer/System requirements (traceability table) picker: only scan the dedicated
-        // System-to-Customer folder. If it doesn't exist in the tenant, return null
-        // rather than scanning the whole SysRS root, which would surface unrelated
-        // flat queries into the picker.
+        // Customer/System requirements (traceability table) picker: scan the entire
+        // dedicated SysRS folder for executable query nodes. The selected query
+        // defines the customer-side candidate set, so discovery does not infer
+        // "customer" semantics from WIQL. Scope is intentionally limited to the
+        // dedicated `sysrs` folder so unrelated queries from the Shared Queries root
+        // do not leak into the picker.
         let customerRequirementsQueries = null;
-        if (systemToCustomerFolder) {
-            customerRequirementsQueries = await this.fetchFlatUpstreamQueries(systemToCustomerFolder, [], ['requirement']);
+        if (sysRsRootFound) {
+            customerRequirementsQueries = await this.fetchCustomerRequirementQueries(sysRsRoot);
         }
         else {
-            logger_1.default.debug('[GetSharedQueries][sysrs] System-to-Customer folder not found; skipping customer-requirements picker');
+            logger_1.default.debug('[GetSharedQueries][sysrs] dedicated sysrs folder not found; skipping customer-requirements picker');
         }
         return {
             systemRequirementsQueries,
             customerRequirementsQueries,
-            subsystemToSystemRequirementsQueries,
+            // Legacy field retained for backward compatibility with callers/tests.
+            // The sub-system -> system trace table is out of scope for v0 and no
+            // longer sourced from a hardcoded "System to Customer" folder.
+            subsystemToSystemRequirementsQueries: null,
             systemToSubsystemRequirementsQueries,
         };
     }
@@ -1770,21 +1799,25 @@ class TicketsDataProvider {
         };
     }
     async PopulateWorkItemsByIds(workItemsArray = [], projectName = '') {
-        let url = `${this.orgUrl}${projectName}/_apis/wit/workitemsbatch`;
-        let res = [];
-        let divByMax = Math.floor(workItemsArray.length / 200);
-        let modulusByMax = workItemsArray.length % 200;
-        //iterating
+        const baseUrl = `${this.orgUrl}${projectName}/_apis/wit/workitemsbatch`;
+        // On-prem Azure DevOps Server rejects this POST with HTTP 400 unless an
+        // api-version is explicitly set on the URL. Use the same fallback chain
+        // (7.1 -> 5.1 -> no version) the historical batch hydration already uses,
+        // so the helper stays compatible with ADO cloud and older on-prem tenants.
+        const postBatch = (currentIds) => this.withHistoricalApiVersionFallback('populate-workitems-batch', (apiVersion) => tfs_1.TFSServices.getItemContent(this.appendApiVersion(baseUrl, apiVersion), this.token, 'post', {
+            $expand: 'Relations',
+            ids: currentIds,
+        })).then(({ result }) => result);
+        const res = [];
+        const divByMax = Math.floor(workItemsArray.length / 200);
+        const modulusByMax = workItemsArray.length % 200;
         for (let i = 0; i < divByMax; i++) {
-            let from = i * 200;
-            let to = (i + 1) * 200;
-            let currentIds = workItemsArray.slice(from, to);
+            const from = i * 200;
+            const to = (i + 1) * 200;
+            const currentIds = workItemsArray.slice(from, to);
             try {
-                let subRes = await tfs_1.TFSServices.getItemContent(url, this.token, 'post', {
-                    $expand: 'Relations',
-                    ids: currentIds,
-                });
-                res = [...res, ...subRes.value];
+                const subRes = await postBatch(currentIds);
+                res.push(...subRes.value);
             }
             catch (error) {
                 logger_1.default.error(`error populating workitems array`);
@@ -1792,22 +1825,18 @@ class TicketsDataProvider {
                 return [];
             }
         }
-        //compliting the rimainder
         if (modulusByMax !== 0) {
             try {
-                let currentIds = workItemsArray.slice(workItemsArray.length - modulusByMax, workItemsArray.length);
-                let subRes = await tfs_1.TFSServices.getItemContent(url, this.token, 'post', {
-                    $expand: 'Relations',
-                    ids: currentIds,
-                });
-                res = [...res, ...subRes.value];
+                const currentIds = workItemsArray.slice(workItemsArray.length - modulusByMax, workItemsArray.length);
+                const subRes = await postBatch(currentIds);
+                res.push(...subRes.value);
             }
             catch (error) {
                 logger_1.default.error(`error populating workitems array`);
                 logger_1.default.error(JSON.stringify(error));
                 return [];
             }
-        } //if
+        }
         return res;
     }
     async GetModeledQueryResults(results, project) {