fix: cheerioAPI text(); events missing data-element error handling (#538

)
italia · Nov 5, 2024 · 934d29b · 934d29b
1 parent 76892da
commit 934d29b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/audits/municipality/serviziAudit.ts b/src/audits/municipality/serviziAudit.ts
@@ -3,7 +3,7 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import lighthouse from "lighthouse";
-import { CheerioAPI, text } from "cheerio";
+import { CheerioAPI } from "cheerio";
 import {
   checkBreadcrumb,
   checkOrder,
@@ -172,7 +172,7 @@ class LoadAudit extends Audit {
 
       for (const mandatoryVoiceDataElement of mandatoryVoicesDataElements.paragraph) {
         const dataElement = `[data-element="${mandatoryVoiceDataElement.data_element}"]`;
-        const textContent = text($(dataElement));
+        const textContent = $(dataElement).text();
         if (textContent.length >= 3) {
           indexElementsWithContent.push(mandatoryVoiceDataElement.key);
         }

diff --git a/src/audits/school/serviziAudit.ts b/src/audits/school/serviziAudit.ts
@@ -22,7 +22,7 @@ import {
   contentTypeItemsMetadata,
 } from "../../storage/school/contentTypeItems";
 import { auditDictionary } from "../../storage/auditDictionary";
-import { CheerioAPI, text } from "cheerio";
+import { CheerioAPI } from "cheerio";
 import { auditScanVariables } from "../../storage/school/auditScanVariables";
 import {
   errorHandling,
@@ -173,7 +173,7 @@ class LoadAudit extends Audit {
 
       for (const mandatoryVoiceDataElement of mandatoryVoicesDataElements.paragraph) {
         const dataElement = `[data-element="${mandatoryVoiceDataElement.data_element}"]`;
-        const textContent = text($(dataElement));
+        const textContent = $(dataElement).text();
         if (textContent.length >= 3) {
           indexElementsWithContent.push(mandatoryVoiceDataElement.key);
         }

diff --git a/src/utils/municipality/utils.ts b/src/utils/municipality/utils.ts
@@ -1058,15 +1058,19 @@ const getPages = async (
             break;
           }
           case "events": {
+            const primaryPageUrl = await getPrimaryPageUrl(
+              url,
+              primaryMenuItems.live.data_element
+            );
+
+            if (!primaryPageUrl) {
+              throw new DataElementError(primaryMenuItems.live.data_element);
+            }
+
             requestedPages = await getRandomThirdLevelPagesUrl(
               url,
               await getButtonUrl(
-                await loadPageData(
-                  await getPrimaryPageUrl(
-                    url,
-                    primaryMenuItems.live.data_element
-                  )
-                ),
+                await loadPageData(primaryPageUrl),
                 url,
                 `[data-element="${primaryMenuItems.live.secondary_item_data_element[1]}"]`
               ),