@elisra-devops/docgen-data-provider 1.134.0 → 1.136.0

package/bin/modules/TicketsDataProvider.d.ts

@@ -191,6 +191,12 @@ export default class TicketsDataProvider {
     GetQueryResultsByWiqlHref(wiqlHref: string, project: string): Promise<any>;
     GetQueryResultsByWiqlString(wiql: string, projectName: string): Promise<any>;
     GetQueryResultById(query: string, project: string): Promise<any>;
+    GetQueryDefinitionById(queryId: string, project: string): Promise<{
+        id: string;
+        name: string;
+        columns: any[];
+        wiql: any;
+    }>;
     private normalizeHistoricalAsOf;
     private normalizeHistoricalCompareValue;
     private normalizeTestPhaseValue;
@@ -371,8 +377,14 @@ export default class TicketsDataProvider {
      * source + first target work item). Trace queries are single-type per side in practice.
      */
     GetTraceColumnsByType(reqTestWiqlHref: string | undefined, testReqWiqlHref: string | undefined, project: string): Promise<{
-        Requirement: any[];
-        'Test Case': any[];
+        'req-test'?: {
+            Requirement: any[];
+            'Test Case': any[];
+        };
+        'test-req'?: {
+            Requirement: any[];
+            'Test Case': any[];
+        };
     }>;
 }
 export {};

package/bin/modules/TicketsDataProvider.js

@@ -1302,6 +1302,17 @@ class TicketsDataProvider {
         var wiql = querie._links.wiql;
         return await this.GetQueryResultsByWiqlHref(wiql.href, project);
     }
