display auditor organisation in a11y statement

Author: bellangerq

confiture-rest-api/src/audits/audit-report.dto.ts

@@ -113,6 +113,10 @@ class ReportContext {
    * @example "john-doe@example.com"
    */
   auditorEmail: string | null;
+  /**
+   * @example "Web Audit Services Corp."
+   */
+  auditorOrganisation: string;
 
   technologies: string[];
 

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

@@ -768,6 +768,7 @@ export class AuditService {
         auditorEmail: audit.showAuditorEmailInReport
           ? audit.auditorEmail
           : null,
+        auditorOrganisation: audit.auditorOrganisation,
         desktopEnvironments: audit.environments
           .filter((e) => e.platform === 'desktop')
           .map((e) => ({

confiture-web-app/src/components/ReportA11yStatement.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed } from "vue";
+import { ref } from "vue";
 import { useRoute } from "vue-router";
 
 import { useWrappedFetch } from "../composables/useWrappedFetch";
@@ -28,11 +28,6 @@ function getA11yLevel() {
 const statementRef = ref<HTMLDivElement>();
 const showCopyAlert = ref(false);
 
-const auditIsInProgress = computed(() => {
-  // The `initiator` field is requied on the a11y declaration form so we can check that it's not null
-  return !report.data?.procedureInitiator;
-});
-
 async function copyA11yStatementHTML() {
   const tagsWithSpacesRegex = /<(?<tagName>\S+)(\s+)>/g; // "<XX  >"
   const whitespaceFollowedTags = /<(?<tagName>p)>\s{1}/g; // "<p> "
@@ -241,9 +236,9 @@ function hideCopyAlert() {
         <h4 class="fr-h2">Résultats des tests</h4>
         <p class="fr-mb-9v fr-mb-md-6w">
           L’audit de conformité réalisé par
-          <strong>{{ report.data.procedureInitiator }}</strong> révèle que
-          <strong>{{ report.data.accessibilityRate }}%</strong> des critères du
-          RGAA version 4 sont respectés.
+          <strong>{{ report.data.context.auditorOrganisation }}</strong> révèle
+          que <strong>{{ report.data.accessibilityRate }}%</strong> des critères
+          du RGAA version 4 sont respectés.
         </p>
         <!--ul class="fr-mb-9v fr-mb-md-6w">
         <li>

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

@@ -80,6 +80,7 @@ interface AuditReportContext {
 
   auditorName: string;
   auditorEmail: string | null;
+  auditorOrganisation: string;
 
   technologies: string[];