From 4953c0397b955b6e1363e3bb7d3f3c3c183dced4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 11 Jul 2025 16:19:53 +0530 Subject: [PATCH 1/7] Fix: Remove 'Closed' label from merged PRs in reviewed section --- scrum_helper | 1 + 1 file changed, 1 insertion(+) create mode 160000 scrum_helper diff --git a/scrum_helper b/scrum_helper new file mode 160000 index 0000000..573449a --- /dev/null +++ b/scrum_helper @@ -0,0 +1 @@ +Subproject commit 573449a36a0c47828718f579a98f49ab98752ee9 From 0c6d2dbe91cc289cb5daa66dfdc761f9066b8145 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 11 Jul 2025 19:14:24 +0530 Subject: [PATCH 2/7] Fix: Hide closed/merged labels in reviewed PRs section --- scrum_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrum_helper b/scrum_helper index 573449a..518de01 160000 --- a/scrum_helper +++ b/scrum_helper @@ -1 +1 @@ -Subproject commit 573449a36a0c47828718f579a98f49ab98752ee9 +Subproject commit 518de0137fea7dddc32168b8667cb80c2daf1c3b From da2d34263abf391a9e50afdca5525a1258e25e40 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 18 Jul 2025 22:11:03 +0530 Subject: [PATCH 3/7] closed label showing bug --- src/scripts/scrumHelper.js | 164 +++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 88 deletions(-) diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js index b6c92b3..6abf1a7 100644 --- a/src/scripts/scrumHelper.js +++ b/src/scripts/scrumHelper.js @@ -947,102 +947,90 @@ ${userReason}`; } } for (let i = 0; i < items.length; i++) { - let item = items[i]; - let html_url = item.html_url; - let repository_url = item.repository_url; - let project = repository_url.substr(repository_url.lastIndexOf('/') + 1); - let title = item.title; - let number = item.number; - let li = ''; - let isDraft = false; - if (item.pull_request && typeof item.draft !== 'undefined') { - isDraft = item.draft; - } - if (item.pull_request) { - - const prCreatedDate = new Date(item.created_at); - const startDate = new Date(startingDate); - const endDate = new Date(endingDate + 'T23:59:59'); - const isNewPR = prCreatedDate >= startDate && prCreatedDate <= endDate; + let item = items[i]; + let html_url = item.html_url; + let repository_url = item.repository_url; + let project = repository_url.substr(repository_url.lastIndexOf('/') + 1); + let title = item.title; + let number = item.number; + let li = ''; + let isDraft = false; + + if (item.pull_request && typeof item.draft !== 'undefined') { + isDraft = item.draft; + } - if (!isNewPR) { - const hasCommitsInRange = showCommits && item._allCommits && item._allCommits.length > 0; + if (item.pull_request) { + const prCreatedDate = new Date(item.created_at); + const startDate = new Date(startingDate); + const endDate = new Date(endingDate + 'T23:59:59'); + const isNewPR = prCreatedDate >= startDate && prCreatedDate <= endDate; - if (!hasCommitsInRange) { + if (!isNewPR) { + const hasCommitsInRange = showCommits && item._allCommits && item._allCommits.length > 0; + if (!hasCommitsInRange) { + continue; // Skip PRs created outside the date range with no commits + } + } - continue; //skip these prs - created outside daterange with no commits - } else { + const prAction = isNewPR ? 'Made PR' : 'Existing PR'; + + // 🟤 Draft PR + if (isDraft) { + li = `
  • (${project}) - ${prAction} (#${number}) - ${title} ${pr_draft_button}
    • `; + + // 🟢 Open PR + } else if (item.state === 'open') { + li = `
  • (${project}) - ${prAction} (#${number}) - ${title} ${pr_open_button}`; + if (showCommits && item._allCommits && item._allCommits.length && !isNewPR) { + log(`[PR DEBUG] Rendering commits for existing PR #${number}:`, item._allCommits); + item._allCommits.forEach(commit => { + li += `
  • + ${commit.messageHeadline} + (${new Date(commit.committedDate).toLocaleString()}) +
    • `; + }); + } + li += ``; - } - } else { + // 🔴 Closed PR (check if merged or not) + } else if (item.state === 'closed') { + const isMerged = item.merged_at !== null && item.merged_at !== undefined; - } - const prAction = isNewPR ? 'Made PR' : 'Existing PR'; - if (isDraft) { - li = `
  • (${project}) - ${prAction} (#${number}) - ${title} ${pr_draft_button}
    • `; - } else if (item.state === 'open') { - li = `
  • (${project}) - ${prAction} (#${number}) - ${title} ${pr_open_button}`; - if (showCommits && item._allCommits && item._allCommits.length && !isNewPR) { - log(`[PR DEBUG] Rendering commits for existing PR #${number}:`, item._allCommits); - item._allCommits.forEach(commit => { - li += `
  • ${commit.messageHeadline} (${new Date(commit.committedDate).toLocaleString()})
    • `; - }); - } - li += ``; - } else if (item.state === 'closed') { - let merged = null; - if ((githubToken || (useMergedStatus && !fallbackToSimple)) && mergedStatusResults) { - let repoParts = repository_url.split('/'); - let owner = repoParts[repoParts.length - 2]; - let repo = repoParts[repoParts.length - 1]; - merged = mergedStatusResults[`${owner}/${repo}#${number}`]; - } - if (merged === true) { - li = `
  • (${project}) - Made PR (#${number}) - ${title} ${pr_merged_button}
    • `; - } else { - // Always show closed label for merged === false or merged === null/undefined - li = `
  • (${project}) - Made PR (#${number}) - ${title} ${pr_closed_button}
    • `; - } - } - lastWeekArray.push(li); - continue; + if (isMerged) { + // Merged PR: no label shown + console.log(`[ScrumHelper] Reviewed PR #${number} is MERGED – no label shown.`); + li = `
  • (${project}) - ${prAction} (#${number}) - ${title}
    • `; } else { - // is a issue - if (item.state === 'open' && item.body?.toUpperCase().indexOf('YES') > 0) { - let li2 = - '
  • (' + - project + - ') - Work on Issue(#' + - number + - ") - " + - title + - ' ' + - issue_opened_button + - '  
    • '; - nextWeekArray.push(li2); - } - if (item.state === 'open') { - li = `
  • (${project}) - Opened Issue(#${number}) - ${title} ${issue_opened_button}
    • `; - } else if (item.state === 'closed') { - li = `
  • (${project}) - Opened Issue(#${number}) - ${title} ${issue_closed_button}
    • `; - } else { - li = - '
  • (' + - project + - ') - Opened Issue(#' + - number + - ") - " + - title + - '
    • '; - } + // Closed but not merged: no label either + console.log(`[ScrumHelper] Reviewed PR #${number} is CLOSED (not merged) – no label shown.`); + li = `
  • (${project}) - ${prAction} (#${number}) - ${title}
    • `; } - lastWeekArray.push(li); } - issuesDataProcessed = true; + + lastWeekArray.push(li); + continue; + + } else { + // 📌 It's an Issue + if (item.state === 'open' && item.body?.toUpperCase().indexOf('YES') > 0) { + let li2 = + `
  • (${project}) - Work on Issue(#${number}) - ${title} ${issue_opened_button}
    • `; + nextWeekArray.push(li2); + } + + if (item.state === 'open') { + li = `
  • (${project}) - Opened Issue(#${number}) - ${title} ${issue_opened_button}
    • `; + } else if (item.state === 'closed') { + li = `
  • (${project}) - Opened Issue(#${number}) - ${title}
    • `; + } else { + li = `
  • (${project}) - Opened Issue(#${number}) - ${title}
    • `; + } + + lastWeekArray.push(li); + } +} +issuesDataProcessed = true; if (outputTarget === 'email') { triggerScrumGeneration(); } From 0c05e9f6125f438b5f4c8775450f34f943f85536 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 18 Jul 2025 22:21:51 +0530 Subject: [PATCH 4/7] fixing-the-closed-label --- src/scripts/scrumHelper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js index 6abf1a7..67be155 100644 --- a/src/scripts/scrumHelper.js +++ b/src/scripts/scrumHelper.js @@ -812,7 +812,7 @@ ${userReason}`; prText += "#" + pr_arr.number + ' (' + pr_arr.title + ') '; if (pr_arr.state === 'open') prText += issue_opened_button; - else prText += issue_closed_button; + //else prText += issue_closed_button; prText += '  '; repoLi += prText; @@ -831,7 +831,7 @@ ${userReason}`; pr_arr1.title + ') '; if (pr_arr1.state === 'open') prText1 += issue_opened_button; - else prText1 += issue_closed_button; + //else prText1 += issue_draft_button; prText1 += '  '; repoLi += prText1; From 38e364336eb0265b1caf12167d2de07065aed9dd Mon Sep 17 00:00:00 2001 From: MANOJ KUMAR KUMMARI Date: Fri, 18 Jul 2025 22:59:35 +0530 Subject: [PATCH 5/7] Update src/scripts/scrumHelper.js Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- src/scripts/scrumHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js index 67be155..7e446f3 100644 --- a/src/scripts/scrumHelper.js +++ b/src/scripts/scrumHelper.js @@ -952,7 +952,7 @@ ${userReason}`; let repository_url = item.repository_url; let project = repository_url.substr(repository_url.lastIndexOf('/') + 1); let title = item.title; - let number = item.number; + let {number} = item; let li = ''; let isDraft = false; From 2da2062212ed41e9dedfb2c0551689c68b8a10c3 Mon Sep 17 00:00:00 2001 From: MANOJ KUMAR KUMMARI Date: Fri, 18 Jul 2025 23:23:21 +0530 Subject: [PATCH 6/7] Update src/scripts/scrumHelper.js Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- src/scripts/scrumHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js index 7e446f3..e9d7dcf 100644 --- a/src/scripts/scrumHelper.js +++ b/src/scripts/scrumHelper.js @@ -949,7 +949,7 @@ ${userReason}`; for (let i = 0; i < items.length; i++) { let item = items[i]; let html_url = item.html_url; - let repository_url = item.repository_url; + let {repository_url} = item; let project = repository_url.substr(repository_url.lastIndexOf('/') + 1); let title = item.title; let {number} = item; From f4dd540a0ac949c4aacbe1b02a3dbc57070a2bb6 Mon Sep 17 00:00:00 2001 From: MANOJ KUMAR KUMMARI Date: Fri, 18 Jul 2025 23:23:42 +0530 Subject: [PATCH 7/7] Update src/scripts/scrumHelper.js Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- src/scripts/scrumHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js index e9d7dcf..46c4f06 100644 --- a/src/scripts/scrumHelper.js +++ b/src/scripts/scrumHelper.js @@ -951,7 +951,7 @@ ${userReason}`; let html_url = item.html_url; let {repository_url} = item; let project = repository_url.substr(repository_url.lastIndexOf('/') + 1); - let title = item.title; + let {title} = item; let {number} = item; let li = ''; let isDraft = false;