@elisra-devops/docgen-data-provider 1.78.0 → 1.79.0

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

@@ -36,6 +36,7 @@ export interface MewpL2RequirementWorkItem {
     areaPath: string;
 }
 export interface MewpL2RequirementFamily {
+    workItemId?: number;
     requirementId: string;
     baseKey: string;
     title: string;

package/bin/modules/ResultDataProvider.d.ts

@@ -86,7 +86,6 @@ export default class ResultDataProvider {
     private createEmptyMewpCoverageBugCell;
     private createEmptyMewpCoverageL3L4Cell;
     private buildMewpCoverageL3L4Rows;
-    private formatMewpCustomerId;
     private buildMewpCoverageRows;
     private resolveCoverageBugResponsibility;
     private resolveMewpL2RunStatus;

package/bin/modules/ResultDataProvider.js

@@ -694,7 +694,8 @@ class ResultDataProvider {
         return `MEWP Internal Validation - ${suffix}`;
     }
     createMewpCoverageRow(requirement, runStatus, bug, linkedL3L4) {
-        const l2ReqId = this.formatMewpCustomerId(requirement.requirementId);
+        const l2ReqIdNumeric = Number((requirement === null || requirement === void 0 ? void 0 : requirement.workItemId) || 0);
+        const l2ReqId = l2ReqIdNumeric > 0 ? String(l2ReqIdNumeric) : '';
         const l2ReqTitle = this.toMewpComparableText(requirement.title);
         const l2SubSystem = this.toMewpComparableText(requirement.subSystem);
         return {
@@ -735,15 +736,6 @@ class ResultDataProvider {
         }
         return rows;
     }
-    formatMewpCustomerId(rawValue) {
-        const normalized = this.normalizeMewpRequirementCode(this.toMewpComparableText(rawValue));
-        if (normalized)
-            return normalized;
-        const onlyDigits = String(rawValue || '').replace(/\D/g, '');
-        if (onlyDigits)
-            return `SR${onlyDigits}`;
-        return '';
-    }
     buildMewpCoverageRows(requirements, requirementIndex, observedTestCaseIdsByRequirement, linkedRequirementsByTestCase, l3l4ByBaseKey, externalBugsByTestCase) {
         var _a;
         const rows = [];
@@ -1369,7 +1361,7 @@ class ResultDataProvider {
         const workItems = await this.fetchWorkItemsByIds(projectName, requirementIds, true);
         const requirements = workItems.map((wi) => {
             const fields = (wi === null || wi === void 0 ? void 0 : wi.fields) || {};
-            const requirementId = this.extractMewpRequirementIdentifier(fields, Number((wi === null || wi === void 0 ? void 0 : wi.id) || 0));
+            const requirementId = this.extractMewpRequirementIdentifier(fields);
             const areaPath = this.toMewpComparableText(fields === null || fields === void 0 ? void 0 : fields['System.AreaPath']);
             return {
                 workItemId: Number((wi === null || wi === void 0 ? void 0 : wi.id) || 0),
@@ -1451,13 +1443,14 @@ class ResultDataProvider {
         }
         return [...families.entries()]
             .map(([baseKey, family]) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             return ({
-                requirementId: String(((_a = family === null || family === void 0 ? void 0 : family.representative) === null || _a === void 0 ? void 0 : _a.requirementId) || baseKey),
+                workItemId: Number(((_a = family === null || family === void 0 ? void 0 : family.representative) === null || _a === void 0 ? void 0 : _a.workItemId) || 0),
+                requirementId: String(((_b = family === null || family === void 0 ? void 0 : family.representative) === null || _b === void 0 ? void 0 : _b.requirementId) || baseKey),
                 baseKey,
-                title: String(((_b = family === null || family === void 0 ? void 0 : family.representative) === null || _b === void 0 ? void 0 : _b.title) || ''),
-                subSystem: String(((_c = family === null || family === void 0 ? void 0 : family.representative) === null || _c === void 0 ? void 0 : _c.subSystem) || ''),
-                responsibility: String(((_d = family === null || family === void 0 ? void 0 : family.representative) === null || _d === void 0 ? void 0 : _d.responsibility) || ''),
+                title: String(((_c = family === null || family === void 0 ? void 0 : family.representative) === null || _c === void 0 ? void 0 : _c.title) || ''),
+                subSystem: String(((_d = family === null || family === void 0 ? void 0 : family.representative) === null || _d === void 0 ? void 0 : _d.subSystem) || ''),
+                responsibility: String(((_e = family === null || family === void 0 ? void 0 : family.representative) === null || _e === void 0 ? void 0 : _e.responsibility) || ''),
                 linkedTestCaseIds: [...family.linkedTestCaseIds].sort((a, b) => a - b),
             });
         })
@@ -1713,48 +1706,30 @@ class ResultDataProvider {
         }
         return [...out].sort((a, b) => a - b);
     }
-    extractMewpRequirementIdentifier(fields, fallbackWorkItemId) {
+    extractMewpRequirementIdentifier(fields) {
         const entries = Object.entries(fields || {});
-        // First pass: only trusted identifier-like fields.
-        const strictHints = [
+        const normalizeFieldKey = (value) => String(value || '')
+            .toLowerCase()
+            .replace(/[^a-z0-9]/g, '');
+        // Strict MEWP mode: only explicit MEWP customer-id fields are accepted.
+        // API display name: "Customer ID"
+        // API reference name: "Custom.CustomerID"
+        const customerIdFieldKeys = new Set([
             'customerid',
-            'customer id',
-            'customerrequirementid',
-            'requirementid',
-            'externalid',
-            'srid',
-            'sapwbsid',
-        ];
+            'customcustomerid',
+        ]);
         for (const [key, value] of entries) {
-            const normalizedKey = String(key || '').toLowerCase();
-            if (!strictHints.some((hint) => normalizedKey.includes(hint)))
+            const normalizedKey = normalizeFieldKey(key);
+            if (!customerIdFieldKeys.has(normalizedKey))
                 continue;
             const valueAsString = this.toMewpComparableText(value);
             if (!valueAsString)
                 continue;
-            const normalized = this.normalizeMewpRequirementCodeWithSuffix(valueAsString);
-            if (normalized)
-                return normalized;
+            const normalizedRequirementId = this.normalizeMewpRequirementCodeWithSuffix(valueAsString);
+            if (normalizedRequirementId)
+                return normalizedRequirementId;
         }
-        // Second pass: weaker hints, but still key-based only.
-        const looseHints = ['customer', 'requirement', 'external', 'sapwbs', 'sr'];
-        for (const [key, value] of entries) {
-            const normalizedKey = String(key || '').toLowerCase();
-            if (!looseHints.some((hint) => normalizedKey.includes(hint)))
-                continue;
-            const valueAsString = this.toMewpComparableText(value);
-            if (!valueAsString)
-                continue;
-            const normalized = this.normalizeMewpRequirementCodeWithSuffix(valueAsString);
-            if (normalized)
-                return normalized;
-        }
-        // Optional fallback from title only (avoid scanning all fields and accidental SR matches).
-        const title = this.toMewpComparableText(fields === null || fields === void 0 ? void 0 : fields['System.Title']);
-        const titleCode = this.normalizeMewpRequirementCodeWithSuffix(title);
-        if (titleCode)
-            return titleCode;
-        return fallbackWorkItemId ? `SR${fallbackWorkItemId}` : '';
+        return '';
     }
     deriveMewpResponsibility(fields) {
         const explicitSapWbs = this.toMewpComparableText(fields === null || fields === void 0 ? void 0 : fields['Custom.SAPWBS']);