From 6c8301ecea87691d2174587d12e378b467374991 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Thu, 24 Oct 2024 13:28:52 +0200 Subject: [PATCH] fix: CMS field 'original_url' should not be manipulated, render as-is. --- server/routers/contentstack/schemas/pageLinks.ts | 2 +- utils/url.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/routers/contentstack/schemas/pageLinks.ts b/server/routers/contentstack/schemas/pageLinks.ts index 95b1b5fc5..c98a47d2b 100644 --- a/server/routers/contentstack/schemas/pageLinks.ts +++ b/server/routers/contentstack/schemas/pageLinks.ts @@ -92,7 +92,7 @@ export function transform(data: Data) { system: data.system, title: data.title, url: data.web.original_url - ? removeMultipleSlashes(data.web.original_url) + ? data.web.original_url : removeMultipleSlashes(`/${data.system.locale}/${data.url}`), web: data.web, } diff --git a/utils/url.ts b/utils/url.ts index 51ba2c52d..d9be2c491 100644 --- a/utils/url.ts +++ b/utils/url.ts @@ -1,5 +1,5 @@ -export function removeMultipleSlashes(str: string) { - return str.replaceAll(/\/\/+/g, "/") +export function removeMultipleSlashes(pathname: string) { + return pathname.replaceAll(/\/\/+/g, "/") } export function removeTrailingSlash(pathname: string) {