-
Notifications
You must be signed in to change notification settings - Fork 28
fix(contribution): bloquer "Afficher les informations" sans CC sélectionnée #7232
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
Open
maxgfr
wants to merge
5
commits into
dev
Choose a base branch
from
maxgfr/afficher-les-informations
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e94b2dc
fix(contribution): bloquer "Afficher les informations" sans CC sélect…
maxgfr 8194d59
test(contribution): mettre à jour le test de tracking pour le clic sa…
maxgfr a64c4cd
fix: display generic contributions via no-agreement radio option
maxgfr 6b4934e
test(e2e): adapter le parcours contribution au nouveau bouton
maxgfr 8ef96d7
fix(contribution): transformer le bandeau d'avertissement en bandeau …
maxgfr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ import { Contribution } from "./type"; | |
| import Link from "../common/Link"; | ||
| import BlueCard from "../common/BlueCard"; | ||
| import { AgreementSearchForm } from "../convention-collective/AgreementSearch/AgreementSearchForm"; | ||
| import { AccessibleAlert } from "../outils/common/components/AccessibleAlert"; | ||
|
|
||
| type Props = { | ||
| onAgreementSelect: (agreement?: Agreement) => void; | ||
|
|
@@ -37,9 +38,12 @@ export function ContributionGenericAgreementSearch({ | |
| const router = useRouter(); | ||
| const { slug } = contribution; | ||
| const [isValid, setIsValid] = useState(false); | ||
| const [showMissingAgreementError, setShowMissingAgreementError] = | ||
| useState(false); | ||
|
|
||
| useEffect(() => { | ||
| setIsValid(isAgreementValid(contribution, selectedAgreement)); | ||
| setShowMissingAgreementError(false); | ||
| }, [selectedAgreement]); | ||
|
|
||
| const selectedAgreementAlert = (agreement: Agreement) => { | ||
|
|
@@ -125,24 +129,49 @@ export function ContributionGenericAgreementSearch({ | |
| }} | ||
| /> | ||
| {((contribution.isNoCDT && isValid) || !contribution.isNoCDT) && ( | ||
| <Button | ||
| className={fr.cx("fr-mt-2w")} | ||
| type="button" | ||
| onClick={(event) => { | ||
| onDisplayClick(isValid && !!selectedAgreement); | ||
| if (isValid && selectedAgreement) { | ||
| router.push( | ||
| slug === "les-conges-pour-evenements-familiaux" | ||
| ? `/contribution/${slug}/${selectedAgreement?.slug || selectedAgreement?.num}` | ||
| : `/contribution/${selectedAgreement?.num}-${slug}` | ||
| ); | ||
| } else { | ||
| event.preventDefault(); | ||
| } | ||
| }} | ||
| > | ||
| Afficher les informations | ||
| </Button> | ||
| <> | ||
| {showMissingAgreementError && ( | ||
| <AccessibleAlert | ||
| title="Veuillez sélectionner une convention collective" | ||
| description={ | ||
| <p> | ||
| Pour afficher des informations personnalisées, vous devez | ||
| d’abord sélectionner une convention collective. Si vous ne | ||
| souhaitez pas en sélectionner, vous pouvez cliquer sur | ||
| « Afficher les informations sans sélectionner une | ||
| convention collective » ci-dessous. | ||
| </p> | ||
| } | ||
| severity="error" | ||
| className={["fr-mt-2w"]} | ||
| data-testid="missing-agreement-error" | ||
| /> | ||
| )} | ||
| <Button | ||
| className={fr.cx("fr-mt-2w")} | ||
| type="button" | ||
| onClick={(event) => { | ||
| if (!selectedAgreement) { | ||
| event.preventDefault(); | ||
| setShowMissingAgreementError(true); | ||
| return; | ||
| } | ||
| setShowMissingAgreementError(false); | ||
| onDisplayClick(isValid && !!selectedAgreement); | ||
| if (isValid && selectedAgreement) { | ||
| router.push( | ||
| slug === "les-conges-pour-evenements-familiaux" | ||
| ? `/contribution/${slug}/${selectedAgreement?.slug || selectedAgreement?.num}` | ||
| : `/contribution/${selectedAgreement?.num}-${slug}` | ||
| ); | ||
| } else { | ||
| event.preventDefault(); | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [IMPORTANT]
|
||
| }} | ||
| > | ||
| Afficher les informations | ||
| </Button> | ||
| </> | ||
| )} | ||
| </div> | ||
| </BlueCard> | ||
|
|
||
This file contains hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -124,6 +124,54 @@ describe("<ContributionLayout />", () => { | |||||
| expect(rendering.getByText("my content")).toBeInTheDocument(); | ||||||
| }); | ||||||
|
|
||||||
| it("should display an error and not navigate when clicking 'Afficher les informations' without selecting any agreement", async () => { | ||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [MINOR] New tests are declared
|
||||||
| it("should display an error and not navigate when clicking 'Afficher les informations' without selecting any agreement", async () => { | |
| it("should display an error and not navigate when clicking 'Afficher les informations' without selecting any agreement", () => { |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[IMPORTANT] Error alert is rendered above the button it describes — reading order concern
<AccessibleAlert>below the<Button>keeps the DOM order consistent with the visual interaction flow and improves the experience for assistive-technology users.