Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/convert-Attention-components
Browse files Browse the repository at this point in the history
  • Loading branch information
dsamojlenko authored Aug 16, 2023
2 parents 3cd0ca6 + 405e786 commit 31225ac
Show file tree
Hide file tree
Showing 13 changed files with 403 additions and 302 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "3.2.0"
".": "3.3.0"
}
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,43 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.3.0](https://github.com/cds-snc/platform-forms-client/compare/v3.2.0...v3.3.0) (2023-08-16)


### Features

* added unit tests around password reset library ([#2518](https://github.com/cds-snc/platform-forms-client/issues/2518)) ([ef1755b](https://github.com/cds-snc/platform-forms-client/commit/ef1755b35f65b34aa1b943ae50e4d56087ea06a8))
* added user email to ownership and privilege audit logs ([#2459](https://github.com/cds-snc/platform-forms-client/issues/2459)) ([5315839](https://github.com/cds-snc/platform-forms-client/commit/5315839fec49fd077decc418a1c23d92df56710a))
* Alerts refactor - create new Alert component for admin/FormBuilder ([#2446](https://github.com/cds-snc/platform-forms-client/issues/2446)) ([3122649](https://github.com/cds-snc/platform-forms-client/commit/3122649730b8a3cb7985a766e8e869e47bb23fca))


### Bug Fixes

* auth errors copy edits ([#2538](https://github.com/cds-snc/platform-forms-client/issues/2538)) ([0adec47](https://github.com/cds-snc/platform-forms-client/commit/0adec475bec3ff001b53fbeba98ae75ce27ccb45))
* check user privileges when setting security questions ([#2517](https://github.com/cds-snc/platform-forms-client/issues/2517)) ([f5e67bd](https://github.com/cds-snc/platform-forms-client/commit/f5e67bd5761c10d69e73a5ebf8de76f6b1ac8e2d))
* **deps:** update all patch dependencies ([#2529](https://github.com/cds-snc/platform-forms-client/issues/2529)) ([3ed8a5c](https://github.com/cds-snc/platform-forms-client/commit/3ed8a5ca40fab40cb85d8a75127021be345043d7))
* disables input field for form name on published forms ([#2507](https://github.com/cds-snc/platform-forms-client/issues/2507)) ([8c3caa0](https://github.com/cds-snc/platform-forms-client/commit/8c3caa0ff8cea46df77cdd33b905c1cb77473e23))
* display missing privilege in admin panel ([#2536](https://github.com/cds-snc/platform-forms-client/issues/2536)) ([6e08697](https://github.com/cds-snc/platform-forms-client/commit/6e08697ed7ce01c69514619571b131a78101eba6))
* make security questions unique in database schema ([#2516](https://github.com/cds-snc/platform-forms-client/issues/2516)) ([943ca22](https://github.com/cds-snc/platform-forms-client/commit/943ca2200adca0650553bfcd6d522e96245c20ca))
* privilege seeding ([#2541](https://github.com/cds-snc/platform-forms-client/issues/2541)) ([10d7436](https://github.com/cds-snc/platform-forms-client/commit/10d7436296eaae1d8ebe109cfe2109311811795c))
* Publish page heading levels ([#2537](https://github.com/cds-snc/platform-forms-client/issues/2537)) ([5d3ab43](https://github.com/cds-snc/platform-forms-client/commit/5d3ab43403df1797447cc7145a7b896be883a35a))
* Skip to main content redundant nav landmark region ([#2534](https://github.com/cds-snc/platform-forms-client/issues/2534)) ([dee9ea0](https://github.com/cds-snc/platform-forms-client/commit/dee9ea04850fcff54a24f1309f7d8702bee15f3a))
* token session ([#2531](https://github.com/cds-snc/platform-forms-client/issues/2531)) ([d1437a9](https://github.com/cds-snc/platform-forms-client/commit/d1437a912fd21d3cc4509914e9245d947e944f8a))


### Miscellaneous Chores

* Add Get Support link to Answer Security Questions ([#2525](https://github.com/cds-snc/platform-forms-client/issues/2525)) ([9dfa6c7](https://github.com/cds-snc/platform-forms-client/commit/9dfa6c75f5a84626aa4d2f9e585857749625bd28))
* Add Permissions-Policy header ([#2532](https://github.com/cds-snc/platform-forms-client/issues/2532)) ([315f5c0](https://github.com/cds-snc/platform-forms-client/commit/315f5c0ad4801ea5a9b3ab6e0be5f755babf57b9))
* **deps:** pin dependencies ([#2369](https://github.com/cds-snc/platform-forms-client/issues/2369)) ([5bf9ed3](https://github.com/cds-snc/platform-forms-client/commit/5bf9ed3ed6f2e698f2601d750bbe80fd999b4c5a))
* **deps:** update all non-major docker images ([#2527](https://github.com/cds-snc/platform-forms-client/issues/2527)) ([83febef](https://github.com/cds-snc/platform-forms-client/commit/83febef64fbf5137f4dd4b15b6dfcae87e2fa892))
* **deps:** update all non-major github action dependencies ([#2368](https://github.com/cds-snc/platform-forms-client/issues/2368)) ([bb8b43c](https://github.com/cds-snc/platform-forms-client/commit/bb8b43c3f1a9d4e41830e113a1e715c5fb059d20))
* **deps:** update all non-major github action dependencies ([#2528](https://github.com/cds-snc/platform-forms-client/issues/2528)) ([5c0c636](https://github.com/cds-snc/platform-forms-client/commit/5c0c636218f1d0f4e35be2dc8b74f345a9fe02f7))
* **deps:** update all patch dependencies ([#2434](https://github.com/cds-snc/platform-forms-client/issues/2434)) ([4d75fa7](https://github.com/cds-snc/platform-forms-client/commit/4d75fa7bd4aba197a16066206120aadff8cd2eff))
* fix security questions banner text ([#2550](https://github.com/cds-snc/platform-forms-client/issues/2550)) ([301fd35](https://github.com/cds-snc/platform-forms-client/commit/301fd350ad6899e31d12331268a920f7e1bb0dba))
* Form title line wrap ([#2526](https://github.com/cds-snc/platform-forms-client/issues/2526)) ([b27db37](https://github.com/cds-snc/platform-forms-client/commit/b27db3776ef1173fd9dcebd7911d1a80237bd45d))
* Remove password reset feature flag ([#2509](https://github.com/cds-snc/platform-forms-client/issues/2509)) ([c361d93](https://github.com/cds-snc/platform-forms-client/commit/c361d935498cef16cd4adc582eb48ac607efc1c4))

## [3.2.0](https://github.com/cds-snc/platform-forms-client/compare/v3.1.1...v3.2.0) (2023-08-03)


Expand Down
15 changes: 12 additions & 3 deletions cypress/e2e/setup_security_questions_page.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ describe("Security Questions Page", () => {
cy.get("#question1").select(questions1);
cy.get("#question1").find(":selected").contains(questions1);
cy.get("button[type='submit']").click();
cy.get("p[data-testid='errorMessage'").should("contain", "Required field");
cy.get("p[data-testid='errorMessage'").should(
"contain",
"Complete the required field to continue."
);
});

it("Fails to submit when a question is not selected", () => {
Expand All @@ -47,7 +50,10 @@ describe("Security Questions Page", () => {
cy.get("#answer3").type("123456");
cy.get("#answer3").should("have.value", "123456");
cy.get("button[type='submit']").click();
cy.get("p[data-testid='errorMessage'").should("contain", "Required field");
cy.get("p[data-testid='errorMessage'").should(
"contain",
"Complete the required field to continue."
);
});

it("Fails to submit when a answer is not filled in", () => {
Expand All @@ -62,7 +68,10 @@ describe("Security Questions Page", () => {
cy.get("#question3").select(questions3);
cy.get("#question3").find(":selected").contains(questions3);
cy.get("button[type='submit']").click();
cy.get("p[data-testid='errorMessage'").should("contain", "Required field");
cy.get("p[data-testid='errorMessage'").should(
"contain",
"Complete the required field to continue."
);
});

it("Fails to submit when a question is too short", () => {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gcforms",
"version": "3.2.0",
"version": "3.3.0",
"private": true,
"prisma": {
"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seeds/seed_cli.ts --environment=development"
Expand Down Expand Up @@ -43,7 +43,7 @@
"@lexical/react": "0.9.2",
"@next-auth/prisma-adapter": "1.0.7",
"@prisma/client": "4.12.0",
"@radix-ui/react-dropdown-menu": "2.0.4",
"@radix-ui/react-dropdown-menu": "2.0.5",
"@types/cypress": "^1.1.3",
"axios": "0.26.1",
"classnames": "2.3.2",
Expand All @@ -70,8 +70,8 @@
"markdown-to-jsx": "7.1.9",
"markdown-to-txt": "2.0.1",
"mmmagic": "0.5.3",
"next": "13.4.12",
"next-auth": "4.22.1",
"next": "13.4.13",
"next-auth": "4.22.5",
"next-i18next": "13.2.2",
"notifications-node-client": "5.1.2",
"pino": "8.8.0",
Expand Down
4 changes: 2 additions & 2 deletions public/static/locales/en/form-builder-responses.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"errorDownloadingFiles": "Try again in a few minutes. If the problem persists, ",
"errorDownloadingFilesLink": "contact Support",
"overdueAlert": {
"title": "Downloading is restricted for overdue responses until they are downloaded and confirmed",
"description": "There are {{numberOfOverdueResponses}} unconfirmed responses {{escalatedAfter}} days overdue. Download and confirm all overdue responses before continuing."
"title": "Access to new responses is restricted until overdue responses are downloaded and confirmed",
"description": "There are {{numberOfOverdueResponses}} unconfirmed responses that are {{escalatedAfter}} days old. Download and confirm all overdue responses to remove this restriction."
}
},
"downloadXSelectedResponses": "Download {{size}} selected responses",
Expand Down
12 changes: 6 additions & 6 deletions public/static/locales/en/setup-security-questions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
"requirements2": "No personal identifying information",
"question": "Question",
"answer": "Answer",
"firstQuestion": "Enter the first security qestion and answer[FR]",
"secondQuestion": "Enter the second security qestion and answer[FR]",
"thirdQuestion": "Enter the third security qestion and answer[FR]",
"firstQuestion": "Select a first security question and enter an answer",
"secondQuestion": "Select a second security question and enter an answer",
"thirdQuestion": "Select a third security question and enter an answer",
"questionPlaceholder": "Select question",
"continue": "Continue",
"support": "Get support",
"errors": {
"serverError": {
"title": "An error occurred"
},
"required": "Required field",
"required": "Complete the required field to continue.",
"answerLength": "Must be at least 4 characters",
"duplicateAnswer": "Answers cannot be the same. Create a unique answer for this question"
"duplicateAnswer": "Answers cannot be the same. Create a unique answer for this question."
},
"banner": {
"title": "We’ve added protection to keep your account and forms safe.",
"body": "You’ll need to enter a security code to access GC Forms."
"body": "You’ll be prompted with security questions when you reset your password."
},
"success": {
"title": "Your security questions have been saved"
Expand Down
2 changes: 1 addition & 1 deletion public/static/locales/fr/admin-home.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"permissions": "Permissions",
"systemAdministration": "Administration du système",
"accountAdministration": "Administration des comptes",
"manageUsersAndTheirForms": "[FR] Manage users and their forms",
"manageUsersAndTheirForms": "Gérer les utilisateur·rice·s et leurs formulaires",
"configureHowTheApplicationWorks": "Configurer le fonctionnement de l’application."
}
20 changes: 10 additions & 10 deletions public/static/locales/fr/admin-users.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
},
"backToAccounts": "Retourner à Comptes",
"backToManageForms": "Retourner à Gérer les formulaires",
"lockPublishing": "Lock publishing[FR]",
"unlockPublishing" : "Unlock publishing[FR]",
"mustHaveAtLeastOneUser": "Must assign at least one user.",
"accountsFilterLabel": "Accounts filters[FR]",
"lockPublishing": "Vérouiller la publication",
"unlockPublishing" : "Dévérouiller la publication",
"mustHaveAtLeastOneUser": "Doit assigner au moins un·e utilisateur·rice.",
"accountsFilterLabel": "Filtrer les comptes",
"accountsFilter": {
"all": "All[FR]",
"active": "Active[FR]",
"deactivated": "Deactivated[FR]",
"noAccounts": "No accounts[FR]",
"noActiveAccounts": "No active accounts[FR]",
"noDeactivatedAccounts": "No deactivated accounts[FR]"
"all": "Tous",
"active": "Activés",
"deactivated": "Désactivés",
"noAccounts": "Aucun compte",
"noActiveAccounts": "Aucun compte activé",
"noDeactivatedAccounts": "Aucun compte désactivé"
}
}
4 changes: 2 additions & 2 deletions public/static/locales/fr/form-builder-responses.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"errorDownloadingFiles": "Réessayez dans quelques minutes. Si le problème persiste, ",
"errorDownloadingFilesLink": "contactez Soutien",
"overdueAlert": {
"title": "Downloading is restricted for overdue responses until they are downloaded and confirmed[FR]",
"description": "There are {{numberOfOverdueResponses}} unconfirmed responses {{escalatedAfter}} days overdue. Download and confirm all overdue responses before continuing.[FR]"
"title": "L'accès aux nouvelles réponses est restreint jusqu'à ce que les réponses en retard soient téléchargées et confirmées",
"description": "Il y a {{numberOfOverdueResponses}} réponses qui datent de {{escalatedAfter}} jours. Téléchargez et confirmez toutes les réponses en retard pour enlever cette restriction."
}
},
"downloadXSelectedResponses": "Télécharger {{size}} réponses sélectionnées",
Expand Down
6 changes: 3 additions & 3 deletions public/static/locales/fr/form-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
"title": "Contactez-nous",
"useThisForm": "Utilisez ce formulaire pour en apprendre davantage sur Formulaires GC et sur la façon dont cet outil peut fonctionner au sein de votre ministère ou organisme.",
"errors": {
"submissionError": "Something went wrong. Please try again later.[FR]"
"submissionError": "Il y a eu une erreur. Veuillez réessayer plus tard."
}
},
"copyButton": "Copié dans le presse-papiers",
Expand Down Expand Up @@ -595,7 +595,7 @@
"title": "Soutien",
"useThisForm": "Utilisez ce formulaire pour obtenir du soutien technique ou signaler tout problème technique avec Formulaires GC.",
"errors": {
"submissionError": "Something went wrong. Please try again later.[FR]"
"submissionError": "Il y a eu une erreur. Veuillez réessayer plus tard."
}
},
"test": "Tester",
Expand All @@ -615,7 +615,7 @@
"unlockPublishing": "Soumettre",
"unlockPublishingDescription": "Pour déverrouiller la publication, fournissez les coordonnées de la personne de qui vous relevez. ",
"unnamedForm": "Formulaire sans titre",
"formName": "Form name[FR]",
"formName": "Nom du formulaire",
"responsesNavLabel": "Réponses",
"nagware": {
"restrictedDownloadAfter35Days": "Le téléchargement sera limité si les réponses non confirmées ont plus de 35 jours de retard.",
Expand Down
4 changes: 2 additions & 2 deletions public/static/locales/fr/profile.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
},
"invalidInput": "Doit être au moins 4 caractères.",
"unknownError": {
"title": "Unknown error[FR]",
"content": "An unknown error occurred and we could not process your request. Please try again later.[FR]"
"title": "Erreur inconnue",
"content": "Une erreur inconnue s'est produite et nous n'avons pas pu traiter votre demande. Veuillez réessayer plus tard."
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions public/static/locales/fr/setup-security-questions.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"title": "Configurer les questions de sécurité",
"description": "Répondez à 3 questions de sécurité pour sécuriser votre compte.",
"requirementsTitle": "YVos réponses devraient être difficiles à deviner:",
"requirementsTitle": "Vos réponses devraient être difficiles à deviner:",
"requirements1": "Au moins 4 caractères.",
"requirements2": "Aucune information d'identification personnelle.",
"question": "Question",
"answer": "Réponse",
"firstQuestion": "Enter the first security qestion and answer[FR]",
"secondQuestion": "Enter the second security qestion and answer[FR]",
"thirdQuestion": "Enter the third security qestion and answer[FR]",
"firstQuestion": "Sélectionner une première question de sécurité et entrer une réponse",
"secondQuestion": "Sélectionner une deuxième question de sécurité et entrer une réponse",
"thirdQuestion": "Sélectionner une troisième question de sécurité et entrer une réponse",
"questionPlaceholder": "Sélectionner une question",
"continue": "Continuer",
"support": "Obtenir du soutien",
"errors": {
"serverError": {
"title": "An error occurred[FR]"
"title": "Une erreur s'est produite"
},
"required": "Required field[FR]",
"required": "Compléter le champ obligatoire afin de continuer.",
"answerLength": "Doit être au moins 4 caractères.",
"duplicateAnswer": "Answers cannot be the same. Create a unique answer for this question[FR]"
"duplicateAnswer": "Les réponses ne peuvent pas être identiques. Créez une réponse unique pour cette question."
},
"banner": {
"title": "Nous renforçons la sécurité de votre compte et de vos formulaires.",
Expand Down
Loading

0 comments on commit 31225ac

Please sign in to comment.