Skip to content
Open
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
5 changes: 5 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ a {
color: #3f51b5;
}

#scrumReport a {
cursor: pointer;
-webkit-user-modify: read-only;
}

.btn,
.btn-large {
background-color: #3f51b5;
Expand Down
3 changes: 2 additions & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
}
],
"permissions": [
"storage"
"storage",
"tabs"
],
"host_permissions": [
"*://*.google.com/*",
Expand Down
6 changes: 3 additions & 3 deletions src/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ <h4 class="font-semibold text-xl" data-i18n="noteTitle">Note:</h4>
your git data. You can add one anytime in the extension
settings.<br><br>
<b>How to obtain:</b><br>
1. Go to <a href="https://github.com/settings/tokens" target="_blank"
1. Go to <a href="https://github.com/settings/tokens" target="_blank" rel="noopener noreferrer"
style="color:#2563eb;text-decoration:underline;">GitHub Developer
Settings</a>.<br>
3. Click "Generate new token", select classic token<br>
Expand Down Expand Up @@ -387,12 +387,12 @@ <h4 class="font-semibold text-xl" data-i18n="noteTitle">Note:</h4>
<div class="mt-6 border-t border-gray-300">
<div class="bg-white rounded-3xl mx-2 mt-4 mb-2 p-4 border border-gray-100 shadow-sm">
<div class="flex items-center justify-center space-x-3">
<a target="_blank" href="https://github.com/fossasia/scrum_helper"
<a target="_blank" rel="noopener noreferrer" href="https://github.com/fossasia/scrum_helper"
class="bg-blue-50 hover:bg-blue-100 text-blue-600 transition-all duration-200 rounded-lg px-4 py-2 flex items-center space-x-2 gap-2">
<i class="fa fa-code text-sm pl-1"></i>
<span class="text-sm font-medium" data-i18n="viewCodeButton">View Code</span>
</a>
<a target="_blank" href="https://github.com/fossasia/scrum_helper/issues"
<a target="_blank" rel="noopener noreferrer" href="https://github.com/fossasia/scrum_helper/issues"
class="bg-blue-50 hover:bg-blue-100 text-blue-600 transition-all duration-200 rounded-lg px-4 py-2 flex items-center space-x-2 gap-2">
<i class="fa fa-bug text-sm"></i>
<span class="text-sm font-medium" data-i18n="reportIssueButton">Report Issue</span>
Expand Down
15 changes: 15 additions & 0 deletions src/scripts/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,21 @@ document.querySelectorAll('input[name="timeframe"]').forEach(radio => {
toggleRadio(this);
}
});

// Handle clicks on links within scrumReport to open in new tabs
document.addEventListener('click', function(e) {
const target = e.target.closest('a');
if (target && target.closest('#scrumReport')) {
e.preventDefault();
e.stopPropagation();
e.stopImmediatePropagation();
const href = target.getAttribute('href');
if (href && href.startsWith('http')) {
chrome.tabs.create({ url: href });
}
return false;
}
}, true); // Use capture phase to handle before contentEditable
});

// refresh cache button
Expand Down
16 changes: 8 additions & 8 deletions src/scripts/scrumHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ ${userReason}`;
let pr_arr = githubPrsReviewDataProcessed[repo][pr];
let prText = '';
prText +=
"<a href='" + pr_arr.html_url + "' target='_blank'>#" + pr_arr.number + '</a> (' + pr_arr.title + ') ';
"<a href='" + pr_arr.html_url + "' target='_blank' rel='noopener noreferrer'>#" + pr_arr.number + '</a> (' + pr_arr.title + ') ';
if (showOpenLabel && pr_arr.state === 'open') prText += issue_opened_button;
// Do not show closed label for reviewed PRs
prText += '&nbsp;&nbsp;';
Expand All @@ -1242,7 +1242,7 @@ ${userReason}`;
prText1 +=
"<li><a href='" +
pr_arr1.html_url +
"' target='_blank'>#" +
"' target='_blank' rel='noopener noreferrer'>#" +
pr_arr1.number +
'</a> (' +
pr_arr1.title +
Expand Down Expand Up @@ -1463,7 +1463,7 @@ ${userReason}`;

if (isDraft) {

li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_draft_button : ''}`;
li = `<li><i>(${project})</i> - Made PR <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>(#${number})</a> - <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>${title}</a>${showOpenLabel ? ' ' + pr_draft_button : ''}`;
if (showCommits && item._allCommits && item._allCommits.length && !isNewPR) {
log(`[PR DEBUG] Rendering commits for existing draft PR #${number}:`, item._allCommits);
li += '<ul>';
Expand All @@ -1474,7 +1474,7 @@ ${userReason}`;
}
li += `</li>`;
} else if (item.state === 'open' || item.state === 'opened') {
li = `<li><i>(${project})</i> - ${prAction} (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_open_button : ''}`;
li = `<li><i>(${project})</i> - ${prAction} <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>(#${number})</a> - <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>${title}</a>${showOpenLabel ? ' ' + pr_open_button : ''}`;

if (showCommits && item._allCommits && item._allCommits.length && !isNewPR) {
log(`[PR DEBUG] Rendering commits for existing PR #${number}:`, item._allCommits);
Expand All @@ -1486,7 +1486,7 @@ ${userReason}`;
}
li += `</li>`;
} else if (platform === 'gitlab' && item.state === 'closed') {
li = `<li><i>(${project})</i> - ${prAction} (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_closed_button : ''}</li>`;
li = `<li><i>(${project})</i> - ${prAction} <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>(#${number})</a> - <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>${title}</a>${showOpenLabel ? ' ' + pr_closed_button : ''}</li>`;
} else {
let merged = null;
if ((githubToken || (useMergedStatus && !fallbackToSimple)) && mergedStatusResults) {
Expand All @@ -1497,10 +1497,10 @@ ${userReason}`;
}
if (merged === true) {

li = `<li><i>(${project})</i> - ${prAction} (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_merged_button : ''}</li>`;
li = `<li><i>(${project})</i> - ${prAction} <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>(#${number})</a> - <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>${title}</a>${showOpenLabel ? ' ' + pr_merged_button : ''}</li>`;
} else {
// Always show closed label for merged === false or merged === null/undefined
li = `<li><i>(${project})</i> - ${prAction} (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_closed_button : ''}</li>`;
li = `<li><i>(${project})</i> - ${prAction} <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>(#${number})</a> - <a href='${html_url}' target='_blank' rel='noopener noreferrer' contenteditable='false'>${title}</a>${showOpenLabel ? ' ' + pr_closed_button : ''}</li>`;
}
}
log('[SCRUM-DEBUG] Added PR/MR to lastWeekArray:', li, item);
Expand All @@ -1516,7 +1516,7 @@ ${userReason}`;
number +
") - <a href='" +
html_url +
"' target='_blank'>" +
"' target='_blank' rel='noopener noreferrer'>" +
title +
'</a>' + (showOpenLabel ? ' ' + issue_opened_button : '') +
'&nbsp;&nbsp;</li>';
Expand Down
Loading