order pages in report statement and report errors

Author: bellangerq

confiture-rest-api/src/audits/audit.service.ts

@@ -788,13 +788,15 @@ export class AuditService {
             browserVersion: e.browserVersion
           })),
         referencial: "RGAA Version 4.1",
-        samples: audit.pages.map((p, i) => ({
-          name: p.name,
-          order: p.order,
-          number: i + 1,
-          url: p.url,
-          id: p.id
-        })),
+        samples: audit.pages
+          .map((p, i) => ({
+            name: p.name,
+            order: p.order,
+            number: i + 1,
+            url: p.url,
+            id: p.id
+          }))
+          .sort((p) => p.order),
         tools: audit.tools,
         technologies: audit.technologies
       },

confiture-web-app/src/components/report/ReportErrors.vue

@@ -66,6 +66,7 @@ const errors = computed(() => {
       mapValues(resultsGroupedByPage, (results, pageId) => {
         return {
           pageId: Number(pageId),
+          pageOrder: getPage(Number(pageId)).order,
           pageName: getPage(Number(pageId)).name,
           pageUrl: getPage(Number(pageId)).url,
           topics: sortBy(
@@ -86,15 +87,7 @@ const errors = computed(() => {
         };
       })
     ),
-    (el) => {
-      return report.data?.context.samples.indexOf(
-        // TODO: TS error
-        // @ts-expect-error #sendHelp
-        report.data?.context.samples.find((s) => {
-          return s.name === el.pageName;
-        })
-      );
-    }
+    (el) => el.pageOrder
   );
 
   return data;

confiture-web-app/src/types/report.ts

@@ -96,6 +96,7 @@ interface AuditReportContext {
 interface PageSample {
   // number: number;
   id: number;
+  order: number;
   name: string;
   url: string;
 }