Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Tous les changements notables de Ara sont documentés ici avec leur date, leur c
## 30/11/2022

### Nouvelles fonctionnalités 🚀

- Ajout d’une mise en avant pour notifier le caractère obligatoire de la déclaration d’accessibilité ([#206](https://github.com/DISIC/Ara/pull/206))
- Ajout de l'URL de la page près de son nom dans le rapport d’erreurs ([#231](https://github.com/DISIC/Ara/pull/231))

### Autres changements ⚙️

- Ajout du changelog ([#207](https://github.com/DISIC/Ara/pull/207))
Expand Down
50 changes: 28 additions & 22 deletions confiture-web-app/src/components/ReportErrors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ const errors = computed(() => {
(results, pageId) => {
return {
pageId: Number(pageId),
pageName: getPageName(Number(pageId)),
pageName: getPage(Number(pageId)).name,
pageUrl: getPage(Number(pageId)).url,
topics: Object.values(
mapValues(groupBy(results, "topic"), (results, topicNumber) => {
return {
Expand Down Expand Up @@ -141,12 +142,13 @@ function getCriteriumTitle(topicNumber: number, criteriumNumber: number) {
return marked.parseInline(getCriterium(topicNumber, criteriumNumber).title);
}

function getPageName(pageId: number) {
return report.data!.context.samples.find((p) => p.id === pageId)!.name;
/** Get a page by its id */
function getPage(pageId: number) {
return report.data!.context.samples.find((p) => p.id === pageId)!;
}

function getPageSlug(pageId: number) {
return slugify(getPageName(pageId));
return slugify(getPage(pageId)?.name);
}

/**
Expand Down Expand Up @@ -348,12 +350,18 @@ function updateActiveAnchorLink(id: string, event: MouseEvent) {
</button>
</div>
<section v-for="page in errors" :key="page.pageId" class="fr-mb-8w">
<h2
:id="`${getPageSlug(page.pageId)}`"
class="fr-mb-4w fr-h3 page-title"
>
{{ page.pageName }}
</h2>
<div class="fr-mb-4w page-title-container">
<h2
:id="`${getPageSlug(page.pageId)}`"
class="fr-h3 fr-mb-0 page-title"
>
{{ page.pageName }}
</h2>
<a :href="page.pageUrl" class="" target="_blank" rel="noopener">
{{ page.pageUrl }}
<span class="sr-only"> (ouvre dans un nouvel onglet) </span>
</a>
</div>

<div
v-for="(topic, i) in page.topics"
Expand Down Expand Up @@ -430,16 +438,6 @@ function updateActiveAnchorLink(id: string, event: MouseEvent) {
</div>
</div>
</div> -->
<p
class="fr-text--xs fr-mt-3w fr-mb-1w error-accordion-subtitle"
>
URL de la page concernée
</p>
<p class="fr-mb-0">
<a href="https://example.com" target="_blank" class="fr-link"
>https://example.com</a
>
</p>
</LazyAccordion>

<!-- Recommendation -->
Expand Down Expand Up @@ -488,6 +486,14 @@ function updateActiveAnchorLink(id: string, event: MouseEvent) {
box-shadow: inset -1px 0 0 0 var(--border-default-grey);
}

.page-title-container {
display: flex;
justify-content: space-between;
align-items: center;
gap: 1rem;
flex-wrap: wrap;
}

.page-title {
color: var(--text-active-blue-france);
}
Expand All @@ -496,9 +502,9 @@ function updateActiveAnchorLink(id: string, event: MouseEvent) {
color: var(--text-title-grey);
}

.error-accordion-subtitle {
/* .error-accordion-subtitle {
color: var(--text-mention-grey);
}
} */

.fr-sidemenu__inner {
box-shadow: none !important;
Expand Down