Skip to content

Commit

Permalink
Merge pull request #6316 from GCTC-NTGC/feature_temp-strike-notice
Browse files Browse the repository at this point in the history
[Feature] Adds Strike Notice
  • Loading branch information
esizer authored and tristan-orourke committed Apr 19, 2023
1 parent c596ace commit 14c1ab0
Show file tree
Hide file tree
Showing 13 changed files with 159 additions and 2 deletions.
1 change: 1 addition & 0 deletions .vscode/project-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ OCIO
Ojibway
personalisation
pgsql
psac
Queueable
recruitmentimit
recruitments
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,8 @@
],
"[php]": {
"editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
},
"files.associations": {
"**/public/config.ejs": "plaintext"
}
}
1 change: 1 addition & 0 deletions apps/web/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ OAUTH_LOGOUT_URI="http://localhost:8000/oxauth/endsession"
FEATURE_ONGOING_RECRUITMENTS=true
FEATURE_APPLICANT_DASHBOARD=true
FEATURE_APPLICATION_REVAMP=true
FEATURE_PSAC_STRIKE=true

# Logging - enable by setting the logging level. Eight severity levels from rfc5424.
LOG_CONSOLE_LEVEL="debug"
Expand Down
1 change: 1 addition & 0 deletions apps/web/public/config.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const data = new Map([
["FEATURE_ONGOING_RECRUITMENTS", filterUnusable("$FEATURE_ONGOING_RECRUITMENTS") ?? "<%= htmlWebpackPlugin.options.environment.FEATURE_ONGOING_RECRUITMENTS %>"],
["FEATURE_APPLICANT_DASHBOARD", filterUnusable("$FEATURE_APPLICANT_DASHBOARD") ?? "<%= htmlWebpackPlugin.options.environment.FEATURE_APPLICANT_DASHBOARD %>"],
["FEATURE_APPLICATION_REVAMP", filterUnusable("$FEATURE_APPLICATION_REVAMP") ?? "<%= htmlWebpackPlugin.options.environment.FEATURE_APPLICATION_REVAMP %>"],
["FEATURE_PSAC_STRIKE", filterUnusable("$FEATURE_PSAC_STRIKE") ?? "<%= htmlWebpackPlugin.options.environment.FEATURE_PSAC_STRIKE %>"],

// Azure application insights not used in dev
["APPLICATIONINSIGHTS_CONNECTION_STRING", filterUnusable("$APPLICATIONINSIGHTS_CONNECTION_STRING")],
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/Hero/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const Hero = ({
<>
<Flourish />
<div
data-h2-container="base(center, large, x1) p-tablet(center, large, x2)"
data-h2-container="base(center, large, x1) p-tablet(center, medium, x2)"
data-h2-position="base(relative)"
data-h2-margin="base(-x5, auto, 0, auto)"
data-h2-z-index="base(4)"
Expand Down
35 changes: 35 additions & 0 deletions apps/web/src/components/StrikeNotice/StrikeNotice.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from "react";
import { useIntl } from "react-intl";

import { Alert } from "@gc-digital-talent/ui";
import { useFeatureFlags } from "@gc-digital-talent/env";

const StrikeNotice = () => {
const intl = useIntl();
const { psacStrike } = useFeatureFlags();

if (!psacStrike) return null;

return (
<Alert.Root type="warning">
<Alert.Title>
{intl.formatMessage({
defaultMessage:
"The Government of Canada and the Public Service Alliance of Canada (PSAC) are currently negotiating collective agreements.",
id: "oF8h5+",
description: "Heading for the PSAC strike notice.",
})}
</Alert.Title>
<p>
{intl.formatMessage({
defaultMessage:
"In the event of a labour disruption, referral services from this platform will be affected. Please note that your request will be responded to when services resume. Thank you for your patience.",
id: "6q29tj",
description: "Content for the PSAC strike notice.",
})}
</p>
</Alert.Root>
);
};

export default StrikeNotice;
108 changes: 108 additions & 0 deletions apps/web/src/lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -7476,5 +7476,113 @@
"z+qxaE": {
"defaultMessage": "Veuillez sélectionner un type afin de poursuivre.",
"description": "Test displayed on the experience form when a user has not selected an experience type."
},
"7XSyhV": {
"defaultMessage": "Cette habilité obligatoires doit compter au moins une expérience connexe tirée du cv.",
"description": "Experience tree view error message"
},
"GE9NbK": {
"defaultMessage": "Lier à une expérience tirée du cv",
"description": "Experience tree view action button label"
},
"HtllH6": {
"defaultMessage": "Ojibwé de l’Ouest",
"description": "Name of Western Ojibway language"
},
"TEt9Ua": {
"defaultMessage": "Cris des Plaines",
"description": "Name of Plains Cree language"
},
"qxe/hN": {
"defaultMessage": "Mi’kmaq",
"description": "Name of Mikmaq language"
},
"zAl7ZH": {
"defaultMessage": "Michif",
"description": "Name of Michif language"
},
"F7RkOA": {
"defaultMessage": "<strong>Pour commencer, nous vous demanderons de vérifier les renseignements de base de votre profil</strong>. Si vous n’avez pas encore créé votre profil, pas de problème! Vous pouvez ajouter tous les renseignements pertinents à l’étape suivante.",
"description": "Description of the application process and the next step"
},
"MNjEW5": {
"defaultMessage": "Nous sommes heureux de voir votre intérêt pour {poolName}.",
"description": "Introductory sentence for a pool application."
},
"u/DBSl": {
"defaultMessage": "La Plateforme de talents numériques du gouvernement du Canada est un système de recrutement basé sur les compétences. Cela signifie que votre candidature mettra davantage l’accent sur vos compétences et sur la façon dont vous les avez utilisées lors d’expériences passées pour nous aider à mieux comprendre votre adéquation.",
"description": "Description of how the skills-based hiring platform assess candidates."
},
"RWvojd": {
"defaultMessage": "Revenir à la publicité",
"description": "Link text to return to a pool advertisement during the application"
},
"r6z4HM": {
"defaultMessage": "Allons-y!",
"description": "Link text to begin the application process"
},
"5DfpAy": {
"defaultMessage": "Supprimer cette expérience",
"description": "Label on button to delete the current experience"
},
"YVhQ4t": {
"defaultMessage": "Erreur : La suppression de l’expérience a échoué",
"description": "Message displayed to user after experience fails to be deleted."
},
"kfXCY8": {
"defaultMessage": "L’étape suivante consiste à vous assurer que votre CV est aussi à jour que possible.",
"description": "Application step to begin working on résumé, paragraph one"
},
"rpES4b": {
"defaultMessage": "Plus précisément, non seulement nous voulons connaître votre <strong>parcours professionnel</strong>, mais également votre <strong>expérience communautaire</strong>, vos <strong>récompenses</strong>, vos <strong>initiatives personnelles</strong> et votre <strong>éducation</strong>!",
"description": "Application step to begin working on résumé, paragraph two"
},
"iK/Vqe": {
"defaultMessage": "Une fois que vous avez mis votre CV à jour et que vous êtes satisfait des expériences que vous avez ajoutées, vous les utiliserez dans d’autres étapes pour nous aider à mieux comprendre comment vous répondez aux exigences de compétences pour cette occasion.",
"description": "Application step to begin working on résumé, paragraph three"
},
"zMZQLY": {
"defaultMessage": "À partir d’ici, vous pouvez modifier cette expérience. N’oubliez pas, les expériences de travail devraient miser sur une description d’expériences vécues dans le cadre de postes à temps partiel, à plein temps, d’emplois autonomes, de bourses, de postes bénévoles, et de stages.",
"description": "Description for editing an experience."
},
"PnyBYM": {
"defaultMessage": "Allons-y!",
"description": "Action button to move to the next step"
},
"ikYbDD": {
"defaultMessage": "L’étape suivante est la partie la plus importante de votre candidature. Il vous sera demandé de dire comment vous répondez aux exigences de compétences pour ce rôle.",
"description": "Application step for skill requirements, introduction, description, paragraph one"
},
"pKLIzg": {
"defaultMessage": "De la même manière que vous avez sélectionné des éléments de votre CV pour confirmer les exigences en matière d’expérience et de formation, nous vous demanderons de décrire une ou plusieurs expériences de votre CV où vous avez activement utilisé la compétence requise.",
"description": "Application step for skill requirements, introduction, description, paragraph two"
},
"U86N4g": {
"defaultMessage": "Pour l’instant, sauvegardez et quittez",
"description": "Action button to save and exit an application"
},
"L5duFP": {
"defaultMessage": "Dans la dernière étape de la candidature, nous aimerions vous poser quelques questions relatives à l’occasion qui nous aideront à comprendre votre profil unique.",
"description": "Application step for screening questions, introduction description, paragraph one"
},
"OUXmYd": {
"defaultMessage": "Vos réponses seront évaluées dans le cadre de votre candidature, alors assurez-vous de donner à chaque question le temps et la réflexion nécessaires pour une réponse qui vous représente vraiment, vous et votre expérience.",
"description": "Application step for screening questions, introduction description, paragraph two"
},
"AOrJqm": {
"defaultMessage": "J'ai compris, allons-y!",
"description": "Link text to continue the application process"
},
"egLb65": {
"defaultMessage": "Je suis prêt!",
"description": "An action button to proceed"
},
"oF8h5+": {
"defaultMessage": "Le gouvernement du Canada et l'Alliance de la Fonction publique du Canada (AFPC) sont en pourparlers actuellement pour les conventions collectives.",
"description": "Heading for the PSAC strike notice."
},
"6q29tj": {
"defaultMessage": "En cas d'interruption du travail, les services de référence de cette plateforme seront touchés. Veuillez noter que votre demande sera traitée lorsque les services reprendront. Merci de votre patience.",
"description": "Content for the PSAC strike notice."
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Heading, ThrowNotFound, Button, Link } from "@gc-digital-talent/ui";

import Hero from "~/components/Hero";
import SEO from "~/components/SEO/SEO";
import StrikeNotice from "~/components/StrikeNotice/StrikeNotice";

import useBreadcrumbs from "~/hooks/useBreadcrumbs";
import useRoutes from "~/hooks/useRoutes";
Expand Down Expand Up @@ -70,6 +71,7 @@ const RequestConfirmationPage = () => {
crumbs={crumbs}
/>
<div data-h2-container="base(center, large, x1) p-tablet(center, large, x2)">
<StrikeNotice />
<Text data-h2-font-size="base(3rem)">
{intl.formatMessage({
defaultMessage: "We got it!",
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/pages/SearchRequests/RequestPage/RequestPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useIntl } from "react-intl";
import { useLocation } from "react-router-dom";

import Hero from "~/components/Hero/Hero";
import StrikeNotice from "~/components/StrikeNotice/StrikeNotice";
import { ApplicantFilterInput } from "~/api/generated";
import { SimpleClassification } from "~/types/pool";
import { FormValues as SearchFormValues } from "~/types/searchRequest";
Expand Down Expand Up @@ -37,6 +38,7 @@ const RequestPage = () => {
description: "Main heading displayed at the top of request page.",
})}
>
<StrikeNotice />
<div
data-h2-background-color="base(white)"
data-h2-radius="base(rounded)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from "react";
import { useIntl } from "react-intl";

import Hero from "~/components/Hero/Hero";
import StrikeNotice from "~/components/StrikeNotice/StrikeNotice";

const SearchHeading = () => {
const intl = useIntl();
Expand All @@ -14,6 +15,7 @@ const SearchHeading = () => {
description: "Title displayed in the hero section of the Search page.",
})}
>
<StrikeNotice />
<div
data-h2-background-color="base(white)"
data-h2-radius="base(rounded)"
Expand Down
1 change: 1 addition & 0 deletions packages/env/src/useFeatureFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export type FeatureFlags = {
ongoingRecruitments: boolean;
applicantDashboard: boolean;
applicationRevamp: boolean;
psacStrike: boolean;
};

const useFeatureFlags = (): FeatureFlags => {
Expand Down
1 change: 1 addition & 0 deletions packages/env/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ export const getFeatureFlags = () => ({
ongoingRecruitments: checkFeatureFlag("FEATURE_ONGOING_RECRUITMENTS"),
applicantDashboard: checkFeatureFlag("FEATURE_APPLICANT_DASHBOARD"),
applicationRevamp: checkFeatureFlag("FEATURE_APPLICATION_REVAMP"),
psacStrike: checkFeatureFlag("FEATURE_PSAC_STRIKE"),
});
2 changes: 1 addition & 1 deletion packages/ui/src/components/Alert/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const Title = ({ as = "h2", children, ...rest }: AlertTitleProps) => {

return (
<Heading
data-h2-font-size="base(h6, 1)"
data-h2-font-size="base(h6)"
data-h2-font-weight="base(700)"
data-h2-margin="base(0, 0, x.5, 0)"
{...rest}
Expand Down

0 comments on commit 14c1ab0

Please sign in to comment.