Trigger bot to cleanup columns

Author: jablko

src/queries/all-open-prs-query.ts

@@ -1,9 +1,9 @@
 import { gql, TypedDocumentNode } from "@apollo/client/core";
 import { client } from "../graphql-client";
-import { GetAllOpenPRsAndCardIDs, GetAllOpenPRsAndCardIDsVariables } from "./schema/GetAllOpenPRsAndCardIDs";
+import { GetAllOpenPRs, GetAllOpenPRsVariables } from "./schema/GetAllOpenPRs";
 
-export const getAllOpenPRsAndCardIDsQuery: TypedDocumentNode<GetAllOpenPRsAndCardIDs, GetAllOpenPRsAndCardIDsVariables> = gql`
-query GetAllOpenPRsAndCardIDs($after: String) {
+export const getAllOpenPRsQuery: TypedDocumentNode<GetAllOpenPRs, GetAllOpenPRsVariables> = gql`
+query GetAllOpenPRs($after: String) {
   repository(owner: "DefinitelyTyped", name: "DefinitelyTyped") {
     id
     pullRequests(orderBy: { field: UPDATED_AT, direction: DESC }, states: [OPEN], first: 100, after: $after) {
@@ -12,26 +12,24 @@ query GetAllOpenPRsAndCardIDs($after: String) {
         node {
           number
           updatedAt
-          projectCards(first: 100) { nodes { id } }
         }
       }
     }
   }
 }`;
 
-export async function getAllOpenPRsAndCardIDs() {
+export async function getAllOpenPRs() {
     const prNumbers: number[] = [];
-    const cardIDs: string[] = [];
     let after: string | undefined;
     while (true) {
         const results = await client.query({
-            query: getAllOpenPRsAndCardIDsQuery,
+            query: getAllOpenPRsQuery,
             fetchPolicy: "network-only",
             variables: { after }
         });
 
         if (!results.data.repository?.pullRequests.edges?.length) {
-            return { prNumbers, cardIDs };
+            return prNumbers;
         }
 
         for (const edge of results.data.repository.pullRequests.edges) {
@@ -41,7 +39,6 @@ export async function getAllOpenPRsAndCardIDs() {
             if (!node) continue;
 
             prNumbers.push(node.number);
-            node.projectCards.nodes?.forEach(n => n && cardIDs.push(n.id));
         }
     }
 }

src/queries/card-id-to-pr-query.ts

@@ -1,6 +1,7 @@
 import { gql, TypedDocumentNode } from "@apollo/client/core";
 import { client } from "../graphql-client";
 import { GetProjectBoardCards } from "./schema/GetProjectBoardCards";
+import { noNullish } from "../util/util";
 
 const GetProjectBoardCardsQuery: TypedDocumentNode<GetProjectBoardCards, never> = gql`
   query GetProjectBoardCards {
@@ -17,6 +18,11 @@ const GetProjectBoardCardsQuery: TypedDocumentNode<GetProjectBoardCards, never>
               nodes {
                 id
                 updatedAt
+                content {
+                  ... on PullRequest {
+                    number
+                  }
+                }
               }
             }
           }
@@ -25,16 +31,6 @@ const GetProjectBoardCardsQuery: TypedDocumentNode<GetProjectBoardCards, never>
     }
   }`;
 
-interface CardInfo {
-    id: string;
-    updatedAt: string;
-}
-interface ColumnInfo {
-    name: string;
-    totalCount: number;
-    cards: CardInfo[];
-}
-
 export async function getProjectBoardCards() {
     const results = await client.query({
         query: GetProjectBoardCardsQuery,
@@ -47,17 +43,13 @@ export async function getProjectBoardCards() {
         throw new Error("No project found");
     }
 
-    const columns: ColumnInfo[] = [];
-    project.columns.nodes?.forEach(col => {
-        if (!col) return;
-        const cards: CardInfo[] = [];
-        col.cards.nodes?.forEach(card => card && cards.push({ id: card.id, updatedAt: card.updatedAt }));
-        columns.push({
-            name: col.name,
-            totalCount: col.cards.totalCount,
-            cards
-        });
-    });
-
-    return columns;
+    return noNullish(project.columns.nodes).map(column => ({
+        name: column.name,
+        totalCount: column.cards.totalCount,
+        cards: noNullish(column.cards.nodes).map(card => ({
+            id: card.id,
+            updatedAt: card.updatedAt,
+            number: card.content && "number" in card.content ? card.content.number : undefined,
+        })),
+    }));
 }

src/queries/projectboard-cards.ts

@@ -0,0 +1,60 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: GetAllOpenPRs
+// ====================================================
+
+export interface GetAllOpenPRs_repository_pullRequests_edges_node {
+  __typename: "PullRequest";
+  /**
+   * Identifies the pull request number.
+   */
+  number: number;
+  /**
+   * Identifies the date and time when the object was last updated.
+   */
+  updatedAt: any;
+}
+
+export interface GetAllOpenPRs_repository_pullRequests_edges {
+  __typename: "PullRequestEdge";
+  /**
+   * A cursor for use in pagination.
+   */
+  cursor: string;
+  /**
+   * The item at the end of the edge.
+   */
+  node: GetAllOpenPRs_repository_pullRequests_edges_node | null;
+}
+
+export interface GetAllOpenPRs_repository_pullRequests {
+  __typename: "PullRequestConnection";
+  /**
+   * A list of edges.
+   */
+  edges: (GetAllOpenPRs_repository_pullRequests_edges | null)[] | null;
+}
+
+export interface GetAllOpenPRs_repository {
+  __typename: "Repository";
+  id: string;
+  /**
+   * A list of pull requests that have been opened in the repository.
+   */
+  pullRequests: GetAllOpenPRs_repository_pullRequests;
+}
+
+export interface GetAllOpenPRs {
+  /**
+   * Lookup a given repository by the owner and repository name.
+   */
+  repository: GetAllOpenPRs_repository | null;
+}
+
+export interface GetAllOpenPRsVariables {
+  after?: string | null;
+}

src/queries/schema/CardIdToPr.ts

@@ -7,13 +7,31 @@
 // GraphQL query operation: GetProjectBoardCards
 // ====================================================
 
+export interface GetProjectBoardCards_repository_project_columns_nodes_cards_nodes_content_Issue {
+  __typename: "Issue";
+}
+
+export interface GetProjectBoardCards_repository_project_columns_nodes_cards_nodes_content_PullRequest {
+  __typename: "PullRequest";
+  /**
+   * Identifies the pull request number.
+   */
+  number: number;
+}
+
+export type GetProjectBoardCards_repository_project_columns_nodes_cards_nodes_content = GetProjectBoardCards_repository_project_columns_nodes_cards_nodes_content_Issue | GetProjectBoardCards_repository_project_columns_nodes_cards_nodes_content_PullRequest;
+
 export interface GetProjectBoardCards_repository_project_columns_nodes_cards_nodes {
   __typename: "ProjectCard";
   id: string;
   /**
    * Identifies the date and time when the object was last updated.
    */
   updatedAt: any;
+  /**
+   * The card content item
+   */
+  content: GetProjectBoardCards_repository_project_columns_nodes_cards_nodes_content | null;
 }
 
 export interface GetProjectBoardCards_repository_project_columns_nodes_cards {