github-issue-tower-defence-management 1.189.0 → 1.189.1

package/bin/adapter/entry-points/console/ui-dist/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>TDPM Console</title>
-    <script type="module" crossorigin src="/assets/index-CZ1NNzIm.js"></script>
+    <script type="module" crossorigin src="/assets/index-B22eMy23.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CLHvrafO.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-issue-tower-defence-management",
-  "version": "1.189.0",
+  "version": "1.189.1",
   "description": "",
   "main": "bin/index.js",
   "scripts": {

package/src/adapter/entry-points/console/consoleOperationApi.test.ts

@@ -292,6 +292,34 @@ describe('consoleOperationApi', () => {
       expectRecordedAcrossTabs('PVTI_c');
     });
 
+    it('closes a pull request and moves linked issue to Awaiting workspace when issueUrl is provided', async () => {
+      const response = await handleReview(context, {
+        pjcode: 'acme',
+        action: 'close',
+        prUrl: 'https://github.com/o/r/pull/1',
+        issueUrl: 'https://github.com/o/r/issues/7',
+        projectItemId: 'PVTI_c_totally_wrong',
+        commentBody: 'totally wrong',
+      });
+      expect(response.statusCode).toBe(200);
+      expect(issueRepository.closePullRequest).toHaveBeenCalledWith(
+        'https://github.com/o/r/pull/1',
+      );
+      expect(issueRepository.createCommentByUrl).toHaveBeenCalledWith(
+        'https://github.com/o/r/pull/1',
+        'totally wrong',
+      );
+      expect(issueRepository.updateStatus).toHaveBeenCalledWith(
+        project,
+        expect.objectContaining({
+          itemId: 'PVTI_c_totally_wrong',
+          url: 'https://github.com/o/r/issues/7',
+        }),
+        'status_aw',
+      );
+      expectRecordedAcrossTabs('PVTI_c_totally_wrong');
+    });
+
     it('marks a pull request unnecessary by closing it, labelling the item chore and moving it to Awaiting workspace', async () => {
       issueRepository.getIssueByUrl.mockResolvedValue({
         ...issue,

package/src/adapter/entry-points/console/consoleOperationApi.ts

@@ -294,6 +294,23 @@ export const handleReview = async (
         .resolveIssueRepository(prUrl)
         .createCommentByUrl(prUrl, body.commentBody);
     }
+    const issueUrl = body.issueUrl;
+    if (isNonEmptyString(issueUrl)) {
+      const binding = await context.resolveProject(pjcodeResult);
+      if (binding === null) {
+        return badRequest(`no project configured for pjcode "${pjcodeResult}"`);
+      }
+      const statusFailure = await updateStatusByName(
+        context.resolveIssueRepository(issueUrl),
+        binding.project,
+        issueUrl,
+        projectItemId,
+        AWAITING_WORKSPACE_STATUS_NAME,
+      );
+      if (statusFailure !== null) {
+        return statusFailure;
+      }
+    }
     recordDone(context, pjcodeResult, projectItemId);
     return ok();
   }

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.test.ts

@@ -68,6 +68,7 @@ describe('useConsoleOperations', () => {
       pjcode: 'acme',
       action: 'close',
       prUrl: prItem.url,
+      issueUrl: prItem.url,
       commentBody: 'totally wrong',
     });
   });

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.ts

@@ -113,6 +113,7 @@ const reviewRequest = (
       pjcode,
       action: 'close',
       prUrl,
+      issueUrl: item.url,
       projectItemId: item.projectItemId,
       commentBody: TOTALLY_WRONG_COMMENT_BODY,
     };