+    async GetQueryDefinitionById(queryId, project) {
+        var _a, _b, _c, _d, _e;
+        const url = `${this.orgUrl}${project}/_apis/wit/queries/${encodeURIComponent(queryId)}?$expand=all`;
+        const def = await tfs_1.TFSServices.getItemContent(url, this.token);
+        return {
+            id: (_a = def === null || def === void 0 ? void 0 : def.id) !== null && _a !== void 0 ? _a : queryId,
+            name: (_b = def === null || def === void 0 ? void 0 : def.name) !== null && _b !== void 0 ? _b : '',
+            columns: (_c = def === null || def === void 0 ? void 0 : def.columns) !== null && _c !== void 0 ? _c : [],
+            wiql: (_e = (_d = def === null || def === void 0 ? void 0 : def._links) === null || _d === void 0 ? void 0 : _d.wiql) !== null && _e !== void 0 ? _e : null,
+        };
+    }
     normalizeHistoricalAsOf(value) {
         const raw = String(value || '').trim();
         if (!raw) {
@@ -1663,29 +1674,40 @@ class TicketsDataProvider {
             skippedWorkItemIds,
         };
     }
-    collectHistoricalQueries(root, parentPath = '') {
-        const items = [];
+    async collectHistoricalQueries(root, parentPath = '', acc = [], visited = new Set()) {
         if (!root) {
-            return items;
+            return acc;
         }
         const name = String((root === null || root === void 0 ? void 0 : root.name) || '').trim();
         const currentPath = parentPath && name ? `${parentPath}/${name}` : name || parentPath;
         if (!(root === null || root === void 0 ? void 0 : root.isFolder)) {
             const id = String((root === null || root === void 0 ? void 0 : root.id) || '').trim();
             if (id) {
-                items.push({
+                acc.push({
                     id,
                     queryName: name || id,
                     path: parentPath || 'Shared Queries',
                 });
             }
-            return items;
+            return acc;
         }
-        const children = Array.isArray(root === null || root === void 0 ? void 0 : root.children) ? root.children : [];
-        for (const child of children) {
-            items.push(...this.collectHistoricalQueries(child, currentPath || 'Shared Queries'));
+        const folderId = String((root === null || root === void 0 ? void 0 : root.id) || '').trim();
+        if (folderId && visited.has(folderId)) {
+            return acc;
         }
-        return items;
+        if (folderId) {
+            visited.add(folderId);
+        }
+        try {
+            await this.ensureQueryChildren(root);
+        }
+        catch (err) {
+            logger_1.default.warn(`collectHistoricalQueries: failed to expand folder "${name}" (id=${folderId}): ${err.message}`);
+            return acc;
+        }
+        const children = Array.isArray(root === null || root === void 0 ? void 0 : root.children) ? root.children : [];
+        await Promise.all(children.map((child) => this.collectHistoricalQueries(child, currentPath || 'Shared Queries', acc, visited)));
+        return acc;
     }
     /**
      * Returns a flat list of shared queries for historical/as-of execution.
@@ -1699,7 +1721,7 @@ class TicketsDataProvider {
             return tfs_1.TFSServices.getItemContent(url, this.token);
         });
         const normalizedRoot = this.normalizeHistoricalQueryRoot(root);
-        const items = this.collectHistoricalQueries(normalizedRoot).filter((query) => query.id !== '');
+        const items = (await this.collectHistoricalQueries(normalizedRoot)).filter((query) => query.id !== '');
         items.sort((a, b) => {
             const byPath = a.path.localeCompare(b.path);
             if (byPath !== 0)
@@ -2780,17 +2802,6 @@ class TicketsDataProvider {
             referenceName: c.referenceName,
             name: c.name,
         }));
-        const mergeCols = (a, b) => {
-            const seen = new Set();
-            const result = [];
-            for (const col of [...a, ...b]) {
-                if (!seen.has(col.referenceName)) {
-                    seen.add(col.referenceName);
-                    result.push(col);
-                }
-            }
-            return result;
-        };
         // Sample one work item to read its System.WorkItemType.
         // In OneHop query relations: !relation.source means root (target = source WI);
         // relation.source present means link (target = target WI).
@@ -2823,64 +2834,65 @@ class TicketsDataProvider {
             const fields = (_a = res === null || res === void 0 ? void 0 : res.value) !== null && _a !== void 0 ? _a : [];
             return new Set(fields.map((f) => f.referenceName));
         };
-        try {
-            // Step 1: fetch declared columns from provided query hrefs
-            let reqTestCols = [];
-            let testReqCols = [];
-            let reqTestRelations = [];
-            let testReqRelations = [];
-            if (reqTestWiqlHref) {
-                const qr = await tfs_1.TFSServices.getItemContent(reqTestWiqlHref, this.token);
-                reqTestCols = normalizeCols((qr === null || qr === void 0 ? void 0 : qr.columns) || []);
-                reqTestRelations = (qr === null || qr === void 0 ? void 0 : qr.workItemRelations) || [];
-            }
-            if (testReqWiqlHref) {
-                const qr = await tfs_1.TFSServices.getItemContent(testReqWiqlHref, this.token);
-                testReqCols = normalizeCols((qr === null || qr === void 0 ? void 0 : qr.columns) || []);
-                testReqRelations = (qr === null || qr === void 0 ? void 0 : qr.workItemRelations) || [];
-            }
-            const declaredCols = mergeCols(reqTestCols, testReqCols);
-            if (declaredCols.length === 0) {
+        // Resolve per-side columns for one query independently.
+        // srcIsReq: true = source WI is Requirement (req-test query), false = source WI is Test Case (test-req query).
+        const resolveQuerySides = async (cols, relations, srcIsReq) => {
+            if (cols.length === 0)
                 return { Requirement: [], 'Test Case': [] };
+            if (relations.length === 0) {
+                // No items to sample — degrade to declared columns on both sides
+                return { Requirement: cols, 'Test Case': cols };
+            }
+            const [srcType, tgtType] = await Promise.all([
+                sampleWitType(relations, true),
+                sampleWitType(relations, false),
+            ]);
+            const reqType = srcIsReq ? srcType : tgtType;
+            const tcType = srcIsReq ? tgtType : srcType;
+            if (!reqType || !tcType) {
+                logger_1.default.warn('GetTraceColumnsByType: could not determine WIT type names — returning declared columns for both sides');
+                return { Requirement: cols, 'Test Case': cols };
             }
-            // Step 2: sample WIT type names
-            // reqTest: source = Requirement, target = Test Case
-            // testReq: source = Test Case, target = Requirement
-            let reqTypeName;
-            let tcTypeName;
-            if (reqTestRelations.length > 0) {
-                [reqTypeName, tcTypeName] = await Promise.all([
-                    sampleWitType(reqTestRelations, true),
-                    sampleWitType(reqTestRelations, false),
-                ]);
-            }
-            if ((!reqTypeName || !tcTypeName) && testReqRelations.length > 0) {
-                const [tSrc, tTgt] = await Promise.all([
-                    sampleWitType(testReqRelations, true),
-                    sampleWitType(testReqRelations, false),
-                ]);
-                if (!tcTypeName)
-                    tcTypeName = tSrc;
-                if (!reqTypeName)
-                    reqTypeName = tTgt;
-            }
-            if (!reqTypeName || !tcTypeName) {
-                logger_1.default.warn('GetTraceColumnsByType: could not determine WIT type names — returning merged columns');
-                return { Requirement: declaredCols, 'Test Case': declaredCols };
-            }
-            // Step 3: fetch WIT field schemas and intersect with declared columns
             const [reqFieldSet, tcFieldSet] = await Promise.all([
-                fetchTypeFieldSet(reqTypeName),
-                fetchTypeFieldSet(tcTypeName),
+                fetchTypeFieldSet(reqType),
+                fetchTypeFieldSet(tcType),
             ]);
             return {
-                Requirement: declaredCols.filter((c) => reqFieldSet.has(c.referenceName)),
-                'Test Case': declaredCols.filter((c) => tcFieldSet.has(c.referenceName)),
+                Requirement: cols.filter((c) => reqFieldSet.has(c.referenceName)),
+                'Test Case': cols.filter((c) => tcFieldSet.has(c.referenceName)),
             };
+        };
+        try {
+            const result = {};
+            if (reqTestWiqlHref) {
+                try {
+                    const qr = await tfs_1.TFSServices.getItemContent(reqTestWiqlHref, this.token);
+                    const cols = normalizeCols((qr === null || qr === void 0 ? void 0 : qr.columns) || []);
+                    const relations = (qr === null || qr === void 0 ? void 0 : qr.workItemRelations) || [];
+                    result['req-test'] = await resolveQuerySides(cols, relations, true);
+                }
+                catch (err) {
+                    logger_1.default.error(`GetTraceColumnsByType[req-test] failed: ${err.message}`);
+                    result['req-test'] = { Requirement: [], 'Test Case': [] };
+                }
+            }
+            if (testReqWiqlHref) {
+                try {
+                    const qr = await tfs_1.TFSServices.getItemContent(testReqWiqlHref, this.token);
+                    const cols = normalizeCols((qr === null || qr === void 0 ? void 0 : qr.columns) || []);
+                    const relations = (qr === null || qr === void 0 ? void 0 : qr.workItemRelations) || [];
+                    result['test-req'] = await resolveQuerySides(cols, relations, false);
+                }
+                catch (err) {
+                    logger_1.default.error(`GetTraceColumnsByType[test-req] failed: ${err.message}`);
+                    result['test-req'] = { Requirement: [], 'Test Case': [] };
+                }
+            }
+            return result;
         }
         catch (err) {
             logger_1.default.error(`GetTraceColumnsByType failed: ${err.message}`);
-            return { Requirement: [], 'Test Case': [] };
+            return {};
         }
     }
 }