chore: last merge before code freeze (#1163)

* fix(deps): update dependency com.nimbusds:nimbus-jose-jwt to v9.41 * fix(fe:FSADT1-1505): Location notes in the Review step missing break lines (#1160) fix(fe:FSADT1-1505): Location notes in the Review step missing line breaks --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
bcgov · Sep 17, 2024 · 58bd1b6 · 58bd1b6
1 parent 107a1d0
commit 58bd1b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -45,7 +45,7 @@
         <junit-platform.version>1.9.1</junit-platform.version>
         <netty.version>4.1.113.Final</netty.version>
         <oci.revision>${project.version}</oci.revision>
-        <nimbus-jose-jwt.version>9.40</nimbus-jose-jwt.version>
+        <nimbus-jose-jwt.version>9.41</nimbus-jose-jwt.version>
     </properties>
 
     <dependencies>

diff --git a/frontend/src/pages/staffform/ReviewWizardStep.vue b/frontend/src/pages/staffform/ReviewWizardStep.vue
@@ -20,8 +20,7 @@ import Information16 from "@carbon/icons-vue/es/information/16";
 import { useFetchTo } from "@/composables/useFetch";
 import { getValidations } from "@/helpers/validators/StaffFormValidations";
 import { submissionValidation } from "@/helpers/validators/SubmissionValidators";
-import { codeConversionFn } from "@/services/ForestClientService";
-import { testGroup } from '../../../tests/unittests/TestConstant';
+import { codeConversionFn, getFormattedHtml } from "@/services/ForestClientService";
 
 //Defining the props and emiter to reveice the data and emit an update
 const props = defineProps<{
@@ -212,7 +211,7 @@ watch([validation], () => {
         <span v-if="address.notes  && 
                     address.notes.length"
               class="body-compact-01">
-          {{ address.notes }}
+          <span v-html="getFormattedHtml(address.notes)"></span>
         </span>
       </div>
     </div>

diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
@@ -89,3 +89,7 @@ export const adminEmail = "[email protected]";
 export const getObfuscatedEmailLink = email => {
   return `<a target="_blank" href="mailto:${email}">${getObfuscatedEmail(email)}</a>`;
 };
+
+export const getFormattedHtml = ((value: string) => {
+  return value ? value.replace(/\n/g, '<br>') : '';
+});