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.

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

[Debt] Removes ongoing jobs/recruitment #12179

Merged
merged 7 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion api/app/Enums/PublishingGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ enum PublishingGroup

case IAP;
case IT_JOBS;
case IT_JOBS_ONGOING;
case EXECUTIVE_JOBS;
case OTHER;

Expand Down
1 change: 0 additions & 1 deletion api/app/Models/PoolCandidate.php
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ public static function scopePublishingGroups(Builder $query, ?array $publishingG
public static function scopeInTalentSearchablePublishingGroup(Builder $query)
{
$query = self::scopePublishingGroups($query, [
PublishingGroup::IT_JOBS_ONGOING->name,
PublishingGroup::IT_JOBS->name,
PublishingGroup::OTHER->name,
]);
Expand Down
5 changes: 1 addition & 4 deletions api/database/factories/PoolFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,7 @@ public function candidatesAvailableInSearch()
{
return $this->published()->state(function () {
return [
'publishing_group' => $this->faker->randomElement([
PublishingGroup::IT_JOBS->name,
PublishingGroup::IT_JOBS_ONGOING->name,
]),
'publishing_group' => PublishingGroup::IT_JOBS->name,
];
});
}
Expand Down
2 changes: 1 addition & 1 deletion api/database/seeders/PoolTestSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public function run()
'community_id' => $digitalCommunityId,
'published_at' => config('constants.past_date'),
'closing_date' => config('constants.far_future_date'),
'publishing_group' => PublishingGroup::IT_JOBS_ONGOING->name,
'publishing_group' => PublishingGroup::IT_JOBS->name,
'stream' => PoolStream::BUSINESS_ADVISORY_SERVICES->name,
'work_stream_id' => $businessAdvisoryStreamId,

Expand Down
1 change: 0 additions & 1 deletion api/lang/en/publishing_group.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
'executive_jobs' => 'Executive Jobs',
'iap' => 'IAP',
'it_jobs' => 'IT Jobs',
'it_jobs_ongoing' => 'IT Jobs (ongoing)',
'other' => Lang::get('common.other', [], 'en'),
];
1 change: 0 additions & 1 deletion api/lang/fr/publishing_group.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
'executive_jobs' => 'Postes de direction',
'iap' => 'PAPA',
'it_jobs' => 'Emplois en TI',
'it_jobs_ongoing' => 'Emplois en TI (en cours)',
'other' => Lang::get('common.other', [], 'fr'),
];
1 change: 0 additions & 1 deletion api/storage/app/lighthouse-schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -3300,7 +3300,6 @@ enum ProvinceOrTerritory {
enum PublishingGroup {
IAP
IT_JOBS
IT_JOBS_ONGOING
EXECUTIVE_JOBS
OTHER
}
Expand Down
10 changes: 2 additions & 8 deletions api/tests/Feature/ApplicantTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function testCountApplicantsQuery(): void
$user = User::all()->first();
$ITPool1 = Pool::factory()->candidatesAvailableInSearch()->create([
'user_id' => $user['id'],
'publishing_group' => PublishingGroup::IT_JOBS_ONGOING->name,
'publishing_group' => PublishingGroup::IT_JOBS->name,
]);
$ITPool2 = Pool::factory()->candidatesAvailableInSearch()->create([
'user_id' => $user['id'],
Expand Down Expand Up @@ -1736,12 +1736,6 @@ public function testOnlyITJobsAppear()
PoolCandidate::factory()->availableInSearch()->create([
'pool_id' => $itPool->id,
]);
$itOngoingPool = Pool::factory()->published()->candidatesAvailableInSearch()->create([
'user_id' => $this->adminUser->id,
]);
PoolCandidate::factory()->availableInSearch()->create([
'pool_id' => $itOngoingPool->id,
]);
$execPool = Pool::factory()->published()->create([
'user_id' => $this->adminUser->id,
'publishing_group' => PublishingGroup::EXECUTIVE_JOBS->name,
Expand All @@ -1762,7 +1756,7 @@ public function testOnlyITJobsAppear()
]
)->assertJson([
'data' => [
'countApplicants' => 2,
'countApplicants' => 1,
],
]);
}
Expand Down
11 changes: 0 additions & 11 deletions api/tests/Feature/CountPoolCandidatesByPoolTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -630,12 +630,6 @@ public function testOnlyItJobsAppear()
]);
PoolCandidate::factory()->create($this->poolCandidateData($itPool, $user, true));

$itOngoingPool = Pool::factory()->create([
...$this->poolData(),
'publishing_group' => PublishingGroup::IT_JOBS_ONGOING->name,
]);
PoolCandidate::factory()->create($this->poolCandidateData($itOngoingPool, $user, true));

