Skip to content

wording(moderations): update informations into acceptal & refusal modals #906

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

Merged
merged 1 commit into from
May 27, 2025
Merged

wording(moderations): update informations into acceptal & refusal modals #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion e2e/features/moderations/jean_bon_do_not_join_dinum.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Fonctionnalité: Moderation blockante à refuser

Scénario: Le modérateur le refuse avec la barre d'outils
Quand je clique sur "❌ Refuser"
Alors je vois "Motif de refus pour jeanbon@yopmail.com (organisation : DINUM)"
Alors je vois "Motif de refus :"

Soit je vais à l'intérieur du dialogue nommé "la modale de refus"
Quand je saisie le mot "Nom de domaine introuvable{enter}" dans la boîte à texte nommée "Recherche d'une réponse type"
Expand Down
2 changes: 1 addition & 1 deletion e2e/features/moderations/jean_bon_join_abracadabra.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Fonctionnalité: Moderation blockante à accepter

Scénario: Le modérateur le valide avec la barre d'outils
Quand je clique sur "✅ Accepter"
Alors je vois "A propos de jeanbon@yopmail.com (organisation : Abracadabra), je valide :"
Alors je vois "A propos de jeanbon@yopmail.com pour l'organisation Abracadabra, je valide :"

Soit je vais à l'intérieur du dialogue nommé "la modale de validation"
Quand je clique sur "Notifier et terminer"
Expand Down
3 changes: 2 additions & 1 deletion packages/~/moderations/ui/src/Actions/AcceptModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ export async function AcceptModal({
<span class="font-bold text-[--text-action-high-blue-france]">
{userEmail}{" "}
</span>
(organisation : {moderation.organization.cached_libelle}), je valide :
pour l'organisation <b>{moderation.organization.cached_libelle}</b>, je
valide :
</p>
<form
{...hx_path_validate_moderation}
Expand Down
12 changes: 8 additions & 4 deletions packages/~/moderations/ui/src/Actions/RefusalModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,22 @@ export async function RefusalModal({ userEmail }: { userEmail: string }) {
Label bouton
</button>
</div>
<p class="my-2">
Motif de refus pour <b>{userEmail}</b> (organisation :{" "}
{moderation.organization.cached_libelle})
<p class="mb-1">
A propos de{" "}
<span class="font-bold text-[--text-action-high-blue-france]">
{userEmail}{" "}
</span>
pour l'organisation <b>{moderation.organization.cached_libelle}</b>
</p>
<p class="mb-1">Motif de refus :</p>
<ResponseMessageSelector $message={$modal_message} />
<div class="my-2">
<label class="fr-label" for={$modal_message}>
Message
</label>
<textarea
class="fr-input"
rows={17}
rows={15}
id={$modal_message}
name={reject_form_schema.keyof().Enum.message}
_={`
Expand Down