From 6fe20a2579cd210ad99b4413d5eff351f2fd58d6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 5 Jul 2025 12:08:02 +0530 Subject: [PATCH] Fix: Remove incorrect 'Closed' label for merged PRs in reviewed section - Fixed logic that showed 'Closed' label for merged PRs when merge status was unknown - Now defaults to 'Open' label for unknown status instead of 'Closed' - Addresses issue #176 where merged reviewed PRs incorrectly displayed 'Closed' label Fixes #176 --- src/scripts/scrumHelper.js | 43 +++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js index 3aebad4..a2996e8 100644 --- a/src/scripts/scrumHelper.js +++ b/src/scripts/scrumHelper.js @@ -972,21 +972,34 @@ ${userReason}`; }); } 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}
  • `; - } - } + }//// Replace the existing logic around line where item.state === 'closed' is handled + +} 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) { + // PR is confirmed merged + li = `
  • (${project}) - Made PR (#${number}) - ${title} ${pr_merged_button}
  • `; + } else if (merged === false) { + // PR is confirmed closed but not merged + li = `
  • (${project}) - Made PR (#${number}) - ${title} ${pr_closed_button}
  • `; + } else { + // merged === null/undefined - status unknown + // For reviewed PRs section, we should be more conservative about showing "closed" + // since these aren't the user's PRs. Default to showing no specific state label + // or a neutral label instead of assuming "closed" + li = `
  • (${project}) - Made PR (#${number}) - ${title} ${pr_open_button}
  • `; + + // Alternative approach: Don't show any state label for unknown status + // li = `
  • (${project}) - Made PR (#${number}) - ${title}
  • `; + } + lastWeekArray.push(li); continue; } else {