Fixed wrong state mapping with not open and rejected (#4)

If a pr is rejected, it now also counts as not open (!open) This fixes the issue, that rejected prs get constantly reopened. Additionally drafts are treated correctly as open pull requests. Co-authored-by: tzerr <[email protected]>
scm-manager · Jan 24, 2024 · afe7f6b · afe7f6b
1 parent cfc6e19
commit afe7f6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/modules/platform/scmm/utils.spec.ts b/lib/modules/platform/scmm/utils.spec.ts
@@ -46,13 +46,13 @@ describe('modules/platform/scmm/utils', () => {
       [{ ...defaultPr, state: 'MERGED' }, 'all', true],
       [{ ...defaultPr, state: 'REJECTED' }, 'all', true],
       [{ ...defaultPr, state: 'OPEN' }, 'open', true],
-      [{ ...defaultPr, state: 'DRAFT' }, 'open', false],
+      [{ ...defaultPr, state: 'DRAFT' }, 'open', true],
       [{ ...defaultPr, state: 'MERGED' }, 'open', false],
       [{ ...defaultPr, state: 'REJECTED' }, 'open', false],
       [{ ...defaultPr, state: 'OPEN' }, '!open', false],
       [{ ...defaultPr, state: 'DRAFT' }, '!open', false],
       [{ ...defaultPr, state: 'MERGED' }, '!open', true],
-      [{ ...defaultPr, state: 'REJECTED' }, '!open', false],
+      [{ ...defaultPr, state: 'REJECTED' }, '!open', true],
       [{ ...defaultPr, state: 'OPEN' }, 'closed', false],
       [{ ...defaultPr, state: 'DRAFT' }, 'closed', false],
       [{ ...defaultPr, state: 'MERGED' }, 'closed', true],

diff --git a/lib/modules/platform/scmm/utils.ts b/lib/modules/platform/scmm/utils.ts
@@ -10,11 +10,11 @@ export function matchPrState(pr: Pr, state: PrFilterByState): boolean {
     return true;
   }
 
-  if (state === 'open' && pr.state === 'OPEN') {
+  if (state === 'open' && (pr.state === 'OPEN' || pr.state === 'DRAFT')) {
     return true;
   }
 
-  if (state === '!open' && pr.state === 'MERGED') {
+  if (state === '!open' && (pr.state === 'MERGED' || pr.state === 'REJECTED')) {
     return true;
   }