accessibility-insights-report 4.6.4 → 4.6.5

package/drop/index.js

@@ -325,8 +325,8 @@ var AllRuleResultStatuses = [
 ];
 
 // src/common/rule-based-view-model-provider.ts
-var getCardViewData = (rules, results, cardSelectionViewData) => {
-  if (results == null || rules == null || cardSelectionViewData == null) {
+var getCardViewData = (results, cardSelectionViewData, rules) => {
+  if (results == null || cardSelectionViewData == null) {
     return null;
   }
   const statusResults = getEmptyStatusResults();
@@ -336,12 +336,8 @@ var getCardViewData = (rules, results, cardSelectionViewData) => {
     const isInstanceDisplayed = result.status === "fail" || result.status === "unknown";
     let ruleResult = getExistingRuleFromResults(result.ruleId, ruleResults);
     if (ruleResult == null) {
-      const rule = getUnifiedRule(result.ruleId, rules);
-      if (!rule) {
-        continue;
-      }
-      const isExpanded = isInstanceDisplayed ? (0, import_lodash.includes)(cardSelectionViewData.expandedRuleIds, rule.id) : false;
-      ruleResult = createCardRuleResult(result.status, rule, isExpanded);
+      const isExpanded = isInstanceDisplayed ? (0, import_lodash.includes)(cardSelectionViewData.expandedRuleIds, result.ruleId) : false;
+      ruleResult = createCardRuleResult(result.status, result.rule, isExpanded);
       ruleResults.push(ruleResult);
     }
     const isSelected = isInstanceDisplayed ? (0, import_lodash.includes)(cardSelectionViewData.selectedResultUids, result.uid) : false;
@@ -349,9 +345,11 @@ var getCardViewData = (rules, results, cardSelectionViewData) => {
     ruleResult.nodes.push(createCardResult(result, isSelected, highlightStatus));
     ruleIdsWithResultNodes.add(result.ruleId);
   }
-  for (const rule of rules) {
-    if (!ruleIdsWithResultNodes.has(rule.id)) {
-      statusResults.inapplicable.push(createRuleResultWithoutNodes("inapplicable", rule));
+  if (rules) {
+    for (const rule of rules) {
+      if (!ruleIdsWithResultNodes.has(rule.id)) {
+        statusResults.inapplicable.push(createRuleResultWithoutNodes("inapplicable", rule));
+      }
     }
   }
   return {
@@ -389,14 +387,13 @@ var createRuleResultWithoutNodes = (status, rule) => ({
   guidance: rule.guidance,
   isExpanded: false
 });
-var createCardResult = (unifiedResult, isSelected, highlightStatus) => {
+var createCardResult = (result, isSelected, highlightStatus) => {
   return {
-    ...unifiedResult,
+    ...result,
     isSelected,
     highlightStatus
   };
 };
-var getUnifiedRule = (id2, rules) => rules.find((rule) => rule.id === id2);
 var getRuleResultIndex = (ruleId, ruleResults) => ruleResults.findIndex((result) => result.id === ruleId);
 
 // src/common/uid-generator.ts
@@ -507,11 +504,12 @@ function extractRelatedSelectors(nodeResult) {
 
 // src/injected/adapters/resolution-creator.ts
 var getFixResolution = (data) => {
+  var _a, _b, _c;
   return {
     "how-to-fix-web": {
-      any: data.nodeResult.any.map((checkResult) => checkResult.message),
-      none: data.nodeResult.none.map((checkResult) => checkResult.message),
-      all: data.nodeResult.all.map((checkResult) => checkResult.message)
+      any: (_a = data.nodeResult.any) == null ? void 0 : _a.map((checkResult) => checkResult.message),
+      none: (_b = data.nodeResult.none) == null ? void 0 : _b.map((checkResult) => checkResult.message),
+      all: (_c = data.nodeResult.all) == null ? void 0 : _c.map((checkResult) => checkResult.message)
     }
   };
 };
@@ -3341,6 +3339,28 @@ var SummaryReportSectionFactory = {
   resultSectionsOrder: ["failed", "notApplicable", "passed"]
 };
 
+// src/common/store-data-to-scan-node-result-converter.ts
+var import_applicationinsights_core_js = require("@microsoft/applicationinsights-core-js");
+var import_lodash13 = require("lodash");
+function convertUnifiedStoreDataToScanNodeResults(unifiedScanResultStoreData) {
+  const { rules, results } = unifiedScanResultStoreData;
+  if ((0, import_applicationinsights_core_js.isNullOrUndefined)(unifiedScanResultStoreData) || (0, import_applicationinsights_core_js.isNullOrUndefined)(results)) {
+    return null;
+  }
+  const transformedResults = results.map((unifiedResult) => {
+    const rule = rules ? (0, import_lodash13.find)(rules, (unifiedRule) => unifiedRule.id === unifiedResult.ruleId) : { id: unifiedResult.ruleId };
+    if (rule == null) {
+      throw new Error(`Got result with unknown ruleId ${unifiedResult.ruleId}`);
+    }
+    const result = {
+      ...unifiedResult,
+      rule
+    };
+    return result;
+  });
+  return transformedResults;
+}
+
 // src/reports/package/axe-results-report.ts
 var AxeResultsReport = class {
   constructor(deps, parameters, toolInfo) {
@@ -3368,7 +3388,8 @@ var AxeResultsReport = class {
       visualHelperEnabled: false,
       resultsHighlightStatus: {}
     };
-    const cardsViewModel = getCards(unifiedRules, unifiedResults, cardSelectionViewData);
+    const scanNodeResults = convertUnifiedStoreDataToScanNodeResults({ rules: unifiedRules, results: unifiedResults });
+    const cardsViewModel = getCards(scanNodeResults, cardSelectionViewData, unifiedRules);
     const targetAppInfo = {
       name: pageTitle,
       url: results.url
@@ -3425,7 +3446,7 @@ var CombinedResultsReport = class {
 };
 
 // src/reports/package/combined-results-to-cards-model-converter.ts
-var import_lodash13 = require("lodash");
+var import_lodash14 = require("lodash");
 var CombinedResultsToCardsModelConverter = class {
   constructor(mapAxeTagsToGuidanceLinks2, cardSelectionViewData, uuidGenerator, helpUrlGetter, getFixResolution2, extractRelatedSelectors2) {
     this.mapAxeTagsToGuidanceLinks = mapAxeTagsToGuidanceLinks2;
@@ -3451,7 +3472,7 @@ var CombinedResultsToCardsModelConverter = class {
       };
     };
     this.getCardRuleResults = (rules) => {
-      if ((0, import_lodash13.isNil)(rules)) {
+      if ((0, import_lodash14.isNil)(rules)) {
         return [];
       }
       return rules.map((rule) => this.getCardRuleResult(rule));
@@ -3463,7 +3484,7 @@ var CombinedResultsToCardsModelConverter = class {
         url: this.helpUrlGetter.getHelpUrl(rule.ruleId, rule.ruleUrl),
         isExpanded: false,
         guidance: this.mapAxeTagsToGuidanceLinks(rule.ruleId, rule.tags),
-        nodes: (0, import_lodash13.isNil)(nodes) ? [] : nodes
+        nodes: (0, import_lodash14.isNil)(nodes) ? [] : nodes
       };
     };
     this.getFailuresGroupedByRule = (groupedFailures) => {
@@ -5330,7 +5351,7 @@ var link = {
 };
 
 // src/scanner/map-axe-tags-to-guidance-links.ts
-var import_lodash14 = require("lodash");
+var import_lodash15 = require("lodash");
 var BestPractice = {
   text: "",
   href: "",
@@ -5341,7 +5362,7 @@ var bestPracticeToGuidanceTagOverrideMapping = {
   "presentation-role-conflict": ["wcag131"]
 };
 function addGuidanceTagOverrides(resultId, currentTags) {
-  return (0, import_lodash14.concat)(currentTags ?? [], bestPracticeToGuidanceTagOverrideMapping[resultId] ?? []);
+  return (0, import_lodash15.concat)(currentTags ?? [], bestPracticeToGuidanceTagOverrideMapping[resultId] ?? []);
 }
 function mapAxeTagToGuidanceLink(axeTag) {
   if (axeTag === "best-practice") {
@@ -5357,7 +5378,7 @@ function mapAxeTagsToGuidanceLinks(resultId, axeTags) {
   const normalizedTags = addGuidanceTagOverrides(resultId, axeTags);
   const unsortedMaybeLinks = normalizedTags.map(mapAxeTagToGuidanceLink);
   const unsortedLinks = unsortedMaybeLinks.filter(isNotNull);
-  const sortedLinks = (0, import_lodash14.sortBy)(unsortedLinks, (link2) => link2.text);
+  const sortedLinks = (0, import_lodash15.sortBy)(unsortedLinks, (link2) => link2.text);
   return sortedLinks;
 }
 function isNotNull(maybeInstance) {
@@ -5782,14 +5803,14 @@ function initializeFabricIcons() {
 }
 
 // src/common/get-guidance-tags-from-guidance-links.ts
-var import_lodash15 = require("lodash");
+var import_lodash16 = require("lodash");
 var GetGuidanceTagsFromGuidanceLinks = (links) => {
-  if (!links || (0, import_lodash15.isArray)(links) === false) {
+  if (!links || (0, import_lodash16.isArray)(links) === false) {
     return [];
   }
   const tags = [];
   links.forEach((link2) => {
-    if ((0, import_lodash15.isObject)(link2) === false || (0, import_lodash15.isArray)(link2.tags) === false) {
+    if ((0, import_lodash16.isObject)(link2) === false || (0, import_lodash16.isArray)(link2.tags) === false) {
       return;
     }
     link2.tags.forEach((tag) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "accessibility-insights-report",
-    "version": "4.6.4",
+    "version": "4.6.5",
     "description": "Accessibility Insights Report",
     "license": "MIT",
     "files": [
@@ -22,7 +22,7 @@
         "axe-core": "4.6.3",
         "classnames": "^2.3.2",
         "lodash": "^4.17.21",
-        "luxon": "^3.2.1",
+        "luxon": "^3.3.0",
         "react": "^16.14.0",
         "react-dom": "^16.14.0",
         "react-helmet": "^6.1.0",