// Note: Should not appear in results
$execPool = Pool::factory()->create([
...$this->poolData(),
Expand All @@ -657,18 +651,13 @@ public function testOnlyItJobsAppear()
'where' => [
'pools' => [
['id' => $itPool->id],
['id' => $itOngoingPool->id],
['id' => $execPool->id], // Should not show up
],
],
]
)->assertSimilarJson([
'data' => [
'countPoolCandidatesByPool' => [
[
'pool' => ['id' => $itOngoingPool->id],
'candidateCount' => 1,
],
[
'pool' => ['id' => $itPool->id],
'candidateCount' => 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ const defaultState = {
},
poolCandidateStatus: [],
priorityWeight: [],
publishingGroups: [PublishingGroup.ItJobs, PublishingGroup.ItJobsOngoing],
publishingGroups: [PublishingGroup.ItJobs],
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
} from "@gc-digital-talent/graphql";

import { categorizeSkill, filterPoolSkillsByType } from "~/utils/skillUtils";
import { getRecruitmentType } from "~/utils/poolCandidate";
import poolCandidateMessages from "~/messages/poolCandidateMessages";

import RecruitmentAvailabilityDialog from "../RecruitmentAvailabilityDialog/RecruitmentAvailabilityDialog";
import { getQualifiedRecruitmentInfo } from "./utils";
Expand Down Expand Up @@ -180,7 +180,7 @@ const QualifiedRecruitmentCard = ({
data-h2-color="base(secondary.darker)"
data-h2-margin="base(x.25 0 x1 0)"
>
{getRecruitmentType(candidate.pool.publishingGroup?.value, intl)}
{intl.formatMessage(poolCandidateMessages.targetedRecruitment)}
</p>
<Collapsible.Root open={isOpen} onOpenChange={setIsOpen}>
<Collapsible.Trigger asChild>
Expand Down
4 changes: 0 additions & 4 deletions apps/web/src/constants/pool.ts

This file was deleted.

68 changes: 16 additions & 52 deletions apps/web/src/lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,10 @@
"defaultMessage": "Fournissez vos renseignements",
"description": "How it works, step 2 heading"
},
"/61ANw": {
"defaultMessage": "Les candidatures pour les possibilités de recrutement peuvent être gérées et suivies ici. Vous pourrez voir les dates limites de présentation des candidatures, le statut de votre candidature au fil du temps et les candidatures antérieures.",
"description": "Description for the track applications section on the profile and applications, paragraph one."
},
"/81xCT": {
"defaultMessage": "« Je suis métisse ou métis »",
"description": "Label text for Métis community declaration"
Expand Down Expand Up @@ -551,10 +555,6 @@
"defaultMessage": "Tâches de travail (anglais)",
"description": "Label for a process' English work tasks"
},
"0lDq3P": {
"defaultMessage": "La liste n’est pas filtrée. ",
"description": "Announcement that the job stream filter is not active."
},
"0nP0Wj": {
"defaultMessage": "Selon la <link>définition de Statistique Canada</link>, ce groupe :",
"description": "Link to Statistics Canada's employment equity definitions"
Expand Down Expand Up @@ -3895,10 +3895,6 @@
"defaultMessage": "Les conditions d’emploi sélectionnées seront comparées à celles choisies par les candidats dans leur demande.",
"description": "Message describing the operational requirements filter in the search form."
},
"ITLoHV": {
"defaultMessage": "Nous proposons également des processus de recrutement passif qui nous permettent de trouver rapidement des talents lorsque la demande se fait sentir. Bien qu’il n’y ait aucune garantie qu’un emploi résultera des possibilités ci-dessous, il s’agit d’un moyen facile pour permettre aux gestionnaires de trouver votre nom et votre parcours professionnel le moment venu. N’hésitez pas à soumettre votre nom à toute filière correspondant à vos compétences.",
"description": "instructions for section with ongoing pool advertisements"
},
"IUoUqs": {
"defaultMessage": "Modification de l’état",
"description": "Title for the request status last changed at date block."
Expand Down Expand Up @@ -4511,10 +4507,6 @@
"defaultMessage": "Questions de présélection (au moment de la candidature) - {skillName}",
"description": "Header for application screening decision dialog."
},
"LFYdXR": {
"defaultMessage": "Recommandé selon vos compétences",
"description": "Tip that your skills match this section well and so it is recommended"
},
"LGSw+f": {
"defaultMessage": "Tous les apprentis seront appuyés par des pairs et des mentors soigneusement sélectionnés. Les apprentis seront également invités à se joindre à un Réseau d’apprentissage pour les Autochtones, où ils auront des occasions de communiquer avec d’autres employés autochtones du gouvernement du Canada et avec d’autres apprentis autochtones qui participent à ce programme.",
"description": "Learn more dialog question two paragraph two"
Expand Down Expand Up @@ -4547,6 +4539,10 @@
"defaultMessage": "Collectivité",
"description": "Title for community"
},
"LQbKTy": {
"defaultMessage": "Consultez nos possibilités d'emploi pour trouver un poste de gestionnaire qui vous inspire. Posez votre candidature pour jouer un rôle clé au sein de l'une des équipes de TI du gouvernement du Canada et avoir un impact significatif.",
"description": "Summary for the feature about finding manager jobs"
},
"LTpCFL": {
"defaultMessage": "À propos de nous",
"description": "Title for about us section on a pool advertisement."
Expand Down Expand Up @@ -4655,6 +4651,10 @@
"defaultMessage": "Une fois l’apprentissage terminé avec succès, les diplômés reçoivent un certificat numérique ainsi qu’un certificat vérifiable portable. Il est approuvé par le, la dirigeant·e principal·e de l’information du Canada et officiellement reconnu comme répondant à <link>l‘alternative aux exigences d’études de la norme de qualification minimale du GC pour le groupe professionnel IT</link>.",
"description": "Paragraph 1 of the 'Digital certificate credential' subsection"
},
"M+5+nP": {
"defaultMessage": "Exploiter d’autres occasions",
"description": "Link text for browse jobs page"
},
"M051tF": {
"defaultMessage": "Retirer une compétence",
"description": "Message in skills in details section to remove skill from the experience."
Expand Down Expand Up @@ -5683,10 +5683,6 @@
"defaultMessage": "Télécharger une copie de ce formulaire",
"description": "Button text to download this form"
},
"RBsGRp": {
"defaultMessage": "Postulez au recrutement en cours",
"description": "title for section with ongoing pool advertisements"
},
"RDAVsP": {
"defaultMessage": "Lire la Directive",
"description": "Link text to read the entire directive."
Expand Down Expand Up @@ -5919,6 +5915,10 @@
"defaultMessage": "<strong>Ma situation concorde avec l’option d’expérience de travail appliquée</strong>",
"description": "Radio group option for education requirement filter in application education form."
},
"SP8yeX": {
"defaultMessage": "Vous pouvez commencer par formuler une demande dans le cadre d’un processus de recrutement.",
"description": "Message to user when no qualified recruitments have been attached to profile, paragraph two."
},
"SQJgGP": {
"defaultMessage": "Votre information sur l’annonce et votre plan d'évaluation sont complets.",
"description": "Lead-in text on a complete process, ready for publishing"
Expand Down Expand Up @@ -6023,10 +6023,6 @@
"defaultMessage": "Le travail est-il attribué à la sous-traitance parce qu’il comprend l’apport de ce qui suit :",
"description": "Context for _technological change_ section, paragraph 1, in the _digital services contracting questionnaire_"
},
"SypvZP": {
"defaultMessage": "La liste est filtrée vers le {jobStream} volet du travail.",
"description": "Announcement that the job stream filter is active."
},
"T+fhB+": {
"defaultMessage": "Décision finale annulée",
"description": "Message displayed when a pool candidate final decision has been updated by an admin"
Expand Down Expand Up @@ -6394,18 +6390,10 @@
"defaultMessage": "Ce à quoi s’attendre après l’admission",
"description": "Title for the what to expect post admission section"
},
"Uxw5DB": {
"defaultMessage": "Recrutement en cours",
"description": "Label for an ongoing qualified recruitment"
},
"Uy5Dg2": {
"defaultMessage": "Participation de la collectivité",
"description": "Title for community experience section"
},
"Uzx5dR": {
"defaultMessage": "Vous ne voyez pas de processus de recrutement actif correspondant à vos compétences ? Pas de problème, nous voulons toujours avoir de vos nouvelles.",
"description": "summary for section with ongoing pool advertisements"
},
"V0U95l": {
"defaultMessage": "Vous n'avez pas encore ajouté de compétences essentielles",
"description": "Null message title for essential skills table."
Expand Down Expand Up @@ -6990,10 +6978,6 @@
"defaultMessage": "<strong>Oui</strong>, j'ai un droit de priorité.",
"description": "Label displayed does have priority entitlement option"
},
"XnvXtO": {
"defaultMessage": "Tous",
"description": "All"
},
"XoGKAf": {
"defaultMessage": "À qui s’adresse le recrutement pour les cadres?",
"description": "Heading for EXposition eligibility"
Expand Down Expand Up @@ -8074,10 +8058,6 @@
"defaultMessage": "Publiez votre annonce pour commencer à recevoir des candidatures",
"description": "Instructions on a draft process on how to start getting applicants"
},
"dJXjhw": {
"defaultMessage": "Sélectionnez un volet",
"description": "Placeholder for stream filter in browse opportunities form."
},
"dSfDu1": {
"defaultMessage": "Aidez les gestionnaires à comprendre les domaines dans lesquels vous souhaitez améliorer des compétences comportementales. Vous pouvez modifier cette vitrine à tout moment et vous êtes libre de mettre les compétences dans l’ordre qui vous convient. Les compétences que vous ajoutez à la vitrine qui ne sont pas déjà dans votre bibliothèque seront ajoutées automatiquement.",
"description": "Page blurb for the improve behavioural skills page"
Expand Down Expand Up @@ -8790,10 +8770,6 @@
"defaultMessage": "Ajoutez une expérience à votre parcours professionnel",
"description": "Title for application career timeline add experience"
},
"gURsqG": {
"defaultMessage": "Consultez les processus de recrutement de gestionnaires les plus récents afin de connaître les possibilités d'emploi spécifiques ou posez votre candidature à un processus de recrutement en cours dans l'un des volets de travail génériques des TI. Consultez régulièrement le site pour connaître les nouvelles possibilités d'emploi.",
"description": "Summary for the feature about finding manager jobs"
},
"gUb3PY": {
"defaultMessage": "Demande créée avec succès!",
"description": "Message displayed to user after a pool candidate request is created successfully."
Expand Down Expand Up @@ -9314,10 +9290,6 @@
"defaultMessage": "Modifiez les informations sur le groupe de compétences",
"description": "Link text to edit a skill family"
},
"igTx2a": {
"defaultMessage": "Les candidatures pour le bassin de talents et les possibilités de recrutement en cours peuvent être gérées et suivies ici. Vous pourrez voir les dates limites de présentation des candidatures, le statut de votre candidature au fil du temps et les candidatures antérieures.",
"description": "Description for the track applications section on the profile and applications, paragraph one."
},
"iiEGjW": {
"defaultMessage": "Nous avons bien reçu votre message.",
"description": "Support form success title"
Expand Down Expand Up @@ -10278,10 +10250,6 @@
"defaultMessage": "Supprimer le processus",
"description": "Title to delete a process"
},
"nc5GGm": {
"defaultMessage": "Exploiter d’autres occasions",
"description": "Link text to the ongoing recruitments section on the browse page"
},
"ndW6vI": {
"defaultMessage": "En attente d’une évaluation",
"description": "Message displayed when candidate is on hold at a specific assessment step"
Expand Down Expand Up @@ -12290,10 +12258,6 @@
"defaultMessage": "ne respectent pas les principes de la Charte canadienne des droits et libertés, Loi constitutionnelle de 1982",
"description": "Comments or contributions list item"
},
"z7FpHz": {
"defaultMessage": "Vous pouvez commencer par formuler une demande dans le cadre d’un processus de recrutement ciblé ou en cours.",
"description": "Message to user when no qualified recruitments have been attached to profile, paragraph two."
},
"z8b14H": {
"defaultMessage": "contiennent des renseignements personnels",
"description": "Comments or contributions list item"
Expand Down
5 changes: 0 additions & 5 deletions apps/web/src/messages/poolCandidateMessages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ const messages = defineMessages({
id: "uIWFvk",
description: "Message displayed when a user is appearing in a recruitment",
},
ongoingRecruitment: {
defaultMessage: "Ongoing recruitment",
id: "Uxw5DB",
description: "Label for an ongoing qualified recruitment",
},
targetedRecruitment: {
defaultMessage: "Targeted recruitment",
id: "04smVa",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ const ApplicationSuccess = ({ application }: ApplicationPageProps) => {
>
{intl.formatMessage({
defaultMessage: "Browse for other opportunities",
id: "nc5GGm",
description:
"Link text to the ongoing recruitments section on the browse page",
id: "M+5+nP",
description: "Link text for browse jobs page",
})}
</Link>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ export const HomePage = ({ pools }: HomePageProps) => {
<p>
{intl.formatMessage({
defaultMessage:
"Check out the most recent manager recruitment processes for specific opportunities or apply to ongoing recruitment in any of the IT generic work streams. Check back often for new opportunities.",
id: "gURsqG",
"Check out our job opportunities to find a manager position that inspires you. Apply to play a key role in one of the IT teams at the Government of Canada and make a meaningful impact.",
id: "LQbKTy",
description:
"Summary for the feature about finding manager jobs",
})}
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/pages/Home/ManagerHomePage/ManagerHomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ const ManagerHomePage = () => {
<p>
{intl.formatMessage({
defaultMessage:
"Check out the most recent manager recruitment processes for specific opportunities or apply to ongoing recruitment in any of the IT generic work streams. Check back often for new opportunities.",
id: "gURsqG",
"Check out our job opportunities to find a manager position that inspires you. Apply to play a key role in one of the IT teams at the Government of Canada and make a meaningful impact.",
id: "LQbKTy",
description:
"Summary for the feature about finding manager jobs",
})}
Expand Down
Loading
Loading