θΏ™ζ˜―indexlocζδΎ›ηš„ζœεŠ‘οΌŒδΈθ¦θΎ“ε…₯任何密码
Skip to content

1347 human readable confluence url #1434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

1347 human readable confluence url #1434

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6369d5f
chore: confluence data connector can now handle custom urls, in addit…
cope May 11, 2024
c73c508
chore: formatting as per yarn lint
cope May 11, 2024
19a60e9
Merge branch 'Mintplex-Labs:master' into master
cope May 16, 2024
1fc0044
Merge branch 'Mintplex-Labs:master' into master
cope May 17, 2024
4991aa5
chore: fixing the human readable confluence url fetch baseUrl
May 17, 2024
2360864
chore: fixing the human readable confluence url fetch baseUrl
May 17, 2024
b0497d3
chore: fixing the human readable confluence url fetch baseUrl
May 17, 2024
0fb5fa2
chore: fixing the human readable confluence url fetch baseUrl
May 17, 2024
2da4328
chore: fixing the human readable confluence url fetch baseUrl
May 17, 2024
cf3bfc5
Merge branch 'master' into 1347-human-readable-confluence-url
timothycarambat May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions collector/utils/extensions/Confluence/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,34 @@ const {
ConfluencePagesLoader,
} = require("langchain/document_loaders/web/confluence");

function urlMatchesPatter(url, patter) {
const urlPattern = new UrlPattern(patter);
return urlPattern.match(url);
}

function generateCustomDomain({ subdomain, domain, tld }) {
return (subdomain ? `${subdomain}.` : "") + `${domain}.${tld}`;
}

function validSpaceUrl(spaceUrl = "") {
// Atlassian default URL match
const atlassianPattern = new UrlPattern(
"https\\://(:subdomain).atlassian.net/wiki/spaces/(:spaceKey)*"
);
const atlassianMatch = atlassianPattern.match(spaceUrl);
const atlassianMatch = urlMatchesPatter(spaceUrl, "https\\://(:subdomain).atlassian.net/wiki/spaces/(:spaceKey)*");
if (atlassianMatch) {
return { valid: true, result: atlassianMatch };
}

let customMatch = null;
[
"https\\://(:subdomain.):domain.:tld/wiki/spaces/(:spaceKey)*", // Custom Confluence space
"https\\://(:subdomain.):domain.:tld/display/(:spaceKey)*", // Custom Confluence space + Human-readable space tag.
].forEach((matchPattern) => {
if (!!customMatch) return;
const pattern = new UrlPattern(matchPattern);
customMatch = pattern.match(spaceUrl);
});

// Custom URL match
const customMatch = urlMatchesPatter(spaceUrl, "https\\://(:subdomain.):domain.:tld/wiki/spaces/(:spaceKey)*");
if (customMatch) {
customMatch.customDomain =
(customMatch.subdomain ? `${customMatch.subdomain}.` : "") + //
`${customMatch.domain}.${customMatch.tld}`;
return { valid: true, result: customMatch, custom: true };
customMatch.customDomain = generateCustomDomain(customMatch);
return { valid: true, result: customMatch, humanReadable: false };
}

// Human Readable URL match
const humanReadableMatch = urlMatchesPatter(spaceUrl, "https\\://(:subdomain.):domain.:tld/display/(:spaceKey)*");
if (humanReadableMatch) {
humanReadableMatch.customDomain = generateCustomDomain(humanReadableMatch);
return { valid: true, result: humanReadableMatch, humanReadable: true };
}

// No match
Expand All @@ -50,18 +53,20 @@ async function loadConfluence({ pageUrl, username, accessToken }) {
}

const validSpace = validSpaceUrl(pageUrl);
if (!validSpace.result) {
const { result: validSpaceResult, humanReadable } = validSpace;
if (!validSpaceResult) {
return {
success: false,
reason:
"Confluence space URL is not in the expected format of https://domain.atlassian.net/wiki/space/~SPACEID/* or https://customDomain/wiki/space/~SPACEID/*",
"Confluence space URL is not in the expected format of one of https://domain.atlassian.net/wiki/space/~SPACEID/* or https://customDomain/wiki/space/~SPACEID/* or https://customDomain/display/~SPACEID/*",
};
}

const { subdomain, customDomain, spaceKey } = validSpace.result;
let baseUrl = `https://${subdomain}.atlassian.net/wiki`;
const { subdomain, customDomain, spaceKey } = validSpaceResult;
let subpath = humanReadable ? `` : `/wiki`;
let baseUrl = `https://${subdomain}.atlassian.net${subpath}`;
if (customDomain) {
baseUrl = `https://${customDomain}/wiki`;
baseUrl = `https://${customDomain}${subpath}`;
}

console.log(`-- Working Confluence ${baseUrl} --`);
Expand Down