chore: separate discussions logic

Signed-off-by: Sebastian Beltran <bjohansebas@gmail.com>

Author: bjohansebas

action.yml

@@ -48,6 +48,10 @@ inputs:
   orgs:
     description: 'An optional list of org in the format: <org>,<org>'
     required: false
+  discussions:
+    description: 'Disable/Active discussions fetching'
+    default: 'true'
+    required: false
 outputs:
   issueNumber:
     description: 'If an issue was created, this will be its number'

lib/agenda.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { graphql } = require('@octokit/graphql')
+
 /**
  * get agenda issues and PRs from repositories
  * @param {Object} client - GitHub client
@@ -38,7 +40,7 @@ async function fetchAgendaItems (client, repos, agendaLabel) {
       labels: agendaLabel,
       per_page: 100
     })).filter(pr => pr.labels.find(label => label.name === agendaLabel) &&
-                     !(agendaIssues.find((i) => i.url === pr.url))) // workaround for flaky GH API/SDK behavior where sometimes the issue endpoint loads PRs
+      !(agendaIssues.find((i) => i.url === pr.url))) // workaround for flaky GH API/SDK behavior where sometimes the issue endpoint loads PRs
 
     console.log(`Fetching PRs for ${r.owner}/${r.repo}: Found ${_agendaPrs.length}`)
 
@@ -52,6 +54,80 @@ async function fetchAgendaItems (client, repos, agendaLabel) {
   return agendaIssues
 }
 
+async function fetchDiscussionsItems (repos, agendaLabel, token) {
+  const agendaDiscussions = []
+  for (const r of repos) {
+    let hasNextPage = true
+    let endCursor = null
+    do {
+      const query = `
+          query($owner: String!, $name: String!, $after: String) {
+            repository(owner: $owner, name: $name) {
+              discussions(first: 100, after: $after) {
+                pageInfo {
+                  endCursor
+                  hasNextPage
+                }
+                edges {
+                  cursor
+                  node {
+                    id
+                    title
+                    url
+                    labels(first: 10) {
+                      nodes {
+                        color
+                        name
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `
+      const variables = {
+        owner: r.owner,
+        name: r.repo,
+        after: endCursor
+      }
+
+      const _agendaDiscussions = await graphql(query, {
+        ...variables,
+        headers: {
+          authorization: `token ${token}`
+        }
+      })
+
+      const discussions = _agendaDiscussions?.repository?.discussions
+
+      if (discussions) {
+        const { edges, pageInfo } = discussions
+        for (const edge of edges) {
+          const labels = edge.node?.labels.nodes
+          if (Array.isArray(labels) && labels.some(label => label.name === agendaLabel)) {
+            console.log(`Adding Discussion: ${edge.node.url}`)
+            agendaDiscussions.push({
+              id: edge.node.id,
+              html_url: edge.node.url,
+              title: edge.node.title
+            })
+          }
+        }
+        hasNextPage = pageInfo.hasNextPage
+        endCursor = pageInfo.endCursor
+      } else {
+        hasNextPage = false
+      }
+    } while (hasNextPage)
+  }
+
+  console.log(`Found ${agendaDiscussions.length} total discussions for agenda`)
+
+  return agendaDiscussions
+}
+
 module.exports = {
-  fetchAgendaItems
+  fetchAgendaItems,
+  fetchDiscussionsItems
 }

package-lock.json

@@ -27,7 +27,7 @@
     "@actions/github": "^6.0.1",
     "@hackmd/api": "^2.5.0",
     "@js-temporal/polyfill": "^0.5.1",
-    "@octokit/graphql": "^9.0.1",
+    "@octokit/graphql": "^8.2.2",
     "ejs": "^3.1.10",
     "safe-parse-list": "^0.1.1"
   },

package.json

@@ -1,7 +1,6 @@
 'use strict'
 const core = require('@actions/core')
 const { getOctokit, context } = require('@actions/github')
-const { graphql } = require('@octokit/graphql')
 const list = require('safe-parse-list')
 const ejs = require('ejs')
 const meetings = require('./lib/meetings')
@@ -32,6 +31,8 @@ const pkg = require('./package.json')
     const issueTitle = core.getInput('issueTitle')
     const issueTemplate = core.getInput('issueTemplate')
 
+    const discussions = core.getBooleanInput('discussions')
+
     // variables we use for notes
     const createNotes = core.getInput('createNotes')
     const notesUserTemplate = core.getInput('notesTemplate')
@@ -97,72 +98,15 @@ const pkg = require('./package.json')
       }
     }
 
-    const agendaIssues = await agenda.fetchAgendaItems(client, repos, agendaLabel)
-  
-    for (const r of repos) {
-      let hasNextPage = true
-      let endCursor = null
-      do {
-        const query = `
-          query($owner: String!, $name: String!, $after: String) {
-            repository(owner: $owner, name: $name) {
-              discussions(first: 100, after: $after) {
-                pageInfo {
-                  endCursor
-                  hasNextPage
-                }
-                edges {
-                  cursor
-                  node {
-                    id
-                    title
-                    url
-                    labels(first: 10) {
-                      nodes {
-                        color
-                        name
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        `
-        const variables = {
-          owner: r.owner,
-          name: r.repo,
-          after: endCursor
-        }
-        const _agendaDiscussions = await graphql(query, {
-          ...variables,
-          headers: {
-            authorization: `token ${token}`
-          }
-        })
-        const discussions = _agendaDiscussions?.repository?.discussions
-        if (discussions) {
-          const { edges, pageInfo } = discussions
-          for (const edge of edges) {
-            const labels = edge.node?.labels.nodes
-            if (Array.isArray(labels) && labels.some(label => label.name === agendaLabel)) {
-              console.log(`Adding Discussion: ${edge.node.url}`)
-              agendaIssues.push({
-                id: edge.node.id,
-                html_url: edge.node.url,
-                title: edge.node.title
-              })
-            }
-          }
-          hasNextPage = pageInfo.hasNextPage
-          endCursor = pageInfo.endCursor
-        } else {
-          hasNextPage = false
-        }
-      } while (hasNextPage)
+    const agendaItems = []
+    agendaItems.push(...await agenda.fetchAgendaItems(client, repos, agendaLabel))
+
+    if (discussions) {
+      const agendaDiscussions = await agenda.fetchDiscussionsItems(repos, agendaLabel, token)
+      agendaItems.push(...agendaDiscussions)
     }
 
-    console.log(`Found ${agendaIssues.length} total issues for agenda`)
+    console.log(`Found ${agendaItems.length} total items for agenda`)
 
     const opts = {
       ...repo,
@@ -172,7 +116,7 @@ const pkg = require('./package.json')
       createWithin,
       agendaLabel,
       meetingLink,
-      agendaIssues,
+      agendaIssues: agendaItems,
       issueTitle: titleTemplate
     }