From 7753fee9e1d596b298f2fe0d75665777b063f948 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Thu, 2 Dec 2021 15:44:02 +0000
Subject: [PATCH] Issue workflow improvements (#19976)

- Fix filtering for Design issues
- Split out spaces jobs for new and old boards, so they don't
  depend on each other
- Remove voice message job for the old board
- Rename Priority bugs workflow to be shorter
- Improve naming for jobs so they're easier to read in the GitHub
  Actions page
---
 .github/workflows/triage-move-labelled.yml   | 43 ++++++++++----------
 .github/workflows/triage-move-unlabelled.yml |  2 +-
 .github/workflows/triage-priority-bugs.yml   |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index b6147c1501..29a849cf6b 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -6,7 +6,7 @@ on:
     
 jobs:
   move_needs_info_issues:
-    name: Move X-Needs-Info issues to Need info on triage board
+    name: X-Needs-Info issues to Need info column on triage board
     runs-on: ubuntu-latest
     steps:
       - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
@@ -17,17 +17,17 @@ jobs:
           label-name: "X-Needs-Info"
 
   add_priority_design_issues_to_project:
-    name: Move priority X-Needs-Design issues to Design project board
+    name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
     if: >
         contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-        contains(github.event.issue.labels.*.name, 'S-Critical') &&
-        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-        contains(github.event.issue.labels.*.name, 'S-Major') &&
-        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-        contains(github.event.issue.labels.*.name, 'A11y') &&
-        contains(github.event.issue.labels.*.name, 'O-Frequent')
+        (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+         contains(github.event.issue.labels.*.name, 'S-Major') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+         contains(github.event.issue.labels.*.name, 'A11y') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -47,8 +47,8 @@ jobs:
           PROJECT_ID: "PN_kwDOAM0swc0sUA"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-  move_spaces_issues:
-    name: Move Spaces issues to Delight project board
+  spaces_issues_to_old_board:
+    name: Spaces issues to old Delight project board
     runs-on: ubuntu-latest
     if: >
         contains(github.event.issue.labels.*.name, 'A-Spaces') ||
@@ -61,8 +61,16 @@ jobs:
           project-url: "https://github.com/orgs/vector-im/projects/6"
           column-name: "📥 Inbox"
           label-name: "A-Spaces"
+
+  spaces_issues_to_new_board:
+    name: Spaces issues to new Delight project board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Spaces') ||
+        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
+        contains(github.event.issue.labels.*.name, 'A-Subspaces')
+    steps:
       - uses: octokit/graphql-action@v2.x
-        id: add_to_delight2
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
@@ -80,19 +88,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_voice-message_issues:
-    name: Move A-Voice Messages to Voice message board
+    name: A-Voice Messages to voice message board
     runs-on: ubuntu-latest
     if: >
         contains(github.event.issue.labels.*.name, 'A-Voice Messages')
     steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
-        with:
-          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-          project-url: "https://github.com/vector-im/element-web/projects/28"
-          column-name: "📥 Inbox"
-          label-name: "A-Voice Messages"
       - uses: octokit/graphql-action@v2.x
-        id: add_to_voice
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
@@ -110,7 +111,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_threads_issues:
-    name: Move A-Threads to Thread board
+    name: A-Threads to Thread board
     runs-on: ubuntu-latest
     if: >
         contains(github.event.issue.labels.*.name, 'A-Threads')
diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
index 94bd049b91..5a10cb2376 100644
--- a/.github/workflows/triage-move-unlabelled.yml
+++ b/.github/workflows/triage-move-unlabelled.yml
@@ -3,7 +3,7 @@ name: Move unlabelled from needs info columns to triaged
 on:
   issues:
     types: [unlabeled]
-    
+
 jobs:
   Move_Unabeled_Issue_On_Project_Board:
     name: Move no longer X-Needs-Info issues to Triaged
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index d67afcdfba..80e65c35f8 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -1,4 +1,4 @@
-name: Move labelled issues into the Priority bugs column for the Web App Team
+name: Move P1 bugs to boards
 
 on:
   issues: