Skip to content

Commit

Permalink
feat(report): fixer les entêtes du tableau (#203)
Browse files Browse the repository at this point in the history
* fix(report): alert title required

* fix(report): alert type warning unknown

* fix(report): remove unused code

* chore(report): update jest snapshots

* feat(report): fixer les entêtes du tableau
Fixes #144

* fix: release

* fix(report): declaration rgpd alert title missing

* fix: fix some dsfr icons issues

Co-authored-by: = <=>
Co-authored-by: Julien Bouquillon <[email protected]>
  • Loading branch information
tristanrobert and Julien Bouquillon authored Jul 7, 2022
1 parent 61a6275 commit 54db068
Show file tree
Hide file tree
Showing 14 changed files with 163 additions and 130 deletions.
3 changes: 1 addition & 2 deletions report/www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"test": "jest"
},
"dependencies": {
"@dataesr/react-dsfr": "^0.9.8",
"@gouvfr/dsfr": "^1.3.0",
"@dataesr/react-dsfr": "^2.5.0",
"@socialgouv/matomo-next": "^1.2.2",
"@testing-library/user-event": "^13.5.0",
"country-flag-icons": "^1.4.20",
Expand Down
3 changes: 2 additions & 1 deletion report/www/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { Container } from "@dataesr/react-dsfr";
import Head from "next/head";
import { init } from "@socialgouv/matomo-next";

import "@gouvfr/dsfr/dist/dsfr/dsfr.min.css";
import "@gouvfr/dsfr/dist/utility/utility.main.min.css";
import "@gouvfr/dsfr/dist/dsfr/dsfr.main.min.css";
import "rc-tooltip/assets/bootstrap.css";

import { HeaderSite } from "../src/components/HeaderSite";
Expand Down
4 changes: 2 additions & 2 deletions report/www/src/__tests__/__snapshots__/Dashboard.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`Should render empty Dashboard 1`] = `null`;

exports[`Should render full Dashboard 1`] = `
<div
className="fr-table tableWrapper"
className="fr-table fr-table--header-fixed tableWrapper"
>
<table
className="table"
Expand Down Expand Up @@ -6952,7 +6952,7 @@ exports[`Should render full Dashboard 1`] = `

exports[`Tools config Should render Dashboard with limited tools 1`] = `
<div
className="fr-table tableWrapper"
className="fr-table fr-table--header-fixed tableWrapper"
>
<table
className="table"
Expand Down
29 changes: 9 additions & 20 deletions report/www/src/__tests__/__snapshots__/Intro.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ exports[`Should render Intro 1`] = `
<br />
<div
class="fr-alert fr-alert--success"
role="alert"
>
<p
class="fr-alert__title"
Expand All @@ -104,7 +103,6 @@ exports[`Should render Intro 1`] = `
</div>
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand All @@ -114,8 +112,7 @@ exports[`Should render Intro 1`] = `
</p>
</div>
<div
class="fr-alert fr-alert--warning"
role="alert"
class="fr-alert fr-alert--error"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -174,7 +171,6 @@ exports[`Should render Intro 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -225,7 +221,6 @@ exports[`Should render Intro 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -306,7 +301,6 @@ exports[`Should render Intro 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -388,7 +382,6 @@ exports[`Should render Intro 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -537,7 +530,6 @@ exports[`Should render Intro 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -619,12 +611,13 @@ exports[`Should render Intro 1`] = `
</li>
<br />
<div
class="fr-alert fr-alert--warning"
role="alert"
class="fr-alert fr-alert--error"
>
<p
class="fr-alert__title"
/>
>
thirdparties
</p>
<p>
Certains script légitimes peuvent apparaitre dans cette catégorie s'ils sont hébergés sur d'autres serveurs
</p>
Expand Down Expand Up @@ -867,7 +860,6 @@ exports[`Tools config Should render Intro with limited tools 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -918,7 +910,6 @@ exports[`Tools config Should render Intro with limited tools 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -999,7 +990,6 @@ exports[`Tools config Should render Intro with limited tools 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -1081,7 +1071,6 @@ exports[`Tools config Should render Intro with limited tools 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -1163,7 +1152,6 @@ exports[`Tools config Should render Intro with limited tools 1`] = `
<br />
<div
class="fr-alert fr-alert--info"
role="alert"
>
<p
class="fr-alert__title"
Expand Down Expand Up @@ -1245,12 +1233,13 @@ exports[`Tools config Should render Intro with limited tools 1`] = `
</li>
<br />
<div
class="fr-alert fr-alert--warning"
role="alert"
class="fr-alert fr-alert--error"
>
<p
class="fr-alert__title"
/>
>
thirdparties
</p>
<p>
Certains script légitimes peuvent apparaitre dans cette catégorie s'ils sont hébergés sur d'autres serveurs
</p>
Expand Down
Loading

0 comments on commit 54db068

Please sign in to comment.