Merge pull request #142 from timrogers/timrogers/draft-issue

Allow users to add an issue/PR to a board in a different organization

.github/workflows/test.yml

@@ -18,3 +18,5 @@ jobs:
           npm install
       - run: |
           npm run build
+      - run: |
+          npm run test

README.md

@@ -1,17 +1,13 @@
 # actions/add-to-project
 
-Use this action to automatically add the current issue or pull request to a GitHub project.
+Use this action to automatically add the current issue or pull request to a [GitHub project](https://docs.github.com/en/issues/trying-out-the-new-projects-experience/about-projects).
-Note that this is for [GitHub projects
+Note that this action does not support [GitHub projects (classic)](https://docs.github.com/en/issues/organizing-your-work-with-project-boards).
-(beta)](https://docs.github.com/en/issues/trying-out-the-new-projects-experience/about-projects),
-not the original GitHub projects.
 
 ## Current Status
 
 [![build-test](https://github.com/actions/add-to-project/actions/workflows/test.yml/badge.svg)](https://github.com/actions/add-to-project/actions/workflows/test.yml)
 
-> **NOTE:** This Action (currently) only supports auto-adding Issues/Pull Requests to a Project which lives in the same organization as your target Repository.
+> **NOTE:** ⚠️ This action no longer uses the deprecated ProjectNext API. If you are looking for the old version of that action, use version [v0.0.5](https://github.com/actions/add-to-project/releases/tag/v0.0.5).
-
-> **NOTE:** This action no longer uses the deprecated ProjectNext API. If you are looking for the old version of that action, use version [v0.0.3](https://github.com/actions/add-to-project/releases/tag/v0.0.3).
 
 ## Usage
 
@@ -42,6 +38,8 @@ jobs:
     steps:
       - uses: actions/add-to-project@RELEASE_VERSION
         with:
+          # You can target a repository in a different organization
+          # to the issue
           project-url: https://github.com/orgs/<orgName>/projects/<projectNumber>
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
           labeled: bug, needs-triage

__tests__/add-to-project.test.ts

@@ -12,7 +12,7 @@ describe('addToProject', () => {
 
   beforeEach(() => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token'
     })
 
@@ -24,7 +24,22 @@ describe('addToProject', () => {
     jest.restoreAllMocks()
   })
 
-  test('adds an issue to the project', async () => {
+  test('adds an issue from the same organization to the project', async () => {
+    github.context.payload = {
+      issue: {
+        number: 1,
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
+      }
+    }
+
     mockGraphQL(
       {
         test: /getProject/,
@@ -53,9 +68,53 @@ describe('addToProject', () => {
     expect(outputs.itemId).toEqual('project-item-id')
   })
 
+  test('adds an issue from a different organization to the project', async () => {
+    github.context.payload = {
+      issue: {
+        number: 2221,
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/octokit/octokit.js/issues/2221'
+      },
+      repository: {
+        name: 'octokit.js',
+        owner: {
+          login: 'octokit'
+        }
+      }
+    }
+
+    mockGraphQL(
+      {
+        test: /getProject/,
+        return: {
+          organization: {
+            projectV2: {
+              id: 'project-id'
+            }
+          }
+        }
+      },
+      {
+        test: /addProjectV2DraftIssue/,
+        return: {
+          addProjectV2DraftIssue: {
+            projectItem: {
+              id: 'project-item-id'
+            }
+          }
+        }
+      }
+    )
+
+    await addToProject()
+
+    expect(outputs.itemId).toEqual('project-item-id')
+  })
+
   test('adds matching issues with a label filter without label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new'
     })
@@ -63,7 +122,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'bug'}]
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -97,7 +164,7 @@ describe('addToProject', () => {
 
   test('adds matching pull-requests with a label filter without label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new'
     })
@@ -106,7 +173,15 @@ describe('addToProject', () => {
       // eslint-disable-next-line camelcase
       pull_request: {
         number: 1,
-        labels: [{name: 'bug'}]
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/pull/136'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -140,7 +215,7 @@ describe('addToProject', () => {
 
   test('does not add un-matching issues with a label filter without label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug'
     })
@@ -148,7 +223,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: []
+        labels: [],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -161,7 +244,7 @@ describe('addToProject', () => {
 
   test('adds matching issues with labels filter with AND label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new',
       'label-operator': 'AND'
@@ -170,7 +253,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'bug'}, {name: 'new'}]
+        labels: [{name: 'bug'}, {name: 'new'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -204,7 +295,7 @@ describe('addToProject', () => {
 
   test('does not add un-matching issues with labels filter with AND label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new',
       'label-operator': 'AND'
@@ -213,7 +304,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'bug'}, {name: 'other'}]
+        labels: [{name: 'bug'}, {name: 'other'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -226,7 +325,7 @@ describe('addToProject', () => {
 
   test('does not add matching issues with labels filter with NOT label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new',
       'label-operator': 'NOT'
@@ -235,7 +334,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'bug'}]
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -248,7 +355,7 @@ describe('addToProject', () => {
 
   test('adds issues that do not have labels present in the label list with NOT label-operator', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new',
       'label-operator': 'NOT'
@@ -257,7 +364,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'other'}]
+        labels: [{name: 'other'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -266,17 +381,17 @@ describe('addToProject', () => {
         test: /getProject/,
         return: {
           organization: {
-            projectNext: {
+            projectV2: {
               id: 'project-next-id'
             }
           }
         }
       },
       {
-        test: /addProjectNextItem/,
+        test: /addProjectV2ItemById/,
         return: {
-          addProjectNextItem: {
+          addProjectV2ItemById: {
-            projectNextItem: {
+            item: {
               id: 'project-next-item-id'
             }
           }
@@ -291,7 +406,7 @@ describe('addToProject', () => {
 
   test('adds matching issues with multiple label filters', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'accessibility,backend,bug'
     })
@@ -299,7 +414,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'accessibility'}, {name: 'backend'}]
+        labels: [{name: 'accessibility'}, {name: 'backend'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -331,13 +454,15 @@ describe('addToProject', () => {
     await addToProject()
 
     expect(gqlMock).toHaveBeenCalled()
-    expect(infoSpy).not.toHaveBeenCalled()
+    expect(infoSpy).toHaveBeenCalledWith('Creating project item')
+    // We shouldn't have any logs relating to the issue being skipped
+    expect(infoSpy.mock.calls.length).toEqual(1)
     expect(outputs.itemId).toEqual('project-item-id')
   })
 
   test('does not add un-matching issues with multiple label filters', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'accessibility, backend, bug'
     })
@@ -345,7 +470,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'data'}, {name: 'frontend'}, {name: 'improvement'}]
+        labels: [{name: 'data'}, {name: 'frontend'}, {name: 'improvement'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -360,7 +493,7 @@ describe('addToProject', () => {
 
   test('handles spaces and extra commas gracefully in label filter input', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'accessibility  ,   backend    ,,  . ,     bug'
     })
@@ -369,7 +502,15 @@ describe('addToProject', () => {
       issue: {
         number: 1,
         labels: [{name: 'accessibility'}, {name: 'backend'}, {name: 'bug'}],
-        'label-operator': 'AND'
+        'label-operator': 'AND',
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -401,7 +542,9 @@ describe('addToProject', () => {
     await addToProject()
 
     expect(gqlMock).toHaveBeenCalled()
-    expect(infoSpy).not.toHaveBeenCalled()
+    expect(infoSpy).toHaveBeenCalledWith('Creating project item')
+    // We shouldn't have any logs relating to the issue being skipped
+    expect(infoSpy.mock.calls.length).toEqual(1)
     expect(outputs.itemId).toEqual('project-item-id')
   })
 
@@ -414,7 +557,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: []
+        labels: [],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -436,7 +587,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: []
+        labels: [],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -451,7 +610,7 @@ describe('addToProject', () => {
 
   test('constructs the correct graphQL query given an organization owner', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'bug, new'
     })
@@ -459,7 +618,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'bug'}]
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -488,8 +655,8 @@ describe('addToProject', () => {
 
     await addToProject()
 
-    expect(gqlMock).toHaveBeenNthCalledWith(1, expect.stringContaining('organization(login: $ownerName)'), {
+    expect(gqlMock).toHaveBeenNthCalledWith(1, expect.stringContaining('organization(login: $projectOwnerName)'), {
-      ownerName: 'github',
+      projectOwnerName: 'actions',
       projectNumber: 1
     })
   })
@@ -504,7 +671,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'bug'}]
+        labels: [{name: 'bug'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/monalisa/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'monalisa'
+        }
       }
     }
 
@@ -533,15 +708,15 @@ describe('addToProject', () => {
 
     await addToProject()
 
-    expect(gqlMock).toHaveBeenNthCalledWith(1, expect.stringContaining('user(login: $ownerName)'), {
+    expect(gqlMock).toHaveBeenNthCalledWith(1, expect.stringContaining('user(login: $projectOwnerName)'), {
-      ownerName: 'monalisa',
+      projectOwnerName: 'monalisa',
       projectNumber: 1
     })
   })
 
   test('compares labels case-insensitively', async () => {
     mockGetInput({
-      'project-url': 'https://github.com/orgs/github/projects/1',
+      'project-url': 'https://github.com/orgs/actions/projects/1',
       'github-token': 'gh_token',
       labeled: 'FOO, Bar, baz',
       'label-operator': 'AND'
@@ -550,7 +725,15 @@ describe('addToProject', () => {
     github.context.payload = {
       issue: {
         number: 1,
-        labels: [{name: 'foo'}, {name: 'BAR'}, {name: 'baz'}]
+        labels: [{name: 'foo'}, {name: 'BAR'}, {name: 'baz'}],
+        // eslint-disable-next-line camelcase
+        html_url: 'https://github.com/actions/add-to-project/issues/74'
+      },
+      repository: {
+        name: 'add-to-project',
+        owner: {
+          login: 'actions'
+        }
       }
     }
 
@@ -559,17 +742,17 @@ describe('addToProject', () => {
         test: /getProject/,
         return: {
           organization: {
-            projectNext: {
+            projectV2: {
               id: 'project-next-id'
             }
           }
         }
       },
       {
-        test: /addProjectNextItem/,
+        test: /addProjectV2ItemById/,
         return: {
-          addProjectNextItem: {
+          addProjectV2ItemById: {
-            projectNextItem: {
+            item: {
               id: 'project-next-item-id'
             }
           }

action.yml

@@ -1,5 +1,5 @@
-name: Add To GitHub Projects Beta
+name: Add To GitHub projects
-description: Automatically add issues and PRs to GitHub projects beta
+description: Automatically add issues and PRs to GitHub projects
 author: GitHub
 branding:
   icon: table

dist/index.js

@@ -46,7 +46,7 @@ const github = __importStar(__nccwpck_require__(5438));
 // https://github.com/orgs|users/<ownerName>/projects/<projectNumber>
 const urlParse = /^(?:https:\/\/)?github\.com\/(?<ownerType>orgs|users)\/(?<ownerName>[^/]+)\/projects\/(?<projectNumber>\d+)/;
 function addToProject() {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function* () {
         const projectUrl = core.getInput('project-url', { required: true });
         const ghToken = core.getInput('github-token', { required: true });
@@ -57,9 +57,10 @@ function addToProject() {
             .filter(l => l.length > 0)) !== null && _a !== void 0 ? _a : [];
         const labelOperator = core.getInput('label-operator').trim().toLocaleLowerCase();
         const octokit = github.getOctokit(ghToken);
-        const urlMatch = projectUrl.match(urlParse);
         const issue = (_b = github.context.payload.issue) !== null && _b !== void 0 ? _b : github.context.payload.pull_request;
         const issueLabels = ((_c = issue === null || issue === void 0 ? void 0 : issue.labels) !== null && _c !== void 0 ? _c : []).map((l) => l.name.toLowerCase());
+        const issueOwnerName = (_d = github.context.payload.repository) === null || _d === void 0 ? void 0 : _d.owner.login;
+        core.debug(`Issue/PR owner: ${issueOwnerName}`);
         // Ensure the issue matches our `labeled` filter based on the label-operator.
         if (labelOperator === 'and') {
             if (!labeled.every(l => issueLabels.includes(l))) {
@@ -80,45 +81,68 @@ function addToProject() {
             }
         }
         core.debug(`Project URL: ${projectUrl}`);
+        const urlMatch = projectUrl.match(urlParse);
         if (!urlMatch) {
             throw new Error(`Invalid project URL: ${projectUrl}. Project URL should match the format https://github.com/<orgs-or-users>/<ownerName>/projects/<projectNumber>`);
         }
-        const ownerName = (_d = urlMatch.groups) === null || _d === void 0 ? void 0 : _d.ownerName;
+        const projectOwnerName = (_e = urlMatch.groups) === null || _e === void 0 ? void 0 : _e.ownerName;
-        const projectNumber = parseInt((_f = (_e = urlMatch.groups) === null || _e === void 0 ? void 0 : _e.projectNumber) !== null && _f !== void 0 ? _f : '', 10);
+        const projectNumber = parseInt((_g = (_f = urlMatch.groups) === null || _f === void 0 ? void 0 : _f.projectNumber) !== null && _g !== void 0 ? _g : '', 10);
-        const ownerType = (_g = urlMatch.groups) === null || _g === void 0 ? void 0 : _g.ownerType;
+        const ownerType = (_h = urlMatch.groups) === null || _h === void 0 ? void 0 : _h.ownerType;
         const ownerTypeQuery = mustGetOwnerTypeQuery(ownerType);
-        core.debug(`Org name: ${ownerName}`);
+        core.debug(`Project owner: ${projectOwnerName}`);
         core.debug(`Project number: ${projectNumber}`);
-        core.debug(`Owner type: ${ownerType}`);
+        core.debug(`Project owner type: ${ownerType}`);
         // First, use the GraphQL API to request the project's node ID.
-        const idResp = yield octokit.graphql(`query getProject($ownerName: String!, $projectNumber: Int!) {
+        const idResp = yield octokit.graphql(`query getProject($projectOwnerName: String!, $projectNumber: Int!) {
-      ${ownerTypeQuery}(login: $ownerName) {
+      ${ownerTypeQuery}(login: $projectOwnerName) {
         projectV2(number: $projectNumber) {
           id
         }
       }
     }`, {
-            ownerName,
+            projectOwnerName,
             projectNumber
         });
-        const projectId = (_h = idResp[ownerTypeQuery]) === null || _h === void 0 ? void 0 : _h.projectV2.id;
+        const projectId = (_j = idResp[ownerTypeQuery]) === null || _j === void 0 ? void 0 : _j.projectV2.id;
         const contentId = issue === null || issue === void 0 ? void 0 : issue.node_id;
         core.debug(`Project node ID: ${projectId}`);
         core.debug(`Content ID: ${contentId}`);
         // Next, use the GraphQL API to add the issue to the project.
-        const addResp = yield octokit.graphql(`mutation addIssueToProject($input: AddProjectV2ItemByIdInput!) {
+        // If the issue has the same owner as the project, we can directly
-      addProjectV2ItemById(input: $input) {
+        // add a project item. Otherwise, we add a draft issue.
-        item {
+        if (issueOwnerName === projectOwnerName) {
-          id
+            core.info('Creating project item');
+            const addResp = yield octokit.graphql(`mutation addIssueToProject($input: AddProjectV2ItemByIdInput!) {
+        addProjectV2ItemById(input: $input) {
+          item {
+            id
+          }
         }
-      }
+      }`, {
-    }`, {
+                input: {
-            input: {
+                    projectId,
+                    contentId
+                }
+            });
+            core.setOutput('itemId', addResp.addProjectV2ItemById.item.id);
+        }
+        else {
+            core.info('Creating draft issue in project');
+            const addResp = yield octokit.graphql(`mutation addDraftIssueToProject($projectId: ID!, $title: String!) {
+        addProjectV2DraftIssue(input: {
+          projectId: $projectId,
+          title: $title
+        }) {
+          projectItem {
+            id
+          }
+        }
+      }`, {
                 projectId,
-                contentId
+                title: issue === null || issue === void 0 ? void 0 : issue.html_url
-            }
+            });
-        });
+            core.setOutput('itemId', addResp.addProjectV2DraftIssue.projectItem.id);
-        core.setOutput('itemId', addResp.addProjectV2ItemById.item.id);
+        }
     });
 }
 exports.addToProject = addToProject;

package-lock.json

@@ -15,14 +15,14 @@
       "devDependencies": {
         "@github/prettier-config": "^0.0.4",
         "@types/jest": "^27.5.0",
-        "@types/node": "~16.11.41",
+        "@types/node": "~16.11.45",
-        "@typescript-eslint/parser": "^5.29.0",
+        "@typescript-eslint/parser": "^5.30.7",
         "@vercel/ncc": "^0.34.0",
-        "concurrently": "^7.2.2",
+        "concurrently": "^7.3.0",
-        "eslint": "^8.18.0",
+        "eslint": "^8.20.0",
         "eslint-plugin-github": "^4.3.6",
-        "eslint-plugin-jest": "^26.5.3",
+        "eslint-plugin-jest": "^26.6.0",
-        "eslint-plugin-prettier": "^4.0.0",
+        "eslint-plugin-prettier": "^4.2.1",
         "jest": "^27.5.1",
         "prettier": "2.7.1",
         "ts-jest": "^27.1.4",
@@ -1367,9 +1367,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.11.41",
+      "version": "16.11.45",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.41.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz",
-      "integrity": "sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ==",
+      "integrity": "sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ==",
       "dev": true
     },
     "node_modules/@types/prettier": {
@@ -1448,14 +1448,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.29.0",
+      "version": "5.30.7",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.7.tgz",
-      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
+      "integrity": "sha512-Rg5xwznHWWSy7v2o0cdho6n+xLhK2gntImp0rJroVVFkcYFYQ8C8UJTSuTw/3CnExBmPjycjmUJkxVmjXsld6A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/scope-manager": "5.30.7",
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.30.7",
-        "@typescript-eslint/typescript-estree": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.30.7",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1475,13 +1475,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.29.0",
+      "version": "5.30.7",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.7.tgz",
-      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
+      "integrity": "sha512-7BM1bwvdF1UUvt+b9smhqdc/eniOnCKxQT/kj3oXtj3LqnTWCAM0qHRHfyzCzhEfWX0zrW7KqXXeE4DlchZBKw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.30.7",
-        "@typescript-eslint/visitor-keys": "5.29.0"
+        "@typescript-eslint/visitor-keys": "5.30.7"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1492,9 +1492,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "5.29.0",
+      "version": "5.30.7",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.7.tgz",
-      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
+      "integrity": "sha512-ocVkETUs82+U+HowkovV6uxf1AnVRKCmDRNUBUUo46/5SQv1owC/EBFkiu4MOHeZqhKz2ktZ3kvJJ1uFqQ8QPg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1505,13 +1505,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.29.0",
+      "version": "5.30.7",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.7.tgz",
-      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
+      "integrity": "sha512-tNslqXI1ZdmXXrHER83TJ8OTYl4epUzJC0aj2i4DMDT4iU+UqLT3EJeGQvJ17BMbm31x5scSwo3hPM0nqQ1AEA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.30.7",
-        "@typescript-eslint/visitor-keys": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.30.7",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -1532,12 +1532,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.29.0",
+      "version": "5.30.7",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.7.tgz",
-      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
+      "integrity": "sha512-KrRXf8nnjvcpxDFOKej4xkD7657+PClJs5cJVSG7NNoCNnjEdc46juNAQt7AyuWctuCgs6mVRc1xGctEqrjxWw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.30.7",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -2263,9 +2263,9 @@
       "dev": true
     },
     "node_modules/concurrently": {
-      "version": "7.2.2",
+      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz",
-      "integrity": "sha512-DcQkI0ruil5BA/g7Xy3EWySGrFJovF5RYAYxwGvv9Jf9q9B1v3jPFP2tl6axExNf1qgF30kjoNYrangZ0ey4Aw==",
+      "integrity": "sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.0",
@@ -2659,9 +2659,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.18.0",
+      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
-      "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
+      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.0",
@@ -2901,9 +2901,9 @@
       "dev": true
     },
     "node_modules/eslint-plugin-jest": {
-      "version": "26.5.3",
+      "version": "26.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.6.0.tgz",
-      "integrity": "sha512-sICclUqJQnR1bFRZGLN2jnSVsYOsmPYYnroGCIMVSvTS3y8XR3yjzy1EcTQmk6typ5pRgyIWzbjqxK6cZHEZuQ==",
+      "integrity": "sha512-f8n46/97ZFdU4KqeQYqO8AEVGIhHWvkpgNBWHH3jrM28/y8llnbf3IjfIKv6p2pZIMinK1PCqbbROxs9Eud02Q==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^5.10.0"
@@ -2934,15 +2934,15 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "4.0.0",
+      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
       "dev": true,
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12.0.0"
       },
       "peerDependencies": {
         "eslint": ">=7.28.0",
@@ -7577,9 +7577,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.11.41",
+      "version": "16.11.45",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.41.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz",
-      "integrity": "sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ==",
+      "integrity": "sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ==",
       "dev": true
     },
     "@types/prettier": {
@@ -7638,41 +7638,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.29.0",
+      "version": "5.30.7",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.7.tgz",
-      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
+      "integrity": "sha512-Rg5xwznHWWSy7v2o0cdho6n+xLhK2gntImp0rJroVVFkcYFYQ8C8UJTSuTw/3CnExBmPjycjmUJkxVmjXsld6A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/scope-manager": "5.30.7",
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.30.7",
-        "@typescript-eslint/typescript-estree": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.30.7",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.29.0",
+          "version": "5.30.7",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.7.tgz",
-          "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
+          "integrity": "sha512-7BM1bwvdF1UUvt+b9smhqdc/eniOnCKxQT/kj3oXtj3LqnTWCAM0qHRHfyzCzhEfWX0zrW7KqXXeE4DlchZBKw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.29.0",
+            "@typescript-eslint/types": "5.30.7",
-            "@typescript-eslint/visitor-keys": "5.29.0"
+            "@typescript-eslint/visitor-keys": "5.30.7"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.29.0",
+          "version": "5.30.7",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.7.tgz",
-          "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
+          "integrity": "sha512-ocVkETUs82+U+HowkovV6uxf1AnVRKCmDRNUBUUo46/5SQv1owC/EBFkiu4MOHeZqhKz2ktZ3kvJJ1uFqQ8QPg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.29.0",
+          "version": "5.30.7",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.7.tgz",
-          "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
+          "integrity": "sha512-tNslqXI1ZdmXXrHER83TJ8OTYl4epUzJC0aj2i4DMDT4iU+UqLT3EJeGQvJ17BMbm31x5scSwo3hPM0nqQ1AEA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.29.0",
+            "@typescript-eslint/types": "5.30.7",
-            "@typescript-eslint/visitor-keys": "5.29.0",
+            "@typescript-eslint/visitor-keys": "5.30.7",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -7681,12 +7681,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.29.0",
+          "version": "5.30.7",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.7.tgz",
-          "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
+          "integrity": "sha512-KrRXf8nnjvcpxDFOKej4xkD7657+PClJs5cJVSG7NNoCNnjEdc46juNAQt7AyuWctuCgs6mVRc1xGctEqrjxWw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.29.0",
+            "@typescript-eslint/types": "5.30.7",
             "eslint-visitor-keys": "^3.3.0"
           }
         },
@@ -8204,9 +8204,9 @@
       "dev": true
     },
     "concurrently": {
-      "version": "7.2.2",
+      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz",
-      "integrity": "sha512-DcQkI0ruil5BA/g7Xy3EWySGrFJovF5RYAYxwGvv9Jf9q9B1v3jPFP2tl6axExNf1qgF30kjoNYrangZ0ey4Aw==",
+      "integrity": "sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
@@ -8504,9 +8504,9 @@
       }
     },
     "eslint": {
-      "version": "8.18.0",
+      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
-      "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
+      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
@@ -8759,9 +8759,9 @@
       }
     },
     "eslint-plugin-jest": {
-      "version": "26.5.3",
+      "version": "26.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.6.0.tgz",
-      "integrity": "sha512-sICclUqJQnR1bFRZGLN2jnSVsYOsmPYYnroGCIMVSvTS3y8XR3yjzy1EcTQmk6typ5pRgyIWzbjqxK6cZHEZuQ==",
+      "integrity": "sha512-f8n46/97ZFdU4KqeQYqO8AEVGIhHWvkpgNBWHH3jrM28/y8llnbf3IjfIKv6p2pZIMinK1PCqbbROxs9Eud02Q==",
       "dev": true,
       "requires": {
         "@typescript-eslint/utils": "^5.10.0"
@@ -8774,9 +8774,9 @@
       "dev": true
     },
     "eslint-plugin-prettier": {
-      "version": "4.0.0",
+      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"

package.json

@@ -14,14 +14,14 @@
   "devDependencies": {
     "@github/prettier-config": "^0.0.4",
     "@types/jest": "^27.5.0",
-    "@types/node": "~16.11.41",
+    "@types/node": "~16.11.45",
-    "@typescript-eslint/parser": "^5.29.0",
+    "@typescript-eslint/parser": "^5.30.7",
     "@vercel/ncc": "^0.34.0",
-    "concurrently": "^7.2.2",
+    "concurrently": "^7.3.0",
-    "eslint": "^8.18.0",
+    "eslint": "^8.20.0",
     "eslint-plugin-github": "^4.3.6",
-    "eslint-plugin-jest": "^26.5.3",
+    "eslint-plugin-jest": "^26.6.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "jest": "^27.5.1",
     "prettier": "2.7.1",
     "ts-jest": "^27.1.4",

src/add-to-project.ts

@@ -28,6 +28,14 @@ interface ProjectAddItemResponse {
   }
 }
 
+interface ProjectV2AddDraftIssueResponse {
+  addProjectV2DraftIssue: {
+    projectItem: {
+      id: string
+    }
+  }
+}
+
 export async function addToProject(): Promise<void> {
   const projectUrl = core.getInput('project-url', {required: true})
   const ghToken = core.getInput('github-token', {required: true})
@@ -41,9 +49,11 @@ export async function addToProject(): Promise<void> {
 
   const octokit = github.getOctokit(ghToken)
 
-  const urlMatch = projectUrl.match(urlParse)
   const issue = github.context.payload.issue ?? github.context.payload.pull_request
   const issueLabels: string[] = (issue?.labels ?? []).map((l: {name: string}) => l.name.toLowerCase())
+  const issueOwnerName = github.context.payload.repository?.owner.login
+
+  core.debug(`Issue/PR owner: ${issueOwnerName}`)
 
   // Ensure the issue matches our `labeled` filter based on the label-operator.
   if (labelOperator === 'and') {
@@ -65,32 +75,34 @@ export async function addToProject(): Promise<void> {
 
   core.debug(`Project URL: ${projectUrl}`)
 
+  const urlMatch = projectUrl.match(urlParse)
+
   if (!urlMatch) {
     throw new Error(
       `Invalid project URL: ${projectUrl}. Project URL should match the format https://github.com/<orgs-or-users>/<ownerName>/projects/<projectNumber>`
     )
   }
 
-  const ownerName = urlMatch.groups?.ownerName
+  const projectOwnerName = urlMatch.groups?.ownerName
   const projectNumber = parseInt(urlMatch.groups?.projectNumber ?? '', 10)
   const ownerType = urlMatch.groups?.ownerType
   const ownerTypeQuery = mustGetOwnerTypeQuery(ownerType)
 
-  core.debug(`Org name: ${ownerName}`)
+  core.debug(`Project owner: ${projectOwnerName}`)
   core.debug(`Project number: ${projectNumber}`)
-  core.debug(`Owner type: ${ownerType}`)
+  core.debug(`Project owner type: ${ownerType}`)
 
   // First, use the GraphQL API to request the project's node ID.
   const idResp = await octokit.graphql<ProjectNodeIDResponse>(
-    `query getProject($ownerName: String!, $projectNumber: Int!) {
+    `query getProject($projectOwnerName: String!, $projectNumber: Int!) {
-      ${ownerTypeQuery}(login: $ownerName) {
+      ${ownerTypeQuery}(login: $projectOwnerName) {
         projectV2(number: $projectNumber) {
           id
         }
       }
     }`,
     {
-      ownerName,
+      projectOwnerName,
       projectNumber
     }
   )
@@ -102,23 +114,50 @@ export async function addToProject(): Promise<void> {
   core.debug(`Content ID: ${contentId}`)
 
   // Next, use the GraphQL API to add the issue to the project.
-  const addResp = await octokit.graphql<ProjectAddItemResponse>(
+  // If the issue has the same owner as the project, we can directly
-    `mutation addIssueToProject($input: AddProjectV2ItemByIdInput!) {
+  // add a project item. Otherwise, we add a draft issue.
-      addProjectV2ItemById(input: $input) {
+  if (issueOwnerName === projectOwnerName) {
-        item {
+    core.info('Creating project item')
-          id
+
+    const addResp = await octokit.graphql<ProjectAddItemResponse>(
+      `mutation addIssueToProject($input: AddProjectV2ItemByIdInput!) {
+        addProjectV2ItemById(input: $input) {
+          item {
+            id
+          }
+        }
+      }`,
+      {
+        input: {
+          projectId,
+          contentId
         }
       }
-    }`,
+    )
-    {
-      input: {
-        projectId,
-        contentId
-      }
-    }
-  )
 
-  core.setOutput('itemId', addResp.addProjectV2ItemById.item.id)
+    core.setOutput('itemId', addResp.addProjectV2ItemById.item.id)
+  } else {
+    core.info('Creating draft issue in project')
+
+    const addResp = await octokit.graphql<ProjectV2AddDraftIssueResponse>(
+      `mutation addDraftIssueToProject($projectId: ID!, $title: String!) {
+        addProjectV2DraftIssue(input: {
+          projectId: $projectId,
+          title: $title
+        }) {
+          projectItem {
+            id
+          }
+        }
+      }`,
+      {
+        projectId,
+        title: issue?.html_url
+      }
+    )
+
+    core.setOutput('itemId', addResp.addProjectV2DraftIssue.projectItem.id)
+  }
 }
 
 export function mustGetOwnerTypeQuery(ownerType?: string): 'organization' | 'user' {