@govtechsg/oobee 0.10.86 → 0.10.87

package/src/static/ejs/partials/scripts/ruleModal/pageAccordionBuilder.ejs

@@ -86,7 +86,7 @@
             // Use pre-computed htmlGroups for count if available, otherwise use pages
             const count = isHtmlGrouping && selectedCategory.htmlGroups
               ? Object.keys(selectedCategory.htmlGroups).length
-              : selectedCategory.pagesAffected.length;
+              : (selectedCategory.pagesAffectedCount || selectedCategory.pagesAffected.length);
             if (isHtmlGrouping) {
               dropdownTitle.innerText = `HTML elements affected by this issue (${count})`;
             } else {

package/src/static/ejs/partials/scripts/ruleModal/ruleOffcanvas.ejs

@@ -270,8 +270,8 @@ include('./pageAccordionBuilder') %> <%- include('./constants') %>
           if (!Array.isArray(rule.pagesAffected)) return;
 
           rule.pagesAffected.sort((a, b) => {
-            const lenA = Array.isArray(a.items) ? a.items.length : 0;
-            const lenB = Array.isArray(b.items) ? b.items.length : 0;
+            const lenA = Array.isArray(a.items) ? a.items.length : a.itemsCount || 0;
+            const lenB = Array.isArray(b.items) ? b.items.length : b.itemsCount || 0;
             return lenB - lenA; // DESC
           });
         });
@@ -295,10 +295,10 @@ include('./pageAccordionBuilder') %> <%- include('./constants') %>
             dropdownToggle.innerText = `${ruleInCategory.totalItems} Total occ.`;
             dropdownToggle.setAttribute('aria-label', occurrencesText);
           document.getElementById('expandedRuleDropdownTitle').innerText =
-            `Pages affected by this issue (${ruleInCategory.pagesAffected.length})`;
+            `Pages affected by this issue (${(ruleInCategory.pagesAffectedCount || ruleInCategory.pagesAffected.length)})`;
           buildExpandedRuleCategoryContent(category, ruleInCategory);
           document.getElementById('expandedRulePageContent').innerText =
-            `Total ${ruleInCategory.pagesAffected.length} affected pages`;
+            `Total ${(ruleInCategory.pagesAffectedCount || ruleInCategory.pagesAffected.length)} affected pages`;
         }
       }
     });

package/src/static/ejs/summary.ejs

@@ -21,18 +21,24 @@
     %>
     <script>
       const scanItems = <%- JSON.stringify(
-        {
-          ...items,
-          ...['mustFix','goodToFix','needsReview','passed'].reduce((acc, cat) => {
-            if (items[cat]) {
-              acc[cat] = {
-                ...items[cat],
-                rules: (items[cat].rules || []).map(({ htmlGroups, ...rest }) => rest),
-              };
-            }
-            return acc;
-          }, {}),
-        }
+        ['mustFix','goodToFix','needsReview','passed'].reduce((acc, cat) => {
+          if (items[cat]) {
+            acc[cat] = {
+              description: items[cat].description,
+              totalItems: items[cat].totalItems,
+              totalRuleIssues: items[cat].totalRuleIssues,
+              rules: (items[cat].rules || []).map(rule => ({
+                rule: rule.rule,
+                description: rule.description,
+                helpUrl: rule.helpUrl,
+                conformance: rule.conformance,
+                totalItems: rule.totalItems,
+                pagesAffected: { length: (rule.pagesAffected || []).length },
+              })),
+            };
+          }
+          return acc;
+        }, {})
       ).replace(/<\//g, '<\\/') %>
     </script>
     <%- include('partials/scripts/summaryTable') %>

package/src/utils.ts

@@ -5,6 +5,7 @@ import fs from 'fs-extra';
 import axe, { Rule } from 'axe-core';
 import { v4 as uuidv4 } from 'uuid';
 import { getDomain } from 'tldts';
+import { normalizeUrl } from '@apify/utilities';
 import constants, {
   BrowserTypes,
   destinationPath,
@@ -1078,13 +1079,13 @@ export const randomThreeDigitNumberString = () => {
   return String(threeDigitNumber);
 };
 
+export const normUrl = (u: string): string => (u ? normalizeUrl(u) || u : '');
+
 export const isFollowStrategy = (link1: string, link2: string, rule: string): boolean => {
+  if (rule === 'all') return true;
   try {
     const parsedLink1 = new URL(link1);
     const parsedLink2 = new URL(link2);
-    if (rule === 'all') {
-      return true;
-    }
     if (rule === 'same-origin') {
       return parsedLink1.origin === parsedLink2.origin;
     }

package/testStaticJSScanner.html

@@ -186,7 +186,7 @@
       <li>
         <strong>Add the script</strong> — include the scanner before your closing
         <code>&lt;/body&gt;</code> tag:
-        <pre>&lt;script src="https://cdn.jsdelivr.net/gh/GovTechSG/oobee@v0.10.86/oobee-client-scanner.js"&gt;&lt;/script&gt;</pre>
+        <pre>&lt;script src="https://cdn.jsdelivr.net/gh/GovTechSG/oobee@0.10.86/oobee-client-scanner.js"&gt;&lt;/script&gt;</pre>
         
         <br>This points to the <code>v0.10.86</code> release. Update the version tag as needed for newer releases.
       </li>