Skip to content

Commit

Permalink
rework some wordings on modal to modify user in an agency
Browse files Browse the repository at this point in the history
  • Loading branch information
JeromeBu committed Oct 8, 2024
1 parent 0b3fd1e commit 43e300e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const AgencyUserModificationForm = ({

<ToggleSwitch
id={domElementIds.admin.agencyTab.editAgencyUserIsNotifiedByEmail}
label="Recevoir les notifications par email"
label="Recevoir les notifications pour toutes les conventions de cette structure"
checked={values.isNotifiedByEmail}
onChange={() =>
setValue("isNotifiedByEmail", !values.isNotifiedByEmail, {
Expand Down
42 changes: 30 additions & 12 deletions front/src/app/components/agency/AgencyUsers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { AgencyUserModificationForm } from "src/app/components/agency/AgencyUser
import { useAppSelector } from "src/app/hooks/reduxHooks";
import { icUsersAdminSelectors } from "src/core-logic/domain/admin/icUsersAdmin/icUsersAdmin.selectors";
import { icUsersAdminSlice } from "src/core-logic/domain/admin/icUsersAdmin/icUsersAdmin.slice";
import { featureFlagSelectors } from "src/core-logic/domain/featureFlags/featureFlags.selector";
import { feedbackSlice } from "src/core-logic/domain/feedback/feedback.slice";
import { v4 as uuidV4 } from "uuid";
import { Feedback } from "../feedback/Feedback";
Expand All @@ -37,6 +38,12 @@ export const agencyRoleToDisplay: Record<
AgencyRole,
AgencyDisplayedRoleAndClass
> = {
"agency-admin": {
label: "Administrateur",
className: "fr-badge--green-emeraude",
description:
"Peut modifier les informations de l'organisme, ajouter et supprimer des utilisateurs, modifier leur rôles, consulter les conventions.",
},
"to-review": {
label: "À valider",
className: "fr-badge--yellow-tournesol",
Expand All @@ -54,12 +61,6 @@ export const agencyRoleToDisplay: Record<
description:
"Peut pré-valider les conventions de l'agence et modifier leur statut.",
},
"agency-admin": {
label: "Administrateur",
className: "fr-badge--green-emeraude",
description:
"Peut modifier les informations de l'organisme, ajouter et supprimer des utilisateurs, modifier leur rôles, consulter les conventions.",
},
"agency-viewer": {
label: "Lecteur",
className: "fr-badge--blue-cumulus",
Expand All @@ -80,6 +81,9 @@ const removeUserModal = createModal({
});

export const AgencyUsers = ({ agency }: AgencyUsersProperties) => {
const { enableProConnect } = useAppSelector(
featureFlagSelectors.featureFlagState,
);
const agencyUsers = useAppSelector(icUsersAdminSelectors.agencyUsers);
const dispatch = useDispatch();

Expand All @@ -89,6 +93,8 @@ export const AgencyUsers = ({ agency }: AgencyUsersProperties) => {

const [mode, setMode] = useState<UserFormMode | null>(null);

const provider = enableProConnect ? "ProConnect" : "Inclusion Connect";

return (
<>
<h5 className={fr.cx("fr-h5", "fr-mb-1v", "fr-mt-4w")}>Utilisateurs</h5>
Expand Down Expand Up @@ -214,12 +220,24 @@ export const AgencyUsers = ({ agency }: AgencyUsersProperties) => {
}
>
{selectedUserData && mode && (
<AgencyUserModificationForm
agencyUser={selectedUserData}
closeModal={() => manageUserModal.close()}
mode={mode}
agency={agency}
/>
<>
<h5 className={fr.cx("fr-text--bold", "fr-text--sm")}>
Informations personnelles
</h5>
<p className={fr.cx("fr-text--sm")}>
{selectedUserData.isIcUser
? `Pour modifier ses informations personnelles, l'utilisateur doit passer par son compte ${provider} créé avec l'email ${selectedUserData.email}`
: `Pour ajouter un nom, prénom et mot de passe, l'utilisateur doit se créer un compte
via ${provider}, avec l'email ${selectedUserData.email}.
Nous vous déconseillons de créer un compte pour les boites génériques pour conserver la traçabilité des actions sur les demandes de conventions d'immersion.`}
</p>
<AgencyUserModificationForm
agencyUser={selectedUserData}
closeModal={() => manageUserModal.close()}
mode={mode}
agency={agency}
/>
</>
)}
</manageUserModal.Component>,
document.body,
Expand Down

0 comments on commit 43e300e

Please sign in to comment.