From 795ac86a8110044288b6c1bd1a455280a9a86e0a Mon Sep 17 00:00:00 2001
From: Brett Sun <qisheng.brett.sun@gmail.com>
Date: Wed, 18 Mar 2020 15:34:54 +0100
Subject: [PATCH 1/2] Add option to filter out draft PRs

---
 src/Checkbox.js     | 39 +++++++++++++++++++++++++++++++++++
 src/OptionsGroup.js | 38 ++++++++--------------------------
 src/index.js        | 50 ++++++++++++++++++++++++++++++++++++---------
 3 files changed, 87 insertions(+), 40 deletions(-)
 create mode 100644 src/Checkbox.js

diff --git a/src/Checkbox.js b/src/Checkbox.js
new file mode 100644
index 0000000..bec3132
--- /dev/null
+++ b/src/Checkbox.js
@@ -0,0 +1,39 @@
+import { css, html } from './utils'
+
+export function Checkbox({
+  checked,
+  name,
+  onClick,
+}) {
+  return html`
+    <label
+      class=${css`
+        display: flex;
+        align-items: center;
+        padding: 0.3rem 0.5rem;
+        background: #111;
+        color: #ddd;
+        border-radius: 0.25rem;
+        cursor: pointer;
+        margin-right: 1rem;
+        white-space: nowrap;
+        :active {
+          background: #1a1a1a;
+        }
+      `}
+    >
+      <input
+        type="checkbox"
+        checked=${checked}
+        onClick=${onClick}
+      />
+      <span
+        class=${css`
+          margin-left: 0.25rem;
+        `}
+      >
+        ${name}
+      </span>
+    </label>
+  `
+}
diff --git a/src/OptionsGroup.js b/src/OptionsGroup.js
index 5aef0d0..5cab814 100644
--- a/src/OptionsGroup.js
+++ b/src/OptionsGroup.js
@@ -1,4 +1,5 @@
 import { css, html } from './utils'
+import { Checkbox } from './Checkbox'
 
 export function OptionsGroup({
   name: groupName,
@@ -40,36 +41,13 @@ export function OptionsGroup({
         ${options.length > 0
           ? options.map(
               ([name, checked, optionName]) => html`
-                <label
-                  class=${css`
-                    display: flex;
-                    align-items: center;
-                    padding: 0.3rem 0.5rem;
-                    background: #111;
-                    color: #ddd;
-                    border-radius: 0.25rem;
-                    cursor: pointer;
-                    margin-right: 1rem;
-                    white-space: nowrap;
-                    :active {
-                      background: #1a1a1a;
-                    }
-                  `}
-                >
-                  <input
-                    type="checkbox"
-                    checked=${checked}
-                    onClick=${() =>
-                      onOptionChange(settingName || groupName, optionName || name, !checked)
-                    }
-                  />
-                  <span
-                    class=${css`
-                      margin-left: 0.25rem;
-                    `}
-                    >${name.replace('aragon/', '')}</span
-                  >
-                </label>
+                <${Checkbox}
+                  checked=${checked}
+                  name=${name}
+                  onClick=${() =>
+                    onOptionChange(settingName || groupName, optionName || name, !checked)
+                  }
+                />
               `
             )
           : 'Loading…'}
diff --git a/src/index.js b/src/index.js
index ba239bf..0287c91 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,7 @@
 import { render } from 'preact'
 import { useCallback, useEffect, useMemo, useState } from 'preact/hooks'
 import { css, html, flatten } from './utils'
+import { Checkbox } from './Checkbox'
 import { Layout } from './Layout'
 import { PrGroup } from './PrGroup'
 import { OptionsGroup } from './OptionsGroup'
@@ -36,13 +37,14 @@ async function getRepoPrs(repo) {
     return {
       assignees: pr.assignees,
       created: new Date(pr.created_at),
-      url: pr.html_url,
+      draft: pr.draft,
       number: pr.number,
+      repo: pr.base.repo.full_name,
       reviewers: reviewers.length > 0 ? reviewers : ['none'],
       state: pr.state,
       title: pr.title,
+      url: pr.html_url,
       user: pr.user.login,
-      repo: pr.base.repo.full_name,
     }
   })
 }
@@ -76,6 +78,7 @@ function useFetchPrs() {
 function App() {
   const [repos, setRepos] = useState(REPOS.map(repo => [repo, true]))
   const [reviewers, setReviewers] = useState([])
+  const [ignoredInDraft, setIgnoredInDraft] = useState(true)
   const [prs, loading] = useFetchPrs()
 
   const changeOption = useCallback((groupName, optionName, check) => {
@@ -97,6 +100,13 @@ function App() {
       )
     }
   }, [])
+  const changeIgnored = useCallback(() =>
+    setIgnoredInDraft(ignored => {
+      console.log('ignored', ignored)
+      return !ignored
+    }),
+    []
+  )
 
   const options = useMemo(
     () => {
@@ -117,12 +127,27 @@ function App() {
         return orgMap
       }, new Map())]
       const repoOptions = html`
-        <div
-          class=${css`
-            font-size: 0.8rem;
-          `}
-        >
-          Repos:
+        <div>
+          <div
+            class=${css`
+              display: flex;
+              align-items: center;
+              font-size: 0.8rem;
+              margin-bottom: 1rem;
+            `}
+          >
+            <div
+              class=${css`
+                width: 5rem;
+                margin-right: 1rem;
+              `}
+            >Repos:</div>
+            <${Checkbox}
+              checked=${ignoredInDraft}
+              name="Ignore draft PRs"
+              onClick=${changeIgnored}
+            </label>
+          </div>
           <div
             class=${css`
               padding-left: 20px;
@@ -142,7 +167,7 @@ function App() {
       `
 
       return [repoOptions, reviewerOptions]
-    }, [repos, reviewers]
+    }, [ignoredInDraft, repos, reviewers]
   )
 
   const groups = useMemo(
@@ -152,6 +177,11 @@ function App() {
           const groupPrs = []
           const remainingPrs = []
           prs.forEach(pr => {
+            // Filter by draft status
+            if (ignoredInDraft && pr.draft) {
+              return
+            }
+
             // Filter by reviewer
             if (
               pr.reviewers.length > 0 &&
@@ -183,7 +213,7 @@ function App() {
         },
         [[], [...prs].reverse()]
       )[0],
-    [prs, reviewers, repos]
+    [ignoredInDraft, prs, reviewers, repos]
   )
 
   useEffect(() => {

From 608c14ec84128b508e4105d7c5811fa2dcb90fb6 Mon Sep 17 00:00:00 2001
From: Brett Sun <qisheng.brett.sun@gmail.com>
Date: Thu, 19 Mar 2020 16:40:14 +0100
Subject: [PATCH 2/2] Remove console.log

---
 src/index.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/index.js b/src/index.js
index 0287c91..0f719cf 100644
--- a/src/index.js
+++ b/src/index.js
@@ -101,12 +101,7 @@ function App() {
     }
   }, [])
   const changeIgnored = useCallback(() =>
-    setIgnoredInDraft(ignored => {
-      console.log('ignored', ignored)
-      return !ignored
-    }),
-    []
-  )
+    setIgnoredInDraft(ignored => !ignored), [])
 
   const options = useMemo(
     () => {