Merge pull request #22 from banyan/fix-labelable-ids

Fix labelIds handling
banyan · Feb 2, 2020 · 5d4fc35 · 5d4fc35
2 parents 86c0a05 + 8bd5473
commit 5d4fc35
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/dist/entrypoint.js b/dist/entrypoint.js
@@ -68,7 +68,7 @@ async function run() {
         }, {});
         util_1.logger.debug('allLabels', allLabels);
         const currentLabelNames = new Set(result.repository.pullRequest.labels.edges.map((edge) => edge.node.name));
-        util_1.logger.debug('currentLabelNames', currentLabelNames);
+        util_1.logger.debug('currentLabelNames', Array.from(currentLabelNames));
         const { headRefOid, baseRefOid } = result.repository.pullRequest;
         const { stdout } = await exec(`git fetch && git merge-base --is-ancestor ${baseRefOid} ${headRefOid} && git diff --name-only ${baseRefOid} || git diff --name-only $(git merge-base ${baseRefOid} ${headRefOid})`);
         const diffFiles = stdout.trim().split('\n');
@@ -82,11 +82,13 @@ async function run() {
             });
             return acc;
         }, []));
+        util_1.logger.debug('newLabelNames', newLabelNames);
         const ruledLabelNames = new Set(Object.keys(config.rules));
         const labelNamesToAdd = new Set([...newLabelNames].filter(labelName => !currentLabelNames.has(labelName)));
         const labelNamesToRemove = new Set([...currentLabelNames].filter((labelName) => !newLabelNames.has(labelName) && ruledLabelNames.has(labelName)));
-        util_1.logger.debug('labelNamesToAdd', labelNamesToAdd);
-        util_1.logger.debug('labelNamesToRemove', labelNamesToRemove);
+        util_1.logger.debug('ruledLabelNames', Array.from(ruledLabelNames));
+        util_1.logger.debug('labelNamesToAdd', Array.from(labelNamesToAdd));
+        util_1.logger.debug('labelNamesToRemove', Array.from(labelNamesToRemove));
         const labelableId = result.repository.pullRequest.id;
         util_1.logger.debug('labelableId', labelableId);
         if (labelNamesToAdd.size > 0) {
@@ -132,7 +134,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core = tslib_1.__importStar(require("@actions/core"));
 const lodash_pick_1 = tslib_1.__importDefault(require("lodash.pick"));
-exports.getLabelIds = (allLabels, labelNames) => JSON.stringify(Object.values(lodash_pick_1.default(allLabels, labelNames)));
+exports.getLabelIds = (allLabels, labelNames) => Object.values(lodash_pick_1.default(allLabels, labelNames));
 exports.logger = {
     debug: (message, object) => {
         return core.debug(`${message}: ${JSON.stringify(object)}`);
@@ -190,7 +192,7 @@ exports.getPullRequestAndLabels = (graphqlWithAuth, { owner, repo, number, }) =>
 };
 exports.addLabelsToLabelable = (graphqlWithAuth, { labelIds, labelableId, }) => {
     const query = `
-    mutation addLabelsToLabelable($labelIds: String!, $labelableId: String!) {
+    mutation addLabelsToLabelable($labelIds: [ID!]!, $labelableId: ID!) {
       addLabelsToLabelable(input: {labelIds:$labelIds, labelableId:$labelableId}) {
         clientMutationId
       }
@@ -203,7 +205,7 @@ exports.addLabelsToLabelable = (graphqlWithAuth, { labelIds, labelableId, }) =>
 };
 exports.removeLabelsFromLabelable = (graphqlWithAuth, { labelIds, labelableId, }) => {
     const query = `
-    mutation removeLabelsFromLabelable($labelIds: String!, $labelableId: String!) {
+    mutation removeLabelsFromLabelable($labelIds: [ID!]!, $labelableId: ID!) {
       removeLabelsFromLabelable(input: {labelIds:$labelIds, labelableId:$labelableId}) {
         clientMutationId
       }

diff --git a/src/entrypoint.ts b/src/entrypoint.ts
@@ -93,7 +93,7 @@ async function run() {
       ),
     );
 
-    logger.debug('currentLabelNames', currentLabelNames);
+    logger.debug('currentLabelNames', Array.from(currentLabelNames));
 
     const { headRefOid, baseRefOid } = result.repository.pullRequest;
 
@@ -118,6 +118,8 @@ async function run() {
       }, []),
     );
 
+    logger.debug('newLabelNames', newLabelNames);
+
     const ruledLabelNames = new Set(Object.keys(config.rules));
 
     const labelNamesToAdd = new Set(
@@ -133,8 +135,9 @@ async function run() {
       ),
     );
 
-    logger.debug('labelNamesToAdd', labelNamesToAdd);
-    logger.debug('labelNamesToRemove', labelNamesToRemove);
+    logger.debug('ruledLabelNames', Array.from(ruledLabelNames));
+    logger.debug('labelNamesToAdd', Array.from(labelNamesToAdd));
+    logger.debug('labelNamesToRemove', Array.from(labelNamesToRemove));
 
     const labelableId = result.repository.pullRequest.id;
 

diff --git a/src/query.ts b/src/query.ts
@@ -1,3 +1,4 @@
+import { Label } from './interface';
 import { graphql } from '@octokit/graphql';
 import * as OctokitTypes from '@octokit/types';
 
@@ -66,12 +67,12 @@ export const addLabelsToLabelable = (
     labelIds,
     labelableId,
   }: {
-    labelIds: string;
+    labelIds: (Label | undefined)[];
     labelableId: string;
   },
 ) => {
   const query = `
-    mutation addLabelsToLabelable($labelIds: String!, $labelableId: String!) {
+    mutation addLabelsToLabelable($labelIds: [ID!]!, $labelableId: ID!) {
       addLabelsToLabelable(input: {labelIds:$labelIds, labelableId:$labelableId}) {
         clientMutationId
       }
@@ -90,12 +91,12 @@ export const removeLabelsFromLabelable = (
     labelIds,
     labelableId,
   }: {
-    labelIds: string;
+    labelIds: (Label | undefined)[];
     labelableId: string;
   },
 ) => {
   const query = `
-    mutation removeLabelsFromLabelable($labelIds: String!, $labelableId: String!) {
+    mutation removeLabelsFromLabelable($labelIds: [ID!]!, $labelableId: ID!) {
       removeLabelsFromLabelable(input: {labelIds:$labelIds, labelableId:$labelableId}) {
         clientMutationId
       }

diff --git a/src/util.ts b/src/util.ts
@@ -2,10 +2,8 @@ import * as core from '@actions/core';
 import pick from 'lodash.pick';
 
 import { Label, LabelName } from './interface';
-export const getLabelIds = (
-  allLabels: Label[],
-  labelNames: LabelName[],
-): string => JSON.stringify(Object.values(pick(allLabels, labelNames)));
+export const getLabelIds = (allLabels: Label[], labelNames: LabelName[]) =>
+  Object.values(pick(allLabels, labelNames));
 
 export const logger = {
   debug: (message: string, object: {} | null | undefined) => {