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

[Bug] Talent search page and more spinners! #11703

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Bug] Talent search page and more spinners! #11703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11aa60
don't show text if pending
vd1992 Oct 3, 2024
3456ca7
nest in fragment and add spinner
vd1992 Oct 3, 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
38 changes: 20 additions & 18 deletions apps/web/src/pages/SearchRequests/SearchPage/components/EstimatedCandidates.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,24 +111,26 @@ const EstimatedCandidates = ({
) : (
<CandidateMessage candidateCount={candidateCount} />
)}
<p>
<ScrollToLink to="results" color="black" mode="inline">
{candidateCount
? intl.formatMessage({
defaultMessage: "View results",
id: "3wbcnZ",
description:
"A link to view the pools that contain matching talent.",
})
: intl.formatMessage({
defaultMessage:
"Submit an empty request and we will try to help.",
id: "9qzCX/",
description:
"Link text to scroll to the submit button when no candidates were found",
})}
</ScrollToLink>
</p>
{!updatePending && (
<p>
<ScrollToLink to="results" color="black" mode="inline">
{candidateCount
? intl.formatMessage({
defaultMessage: "View results",
id: "3wbcnZ",
description:
"A link to view the pools that contain matching talent.",
})
: intl.formatMessage({
defaultMessage:
"Submit an empty request and we will try to help.",
id: "9qzCX/",
description:
"Link text to scroll to the submit button when no candidates were found",
})}
</ScrollToLink>
</p>
)}
</div>
</div>
</div>
Expand Down
135 changes: 73 additions & 62 deletions apps/web/src/pages/SearchRequests/SearchPage/components/SearchForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import { useNavigate } from "react-router-dom";
import { useQuery } from "urql";
import { ReactNode, useState, useEffect } from "react";

import { Button, Heading, Pending, Separator } from "@gc-digital-talent/ui";
import {
Button,
Heading,
Loading,
Pending,
Separator,
} from "@gc-digital-talent/ui";
import { unpackMaybes, notEmpty } from "@gc-digital-talent/helpers";
import {
graphql,
Expand Down Expand Up @@ -149,10 +155,14 @@ export const SearchForm = ({ classifications, skills }: SearchFormProps) => {
</div>
</div>
<Separator />
<Heading level="h3" size="h4" id="results">
{intl.formatMessage(
{
defaultMessage: `Results:
{fetching ? (
<Loading inline />
) : (
<>
<Heading level="h3" size="h4" id="results">
{intl.formatMessage(
{
defaultMessage: `Results:
{ totalCandidateCount, plural,
=0 {<testId><b>{totalCandidateCount}</b></testId> matching candidates}
=1 {<testId><b>{totalCandidateCount}</b></testId> matching candidate}
Expand All @@ -162,65 +172,66 @@ export const SearchForm = ({ classifications, skills }: SearchFormProps) => {
=0 {<b>{numPools}</b> pools}
=1 {<b>{numPools}</b> pool}
other {<b>{numPools}</b> pools} }`,
id: "j2qiFb",
description:
"Heading for total matching candidates across a certain number of pools in results section of search page.",
},
{
testId,
b: styledCount,
totalCandidateCount: candidateCount,
numPools: results?.length ?? 0,
},
)}
</Heading>
<SearchFilterAdvice filters={applicantFilter} />

{results?.length && candidateCount > 0 ? (
<>
<p data-h2-margin="base(x1, 0)">
<Button
color="primary"
type="submit"
{...poolSubmitProps}
value=""
onClick={handleSubmitAllPools}
>
{intl.formatMessage({
defaultMessage: "Request candidates from all pools",
id: "DxNuJ9",
id: "j2qiFb",
description:
"Button text to submit search request for candidates across all pools",
})}
</Button>
</p>
<p
data-h2-font-size="base(h4)"
data-h2-margin="base(x1.5, 0, x.25, 0)"
>
{intl.formatMessage({
defaultMessage: "Or request candidates by pool",
id: "l1f8zy",
description:
"Lead-in text to list of pools managers can request candidates from",
})}
{intl.formatMessage(commonMessages.dividingColon)}
</p>
<div
data-h2-display="base(flex)"
data-h2-flex-direction="base(column)"
>
{results.map(({ pool, candidateCount: resultsCount }) => (
<SearchResultCard
key={pool.id}
candidateCount={resultsCount}
pool={pool}
/>
))}
</div>
"Heading for total matching candidates across a certain number of pools in results section of search page.",
},
{
testId,
b: styledCount,
totalCandidateCount: candidateCount,
numPools: results?.length ?? 0,
},
)}
</Heading>
<SearchFilterAdvice filters={applicantFilter} />
{results?.length && candidateCount > 0 ? (
<>
<p data-h2-margin="base(x1, 0)">
<Button
color="primary"
type="submit"
{...poolSubmitProps}
value=""
onClick={handleSubmitAllPools}
>
{intl.formatMessage({
defaultMessage: "Request candidates from all pools",
id: "DxNuJ9",
description:
"Button text to submit search request for candidates across all pools",
})}
</Button>
</p>
<p
data-h2-font-size="base(h4)"
data-h2-margin="base(x1.5, 0, x.25, 0)"
>
{intl.formatMessage({
defaultMessage: "Or request candidates by pool",
id: "l1f8zy",
description:
"Lead-in text to list of pools managers can request candidates from",
})}
{intl.formatMessage(commonMessages.dividingColon)}
</p>
<div
data-h2-display="base(flex)"
data-h2-flex-direction="base(column)"
>
{results.map(({ pool, candidateCount: resultsCount }) => (
<SearchResultCard
key={pool.id}
candidateCount={resultsCount}
pool={pool}
/>
))}
</div>
</>
) : (
<NoResults />
)}
</>
) : (
<NoResults />
)}
</form>
</FormProvider>
Expand Down
Loading