Combine dependent actions

Author: jablko

src/compute-pr-actions.ts

@@ -49,26 +49,22 @@ export const LabelNames = [
 ] as const;
 
 export interface Actions {
-    targetColumn?: ColumnName;
+    projectColumn?: ColumnName | "REMOVE";
     labels: LabelName[];
     responseComments: Comments.Comment[];
     shouldClose: boolean;
     shouldMerge: boolean;
     shouldUpdateLabels: boolean;
-    shouldUpdateProjectColumn: boolean;
-    shouldRemoveFromActiveColumns: boolean;
 }
 
 function createDefaultActions(): Actions {
     return {
-        targetColumn: "Other",
+        projectColumn: "Other",
         labels: [],
         responseComments: [],
         shouldClose: false,
         shouldMerge: false,
         shouldUpdateLabels: true,
-        shouldUpdateProjectColumn: true,
-        shouldRemoveFromActiveColumns: false,
     };
 }
 
@@ -79,8 +75,6 @@ function createEmptyActions(): Actions {
         shouldClose: false,
         shouldMerge: false,
         shouldUpdateLabels: false,
-        shouldUpdateProjectColumn: false,
-        shouldRemoveFromActiveColumns: false,
     };
 }
 
@@ -233,25 +227,17 @@ function extendPrInfo(info: PrInfo): ExtendedPrInfo {
 export function process(prInfo: BotResult,
                         extendedCallback: (info: ExtendedPrInfo) => void = _i => {}): Actions {
     if (prInfo.type === "remove") {
-        if (prInfo.isDraft) {
-            return {
-                ...createEmptyActions(),
-                targetColumn: "Needs Author Action",
-                shouldUpdateProjectColumn: true,
-            };
-        } else {
-            return {
-                ...createEmptyActions(),
-                shouldRemoveFromActiveColumns: true,
-            };
-        }
+        return {
+            ...createEmptyActions(),
+            projectColumn: prInfo.isDraft ? "Needs Author Action" : "REMOVE",
+        };
     }
 
     const actions = createDefaultActions();
     const post = (c: Comments.Comment) => actions.responseComments.push(c);
 
     if (prInfo.type === "error") {
-        actions.targetColumn = "Other";
+        actions.projectColumn = "Other";
         actions.labels.push("Mergebot Error");
         post(Comments.HadError(prInfo.author, prInfo.message));
         return actions;
@@ -306,18 +292,18 @@ export function process(prInfo: BotResult,
     }
 
     // Some step should override this
-    actions.targetColumn = "Other";
+    actions.projectColumn = "Other";
 
     // Needs author attention (bad CI, merge conflicts)
     if (info.needsAuthorAction) {
-        actions.targetColumn = "Needs Author Action";
+        actions.projectColumn = "Needs Author Action";
         if (info.hasMergeConflict) post(Comments.MergeConflicted(headCommitAbbrOid, info.author));
         if (info.failedCI) post(Comments.CIFailed(headCommitAbbrOid, info.author, info.ciUrl!));
         if (info.hasChangereqs) post(Comments.ChangesRequest(headCommitAbbrOid, info.author));
     }
     // CI is running; default column is Waiting for Reviewers
     else if (info.ciResult === "unknown") {
-        actions.targetColumn = "Waiting for Code Reviews";
+        actions.projectColumn = "Waiting for Code Reviews";
     }
     // CI is missing
     else if (info.ciResult === "missing") {
@@ -327,13 +313,13 @@ export function process(prInfo: BotResult,
         if (dayjs(info.now).diff(info.lastPushDate, "minutes") >= 1) {
             label("Where is GH Actions?");
         } else {
-            delete actions.targetColumn;
+            delete actions.projectColumn;
         }
     }
     // CI is green
     else if (info.ciResult === "pass") {
         if (!info.canBeSelfMerged) {
-            actions.targetColumn = info.reviewColumn;
+            actions.projectColumn = info.reviewColumn;
         } else {
             label("Self Merge");
             // post even when merging, so it won't get deleted
@@ -342,9 +328,9 @@ export function process(prInfo: BotResult,
                                          headCommitAbbrOid));
             if (info.hasValidMergeRequest) {
                 actions.shouldMerge = true;
-                actions.targetColumn = "Recently Merged";
+                actions.projectColumn = "Recently Merged";
             } else {
-                actions.targetColumn = "Waiting for Author to Merge";
+                actions.projectColumn = "Waiting for Author to Merge";
             }
         }
         // Ping stale reviewers if any
@@ -384,9 +370,9 @@ function makeStaleness(now: Date, author: string, otherOwners: string[]) { // cu
             if (state === "done") {
                 if (doneColumn === "CLOSE") {
                     actions.shouldClose = true;
-                    actions.shouldRemoveFromActiveColumns = true;
+                    actions.projectColumn = "REMOVE";
                 } else {
-                    actions.targetColumn = doneColumn;
+                    actions.projectColumn = doneColumn;
                 }
             }
         };

src/execute-pr-actions.ts

@@ -45,20 +45,20 @@ async function getMutationsForLabels(actions: Actions, pr: PR_repository_pullReq
 }
 
 async function getMutationsForProjectChanges(actions: Actions, pr: PR_repository_pullRequest) {
-    if (actions.shouldRemoveFromActiveColumns) {
-        const card = pr.projectCards.nodes?.find(card => card?.project.number === ProjectBoardNumber);
-        if (card?.column?.name === "Recently Merged") return [];
-        return [createMutation<schema.DeleteProjectCardInput>("deleteProjectCard", { cardId: card!.id })];
+    if (!actions.projectColumn) return [];
+    const card = pr.projectCards.nodes?.find(card => card?.project.number === ProjectBoardNumber);
+    if (actions.projectColumn === "REMOVE") {
+        if (!card || card.column?.name === "Recently Merged") return [];
+        return [createMutation<schema.DeleteProjectCardInput>("deleteProjectCard", { cardId: card.id })];
     }
-    if (!(actions.shouldUpdateProjectColumn && actions.targetColumn)) return [];
-    const existingCard = pr.projectCards.nodes?.find(n => !!n?.column && n.project.number === ProjectBoardNumber);
-    const targetColumnId = await getProjectBoardColumnIdByName(actions.targetColumn);
-    // No existing card => create a new one
-    if (!existingCard) return [createMutation<schema.AddProjectCardInput>("addProjectCard", { contentId: pr.id, projectColumnId: targetColumnId })];
     // Existing card is ok => do nothing
-    if (existingCard.column?.name === actions.targetColumn) return [];
-    // Move existing card
-    return [createMutation<schema.MoveProjectCardInput>("moveProjectCard", { cardId: existingCard.id, columnId: targetColumnId })];
+    if (card?.column?.name === actions.projectColumn) return [];
+    const columnId = await getProjectBoardColumnIdByName(actions.projectColumn);
+    return [card
+        // Move existing card
+        ? createMutation<schema.MoveProjectCardInput>("moveProjectCard", { cardId: card.id, columnId })
+        // No existing card => create a new one
+        : createMutation<schema.AddProjectCardInput>("addProjectCard", { contentId: pr.id, projectColumnId: columnId })];
 }
 
 type ParsedComment = { id: string, body: string, tag: string, status: string };