@govtechsg/oobee 0.10.85 → 0.10.87

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

@@ -1,10 +1,44 @@
 <script>
   /**
-   * Resolves item references (composite "html\x00xpath" strings) to full item data using htmlGroups.
+   * Rebuilds the item list for a page from pre-computed htmlGroups when the light report omits page.items.
+   */
+  function buildItemsFromHtmlGroupsForPage(page, ruleInCategory) {
+    const htmlGroups = ruleInCategory.htmlGroups || {};
+    const resolvedItems = [];
+
+    Object.values(htmlGroups).forEach(groupData => {
+      if (!Array.isArray(groupData.pageUrls) || !groupData.pageUrls.includes(page.url)) {
+        return;
+      }
+
+      resolvedItems.push({
+        html: groupData.html,
+        xpath: groupData.xpath,
+        message: groupData.message,
+        screenshotPath: groupData.screenshotPath,
+        displayNeedsReview: groupData.displayNeedsReview,
+        pageUrl: page.url,
+        pageTitle: page.pageTitle || page.metadata
+      });
+    });
+
+    return resolvedItems;
+  }
+
+  /**
+   * The embedded report payload now omits page.items and rebuilds occurrences from
+   * htmlGroups + page metadata. Keep the older page.items resolution logic below
+   * commented for an easy rollback if we need to restore mixed payload support.
    */
   function resolveItemReferencesForPage(page, ruleInCategory) {
+    return buildItemsFromHtmlGroupsForPage(page, ruleInCategory);
+
+    /*
     const items = page.items || [];
-    if (items.length === 0) return [];
+
+    if (items.length === 0) {
+      return buildItemsFromHtmlGroupsForPage(page, ruleInCategory);
+    }
 
     const isReference = typeof items[0] === 'string';
 
@@ -27,6 +61,7 @@
           pageTitle: page.pageTitle || page.metadata
         };
       }
+
       // Fallback: parse composite key
       const nullByteIndex = compositeKey.indexOf('\x00');
       const html = nullByteIndex !== -1 ? compositeKey.slice(0, nullByteIndex) : compositeKey;
@@ -40,6 +75,7 @@
         pageTitle: page.pageTitle || page.metadata
       };
     });
+    */
   }
 
   function buildItemCardsWithPagination(accordionId, category, ruleInCategory, page, index) {

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,14 +21,25 @@
     %>
     <script>
       const scanItems = <%- JSON.stringify(
-        {
-          ...items,
-          passed: {
-            rules: items.passed.rules.map(r => delete r.pagesAffected),
-            ...items.passed
-          },
-        }
-      ) %>
+        ['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') %>
     <script>

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;
     }