fix: change order of edge case resolution (#115)

The `no-owner` edge case was resolved before `force-push` edge case. That doesn't make sense, because when there is a `force-push`, then the history can't be resolved and it can't be determined what changed and what didn't. This PR gives the `force-push` case precedence, so it always resolves first. Fixes the #95
Balvajs · Oct 5, 2023 · 7895e47 · 7895e47
1 parent 358949f
commit 7895e47
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 64 deletions.
diff --git a/dist/main.cjs b/dist/main.cjs
diff --git a/dist/main.cjs.map b/dist/main.cjs.map
diff --git a/src/get-inputs.ts b/src/get-inputs.ts
@@ -2,7 +2,7 @@ import { getInput, getMultilineInput } from '@actions/core'
 
 function isValidDismissActionInput(
   dismissAction: string,
-): dismissAction is 'dismissAction' | 'dismiss-none' {
+): dismissAction is 'dismiss-all' | 'dismiss-none' {
   return dismissAction === 'dismiss-all' || dismissAction === 'dismiss-none'
 }
 

diff --git a/src/main.ts b/src/main.ts
@@ -75,19 +75,20 @@ const run = async () => {
         .join()}`,
     )
 
-    // if there are any files without owner, dismiss all reviews
-    if (reviewsToDismissContext.filesWithoutOwner) {
+    // if there are some files without history let the users know and dismiss reviews calculated for dismiss
+    if (reviewsToDismissContext.reviewsWithoutHistory?.length) {
       console.log(
         chalk.yellow(
-          'Files without owner:\n',
-          reviewsToDismissContext.filesWithoutOwner.join('/n'),
+          `Files diff can't be resolved for following reviews due to force push:\n${reviewsToDismissContext.reviewsWithoutHistory
+            .map(({ author }) => author?.login)
+            .join('\n')}\n`,
         ),
       )
 
-      if (noOwnerAction === 'dismiss-none') {
+      if (forcePushAction === 'dismiss-none') {
         console.log(
           chalk.yellow(
-            '"no-owner-action" is set to "dismiss-none", so no reviews are dismissed.',
+            '"force-push-action" is set to "dismiss-none", so no reviews are dismissed.',
           ),
         )
 
@@ -96,36 +97,34 @@ const run = async () => {
 
       await dismissReviews({
         octokit,
-        reviewsToDismiss: latestApprovedReviews,
+        reviewsToDismiss: reviewsToDismissContext.reviewsToDismiss,
         message: `
-          <details>
-            <summary>Because some files don’t have owner, all reviews are dismissed.</summary>
-            <p>
-
-            If you know who should own following files, consider adding the owner to \`.github/CODEOWNERS\` file.
-
-            - \`${reviewsToDismissContext.filesWithoutOwner
-              .join('`\n- `')
-              .replace(/_/g, '&#95;')}\`
-
-            </p>
-          </details>
-        `.replace(/  +/g, ' '),
+        <details>
+          <summary>Following reviews were removed because related commit was overwritten by force push.</summary>
+          <p>
+  
+          - \`${reviewsToDismissContext.reviewsWithoutHistory
+            .map(({ author }) => author?.login)
+            .join('`\n- `')}\`
+  
+          </p>
+        </details>
+      `.replace(/  +/g, ' '),
       })
-      // if there are some files without history let the users know and dismiss reviews calculated for dismiss
-    } else if (reviewsToDismissContext.reviewsWithoutHistory.length) {
+    }
+    // if there are any files without owner, dismiss all reviews
+    else if (reviewsToDismissContext.filesWithoutOwner) {
       console.log(
         chalk.yellow(
-          `Files diff can't be resolved for following reviews due to force push:\n${reviewsToDismissContext.reviewsWithoutHistory
-            .map(({ author }) => author?.login)
-            .join('\n')}\n`,
+          'Files without owner:\n',
+          reviewsToDismissContext.filesWithoutOwner.join('/n'),
         ),
       )
 
-      if (forcePushAction === 'dismiss-none') {
+      if (noOwnerAction === 'dismiss-none') {
         console.log(
           chalk.yellow(
-            '"force-push-action" is set to "dismiss-none", so no reviews are dismissed.',
+            '"no-owner-action" is set to "dismiss-none", so no reviews are dismissed.',
           ),
         )
 
@@ -134,16 +133,18 @@ const run = async () => {
 
       await dismissReviews({
         octokit,
-        reviewsToDismiss: reviewsToDismissContext.reviewsToDismiss,
+        reviewsToDismiss: latestApprovedReviews,
         message: `
           <details>
-            <summary>Following reviews were removed because related commit was overwritten by force push.</summary>
+            <summary>Because some files don’t have owner, all reviews are dismissed.</summary>
             <p>
-    
-            - \`${reviewsToDismissContext.reviewsWithoutHistory
-              .map(({ author }) => author?.login)
-              .join('`\n- `')}\`
-    
+
+            If you know who should own following files, consider adding the owner to \`.github/CODEOWNERS\` file.
+
+            - \`${reviewsToDismissContext.filesWithoutOwner
+              .join('`\n- `')
+              .replace(/_/g, '&#95;')}\`
+
             </p>
           </details>
         `.replace(/  +/g, ' '),