-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(accompagnement): ajoute l‘icone téléphone et rend cliquable de n…
…uméro de téléphone (#2685)
- Loading branch information
1 parent
c077b34
commit 9c57f9c
Showing
6 changed files
with
220 additions
and
51 deletions.
There are no files selected for viewing
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
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
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
57 changes: 57 additions & 0 deletions
57
...ures/Accompagnement/Rechercher/Résultat/RésultatRechercherAccompagnementTagsList.test.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /** | ||
| * @jest-environment jsdom | ||
| */ | ||
|
|
||
|
|
||
| import { render, screen } from '@testing-library/react'; | ||
|
|
||
| import { | ||
| RésultatRechercherAccompagnementTagsList, | ||
| } from '~/client/components/features/Accompagnement/Rechercher/Résultat/RésultatRechercherAccompagnementTagsList'; | ||
| import { TypeÉtablissement } from '~/server/établissement-accompagnement/domain/etablissementAccompagnement'; | ||
| import { | ||
| anÉtablissementAccompagnement, | ||
| } from '~/server/établissement-accompagnement/domain/etablissementAccompagnement.fixture'; | ||
|
|
||
| describe('<RésultatRechercherAccompagnementTagsList/>', () => { | ||
| it('je vois la liste des tags', () => { | ||
| render(<RésultatRechercherAccompagnementTagsList | ||
| etablissement={anÉtablissementAccompagnement({ telephone: '0601010101' })}/>); | ||
|
|
||
| expect(screen.getByRole('list')).toBeVisible(); | ||
| }); | ||
|
|
||
| describe('téléphone', () => { | ||
| it('lorsque le téléphone n‘est pas présent je ne vois pas de téléphone', () => { | ||
| render(<RésultatRechercherAccompagnementTagsList | ||
| etablissement={anÉtablissementAccompagnement({ telephone: undefined })}/>); | ||
| expect(screen.queryByRole('listitem', { name: 'téléphone de l‘établissement' })).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('lorsque le téléphone est présent, je vois le lien de contact par téléphone', () => { | ||
| render(<RésultatRechercherAccompagnementTagsList | ||
| etablissement={anÉtablissementAccompagnement({ telephone: '0601010101' })}/>); | ||
| expect(screen.getByRole('link', { name: '0601010101' })).toHaveAttribute('href', 'tel:0601010101'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('email', () => { | ||
| it('lorsque l‘établissement est mission locale, je n‘affiche pas le mail', () => { | ||
| render(<RésultatRechercherAccompagnementTagsList | ||
| etablissement={anÉtablissementAccompagnement({ email: '[email protected]', type: TypeÉtablissement.MISSION_LOCALE })}/>); | ||
| expect(screen.queryByRole('listitem', { name: 'email de l‘établissement' })).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('lorsque l‘établissement n‘est pas mission locale et que l‘email n‘est pas présent, je ne vois pas d‘email', () => { | ||
| render(<RésultatRechercherAccompagnementTagsList | ||
| etablissement={anÉtablissementAccompagnement({ email: undefined, type: TypeÉtablissement.INFO_JEUNE })}/>); | ||
| expect(screen.queryByRole('listitem', { name: 'email de l‘établissement' })).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('lorsque l‘établissement n‘est pas mission locale et que l‘email est présent, je vois l‘adresse email', () => { | ||
| render(<RésultatRechercherAccompagnementTagsList | ||
| etablissement={anÉtablissementAccompagnement({ email: '[email protected]', type: TypeÉtablissement.INFO_JEUNE })}/>); | ||
| expect(screen.getByRole('listitem', { name: 'email de l‘établissement' })).toHaveTextContent('[email protected]'); | ||
| }); | ||
| }); | ||
| }); |
32 changes: 32 additions & 0 deletions
32
.../features/Accompagnement/Rechercher/Résultat/RésultatRechercherAccompagnementTagsList.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import styles | ||
| from '~/client/components/features/Accompagnement/Rechercher/Résultat/RésultatRechercherAccompagnement.module.scss'; | ||
| import { Icon } from '~/client/components/ui/Icon/Icon'; | ||
| import { Link } from '~/client/components/ui/Link/Link'; | ||
| import { Tag } from '~/client/components/ui/Tag/Tag'; | ||
| import { | ||
| ÉtablissementAccompagnement, | ||
| TypeÉtablissement, | ||
| } from '~/server/établissement-accompagnement/domain/etablissementAccompagnement'; | ||
|
|
||
| interface tagsListProps { | ||
| etablissement: ÉtablissementAccompagnement | ||
| } | ||
|
|
||
| export function RésultatRechercherAccompagnementTagsList({ etablissement }: tagsListProps) { | ||
| const isMissionLocale = etablissement.type === TypeÉtablissement.MISSION_LOCALE; | ||
|
|
||
| return <ul className={styles.tags}> | ||
| {etablissement.telephone && | ||
| <li key="téléphone" aria-label="téléphone de l‘établissement"> | ||
| <Tag> | ||
| <Link href={`tel:${etablissement.telephone}`} className={styles.telephone}> | ||
| <Icon name="phone"/>{etablissement.telephone} | ||
| </Link> | ||
| </Tag> | ||
| </li>} | ||
| {!isMissionLocale && etablissement.email && | ||
| <li key="mail" aria-label="email de l‘établissement"> | ||
| <Tag>{etablissement.email}</Tag> | ||
| </li>} | ||
| </ul>; | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1332,6 +1332,53 @@ export function aMissionLocaleÉtablissementAccompagnement(): ÉtablissementAcco | |
| }; | ||
| } | ||
|
|
||
| export function anÉtablissementAccompagnement(override?: Partial<ÉtablissementAccompagnement>): ÉtablissementAccompagnement { | ||
| return { | ||
| adresse: '93 rue Jeanne-d‘Arc, 75013 Paris', | ||
| email: '[email protected]', | ||
| horaires: [ | ||
| { | ||
| heures: [ | ||
| { | ||
| début: '10:30:00', | ||
| fin: '13:00:00', | ||
| }, | ||
| { | ||
| début: '14:00:00', | ||
| fin: '19:00:00', | ||
| }, | ||
| ], | ||
| jour: 'Lundi', | ||
| }, | ||
| { | ||
| heures: [], | ||
| jour: 'Mardi', | ||
| }, | ||
| { | ||
| heures: [], | ||
| jour: 'Mercredi', | ||
| }, | ||
| { | ||
| heures: [], | ||
| jour: 'Jeudi', | ||
| }, | ||
| { | ||
| heures: [], | ||
| jour: 'Vendredi', | ||
| }, | ||
| { | ||
| heures: [], | ||
| jour: 'Samedi', | ||
| }, | ||
| ], | ||
| id: '11c63eb2-68b3-40dc-828e-33c212686173', | ||
| nom: 'Mission locale pour l‘insertion professionnelle et sociale des jeunes (16-25 ans) - Paris - 5e 12e et 13e arrondissements', | ||
| telephone: '01 45 85 20 50', | ||
| type: TypeÉtablissement.MISSION_LOCALE, | ||
| ...override, | ||
| }; | ||
| } | ||
|
|
||
| export function aMissionLocaleÉtablissementAccompagnementList(): ÉtablissementAccompagnement[] { | ||
| return [ | ||
| aMissionLocaleÉtablissementAccompagnement(), | ||
|
|
||