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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elisra-devops/docgen-data-provider",
-  "version": "1.81.0",
+  "version": "1.82.0",
   "description": "A document generator data provider, aimed to retrive data from azure devops",
   "repository": {
     "type": "git",

package/src/models/mewp-reporting.ts

@@ -16,7 +16,6 @@ export interface MewpCoverageRequestOptions {
   useRelFallback?: boolean;
   externalBugsFile?: MewpExternalFileRef | null;
   externalL3L4File?: MewpExternalFileRef | null;
-  mergeDuplicateL2Cells?: boolean;
 }
 
 export interface MewpInternalValidationRequestOptions {

package/src/modules/ResultDataProvider.ts

@@ -1113,8 +1113,20 @@ export default class ResultDataProvider {
         l4Title: existing.l4Title || l4Title,
       });
     }
+    const normalizedPairs = [...deduped.values()];
+    const l3KeysWithAnyL4 = new Set(
+      normalizedPairs
+        .filter((item) => !!String(item?.l3Id || '').trim() && !!String(item?.l4Id || '').trim())
+        .map((item) => String(item?.l3Id || '').trim().toLowerCase())
+    );
+    const filtered = normalizedPairs.filter((item) => {
+      const l3Id = String(item?.l3Id || '').trim();
+      const l4Id = String(item?.l4Id || '').trim();
+      if (!l3Id || !!l4Id) return true;
+      return !l3KeysWithAnyL4.has(l3Id.toLowerCase());
+    });
 
-    return [...deduped.values()].sort((a, b) => {
+    return filtered.sort((a, b) => {
       const l3Compare = String(a?.l3Id || '').localeCompare(String(b?.l3Id || ''));
       if (l3Compare !== 0) return l3Compare;
       return String(a?.l4Id || '').localeCompare(String(b?.l4Id || ''));

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

@@ -1428,6 +1428,84 @@ describe('ResultDataProvider', () => {
       );
     });
 
+    it('should drop standalone L3 row when same L3 has one or more L4 links', () => {
+      const requirements = [
+        {
+          requirementId: 'SR5310',
+          baseKey: 'SR5310',
+          title: 'Req 5310',
+          subSystem: 'Power',
+          responsibility: 'ESUK',
+          linkedTestCaseIds: [111],
+        },
+      ];
+
+      const requirementIndex = new Map([
+        [
+          'SR5310',
+          new Map([
+            [
+              111,
+              {
+                passed: 1,
+                failed: 0,
+                notRun: 0,
+              },
+            ],
+          ]),
+        ],
+      ]);
+
+      const observedTestCaseIdsByRequirement = new Map<string, Set<number>>([
+        ['SR5310', new Set([111])],
+      ]);
+
+      const linkedRequirementsByTestCase = new Map([
+        [
+          111,
+          {
+            baseKeys: new Set(['SR5310']),
+            fullCodes: new Set(['SR5310']),
+            bugIds: new Set(),
+          },
+        ],
+      ]);
+
+      const l3l4ByBaseKey = new Map([
+        [
+          'SR5310',
+          [
+            { l3Id: '9003', l3Title: 'L3 9003', l4Id: '', l4Title: '' },
+            { l3Id: '9003', l3Title: 'L3 9003', l4Id: '9103', l4Title: 'L4 9103' },
+            { l3Id: '9003', l3Title: 'L3 9003', l4Id: '9104', l4Title: 'L4 9104' },
+          ],
+        ],
+      ]);
+
+      const rows = (resultDataProvider as any).buildMewpCoverageRows(
+        requirements,
+        requirementIndex,
+        observedTestCaseIdsByRequirement,
+        linkedRequirementsByTestCase,
+        l3l4ByBaseKey,
+        new Map()
+      );
+
+      expect(rows).toHaveLength(2);
+      expect(rows[0]).toEqual(
+        expect.objectContaining({
+          'L3 REQ ID': '9003',
+          'L4 REQ ID': '9103',
+        })
+      );
+      expect(rows[1]).toEqual(
+        expect.objectContaining({
+          'L3 REQ ID': '9003',
+          'L4 REQ ID': '9104',
+        })
+      );
+    });
+
     it('should not emit bug rows from ADO-linked bug ids when external bugs source is empty', () => {
       const requirements = [
         {