@elisra-devops/docgen-data-provider 1.80.0 → 1.82.0

package/bin/models/mewp-reporting.d.ts

@@ -14,7 +14,6 @@ export interface MewpCoverageRequestOptions {
     useRelFallback?: boolean;
     externalBugsFile?: MewpExternalFileRef | null;
     externalL3L4File?: MewpExternalFileRef | null;
-    mergeDuplicateL2Cells?: boolean;
 }
 export interface MewpInternalValidationRequestOptions {
     useRelFallback?: boolean;
@@ -62,17 +61,18 @@ export interface MewpL3L4Link {
     title: string;
     level: 'L3' | 'L4';
 }
-export interface MewpCoverageBugCell {
-    id: number | '';
-    title: string;
-    responsibility: string;
-}
-export interface MewpCoverageL3L4Cell {
+export interface MewpL3L4Pair {
     l3Id: string;
     l3Title: string;
     l4Id: string;
     l4Title: string;
 }
+export interface MewpCoverageBugCell {
+    id: number | '';
+    title: string;
+    responsibility: string;
+}
+export type MewpCoverageL3L4Cell = MewpL3L4Pair;
 export interface MewpCoverageRow {
     'L2 REQ ID': string;
     'L2 REQ Title': string;

package/bin/modules/ResultDataProvider.js

@@ -761,38 +761,45 @@ class ResultDataProvider {
     createEmptyMewpCoverageL3L4Cell() {
         return { l3Id: '', l3Title: '', l4Id: '', l4Title: '' };
     }
-    buildMewpCoverageL3L4Rows(links) {
+    buildMewpCoverageL3L4Rows(pairs) {
         const deduped = new Map();
-        for (const item of links || []) {
-            const level = (item === null || item === void 0 ? void 0 : item.level) === 'L4' ? 'L4' : 'L3';
-            const id = String((item === null || item === void 0 ? void 0 : item.id) || '').trim();
-            if (!id)
+        for (const pair of pairs || []) {
+            const l3Id = String((pair === null || pair === void 0 ? void 0 : pair.l3Id) || '').trim();
+            const l3Title = String((pair === null || pair === void 0 ? void 0 : pair.l3Title) || '').trim();
+            const l4Id = String((pair === null || pair === void 0 ? void 0 : pair.l4Id) || '').trim();
+            const l4Title = String((pair === null || pair === void 0 ? void 0 : pair.l4Title) || '').trim();
+            if (!l3Id && !l4Id)
+                continue;
+            const key = `${l3Id}|${l4Id}`;
+            const existing = deduped.get(key);
+            if (!existing) {
+                deduped.set(key, { l3Id, l3Title, l4Id, l4Title });
                 continue;
-            const key = `${level}:${id}`;
-            if (!deduped.has(key)) {
-                deduped.set(key, {
-                    id,
-                    level,
-                    title: String((item === null || item === void 0 ? void 0 : item.title) || '').trim(),
-                });
             }
-        }
-        const sorted = [...deduped.values()].sort((a, b) => {
-            if (a.level !== b.level)
-                return a.level === 'L3' ? -1 : 1;
-            return String(a.id || '').localeCompare(String(b.id || ''));
-        });
-        const rows = [];
-        for (const item of sorted) {
-            const isL3 = item.level === 'L3';
-            rows.push({
-                l3Id: isL3 ? String((item === null || item === void 0 ? void 0 : item.id) || '').trim() : '',
-                l3Title: isL3 ? String((item === null || item === void 0 ? void 0 : item.title) || '').trim() : '',
-                l4Id: isL3 ? '' : String((item === null || item === void 0 ? void 0 : item.id) || '').trim(),
-                l4Title: isL3 ? '' : String((item === null || item === void 0 ? void 0 : item.title) || '').trim(),
+            deduped.set(key, {
+                l3Id: existing.l3Id || l3Id,
+                l3Title: existing.l3Title || l3Title,
+                l4Id: existing.l4Id || l4Id,
+                l4Title: existing.l4Title || l4Title,
             });
         }
-        return rows;
+        const normalizedPairs = [...deduped.values()];
+        const l3KeysWithAnyL4 = new Set(normalizedPairs
+            .filter((item) => !!String((item === null || item === void 0 ? void 0 : item.l3Id) || '').trim() && !!String((item === null || item === void 0 ? void 0 : item.l4Id) || '').trim())
+            .map((item) => String((item === null || item === void 0 ? void 0 : item.l3Id) || '').trim().toLowerCase()));
+        const filtered = normalizedPairs.filter((item) => {
+            const l3Id = String((item === null || item === void 0 ? void 0 : item.l3Id) || '').trim();
+            const l4Id = String((item === null || item === void 0 ? void 0 : item.l4Id) || '').trim();
+            if (!l3Id || !!l4Id)
+                return true;
+            return !l3KeysWithAnyL4.has(l3Id.toLowerCase());
+        });
+        return filtered.sort((a, b) => {
+            const l3Compare = String((a === null || a === void 0 ? void 0 : a.l3Id) || '').localeCompare(String((b === null || b === void 0 ? void 0 : b.l3Id) || ''));
+            if (l3Compare !== 0)
+                return l3Compare;
+            return String((a === null || a === void 0 ? void 0 : a.l4Id) || '').localeCompare(String((b === null || b === void 0 ? void 0 : b.l4Id) || ''));
+        });
     }
     buildMewpCoverageRows(requirements, requirementIndex, observedTestCaseIdsByRequirement, linkedRequirementsByTestCase, l3l4ByBaseKey, externalBugsByTestCase, externalJoinKeysByL2) {
         var _a;
@@ -842,19 +849,15 @@ class ResultDataProvider {
                 ? Array.from(aggregatedBugs.values()).sort((a, b) => a.id - b.id)
                 : [];
             const l3l4ForRows = [...externalJoinKeys].flatMap((joinKey) => l3l4ByBaseKey.get(joinKey) || []);
-            const bugRows = bugsForRows.length > 0
-                ? bugsForRows
-                : [];
+            const bugRows = bugsForRows.map((bug) => ({
+                id: Number.isFinite(Number(bug === null || bug === void 0 ? void 0 : bug.id)) && Number(bug === null || bug === void 0 ? void 0 : bug.id) > 0 ? Number(bug === null || bug === void 0 ? void 0 : bug.id) : '',
+                title: String((bug === null || bug === void 0 ? void 0 : bug.title) || '').trim(),
+                responsibility: String((bug === null || bug === void 0 ? void 0 : bug.responsibility) || '').trim(),
+            }));
             const l3l4Rows = this.buildMewpCoverageL3L4Rows(l3l4ForRows);
-            if (bugRows.length === 0 && l3l4Rows.length === 0) {
-                rows.push(this.createMewpCoverageRow(requirement, runStatus, this.createEmptyMewpCoverageBugCell(), this.createEmptyMewpCoverageL3L4Cell()));
-                continue;
-            }
-            for (const bug of bugRows) {
-                rows.push(this.createMewpCoverageRow(requirement, runStatus, bug, this.createEmptyMewpCoverageL3L4Cell()));
-            }
-            for (const linkedL3L4 of l3l4Rows) {
-                rows.push(this.createMewpCoverageRow(requirement, runStatus, this.createEmptyMewpCoverageBugCell(), linkedL3L4));
+            const rowCount = Math.max(bugRows.length, l3l4Rows.length, 1);
+            for (let index = 0; index < rowCount; index += 1) {
+                rows.push(this.createMewpCoverageRow(requirement, runStatus, bugRows[index] || this.createEmptyMewpCoverageBugCell(), l3l4Rows[index] || this.createEmptyMewpCoverageL3L4Cell()));
             }
         }
         return rows;