Merge pull request #1334 from dpc-sdp/bugfix/internal-links

fix: removes unwanted internal: from URLs
dpc-sdp · Sep 23, 2024 · 0243bda · 0243bda
2 parents 4b28c33 + 2e23ba8
commit 0243bda
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/ripple-tide-api/src/utils/mapping-utils.test.ts b/packages/ripple-tide-api/src/utils/mapping-utils.test.ts
@@ -79,6 +79,11 @@ const field = {
       url: '/landing-page-cc-2',
       origin_url: '/landing-page-cc-2'
     },
+    field_related_link: {
+      uri: 'internal:/contact-us',
+      title: 'Get in touch',
+      options: []
+    },
     field_paragraph_location: {
       langcode: null,
       country_code: 'AU',
@@ -160,6 +165,11 @@ describe('ripple-tide-api/mapping utils', () => {
       text: '',
       url: '/landing-page-cc-2'
     })
+
+    expect(getLinkFromField(field, 'field_related_link')).toEqual({
+      text: 'Get in touch',
+      url: '/contact-us'
+    })
   })
 
   it(`returns null on invalid api key`, () => {

diff --git a/packages/ripple-tide-api/src/utils/mapping-utils.ts b/packages/ripple-tide-api/src/utils/mapping-utils.ts
@@ -145,10 +145,14 @@ export const getLinkFromField = (
     return null
   }
 
-  return {
-    text: linkField.title || linkField.text || '',
-    url: linkField.url || linkField.origin_url || linkField.uri || ''
+  let text = linkField.title || linkField.text || ''
+  let url = linkField.url || linkField.origin_url || linkField.uri || ''
+
+  if (url.startsWith('internal:')) {
+    url = url.replace(/^internal:/, '')
   }
+
+  return { text, url }
 }
 
 export const getAddress = (field: drupalField) => {