Skip to content

Fix - Handle subfinality description in ConsentManager #439

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.

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

Merged
merged 1 commit into from
Jul 29, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import React, { useReducer, useEffect, type ReactNode } from "react";
import type { RegisteredLinkProps } from "../../link";
import type { ExtractFinalityFromFinalityDescription, FinalityConsent } from "../types";
import type {
ExtractFinalityFromFinalityDescription,
FinalityConsent,
SubFinalityContent
} from "../types";
import type { ProcessConsentChanges } from "../processConsentChanges";
import { FooterBottomItem } from "../../Footer";
import { createConsentBanner } from "./ConsentBanner";
Expand All @@ -10,7 +14,11 @@ import { useTranslation } from "./translation";
export function createConsentBannerAndConsentManagement<
FinalityDescription extends Record<
string,
{ title: ReactNode; description?: ReactNode; subFinalities?: Record<string, ReactNode> }
{
title: ReactNode;
description?: ReactNode;
subFinalities?: Record<string, SubFinalityContent>;
}
>
>(params: {
finalityDescription: ((params: { lang: string }) => FinalityDescription) | FinalityDescription;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import React, { useEffect, useMemo, useState, useId, type ReactNode } from "reac
import { fr } from "../../fr";
import type { RegisteredLinkProps } from "../../link";
import { createModal } from "../../Modal";
import type { ExtractFinalityFromFinalityDescription, FinalityConsent } from "../types";
import type {
ExtractFinalityFromFinalityDescription,
FinalityConsent,
SubFinalityContent
} from "../types";
import type { ProcessConsentChanges } from "../processConsentChanges";
import { useLang } from "../../i18n";
import { useIsModalOpen } from "../../Modal/useIsModalOpen";
Expand All @@ -20,7 +24,11 @@ import { useConst } from "../../tools/powerhooks/useConst";
export function createConsentManagement<
FinalityDescription extends Record<
string,
{ title: ReactNode; description?: ReactNode; subFinalities?: Record<string, ReactNode> }
{
title: ReactNode;
description?: ReactNode;
subFinalities?: Record<string, SubFinalityContent>;
}
>
>(params: {
personalDataPolicyLinkProps: RegisteredLinkProps | undefined;
Expand Down Expand Up @@ -238,7 +246,7 @@ export function createConsentManagement<
function ConsentService(props: {
title: ReactNode;
description: ReactNode | undefined;
subFinalities: Record<string, ReactNode> | undefined;
subFinalities: Record<string, { title: ReactNode; description?: ReactNode }> | undefined;
finalityConsent:
| boolean
| ({
Expand Down Expand Up @@ -378,19 +386,22 @@ export function createConsentManagement<
className={fr.cx("fr-consent-services", "fr-collapse")}
id={subFinalityDivId}
>
{Object.entries(subFinalities).map(([subFinality, title]) => (
<SubConsentService
key={subFinality}
title={title}
isConsentGiven={finalityConsent[subFinality]}
onChange={({ isConsentGiven }) =>
onChange({
subFinality,
isConsentGiven
})
}
/>
))}
{Object.entries(subFinalities).map(
([subFinality, { title, description }]) => (
<SubConsentService
key={subFinality}
title={title}
description={description}
isConsentGiven={finalityConsent[subFinality]}
onChange={({ isConsentGiven }) =>
onChange({
subFinality,
isConsentGiven
})
}
/>
)
)}
</div>
</>
))}
Expand All @@ -401,10 +412,11 @@ export function createConsentManagement<

function SubConsentService(props: {
title: ReactNode;
description?: ReactNode;
onChange: (params: { isConsentGiven: boolean }) => void;
isConsentGiven: boolean;
}) {
const { title, onChange, isConsentGiven } = props;
const { title, description, onChange, isConsentGiven } = props;

const { t } = useTranslation();

Expand All @@ -421,6 +433,9 @@ export function createConsentManagement<
<div className={fr.cx("fr-consent-service")}>
<fieldset className={fr.cx("fr-fieldset", "fr-fieldset--inline")}>
<legend className={fr.cx("fr-consent-service__title")}>{title}</legend>
{description !== undefined && (
<p className={fr.cx("fr-consent-service__desc")}>{description}</p>
)}
<div className={fr.cx("fr-consent-service__radios", "fr-fieldset--inline")}>
<div className={fr.cx("fr-radio-group")}>
<input
Expand Down
14 changes: 11 additions & 3 deletions src/consentManagement/createConsentManagement.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useReducer, useEffect, type ReactNode } from "react";
import type { ExtractFinalityFromFinalityDescription } from "./types";
import type { ExtractFinalityFromFinalityDescription, SubFinalityContent } from "./types";
import type { RegisteredLinkProps } from "../link";
import { createUseConsent } from "./useConsent";
import { createProcessConsentChanges, type ConsentCallback } from "./processConsentChanges";
Expand All @@ -14,7 +14,11 @@ export const defaultLocalStorageKeyPrefix = "@codegouvfr/react-dsfr finalityCons
export function createConsentManagement<
FinalityDescription extends Record<
string,
{ title: ReactNode; description?: ReactNode; subFinalities?: Record<string, ReactNode> }
{
title: ReactNode;
description?: ReactNode;
subFinalities?: Record<string, SubFinalityContent>;
}
>
>(params: {
finalityDescription: ((params: { lang: string }) => FinalityDescription) | FinalityDescription;
Expand Down Expand Up @@ -112,7 +116,11 @@ export function createConsentManagement<
export function getFinalitiesFromFinalityDescription<
FinalityDescription extends Record<
string,
{ title: ReactNode; description?: ReactNode; subFinalities?: Record<string, ReactNode> }
{
title: ReactNode;
description?: ReactNode;
subFinalities?: Record<string, SubFinalityContent>;
}
>
>(params: {
finalityDescription: FinalityDescription;
Expand Down
12 changes: 9 additions & 3 deletions src/consentManagement/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@ export type FinalityConsent<Finality extends string> = {
export type ExtractFinalityFromFinalityDescription<
FinalityDescription extends Record<
string,
{ title: ReactNode; subFinalities?: Record<string, ReactNode> }
{
title: ReactNode;
description?: ReactNode;
subFinalities?: Record<string, SubFinalityContent>;
}
>
> = {
[K in keyof FinalityDescription]: K extends string
? FinalityDescription[K] extends { subFinalities: Record<string, any> }
? FinalityDescription[K] extends { subFinalities: Record<string, SubFinalityContent> }
? `${K}.${ExtractFinalityFromFinalityDescription.SubFinalities<FinalityDescription[K]>}`
: K
: never;
}[keyof FinalityDescription];

export namespace ExtractFinalityFromFinalityDescription {
export type SubFinalities<T> = T extends { subFinalities: infer U }
? U extends Record<string, any>
? U extends Record<string, SubFinalityContent>
? keyof U
: never
: never;
}

export type SubFinalityContent = { title: ReactNode; description?: ReactNode };
12 changes: 10 additions & 2 deletions stories/ConsentManagement.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,16 @@ const {
"description":
"Nous utilisons des cookies pour mesurer l’audience de notre site et améliorer son contenu.",
"subFinalities": {
"deviceInfo": "Informations sur votre appareil",
"traffic": "Informations sur votre navigation"
"deviceInfo": {
"title": "Informations sur votre appareil",
"description":
"Nous utilisons des cookies pour mesurer l’audience de notre site et améliorer son contenu."
},
"traffic": {
"title": "Informations sur votre navigation",
"description":
"Nous utilisons des cookies pour mesurer l’audience de notre site et améliorer son contenu."
}
}
}
},
Expand Down