From cf969adf373a7bfee7a19b46f8a5f278c6ff53a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Predrag=20Stojadinovi=C4=87?=
<cope@users.noreply.github.com>
Date: Thu, 16 May 2024 19:46:18 +0200
Subject: [PATCH] 1362 custom display confluence url (#1423)
* chore: confluence data connector can now handle custom urls, in addition to default {subdomain}.atlassian.net ones
* chore: formatting as per yarn lint
* chore: adding /display/ url matching to confluence data connector
---
collector/utils/extensions/Confluence/index.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/collector/utils/extensions/Confluence/index.js b/collector/utils/extensions/Confluence/index.js
index da918b2d2..ff91773cb 100644
--- a/collector/utils/extensions/Confluence/index.js
+++ b/collector/utils/extensions/Confluence/index.js
@@ -24,7 +24,14 @@ function validSpaceUrl(spaceUrl = "") {
"https\\://(:subdomain.):domain.:tld/wiki/spaces/(:spaceKey)/*"
);
const customMatch = customPattern.match(spaceUrl);
- if (customMatch) {
+
+ // Custom "display" Confluence URL match
+ const customDisplayPattern = new UrlPattern(
+ "https\\://(:subdomain.):domain.:tld/display/(:spaceKey)/*"
+ );
+ const customDisplayMatch = customDisplayPattern.match(spaceUrl);
+
+ if (customMatch || customDisplayMatch) {
customMatch.customDomain =
(customMatch.subdomain ? `${customMatch.subdomain}.` : "") + //
`${customMatch.domain}.${customMatch.tld}`;
--
GitLab