Merge branch 'main' into vitest-expect

cds-snc · Oct 31, 2024 · 1abac58 · 1abac58
2 parents bb5bd82 + d5d8954
commit 1abac58
Show file tree

Hide file tree

Showing 21 changed files with 607 additions and 447 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "3.24.2"
+  ".": "3.24.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,26 @@ 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.24.3](https://github.com/cds-snc/platform-forms-client/compare/v3.24.2...v3.24.3) (2024-10-31)
+
+
+### Bug Fixes
+
+* Add client side validation to public forms ([#4529](https://github.com/cds-snc/platform-forms-client/issues/4529)) ([75b06d5](https://github.com/cds-snc/platform-forms-client/commit/75b06d54ae88ed32df0fbc64a1f6bfa5765b3215))
+* Allow apostrophes in email addresses ([#4522](https://github.com/cds-snc/platform-forms-client/issues/4522)) ([66b45d7](https://github.com/cds-snc/platform-forms-client/commit/66b45d7ba98829bea25ba80e6167fefd421165d3))
+* API key dialog update ([#4509](https://github.com/cds-snc/platform-forms-client/issues/4509)) ([6cb8b2d](https://github.com/cds-snc/platform-forms-client/commit/6cb8b2d5141141a7dca3b1e9cada8adbd4a49ff8))
+* Ensure user is owner on form when setting closing form date and message ([#4528](https://github.com/cds-snc/platform-forms-client/issues/4528)) ([4fd6927](https://github.com/cds-snc/platform-forms-client/commit/4fd6927be4d84b3bd8e5e54b17d4860c3ad58bd8))
+* Manage form access a11y improvements ([#4472](https://github.com/cds-snc/platform-forms-client/issues/4472)) ([df53570](https://github.com/cds-snc/platform-forms-client/commit/df535706dab72e86c739c3c1f7b178d07f030a06))
+
+
+### Miscellaneous Chores
+
+* Add Transport Canada branding ([#4536](https://github.com/cds-snc/platform-forms-client/issues/4536)) ([fbfbe92](https://github.com/cds-snc/platform-forms-client/commit/fbfbe92ae3160fb377bc99109635bdf9ba4df8c6))
+* components cleanup  ([#4517](https://github.com/cds-snc/platform-forms-client/issues/4517)) ([d1eb456](https://github.com/cds-snc/platform-forms-client/commit/d1eb456e2e30f49f8925cf061ea070d7deb12cae))
+* Refactor MoreModal to Dialog component with Event trigger ([#4467](https://github.com/cds-snc/platform-forms-client/issues/4467)) ([1ad4ccb](https://github.com/cds-snc/platform-forms-client/commit/1ad4ccb93c59b099dde383d30a03ad5399eee86a))
+* Turn off new feature banner ([#4532](https://github.com/cds-snc/platform-forms-client/issues/4532)) ([312f683](https://github.com/cds-snc/platform-forms-client/commit/312f683988817d51bf3e2d5e1b4a355f0b8c7c5a))
+* Update close message error strings ([#4531](https://github.com/cds-snc/platform-forms-client/issues/4531)) ([b8e045d](https://github.com/cds-snc/platform-forms-client/commit/b8e045df08f1be7dc5f8c73ef664b1261dcf1928))
+
 ## [3.24.2](https://github.com/cds-snc/platform-forms-client/compare/v3.24.1...v3.24.2) (2024-10-29)
 
 

diff --git a/.../[locale]/(form administration)/form-builder/[id]/settings/branding/components/options.ts b/.../[locale]/(form administration)/form-builder/[id]/settings/branding/components/options.ts
@@ -213,6 +213,15 @@ export const options = [
     logoEn: "/img/branding/grain-en.svg",
     logoFr: "/img/branding/grain-fr.svg",
     logoTitleEn: "Canadian Grain Commission",
-    logoTitleFr: "Commission canadienne des grains"
+    logoTitleFr: "Commission canadienne des grains",
+  },
+  {
+    name: "transport",
+    urlEn: "https://tc.canada.ca/en",
+    urlFr: "hhttps://tc.canada.ca/fr",
+    logoEn: "/img/branding/tc-en.svg",
+    logoFr: "/img/branding/tc-fr.svg",
+    logoTitleEn: "Transport Canada",
+    logoTitleFr: "Transports Canada",
   },
 ];
diff --git a/...]/(support)/components/server/Success.tsx → ...]/(support)/components/client/Success.tsx b/...]/(support)/components/server/Success.tsx → ...]/(support)/components/client/Success.tsx
@@ -1,14 +1,14 @@
-import { serverTranslation } from "@i18n";
 import Link from "next/link";
 import { LinkButton } from "@serverComponents/globals/Buttons/LinkButton";
 import { FocusHeader } from "../client/FocusHeader";
+import { useTranslation } from "@i18n/client";
 
-export const Success = async ({ lang }: { lang: string }) => {
-  const { t } = await serverTranslation("form-builder", { lang });
+export const Success = ({ lang }: { lang: string }) => {
+  const { t } = useTranslation("form-builder");
   return (
     <>
       <FocusHeader>{t("requestSuccess.title")}</FocusHeader>
-      <p className="mb-16 mt-[-2rem] font-bold">{t("requestSuccess.weWillRespond")}</p>
+      <p className="-mt-8 mb-16 font-bold">{t("requestSuccess.weWillRespond")}</p>
       <div className="mb-16">
         <LinkButton.Primary href={`/${lang}/forms`}>
           {t("requestSuccess.backToForms")}