Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(a11y): add skiplinks and fix wordings #315

Merged
merged 2 commits into from
Mar 5, 2024
Merged

fix(a11y): add skiplinks and fix wordings #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eae5c6b
fix(a11y): add skiplinks and fix wordings
revolunet Mar 5, 2024
a81876b
feat: add stats and phases filter in summary view
revolunet Mar 5, 2024
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
1 change: 1 addition & 0 deletions report/www/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ function App({ Component, pageProps }: AppProps) {
topBottom: "10v",
}),
}}
id="content"
>
<Component {...pageProps} />
</div>
Expand Down
185 changes: 147 additions & 38 deletions report/www/pages/summary/[id].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,23 @@ import { isToolEnabled, smallUrl, slugifyUrl } from "../../src/utils";
import Link from "next/link";
import { GradeBadge, IconUnknown } from "../../src/components/GradeBadge";
import {
phases,
getLatestPhase,
phaseSeverities,
} from "../../src/components/BetagouvInfo";

const report: DashLordReport = require("../../src/report.json");

type StatDef = {
title: string;
value: (any) => number;
};

type SummaryConfig = {
title: string;
neededTool: DashlordTool;
columns: GridColDef[];
stats: StatDef[];
};

const defaultColumnsProps = {
Expand Down Expand Up @@ -70,6 +77,23 @@ const summaryConfigs: Record<string, SummaryConfig> = {
accessibility: {
title: "Accessibilité",
neededTool: "declaration-a11y",
stats: [
{
title: "Déclaration présente",
value: (rows) =>
rows.filter(
(row) => row["declaration-a11y"] && row["declaration-a11y"].mention
).length,
},
{
title: "Déclaration absente",
value: (rows) =>
rows.filter(
(row) =>
!(row["declaration-a11y"] && row["declaration-a11y"].mention)
).length,
},
],
columns: [
{
...defaultColumnsProps,
Expand Down Expand Up @@ -109,6 +133,18 @@ const summaryConfigs: Record<string, SummaryConfig> = {
stats: {
title: "Page de stats",
neededTool: "stats",
stats: [
{
title: "Stats publiées",
value: (rows) =>
rows.filter((row) => row.stats && row.stats.grade === "A").length,
},
{
title: "Stats non publiées",
value: (rows) =>
rows.filter((row) => row.stats && row.stats.grade === "F").length,
},
],
columns: [
{
...defaultColumnsProps,
Expand All @@ -122,7 +158,8 @@ const summaryConfigs: Record<string, SummaryConfig> = {
renderCell: (params) => {
if (params.value === "A") {
return (
params.row.betagouv && (
params.row.betagouv &&
params.row.betagouv.attributes.stats_url && (
<Link
prefetch={false}
title={`Voir la page de stats de l'url ${slugifyUrl(
Expand All @@ -144,6 +181,23 @@ const summaryConfigs: Record<string, SummaryConfig> = {
budget: {
title: "Publication du budget",
neededTool: "budget_page",
stats: [
{
title: "Budget publié",
value: (rows) =>
rows.filter((row) => row.budget_page && row.budget_page.grade === "A")
.length,
},
{
title: "Budget non publié",
value: (rows) =>
rows.filter(
(row) =>
!row.budget_page ||
(row.budget_page && row.budget_page.grade === "F")
).length,
},
],
columns: [
{
...defaultColumnsProps,
Expand All @@ -157,7 +211,8 @@ const summaryConfigs: Record<string, SummaryConfig> = {
renderCell: (params) => {
if (params.value === "A") {
return (
params.row.betagouv && (
params.row.betagouv &&
params.row.betagouv.attributes.budget_url && (
<Link
prefetch={false}
title={`Voir la page de budget de l'url ${slugifyUrl(
Expand All @@ -166,7 +221,7 @@ const summaryConfigs: Record<string, SummaryConfig> = {
href={params.row.betagouv.attributes.budget_url}
target="_blank"
>
/{params.row.betagouv.attributes.budget_url}
{params.row.betagouv.attributes.budget_url}
</Link>
)
);
Expand All @@ -180,13 +235,24 @@ const summaryConfigs: Record<string, SummaryConfig> = {

const Summary = ({ id }: { id: string }) => {
const [category, setCategory] = useState(null);
const [phase, setPhase] = useState(null);
const summaryConfig = summaryConfigs[id];
const categories = Array.from(
new Set(report.map((url) => url.category).filter(Boolean))
).sort();

const tableData = (
category ? report.filter((url) => url.category === category) : report
category || phase
? report.filter((url) => {
let matchCategory = category ? url.category === category : true;
let matchPhase = phase
? url.betagouv &&
url.betagouv.attributes &&
getLatestPhase(url.betagouv.attributes.phases).id === phase
: true;
return matchCategory && matchPhase;
})
: report
).filter((url) =>
summaryConfig.neededTool
? isToolEnabled(summaryConfig.neededTool, url.url)
Expand All @@ -201,30 +267,33 @@ const Summary = ({ id }: { id: string }) => {
field: "url",
headerName: `URL`,
width: 400,
renderCell: (params) => (
<div
style={{
width: "95%",
overflow: "hidden",
whiteSpace: "nowrap",
textOverflow: "ellipsis",
}}
>
<Link
prefetch={false}
title={`Voir les détails de l'url ${slugifyUrl(params.value)}`}
href={`/url/${encodeURIComponent(slugifyUrl(params.value))}`}
renderCell: (params) =>
params.value && (
<div
style={{
width: "95%",
overflow: "hidden",
whiteSpace: "nowrap",
textOverflow: "ellipsis",
}}
>
<i className={fr.cx("fr-icon-search-line", "fr-icon--sm")} />
&nbsp;
{smallUrl(params.value)}
</Link>
</div>
),
<Link
prefetch={false}
title={`Voir les détails de l'url ${slugifyUrl(params.value)}`}
href={`/url/${encodeURIComponent(slugifyUrl(params.value))}`}
>
<i className={fr.cx("fr-icon-search-line", "fr-icon--sm")} />
&nbsp;
{smallUrl(params.value)}
</Link>
</div>
),
},
isToolEnabled("betagouv") && getPhaseColumn(),
...summaryConfig.columns,
].filter(Boolean);

// console.log(phases, report);
return (
<>
<Head>
Expand All @@ -233,21 +302,61 @@ const Summary = ({ id }: { id: string }) => {
</title>
</Head>
<h1>{summaryConfig.title}</h1>
{categories.length > 1 && (
<Select
label={null}
nativeSelectProps={{
onChange: (event) => setCategory(event.target.value),
}}
>
<option value="">tous les incubateurs</option>
{categories.map((cat) => (
<option value={cat} key={cat}>
{cat}
</option>
))}
</Select>
)}

<div className={fr.cx("fr-grid-row", "fr-grid-row--gutters", "fr-mb-3w")}>
{summaryConfig.stats.map((stat) => {
const value = stat.value(tableData);
return (
<div
className={fr.cx("fr-col-3", "fr-m-1w", "fr-p-3w")}
style={{ textAlign: "center", border: "1px solid #ccc" }}
>
<div className={fr.cx("fr-text--lead", "fr-text--heavy")}>
{stat.title}
</div>
<div
className={fr.cx("fr-text--heavy")}
style={{ fontSize: "2rem" }}
>
{value}
</div>
</div>
);
})}
</div>
<div className={fr.cx("fr-grid-row")}>
{categories.length > 1 && (
<Select
label={null}
nativeSelectProps={{
onChange: (event) => setCategory(event.target.value),
}}
>
<option value="">tous les incubateurs</option>
{categories.map((cat) => (
<option value={cat} key={cat}>
{cat}
</option>
))}
</Select>
)}
{isToolEnabled("betagouv") && (
<Select
className={fr.cx("fr-ml-1w")}
label={null}
nativeSelectProps={{
onChange: (event) => setPhase(event.target.value),
}}
>
<option value="">toutes les phases</option>
{phases.map((phase) => (
<option value={phase.id} key={phase.id}>
{phase.label}
</option>
))}
</Select>
)}
</div>
<DataGrid
rows={tableData}
columns={columns}
Expand Down
Loading
Loading