#2640 - Profil utilisateur : liste des agences en revue #2795
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bbohec
changed the title
|
Review app: |
bbohec
force-pushed
the
2640-user-profile-agencies-to-review
branch
from
20b1171 to
1ca6367
Compare
bbohec
force-pushed
the
2640-user-profile-agencies-to-review
branch
from
1ca6367 to
606dc13
Compare
bbohec
force-pushed
the
2640-user-profile-agencies-to-review
branch
from
606dc13 to
babbbaa
Compare
enguerranws
changed the title
enguerranws
changed the title
JeromeBu
reviewed
Jan 13, 2025
Comment on lines
+358
to
+390
| const getUsersWithAgencyRole = async ( | ||
| transaction: KyselyDb, | ||
| { | ||
| agencyIds, | ||
| isNotifiedByEmail, | ||
| }: { | ||
| agencyIds: AgencyId[]; | ||
| isNotifiedByEmail?: boolean; | ||
| }, | ||
| ): Promise<UserWithAgencyRole[]> => { | ||
| if (agencyIds.length === 0) return []; | ||
|
|
||
| return pipeWithValue( | ||
| transaction | ||
| .selectFrom("users__agencies") | ||
| .innerJoin("users", "users.id", "users__agencies.user_id") | ||
| .where("agency_id", "in", agencyIds) | ||
| .orderBy("users.email") | ||
| .select([ | ||
| "users.id as userId", | ||
| "users.email", | ||
| sql<AgencyRole[]>`users__agencies.roles`.as("roles"), | ||
| "users__agencies.agency_id as agencyId", | ||
| "users__agencies.is_notified_by_email as isNotifiedByEmail", | ||
| ]), | ||
| (builder) => { | ||
| if (isNotifiedByEmail !== undefined) | ||
| return builder.where("is_notified_by_email", "=", isNotifiedByEmail); | ||
| return builder; | ||
| }, | ||
| (builder) => builder.execute(), | ||
| ); | ||
| }; |
There was a problem hiding this comment.
cette fonction n'est pas exporté et pas utilisé on dirait...
Comment on lines
+397
to
+407
| const getEmailsFromUsersWithAgencyRoles = ( | ||
| usersWithAgencyRole: UserWithAgencyRole[], | ||
| { agencyIdToMatch, roleToMatch }: AgencyMatchingCriteria, | ||
| ) => { | ||
| return usersWithAgencyRole | ||
| .filter( | ||
| (user) => | ||
| user.agencyId === agencyIdToMatch && user.roles.includes(roleToMatch), | ||
| ) | ||
| .map((user) => user.email); | ||
| }; |
There was a problem hiding this comment.
ici c'est pareil on dirait
Comment on lines
102
to
149
| const ActiveAgencyRightsTable = ({ | ||
| agenciesWithoutToReviewRights, | ||
| onUpdateClicked, | ||
| isBackofficeAdmin, | ||
| }: { | ||
| agenciesWithoutToReviewRights: AgencyRight[]; | ||
| onUpdateClicked: (agencyRight: AgencyRight) => void; | ||
| isBackofficeAdmin?: boolean; | ||
| }) => ( | ||
| <> | ||
| <h2 className={fr.cx("fr-h4")}> | ||
| Organismes rattachés au profil ({agenciesWithoutToReviewRights.length}{" "} | ||
| {agenciesWithoutToReviewRights.length === 1 ? "agence" : "agences"}) | ||
| </h2> | ||
|
|
||
| <Table | ||
| headers={[ | ||
| "Organisme", | ||
| "Caractéristiques de l'agence", | ||
| "Administrateurs", | ||
| "Roles", | ||
| "Reçoit les notifications", | ||
| "Actions", | ||
| ]} | ||
| data={agenciesWithoutToReviewRights | ||
| .sort((a, b) => a.agency.name.localeCompare(b.agency.name)) | ||
| .map(makeAgencyRightLine(onUpdateClicked, isBackofficeAdmin))} | ||
| /> | ||
| </> | ||
| ); | ||
|
|
||
| const OnGoingAgencyRightsTable = ({ | ||
| agenciesWithToReviewRights, | ||
| }: { agenciesWithToReviewRights: AgencyRight[] }) => ( | ||
| <> | ||
| <h2 className={fr.cx("fr-h4")}> | ||
| Demandes d'accès en cours ({agenciesWithToReviewRights.length}{" "} | ||
| {agenciesWithToReviewRights.length === 1 ? "agence" : "agences"}) | ||
| </h2> | ||
| <Table | ||
| headers={["Organisme", "Caractéristiques de l'agence", "Administrateurs"]} | ||
| data={agenciesWithToReviewRights | ||
| .sort((a, b) => a.agency.name.localeCompare(b.agency.name)) | ||
| .map(makeAgencyWithToReviewRightLine())} | ||
| /> | ||
| </> | ||
| ); | ||
|
|
There was a problem hiding this comment.
on peut peut-être éclater en plusieurs fichiers ?
un pour ActiveAgencyRightsTable, OnGoingAgencyRightsTable et un pour ce qui est commun ?
JeromeBu
approved these changes
Jan 13, 2025
bbohec
force-pushed
the
2640-user-profile-agencies-to-review
branch
from
babbbaa to
f141a9d
Compare
bbohec
force-pushed
the
2640-user-profile-agencies-to-review
branch
from
f141a9d to
bf86efe
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ca inclus ajout des mails des admin d'agence dans le DTO des droits d'agence des utilisateurs.
Il y a aussi quelques éléments de refacto.