Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions allure-generator/src/main/javascript/helpers/linky.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import { SafeString } from "handlebars/runtime";
import { escapeExpression, SafeString } from "handlebars/runtime";

const URL_REGEXP = /^(\w)+:\/\/.*/;

export default function (text) {
return URL_REGEXP.test(text)
? new SafeString(`<a href="${text}" class="link" target="_blank">${text}</a>`)
: text;
if (!URL_REGEXP.test(text)) {
return text;
}

const safeText = escapeExpression(text);

return new SafeString(
`<a href="${safeText}" class="link" target="_blank" rel="noopener noreferrer">${safeText}</a>`
);
}
38 changes: 21 additions & 17 deletions allure-generator/src/main/javascript/helpers/text-with-links.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
import { SafeString } from "handlebars/runtime";
import { escapeExpression, SafeString } from "handlebars/runtime";

const URL_REGEXP = /((?:(https?:\/\/|ftp:\/\/|mailto:)|www\.)\S+?)(\s|"|'|\)|]|}|&#62|$)/gm;

const encodeHTMLEntities = (rawString) =>
rawString.replace(/[\u00A0-\u9999<>&]/gim, (i) => `&#${i.charCodeAt(0)};`);
const URL_REGEXP =
/((?:(https?:\/\/|ftp:\/\/|mailto:)|www\.)\S+?)(\s|"|'|\)|]|}|&#62|$)/gm;

export default function (text) {
const hasUrl = text !== undefined && text.match(URL_REGEXP);
return hasUrl
? new SafeString(
encodeHTMLEntities(text).replace(
URL_REGEXP,
(_, urlFullText, urlProtocol, terminalSymbol) => {
return `<a class="link" target="_blank" href="${
urlProtocol ? urlFullText : `https://${urlFullText}`
}">${urlFullText}</a>${terminalSymbol} `;
},
),
)
: text;

if (!hasUrl) {
return text;
}

const escapedText = escapeExpression(text);

return new SafeString(
escapedText.replace(
URL_REGEXP,
(_, urlFullText, urlProtocol, terminalSymbol) => {
const href = urlProtocol ? urlFullText : `https://${urlFullText}`;

// eslint-disable-next-line max-len
return `<a class="link" target="_blank" href="${href}" rel="noopener noreferrer">${urlFullText}</a>${terminalSymbol} `;
},
),
);
}
Loading