fix: effort setting (#22)

Author: nipsufn

README.md

@@ -12,7 +12,7 @@ It reacts to `issues` and `pull_request` events, and does the following:
 
 - `project`: Project board number (`github.com/orgs/foo/projects/N`)
 - `token`: A personal access token with write:org capabilities.
-- `todo_label`: Initial label for new issues/PRs. Defaults to `needs triage`.
+- `todoLabel`: Initial label for new issues/PRs. Defaults to `needs triage`.
 - `statusName`: Name of the 'status' field on the project board. Defaults to `status`.
 - `statusValue`: Name of the 'todo' status on the project board. Defaults to `needs triage`.
 - `effortName`: Name of the 'effort' field on the project board `effort`.

action.js

@@ -205,16 +205,15 @@ module.exports = async (
     };
 
     // set milestones & effort
-    if (!isPr || (isPr && !isDraftPr)) {
-        const assignProjectFieldsQuery = fs.readFileSync(`${basePath}/graphql/projectItemAssignFields.gql`, 'utf8');
+    if (includeEffort && (isPr && !isDraftPr)) {
+        const assignProjectFieldsQuery = fs.readFileSync(`${basePath}/graphql/projectEffortItemAssignFields.gql`, 'utf8');
         const assignProjectFieldsParams = {
             project: projectId,
             item: projectItemId,
             status_field: statusFieldId,
             status_value: statusValueId,
             effort_field: effortFieldId,
             effort_value: effortValueId,
-            effort_included: isPr && includeEffort,
             primary_milestone_field: monthlyMilestoneFieldId,
             primary_milestone_value: monthlyMilestoneValueId,
             secondary_milestone_field: quarterlyMilestoneFieldId,
@@ -226,6 +225,25 @@ module.exports = async (
             bail(error.message);
         };
     };
+
+    if (!isPr || (!isDraftPr && !includeEffort)) {
+        const assignProjectFieldsQuery = fs.readFileSync(`${basePath}/graphql/projectNoEffortItemAssignFields.gql`, 'utf8');
+        const assignProjectFieldsParams = {
+            project: projectId,
+            item: projectItemId,
+            status_field: statusFieldId,
+            status_value: statusValueId,
+            primary_milestone_field: monthlyMilestoneFieldId,
+            primary_milestone_value: monthlyMilestoneValueId,
+            secondary_milestone_field: quarterlyMilestoneFieldId,
+            secondary_milestone_value: quarterlyMilestoneValueId
+        };
+        try {
+            await github.graphql(assignProjectFieldsQuery, assignProjectFieldsParams);
+        } catch (error) {
+            bail(error.message);
+        };
+    }
 }
 
 /**

action.yml

@@ -12,7 +12,7 @@ inputs:
   token:
     description: GitHub Token with org:write
     required: true
-  todo_label:
+  todoLabel:
     description: Initial label for new issues/PRs
     required: false
     default: "needs triage"
@@ -56,7 +56,7 @@ runs:
       if: ${{ ! env.ACT_TEST }}
       uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90
       with:
-        add-labels: "${{ inputs.todo_label }}"
+        add-labels: "${{ inputs.todoLabel }}"
         ignore-if-assigned: true
         ignore-if-labeled: true
     - name: Fetch project data

graphql/projectItemAssignFields.gql renamed to graphql/projectEffortItemAssignFields.gql

@@ -5,7 +5,6 @@ mutation (
   $status_value: String!
   $effort_field: ID!
   $effort_value: String!
-  $effort_included: Boolean! = false
   $primary_milestone_field: ID!
   $primary_milestone_value: String!
   $secondary_milestone_field: ID!
@@ -30,7 +29,7 @@ mutation (
       fieldId: $effort_field
       value: { singleSelectOptionId: $effort_value }
     }
-  ) @include(if: $effort_included) {
+  ) {
     projectV2Item {
       id
     }

graphql/projectNoEffortItemAssignFields.gql

@@ -0,0 +1,47 @@
+mutation (
+  $project: ID!
+  $item: ID!
+  $status_field: ID!
+  $status_value: String!
+  $primary_milestone_field: ID!
+  $primary_milestone_value: String!
+  $secondary_milestone_field: ID!
+  $secondary_milestone_value: String!
+) {
+  status: updateProjectV2ItemFieldValue(
+    input: {
+      projectId: $project
+      itemId: $item
+      fieldId: $status_field
+      value: { singleSelectOptionId: $status_value }
+    }
+  ) {
+    projectV2Item {
+      id
+    }
+  }
+  primary_milestone: updateProjectV2ItemFieldValue(
+    input: {
+      projectId: $project
+      itemId: $item
+      fieldId: $primary_milestone_field
+      value: { iterationId: $primary_milestone_value }
+    }
+  ) {
+    projectV2Item {
+      id
+    }
+  }
+  secondary_milestone: updateProjectV2ItemFieldValue(
+    input: {
+      projectId: $project
+      itemId: $item
+      fieldId: $secondary_milestone_field
+      value: { iterationId: $secondary_milestone_value }
+    }
+  ) {
+    projectV2Item {
+      id
+    }
+  }
+}