fix: "Mark as Final" unexpectedly disabled (#1650)

* Add missing testResultsLength to TEST_QUEUE_EXPANDED_ROW_QUERY

* Update snapshots

* Update mocks

* Ignore addViewerResolver error if not critical

* Fix not being able to close mark as final dialog

Author: howard-e

client/components/TestQueue/Actions.jsx

@@ -175,6 +175,8 @@ const Actions = ({
         content={content}
         closeLabel="Cancel"
         staticBackdrop={true}
+        useOnHide={true}
+        handleClose={hideConfirmationModal}
         actions={[
           {
             label: 'Confirm',

client/components/TestQueue/queries.js

@@ -278,6 +278,7 @@ export const TEST_QUEUE_EXPANDED_ROW_QUERY = gql`
       }
       draftTestPlanRuns {
         ...TestPlanRunFields
+        testResultsLength
       }
     }
   }

client/tests/__mocks__/GraphQLMocks/TestQueuePageBaseMock.js

@@ -3,7 +3,8 @@ export default (
   existingTestPlanReportsQuery,
   getUpdateEventsQuery,
   addTestPlansQuery,
-  getAutomationSupportedAtVersionsQuery
+  getAutomationSupportedAtVersionsQuery,
+  getRerunnableReportsCountQuery
 ) => [
   {
     request: {
@@ -137,6 +138,19 @@ export default (
       }
     }
   },
+  {
+    request: {
+      query: addTestPlansQuery,
+      variables: {
+        testPlanVersionPhases: ['DRAFT', 'CANDIDATE', 'RECOMMENDED']
+      }
+    },
+    result: {
+      data: {
+        testPlans: []
+      }
+    }
+  },
   {
     request: {
       query: getAutomationSupportedAtVersionsQuery,
@@ -172,5 +186,35 @@ export default (
         ]
       }
     }
+  },
+  {
+    request: {
+      query: getRerunnableReportsCountQuery,
+      variables: {
+        atVersionId: '1'
+      }
+    },
+    result: {
+      data: {
+        rerunnableReports: {
+          previousVersionGroups: []
+        }
+      }
+    }
+  },
+  {
+    request: {
+      query: getRerunnableReportsCountQuery,
+      variables: {
+        atVersionId: '2'
+      }
+    },
+    result: {
+      data: {
+        rerunnableReports: {
+          previousVersionGroups: []
+        }
+      }
+    }
   }
 ];

client/tests/__mocks__/GraphQLMocks/index.js

@@ -6,8 +6,11 @@ import { TEST_PLAN_REPORT_AT_BROWSER_QUERY } from '@components/common/AssignTest
 import { TEST_PLAN_REPORT_STATUS_DIALOG_QUERY } from '@components/TestPlanReportStatusDialog/queries';
 import { EXISTING_TEST_PLAN_REPORTS } from '@components/AddTestToQueueWithConfirmation/queries';
 import { ME_QUERY } from '@components/App/queries';
-import { GET_UPDATE_EVENTS } from '@components/ReportRerun/queries';
-import { GET_AUTOMATION_SUPPORTED_AT_VERSIONS } from '@components/ReportRerun/queries';
+import {
+  GET_UPDATE_EVENTS,
+  GET_AUTOMATION_SUPPORTED_AT_VERSIONS,
+  GET_RERUNNABLE_REPORTS_COUNT_QUERY
+} from '@components/ReportRerun/queries';
 
 import TestQueuePageAdminNotPopulatedMock from './TestQueuePageAdminNotPopulatedMock';
 import TestQueuePageTesterNotPopulatedMock from './TestQueuePageTesterNotPopulatedMock';
@@ -26,7 +29,8 @@ export const TEST_QUEUE_PAGE_BASE_MOCK_DATA = TestQueuePageBaseMock(
   EXISTING_TEST_PLAN_REPORTS,
   GET_UPDATE_EVENTS,
   ADD_TEST_PLANS_QUERY,
-  GET_AUTOMATION_SUPPORTED_AT_VERSIONS
+  GET_AUTOMATION_SUPPORTED_AT_VERSIONS,
+  GET_RERUNNABLE_REPORTS_COUNT_QUERY
 );
 
 export const TEST_PLAN_REPORT_STATUS_DIALOG_MOCK_DATA =

client/tests/e2e/snapshots/saved/_test-queue.html

@@ -1208,7 +1208,6 @@ <h3 class="disclosure-heading">
                                   >Start NVDA Bot Run</button
                                 ><button
                                   type="button"
-                                  disabled=""
                                   class="btn btn-secondary">
                                   <svg
                                     aria-hidden="true"
@@ -1452,7 +1451,6 @@ <h3 class="disclosure-heading">
                                   >Start JAWS Bot Run</button
                                 ><button
                                   type="button"
-                                  disabled=""
                                   class="btn btn-secondary">
                                   <svg
                                     aria-hidden="true"
@@ -1607,7 +1605,6 @@ <h3 class="disclosure-heading">
                                   >Start NVDA Bot Run</button
                                 ><button
                                   type="button"
-                                  disabled=""
                                   class="btn btn-secondary">
                                   <svg
                                     aria-hidden="true"
@@ -1764,7 +1761,6 @@ <h3 class="disclosure-heading">
                                   >Start VoiceOver Bot Run</button
                                 ><button
                                   type="button"
-                                  disabled=""
                                   class="btn btn-secondary">
                                   <svg
                                     aria-hidden="true"
@@ -1921,7 +1917,6 @@ <h3 class="disclosure-heading">
                                   >Start VoiceOver Bot Run</button
                                 ><button
                                   type="button"
-                                  disabled=""
                                   class="btn btn-secondary">
                                   <svg
                                     aria-hidden="true"

server/models/services/ReviewerStatusService.js

@@ -332,16 +332,31 @@ const createOrUpdateReviewerStatus = async ({
 
   await ReviewerStatus.upsert(upsertValues, { transaction });
 
-  return getReviewerStatusById({
-    testPlanReportId,
-    userId,
-    reviewerStatusAttributes,
-    testPlanReportAttributes,
-    testPlanVersionAttributes,
-    userAttributes,
-    vendorAttributes,
-    transaction
-  });
+  // Try to get the updated reviewer status
+  // If the transaction was rolled back (e.g., due to an error in a nested operation),
+  // catch the error and return the existing status or null
+  try {
+    return await getReviewerStatusById({
+      testPlanReportId,
+      userId,
+      reviewerStatusAttributes,
+      testPlanReportAttributes,
+      testPlanVersionAttributes,
+      userAttributes,
+      vendorAttributes,
+      transaction
+    });
+  } catch (error) {
+    // If the transaction was rolled back, we can't query with it
+    // Return the existing status if we have it, otherwise null
+    if (
+      error.message &&
+      error.message.includes('rollback has been called on this transaction')
+    ) {
+      return existing || null;
+    }
+    throw error;
+  }
 };
 
 module.exports = {

server/resolvers/addViewerResolver.js

@@ -24,6 +24,9 @@ const addViewerResolver = async (_, { testId, testPlanReportId }, context) => {
       transaction
     });
   } catch (error) {
+    // Log the error but don't fail the mutation - this is a non-critical operation
+    // that tracks which tests a reviewer has viewed. If it fails, we still want to
+    // return the user successfully. This is intentionally a best-effort operation
     console.error('addViewerResolver.error', error);
   }