Skip to content
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

Jump to bottom

[Feature] Add expand/collapse all button for advanced filters #10001

Merged
merged 4 commits into from
Apr 15, 2024
Merged

[Feature] Add expand/collapse all button for advanced filters #10001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e905da5
add expand/collapse all button
esizer Apr 5, 2024
cef3969
add translations
esizer Apr 15, 2024
c170be3
Merge branch 'main' into 9482-expand-all-advanced-filters
esizer Apr 15, 2024
752936f
remove stray spaces in translations
esizer Apr 15, 2024
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
8 changes: 8 additions & 0 deletions apps/web/src/lang/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,10 @@
"defaultMessage": "Votre numéro de confirmation est le suivant : <strong>{id}</strong>",
"description": "An application confirmation number"
},
"/voRGj": {
"defaultMessage": "Afficher tous<hidden> les filtres avancés</hidden>",
"description": "Button text to show all advanced filters"
},
"/yOfhq": {
"defaultMessage": "Durée de l’emploi ",
"description": "Job duration label "
Expand Down Expand Up @@ -9638,6 +9642,10 @@
"defaultMessage": "À venir!",
"description": "Heading for a coming soon section"
},
"q5V/+5": {
"defaultMessage": "Réduire tous <hidden> les filtres avancés</hidden>",
"description": "Button text to hide all advanced filters"
},
"q5rd9x": {
"defaultMessage": " Description de l’expérience",
"description": "Label displayed on Personal Experience form for experience description input"
Expand Down
72 changes: 59 additions & 13 deletions apps/web/src/pages/SearchRequests/SearchPage/components/AdvancedFilters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IntlShape, useIntl } from "react-intl";
import { useFormContext } from "react-hook-form";
import isArray from "lodash/isArray";

import { Accordion, Heading } from "@gc-digital-talent/ui";
import { Accordion, Button, Heading } from "@gc-digital-talent/ui";
import { Checklist, RadioGroup } from "@gc-digital-talent/forms";
import {
getOperationalRequirement,
Expand Down Expand Up @@ -49,9 +49,16 @@ const getFieldLabel = (
);
};

const accordionIds = {
educationRequirement: "educationRequirement",
employmentDuration: "employmentDuration",
operationalRequirements: "operationalRequirements",
};

const AdvancedFilters = () => {
const intl = useIntl();
const { watch } = useFormContext();
const [openFilters, setOpenFilters] = React.useState<string[]>([]);
const [educationRequirement, employmentDuration, operationalRequirements] =
watch([
"educationRequirement",
Expand Down Expand Up @@ -117,21 +124,60 @@ const AdvancedFilters = () => {
}),
);

const toggleOpenFilters = () => {
const newOpenFilters =
openFilters.length === 0 ? Object.values(accordionIds) : [];
setOpenFilters(newOpenFilters);
};

return (
<>
<Heading
level="h3"
size="h6"
data-h2-font-weight="base(700)"
data-h2-margin="base(x2, 0, x.5, 0)"
<div
data-h2-display="base(flex)"
data-h2-flex-wrap="base(wrap)"
data-h2-align-items="base(center)"
data-h2-gap="base(0x.5)"
data-h2-justify-content="base(space-between)"
data-h2-margin="base(x2 0 x.5 0)"
>
<Heading
level="h3"
size="h6"
data-h2-font-weight="base(700)"
data-h2-margin="base(0)"
>
{intl.formatMessage({
defaultMessage: "Advanced filters",
id: "eozWFc",
description: "Title for the additional filters",
})}
</Heading>
<Button
mode="inline"
color="secondary"
type="button"
onClick={toggleOpenFilters}
>
{openFilters.length > 0
? intl.formatMessage({
defaultMessage:
"Collapse all<hidden> advanced filters</hidden>",
id: "q5V/+5",
description: "Button text to hide all advanced filters",
})
: intl.formatMessage({
defaultMessage: "Expand all<hidden> advanced filters</hidden>",
id: "/voRGj",
description: "Button text to show all advanced filters",
})}
</Button>
</div>
<Accordion.Root
type="multiple"
size="sm"
value={openFilters}
onValueChange={setOpenFilters}
>
{intl.formatMessage({
defaultMessage: "Advanced filters",
id: "eozWFc",
description: "Title for the additional filters",
})}
</Heading>
<Accordion.Root type="multiple" size="sm">
<Accordion.Item value="educationRequirement">
<Accordion.Trigger
as="h4"
Expand Down