Updates the Report Screen to show the correct number of errors, fixed print screen discrepancies.

Author: mbusch3

assets/js/Components/App.js

@@ -134,10 +134,9 @@ export default function App(initialData) {
   const processNewReport = (rawReport) => {
     const tempReport = analyzeReport(rawReport, ISSUE_STATE)
     setReport(tempReport)
-    console.log(tempReport)
 
     let api = new Api(settings)
-    api.setReportData(tempReport.id, {'scanCounts': tempReport.scanCounts})
+    api.setReportData(tempReport.id, {'scanCounts': tempReport.scanCounts, 'scanRules': tempReport.scanRules})
       .then((response) => response.json())
       .then((data) => {
         if(data.errors && data.errors.length > 0) {

assets/js/Components/Reports/ReportsTable.js

@@ -9,9 +9,9 @@ export default function ReportsTable({
 
   const headers = [
     { id: "created", text: t('report.header.date') },
-    { id: "errors", text: t('report.header.issues'), alignText: 'center' },
-    { id: "potentialIssues", text: t('report.header.potential'), alignText: 'center' },
-    { id: "files", text: t('report.header.files_unreviewed'), alignText: 'center', divider: true },
+    { id: "knownBarriers", text: t('report.header.issues'), alignText: 'center' },
+    { id: "potentialBarriers", text: t('report.header.potential'), alignText: 'center' },
+    { id: "filesUnreviewed", text: t('report.header.files_unreviewed'), alignText: 'center', divider: true },
     { id: "contentHandled", text: t('report.header.items_handled'), alignText: 'center' },
     { id: "filesReviewed", text: t('report.header.files_reviewed'), alignText: 'center'}
   ]
@@ -35,14 +35,14 @@ export default function ReportsTable({
 
     list = list.map((report) => {
       if(report.scanCounts) {
-        report.issues = report.scanCounts.issues
-        report.potentialIssues = report.scanCounts.potentials
-        report.files = report.scanCounts.files || 0
+        report.knownBarriers = report.scanCounts.errors || 0
+        report.potentialBarriers = report.scanCounts.potentials
+        report.filesUnreviewed = report.scanCounts.files || 0
       }
       else {
-        report.issues = report.errors || 0
-        report.potentialIssues = 0
-        report.files = 0
+        report.knownBarriers = report.errors || 0
+        report.potentialBarriers = 0
+        report.filesUnreviewed = 0
       }
       report.contentHandled = report.contentFixed + report.contentResolved || 0
       return report

assets/js/Components/ReportsPage.js

@@ -38,23 +38,20 @@ export default function ReportsPage({t, report, settings, quickSearchTerm}) {
         rules[rule] = {
           id: rule,
           type: issue.type,
+          severity: (issue.type == 'error' ? t("filter.label.severity.issue_single") : t("filter.label.severity.potential_single")),
           active: 0,
-          fixed: 0,
           resolved: 0,
           total: 0
         }
       }
 
-      if (2 === status) {
-        rules[rule]['resolved']++
-      }
-      else if (1 === status) {
-        rules[rule]['fixed']++
+      rules[rule]['total']++
+      if (0 === status) {
+        rules[rule]['active']++
       }
       else {
-        rules[rule]['active']++
+        rules[rule]['resolved']++
       }
-      rules[rule]['total']++
     }
 
     return rules
@@ -73,9 +70,9 @@ export default function ReportsPage({t, report, settings, quickSearchTerm}) {
   const getPrintableReportsTable = (reports, t) => {
     const headers = [
       { id: "created", text: t('report.header.date') },
-      { id: "errors", text: t('report.header.issues'), alignText: 'center' },
-      { id: "potentialIssues", text: t('report.header.potential'), alignText: 'center' },
-      { id: "files", text: t('report.header.suggestions'), alignText: 'center' },
+      { id: "knownBarriers", text: t('report.header.issues'), alignText: 'center' },
+      { id: "potentialBarriers", text: t('report.header.potential'), alignText: 'center' },
+      { id: "filesUnreviewed", text: t('report.header.suggestions'), alignText: 'center' },
       { id: "contentHandled", text: t('report.header.items_handled'), alignText: 'center' },
       { id: "filesReviewed", text: t('report.header.files_reviewed'), alignText: 'center'}
     ]
@@ -102,9 +99,8 @@ export default function ReportsPage({t, report, settings, quickSearchTerm}) {
   const getPrintableIssuesTable = (issues, t) => {
     const headers = [
       { id: "label", text: t('report.header.issue_type') },
-      { id: "type", text: t('report.header.severity')},
+      { id: "severity", text: t('report.header.severity')},
       { id: "active", text: t('report.header.active'), alignText: 'center' },
-      { id: "fixed", text: t('report.header.fixed'), alignText: 'center' },
       { id: "resolved", text: t('report.header.resolved'), alignText: 'center' },
       { id: "total", text: t('report.header.total'), alignText: 'center' }
     ]
@@ -168,14 +164,16 @@ export default function ReportsPage({t, report, settings, quickSearchTerm}) {
           </style>
         </head>
         <body>
-          <h2>${t('report.label.printed_report')}</h2>
+          <h2>${t('report.label.printed_report')}</h2>` +
+          (showChart ? `
           <div id="printResolutionsReport">
             <img src="${dataUrl}" alt="${t('report.label.resolutions_chart')}" style="max-width: 100%; height: auto; margin-bottom: 20px;" />
-          </div>
+          </div>` : '') +
+          (showTable ?  `
           <div id="reportsTable">
             ${reportsTableRaw}
-          </div>
-          <div id="issuesTable">
+          </div>` : '') + 
+          `<div id="issuesTable">
             ${issuesTableRaw}
           </div>
           <script>

assets/js/Services/Report.js

@@ -79,6 +79,7 @@ export function analyzeReport(report, ISSUE_STATE) {
     suggestions: 0,
     files: 0,
   }
+  let scanRules = {}
   let sessionIssues = {}
   let currentTime = new Date()
   let millisecondsInADay = 86400000 // 1000 * 60 * 60 * 24
@@ -158,6 +159,13 @@ export function analyzeReport(report, ISSUE_STATE) {
       if(!usedContentItems[issue.contentItemId] && report.contentItems[issue.contentItemId]) {
         usedContentItems[issue.contentItemId] = report.contentItems[issue.contentItemId]
       }
+
+      if(!(issue.scanRuleId in scanRules)) {
+        scanRules[issue.scanRuleId] = 1
+      }
+      else {
+        scanRules[issue.scanRuleId] += 1
+      }
     }
   })
 
@@ -173,6 +181,7 @@ export function analyzeReport(report, ISSUE_STATE) {
 
   tempReport.issues = activeIssues
   tempReport.scanCounts = scanCounts
+  tempReport.scanRules = scanRules
   tempReport.contentItems = usedContentItems
   tempReport.sessionIssues = sessionIssues
   tempReport.filesReviewed = tempFilesReviewed