@govtechsg/oobee 0.10.20 → 0.10.28

package/src/screenshotFunc/pdfScreenshotFunc.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import pdfjs, { PDFPageProxy } from 'pdfjs-dist';
+import  { getDocument, PDFPageProxy } from 'pdfjs-dist';
 import fs from 'fs';
 import { Canvas, createCanvas, SKRSContext2D } from '@napi-rs/canvas';
 import assert from 'assert';
@@ -67,7 +67,7 @@ export async function getPdfScreenshots(
   screenshotPath: string,
 ) {
   const newItems = _.cloneDeep(items);
-  const loadingTask = pdfjs.getDocument({
+  const loadingTask = getDocument({
     url: pdfFilePath,
     standardFontDataUrl: path.join(dirname, '../node_modules/pdfjs-dist/standard_fonts/'),
     disableFontFace: true,
@@ -739,7 +739,7 @@ export const getBboxPage = (bbox, structure) => {
 
 export const getPageFromContext = async (context: string, pdfFilePath: string): Promise<number> => {
   try {
-    const loadingTask = pdfjs.getDocument({
+    const loadingTask = getDocument({
       url: pdfFilePath,
       standardFontDataUrl: path.join(dirname, '../../node_modules/pdfjs-dist/standard_fonts/'),
       disableFontFace: true,

package/src/static/ejs/partials/components/scanAbout.ejs

@@ -225,6 +225,71 @@
         </svg>
       </span>
     </li>
+
+    <li>
+      <svg aria-label="Advanced options scan summary" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+        <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" stroke="#93928D" stroke-width="1.74"/>
+        <path d="M5 9L7.5 11.5L13 6" stroke="#93928D" stroke-width="1.74" stroke-linecap="square"/>
+      </svg>
+      <div>
+        <div class="d-flex flex-row justify-content-center align-items-center gap-3">
+          <button id="advancedScanOptionsSummaryTitle" onclick="toggleAdvanceScanSummary()">Advanced scan summary
+          </button>
+        </div>
+
+      </div>
+    </li>
+    <ul id="advancedScanOptionsSummary" class="d-none mb-3">
+      <li id="showIncludeScreenshots"class="d-flex flex-row">
+          <svg aria-label="Include screenshots was checked" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+            <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" fill="#93928D" stroke="#93928D" stroke-width="1.74"/>
+            <path d="M5 9L7.5 11.5L13 6" fill="none" stroke="#ffffff" stroke-width="1.74" stroke-linecap="square"/>
+          </svg>
+        <div>Include screenshots
+        </div>
+      </li>
+      <li id="showAllowSubdomains"class="d-flex flex-row">
+          <svg aria-label="Allow subdomains was checked" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+            <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" fill="#93928D" stroke="#93928D" stroke-width="1.74"/>
+            <path d="M5 9L7.5 11.5L13 6" fill="none" stroke="#ffffff" stroke-width="1.74" stroke-linecap="square"/>
+          </svg>
+        <div>Allow subdomains for scans
+        </div>
+      </li>
+      <li id="showEnableCustomChecks"class="d-flex flex-row">
+        <svg aria-label="Enable custom checks was checked" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+          <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" fill="#93928D" stroke="#93928D" stroke-width="1.74"/>
+          <path d="M5 9L7.5 11.5L13 6" fill="none" stroke="#ffffff" stroke-width="1.74" stroke-linecap="square"/>
+        </svg>
+      <div>Enable custom checks
+      </div>
+    </li>
+    <li id="showEnableWcagAaa"class="d-flex flex-row">
+        <svg aria-label="Enable WCAG AAA checks was checked" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+          <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" fill="#93928D" stroke="#93928D" stroke-width="1.74"/>
+          <path d="M5 9L7.5 11.5L13 6" fill="none" stroke="#ffffff" stroke-width="1.74" stroke-linecap="square"/>
+        </svg>
+      <div>Enable WCAG AAA checks
+      </div>
+    </li>
+      <li id="showSlowScanMode"class="d-flex flex-row">
+          <svg aria-label="Slow scan mode was checked" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+            <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" fill="#93928D" stroke="#93928D" stroke-width="1.74"/>
+            <path d="M5 9L7.5 11.5L13 6" fill="none" stroke="#ffffff" stroke-width="1.74" stroke-linecap="square"/>
+          </svg>
+        <div>Slow scan mode
+        </div>
+      </li>
+
+      <li id="showAdhereRobots"class="d-flex flex-row">
+          <svg aria-label="Adhere to robots.txt was checked" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+            <rect x="0.87" y="0.87" width="16.26" height="16.26" rx="3.13" fill="#93928D" stroke="#93928D" stroke-width="1.74"/>
+            <path d="M5 9L7.5 11.5L13 6" fill="none" stroke="#ffffff" stroke-width="1.74" stroke-linecap="square"/>
+          </svg>
+        <div>Adhere to robots.txt
+        </div>
+      </li>
+    </ul>
     <li>
       <svg
         aria-label="Scan engine"

package/src/static/ejs/partials/components/wcagCompliance.ejs

@@ -5,24 +5,14 @@
     <span aria-label="Pass percentage" class="ms-2" id="passPercentage"></span>
   </div>
   <div class="wcag-compliance-passes-bar">
-    <div
-      class="wcag-compliance-passes-bar-progress"
-      id="wcag-compliance-passes-bar-progress"
-      style="width: 0%"
-    ></div>
+    <div class="wcag-compliance-passes-bar-progress" id="wcag-compliance-passes-bar-progress" style="width: 0%"></div>
   </div>
   <button id="wcagModalToggle" type="button" data-bs-toggle="modal" data-bs-target="#wcagModal">
     More details
   </button>
 </div>
 <!-- START Modal Pop up -->
-<div
-  id="wcagModal"
-  class="modal fade"
-  tabindex="-1"
-  aria-labelledby="wcagModalLabel"
-  aria-hidden="true"
->
+<div id="wcagModal" class="modal fade" tabindex="-1" aria-labelledby="wcagModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -31,28 +21,19 @@
       </div>
       <div class="modal-body">
         <div>
-          Only 20 WCAG 2.2 Success Criteria can be checked reasonably through automated testing:
+          Only 20 WCAG 2.2 Success Criteria (A & AA) can be checked reasonably through automated testing:
         </div>
         <div class="accordion my-3" id="wcagLinksAccordion">
           <div class="accordion-item">
             <div class="accordion-header" id="wcagLinksAccordionTitle">
-              <button
-                class="accordion-button collapsed"
-                type="button"
-                data-bs-toggle="collapse"
-                data-bs-target="#wcagLinksAccordionContent"
-                aria-expanded="false"
-                aria-controls="wcagLinksAccordionContent"
-              >
-                20 WCAG Success Criteria (A & AA)
+              <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                data-bs-target="#wcagLinksAccordionContent" aria-expanded="false"
+                aria-controls="wcagLinksAccordionContent">
+                20 (A & AA) and 5 (AAA) WCAG Success Criteria
               </button>
             </div>
-            <div
-              id="wcagLinksAccordionContent"
-              class="accordion-collapse collapse"
-              aria-labelledby="wcagLinksAccordionTitle"
-              data-bs-parent="#accordionExample"
-            >
+            <div id="wcagLinksAccordionContent" class="accordion-collapse collapse"
+              aria-labelledby="wcagLinksAccordionTitle" data-bs-parent="#accordionExample">
               <div class="accordion-body">
                 <ul id="wcagLinksList"></ul>
               </div>
@@ -67,4 +48,4 @@
     </div>
   </div>
 </div>
-<!-- END Modal Pop up -->
+<!-- END Modal Pop up -->

package/src/static/ejs/partials/footer.ejs

@@ -1,21 +1,18 @@
 <footer aria-label="Report footer" id="footer" class="card">
   <div class="row mx-0">
     <div class="col-sm-6 text-sm-start">
-      <%
-        const urlScannedField = '64d49b567c3c460011feb8b5'; 
-        const encodedUrlScanned = encodeURIComponent(urlScanned);
-        const versionNumberField = '64db1f79141a46001243b77a';
-        const encodedVersionNumber = encodeURIComponent(phAppVersion);
-        const feedbackForm = `https://form.gov.sg/64d1fcde4d0bb70012010995/?${urlScannedField}=${encodedUrlScanned}&${versionNumberField}=${encodedVersionNumber}`;
-      %>
-      <a href="<%=feedbackForm%>" target="_blank">Help us improve</a>
-      <hr class="d-sm-none" />
+      <% const urlScannedField='64d49b567c3c460011feb8b5' ; const encodedUrlScanned=encodeURIComponent(urlScanned);
+        const versionNumberField='64db1f79141a46001243b77a' ; const
+        encodedVersionNumber=encodeURIComponent(phAppVersion); const
+        feedbackForm=`https://form.gov.sg/64d1fcde4d0bb70012010995/?${urlScannedField}=${encodedUrlScanned}&${versionNumberField}=${encodedVersionNumber}`;
+        %>
+        <a href="<%=feedbackForm%>" target="_blank">Help us improve</a>
+        <hr class="d-sm-none" />
     </div>
     <div class="col-sm-6 text-sm-end">
       Created by
-      <a href="https://form.gov.sg/64d1fcde4d0bb70012010995" target="_blank"
-        >GovTech Accessibility Enabling Team</a
-      >
+      <a href="https://form.gov.sg/64d1fcde4d0bb70012010995" target="_blank">GovTech Accessibility Enabling Team</a> |
+      <a href="https://go.gov.sg/oobee-report-third-party-licenses" target="_blank">Third-Party Licenses</a>
     </div>
   </div>
-</footer>
+</footer>

package/src/static/ejs/partials/scripts/categorySummary.ejs

@@ -17,7 +17,7 @@
         .getElementById('categorySummary')
         .setAttribute('aria-label', `${getFormattedCategoryTitle(category)} summary`);
       selected = event.currentTarget;
-      window.currentCategory = JSON.parse(JSON.stringify(category));
+      window.currentCategory = structuredClone(category);
 
       // Ensures <category>DropdownSelector on mobile view matches
       const matchingDropdownId = category + 'DropdownSelector';
@@ -28,7 +28,7 @@
 
   function loadRulesSummary(category, searchVal) {
     const newItems = [];
-    window.filteredItems = JSON.parse(JSON.stringify(scanItems));
+    window.filteredItems = structuredClone(scanItems);
     if (document.getElementById('searchBarInput').value.trim() !== '') {
       for (let category in filteredItems) {
         handleSearch(category, searchVal, filteredItems);