From a6c0bda680b9be6ac10966c9cad9603adf6c24ac Mon Sep 17 00:00:00 2001
From: Howard Edwards <howarde.edwards@gmail.com>
Date: Wed, 4 Dec 2024 19:01:46 -0500
Subject: [PATCH 1/4] fix: Allow AT and Browser versions to be edited when bot
 run is assigned to manual tester for evaluation (#1279)

* Allow AT and Browser versions to be edited when bot assignment is assigned to manual tester to be evaluated

* Update snapshots

* Update snapshots
---
 client/components/TestRun/index.jsx           |  4 +-
 .../e2e/snapshots/saved/_data-management.html | 42 +++++++++----------
 .../tests/e2e/snapshots/saved/_reports.html   | 14 +++----
 .../e2e/snapshots/saved/_test-queue.html      |  8 ++--
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/client/components/TestRun/index.jsx b/client/components/TestRun/index.jsx
index 144788fec..b6ca26d0c 100644
--- a/client/components/TestRun/index.jsx
+++ b/client/components/TestRun/index.jsx
@@ -270,7 +270,7 @@ const TestRun = () => {
     setCurrentBrowserVersion(currentBrowserVersion);
     // Testers do not need to change AT/Browser versions
     // while assigning verdicts for previously automated tests
-    if (testPlanRun?.initiatedByAutomation) {
+    if (!isSignedIn || tester?.isBot) {
       setIsShowingAtBrowserModal(false);
     }
     setPageReady(true);
@@ -1149,7 +1149,7 @@ const TestRun = () => {
       browser={`${testPlanReport.browser?.name}${
         isViewingRun ? ` ${currentBrowserVersion?.name || ''}` : ''
       }`}
-      showEditAtBrowser={isViewingRun && !testPlanRun.initiatedByAutomation}
+      showEditAtBrowser={isSignedIn && isViewingRun && !openAsUser?.isBot}
       openAsUser={openAsUser}
       testResults={testResults}
       testCount={testCount}
diff --git a/client/tests/e2e/snapshots/saved/_data-management.html b/client/tests/e2e/snapshots/saved/_data-management.html
index 6ddc97cb3..7fd8e920f 100644
--- a/client/tests/e2e/snapshots/saved/_data-management.html
+++ b/client/tests/e2e/snapshots/saved/_data-management.html
@@ -210,10 +210,10 @@ <h3>
                     <label class="disclosure-form-label form-label"
                       >Test Plan</label
                     ><select class="form-select">
-                      <option value="86">
+                      <option value="88">
                         Action Menu Button Example Using aria-activedescendant
                       </option>
-                      <option value="85">
+                      <option value="87">
                         Action Menu Button Example Using element.focus()
                       </option>
                       <option value="81">Alert Example</option>
@@ -247,29 +247,29 @@ <h3>
                       <option value="78">
                         Link Example 1 (span element with text content)
                       </option>
-                      <option value="71">
+                      <option value="86">
                         Link Example 2 (img element with alt attribute)
                       </option>
-                      <option value="70">
+                      <option value="85">
                         Link Example 3 (CSS :before content property on a span
                         element)
                       </option>
                       <option value="49">Main Landmark</option>
                       <option value="60">Media Seek Slider</option>
                       <option value="54">Meter</option>
-                      <option value="88">Modal Dialog Example</option>
-                      <option value="87">Navigation Menu Button</option>
+                      <option value="90">Modal Dialog Example</option>
+                      <option value="89">Navigation Menu Button</option>
                       <option value="74">
                         Radio Group Example Using Roving tabindex
                       </option>
-                      <option value="89">
+                      <option value="91">
                         Radio Group Example Using aria-activedescendant
                       </option>
                       <option value="59">Rating Slider</option>
                       <option value="39">Select Only Combobox Example</option>
                       <option value="61">Switch Example</option>
                       <option value="62">Tabs with Manual Activation</option>
-                      <option value="90">Toggle Button</option>
+                      <option value="92">Toggle Button</option>
                       <option value="64">Vertical Temperature Slider</option>
                     </select>
                   </div>
@@ -277,7 +277,7 @@ <h3>
                     <label class="disclosure-form-label form-label"
                       >Test Plan Version</label
                     ><select aria-disabled="false" class="form-select">
-                      <option value="86">
+                      <option value="88">
                         Sep 18, 2024 at 6:30:36 pm UTC Add quick nav instruction
                         for test 9 with VoiceOver (#1127) (122e07a)
                       </option>
@@ -567,7 +567,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/86"
+                      ><a href="/test-review/88"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -743,7 +743,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/88"
+                      ><a href="/test-review/90"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -1183,7 +1183,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/90"
+                      ><a href="/test-review/92"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -1270,7 +1270,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/85"
+                      ><a href="/test-review/87"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -2044,7 +2044,7 @@ <h2>Test Plans Status Summary</h2>
                 <td>
                   <div class="css-bpz90">
                     <span class="rd full-width css-be9e2a">R&amp;D</span>
-                    <p class="review-text">Complete <b>Aug 23, 2023</b></p>
+                    <p class="review-text">Complete <b>Nov 20, 2024</b></p>
                   </div>
                 </td>
                 <td>
@@ -2052,7 +2052,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/71"
+                      ><a href="/test-review/86"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -2067,7 +2067,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V23.08.23</b></span
+                          ><b>V24.11.20</b></span
                         ></a
                       ></span
                     ><button
@@ -2099,7 +2099,7 @@ <h2>Test Plans Status Summary</h2>
                 <td>
                   <div class="css-bpz90">
                     <span class="rd full-width css-be9e2a">R&amp;D</span>
-                    <p class="review-text">Complete <b>Aug 23, 2023</b></p>
+                    <p class="review-text">Complete <b>Nov 20, 2024</b></p>
                   </div>
                 </td>
                 <td>
@@ -2107,7 +2107,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/70"
+                      ><a href="/test-review/85"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -2122,7 +2122,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V23.08.23</b></span
+                          ><b>V24.11.20</b></span
                         ></a
                       ></span
                     ><button
@@ -2311,7 +2311,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/87"
+                      ><a href="/test-review/89"
                         ><span
                           ><svg
                             aria-hidden="true"
@@ -2415,7 +2415,7 @@ <h2>Test Plans Status Summary</h2>
                     <span
                       class="full-width auto-width css-36z7cz"
                       role="listitem"
-                      ><a href="/test-review/89"
+                      ><a href="/test-review/91"
                         ><span
                           ><svg
                             aria-hidden="true"
diff --git a/client/tests/e2e/snapshots/saved/_reports.html b/client/tests/e2e/snapshots/saved/_reports.html
index 5ee8e6832..a2b4ab2b9 100644
--- a/client/tests/e2e/snapshots/saved/_reports.html
+++ b/client/tests/e2e/snapshots/saved/_reports.html
@@ -106,14 +106,14 @@ <h2>Support Levels</h2>
                   <td>
                     <a
                       aria-label="Action Menu Button Example Using aria-activedescendant, RECOMMENDED report"
-                      href="/report/86"
+                      href="/report/88"
                       >Action Menu Button Example Using aria-activedescendant</a
                     ><span class="recommended css-267jl0" aria-hidden="true"
                       >Recommended</span
                     >
                   </td>
                   <td>
-                    <a aria-label="100%" href="/report/86/targets/21"
+                    <a aria-label="100%" href="/report/88/targets/21"
                       ><div class="progress clipped">
                         <div
                           class="front"
@@ -125,7 +125,7 @@ <h2>Support Levels</h2>
                     >
                   </td>
                   <td>
-                    <a aria-label="100%" href="/report/86/targets/22"
+                    <a aria-label="100%" href="/report/88/targets/22"
                       ><div class="progress clipped">
                         <div
                           class="front"
@@ -137,7 +137,7 @@ <h2>Support Levels</h2>
                     >
                   </td>
                   <td>
-                    <a aria-label="100%" href="/report/86/targets/23"
+                    <a aria-label="100%" href="/report/88/targets/23"
                       ><div class="progress clipped">
                         <div
                           class="front"
@@ -149,7 +149,7 @@ <h2>Support Levels</h2>
                     >
                   </td>
                   <td>
-                    <a aria-label="100%" href="/report/86/targets/24"
+                    <a aria-label="100%" href="/report/88/targets/24"
                       ><div class="progress clipped">
                         <div
                           class="front"
@@ -161,7 +161,7 @@ <h2>Support Levels</h2>
                     >
                   </td>
                   <td>
-                    <a aria-label="100%" href="/report/86/targets/25"
+                    <a aria-label="100%" href="/report/88/targets/25"
                       ><div class="progress clipped">
                         <div
                           class="front"
@@ -173,7 +173,7 @@ <h2>Support Levels</h2>
                     >
                   </td>
                   <td>
-                    <a aria-label="100%" href="/report/86/targets/26"
+                    <a aria-label="100%" href="/report/88/targets/26"
                       ><div class="progress clipped">
                         <div
                           class="front"
diff --git a/client/tests/e2e/snapshots/saved/_test-queue.html b/client/tests/e2e/snapshots/saved/_test-queue.html
index e315c61a1..80252837d 100644
--- a/client/tests/e2e/snapshots/saved/_test-queue.html
+++ b/client/tests/e2e/snapshots/saved/_test-queue.html
@@ -205,14 +205,14 @@ <h3>
                     <label class="disclosure-form-label form-label"
                       >Test Plan</label
                     ><select class="form-select">
-                      <option value="86">
+                      <option value="88">
                         Action Menu Button Example Using aria-activedescendant
                       </option>
                       <option value="1">Alert Example</option>
                       <option value="67">Checkbox Example (Mixed-State)</option>
                       <option value="84">Color Viewer Slider</option>
                       <option value="68">Command Button Example</option>
-                      <option value="88">Modal Dialog Example</option>
+                      <option value="90">Modal Dialog Example</option>
                       <option value="7">Select Only Combobox Example</option>
                       <option value="31">Toggle Button</option>
                     </select>
@@ -221,7 +221,7 @@ <h3>
                     <label class="disclosure-form-label form-label"
                       >Test Plan Version</label
                     ><select aria-disabled="false" class="form-select">
-                      <option value="86">
+                      <option value="88">
                         Sep 18, 2024 at 6:30:36 pm UTC Add quick nav instruction
                         for test 9 with VoiceOver (#1127) (122e07a)
                       </option>
@@ -777,7 +777,7 @@ <h3>
               aria-labelledby="disclosure-btn-modal-dialog-0"
               class="css-19fsyrg">
               <div class="css-25wfk">
-                <a href="/test-review/88"
+                <a href="/test-review/90"
                   ><svg
                     aria-hidden="true"
                     focusable="false"

From f46c027f23834ad15fea330e2df95bdf902be3d2 Mon Sep 17 00:00:00 2001
From: Stalgia Grigg <stalgia@bocoup.com>
Date: Wed, 4 Dec 2024 20:34:22 -0500
Subject: [PATCH 2/4] Update snapshots (#1283)

* Update snapshots

* Update _data-management.html

* Update Color Viewer Slider version number in e2e test
---
 client/tests/e2e/TestRun.e2e.test.js                   | 2 +-
 client/tests/e2e/snapshots/saved/_data-management.html | 6 +++---
 client/tests/e2e/snapshots/saved/_test-queue.html      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/tests/e2e/TestRun.e2e.test.js b/client/tests/e2e/TestRun.e2e.test.js
index 227ed3928..5386ceb8f 100644
--- a/client/tests/e2e/TestRun.e2e.test.js
+++ b/client/tests/e2e/TestRun.e2e.test.js
@@ -406,7 +406,7 @@ describe('Test Run when signed in as tester', () => {
           testPlanSectionButtonSelector:
             'button#disclosure-btn-horizontal-slider-0',
           testPlanTableSelector:
-            'table[aria-label="Reports for Color Viewer Slider V24.06.26 in draft phase"]'
+            'table[aria-label="Reports for Color Viewer Slider V24.12.04 in draft phase"]'
         });
         await handlePageSubmit(page, { expectConflicts: false });
       }
diff --git a/client/tests/e2e/snapshots/saved/_data-management.html b/client/tests/e2e/snapshots/saved/_data-management.html
index 7fd8e920f..fc0f5d489 100644
--- a/client/tests/e2e/snapshots/saved/_data-management.html
+++ b/client/tests/e2e/snapshots/saved/_data-management.html
@@ -949,7 +949,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V24.06.26</b></span
+                          ><b>V24.12.04</b></span
                         ></a
                       ></span
                     ><span role="listitem"
@@ -2407,7 +2407,7 @@ <h2>Test Plans Status Summary</h2>
                 <td>
                   <div class="css-bpz90">
                     <span class="rd full-width css-be9e2a">R&amp;D</span>
-                    <p class="review-text">Complete <b>Oct 22, 2024</b></p>
+                    <p class="review-text">Complete <b>Dec 4, 2024</b></p>
                   </div>
                 </td>
                 <td>
@@ -2430,7 +2430,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V24.10.22</b></span
+                          ><b>V24.12.04</b></span
                         ></a
                       ></span
                     ><button
diff --git a/client/tests/e2e/snapshots/saved/_test-queue.html b/client/tests/e2e/snapshots/saved/_test-queue.html
index 80252837d..33c20b0db 100644
--- a/client/tests/e2e/snapshots/saved/_test-queue.html
+++ b/client/tests/e2e/snapshots/saved/_test-queue.html
@@ -533,7 +533,7 @@ <h3>
                       <path
                         fill="currentColor"
                         d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                    ><b>V24.06.26</b></span
+                    ><b>V24.12.04</b></span
                   ></span
                 >&nbsp;<span class="draft css-be9e2a">Draft</span
                 ><svg
@@ -571,7 +571,7 @@ <h3>
                     <path
                       fill="currentColor"
                       d="M320 0c-17.7 0-32 14.3-32 32s14.3 32 32 32h82.7L201.4 265.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L448 109.3V192c0 17.7 14.3 32 32 32s32-14.3 32-32V32c0-17.7-14.3-32-32-32H320zM80 32C35.8 32 0 67.8 0 112V432c0 44.2 35.8 80 80 80H400c44.2 0 80-35.8 80-80V320c0-17.7-14.3-32-32-32s-32 14.3-32 32V432c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V112c0-8.8 7.2-16 16-16H192c17.7 0 32-14.3 32-32s-14.3-32-32-32H80z"></path></svg
-                  >View tests in V24.06.26</a
+                  >View tests in V24.12.04</a
                 ><button type="button" class="css-1c4pbk0 btn btn-primary">
                   <span
                     ><span class="reports-missing css-fidnqg"></span>Some
@@ -582,7 +582,7 @@ <h3>
               </div>
               <div class="css-1iwfp5o">
                 <table
-                  aria-label="Reports for Color Viewer Slider V24.06.26 in draft phase"
+                  aria-label="Reports for Color Viewer Slider V24.12.04 in draft phase"
                   class="css-hfams3 table table-bordered">
                   <thead>
                     <tr>

From 0fe3946faf2aaff22136460093c783e730a9dcdd Mon Sep 17 00:00:00 2001
From: Stalgia Grigg <stalgia@bocoup.com>
Date: Wed, 4 Dec 2024 22:29:21 -0500
Subject: [PATCH 3/4] Add instructions for snapshot testing to
 local-development.md (#1282)

---
 docs/local-development.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/local-development.md b/docs/local-development.md
index 5b494a9d5..dc96f3817 100644
--- a/docs/local-development.md
+++ b/docs/local-development.md
@@ -157,6 +157,10 @@ yarn storybook
 
 Any changes in the component will be picked up by the Storybook server.
 
+#### Snapshot Testing
+
+We use snapshot testing to detect regressions. These require upkeep since snapshots can become outdated by upstream test changes in aria-at. It is a good practice to routinely run `yarn update-snapshots` on your working branch.
+
 ### Accessibility testing
 
 #### Manual accessibilty testing

From 90807df4b71ea13b25b2e2dd1a0ca03a5976c743 Mon Sep 17 00:00:00 2001
From: Howard Edwards <howarde.edwards@gmail.com>
Date: Thu, 5 Dec 2024 16:17:02 -0500
Subject: [PATCH 4/4] feat: Track vendor approvals across version updates
 through result copy process (#1267)

* Tweaks to address visual glitch when clicking last Next button

* Add 'nvAccess' vendor seeder

* Update signMeInAsVendor function and instructions to support signing in as a specific vendor

* Preserve vendor approval status across result copy process

* Update snapshots

* Prevent phase update to candidate from overwriting older result's vendor approval status

* Update tests to verify vendor approval being copied
---
 .../CandidateTestPlanRun/index.jsx            |  37 ++-
 client/index.js                               |  59 +++-
 docs/local-development.md                     |   8 +
 .../models/services/TestPlanVersionService.js |  34 ++-
 .../promoteVendorReviewStatusResolver.js      |  10 +-
 .../updatePhaseResolver.js                    |   8 +-
 server/resolvers/addViewerResolver.js         |  10 +-
 server/resolvers/helpers/checkUserRole.js     |  15 ++
 .../resolvers/helpers/processCopiedReports.js |  38 ++-
 server/resources/ats.json                     |   2 +-
 .../20241030144705-addNvAccessVendor.js       |  70 +++++
 .../tests/integration/dataManagement.test.js  | 252 ++++++++++++++++++
 12 files changed, 499 insertions(+), 44 deletions(-)
 create mode 100644 server/resolvers/helpers/checkUserRole.js
 create mode 100644 server/seeders/20241030144705-addNvAccessVendor.js

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/index.jsx b/client/components/CandidateReview/CandidateTestPlanRun/index.jsx
index 08a414062..a75525389 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/index.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/index.jsx
@@ -121,7 +121,7 @@ const CandidateTestPlanRun = () => {
       setFirstTimeViewing(true);
       setViewedTests(tests => [...tests, currentTest.id]);
       await addViewerToTest(currentTest.id);
-      refetch();
+      await refetch();
     } else {
       setFirstTimeViewing(false);
     }
@@ -151,7 +151,7 @@ const CandidateTestPlanRun = () => {
 
   const submitApproval = async (status = '') => {
     if (status === 'APPROVED') {
-      updateVendorStatus(true);
+      await updateVendorStatus(true);
       setConfirmationModal(
         <ApprovedModal
           handleAction={async () => {
@@ -180,8 +180,9 @@ const CandidateTestPlanRun = () => {
       if (
         !tests[0].viewers?.find(viewer => viewer.username === data.me.username)
       ) {
-        addViewerToTest(tests[0].id);
-        setFirstTimeViewing(true);
+        addViewerToTest(tests[0].id).then(() => {
+          setFirstTimeViewing(true);
+        });
       }
       const viewedTests = [
         tests[0].id,
@@ -212,23 +213,17 @@ const CandidateTestPlanRun = () => {
   useEffect(() => {
     if (data) {
       updateVendorStatus();
-    }
-  }, [reviewStatus]);
-
-  useEffect(() => {
-    if (data) {
       updateTestViewed();
+      if (currentTestIndex !== 0) setIsFirstTest(false);
+      if (tests?.length === 1) setIsLastTest(true);
+      if (currentTestIndex + 1 === tests?.length) setIsLastTest(true);
     }
-  }, [currentTestIndex]);
-
-  useEffect(() => {
-    if (data) {
-      setIsLastTest(tests?.length === 1);
-    }
-  }, [data, tests]);
+  }, [reviewStatus, currentTestIndex]);
 
   useEffect(() => {
-    if (isLastTest) finishButtonRef.current.focus();
+    // Prevent a plan with only 1 test from immediately pushing the focus to the
+    // submit button
+    if (isLastTest && tests?.length !== 1) finishButtonRef.current.focus();
   }, [isLastTest]);
 
   if (error)
@@ -377,9 +372,9 @@ const CandidateTestPlanRun = () => {
     NVDA: 'nvda'
   };
 
-  if (githubAtLabelMap[at] == 'vo') {
+  if (githubAtLabelMap[at] === 'vo') {
     fileBugUrl = 'https://bugs.webkit.org/buglist.cgi?quicksearch=voiceover';
-  } else if (githubAtLabelMap[at] == 'nvda') {
+  } else if (githubAtLabelMap[at] === 'nvda') {
     fileBugUrl = 'https://github.com/nvaccess/nvda/issues';
   } else {
     fileBugUrl =
@@ -667,14 +662,14 @@ const CandidateTestPlanRun = () => {
             issue =>
               issue.isCandidateReview &&
               issue.feedbackType === 'FEEDBACK' &&
-              issue.author == data.me.username
+              issue.author === data.me.username
           )}
           feedbackGithubUrl={feedbackGithubUrl}
           changesRequestedIssues={testPlanReport.issues?.filter(
             issue =>
               issue.isCandidateReview &&
               issue.feedbackType === 'CHANGES_REQUESTED' &&
-              issue.author == data.me.username
+              issue.author === data.me.username
           )}
           changesRequestedGithubUrl={changesRequestedGithubUrl}
           handleAction={submitApproval}
diff --git a/client/index.js b/client/index.js
index 50c4ece39..0b5ff40c8 100644
--- a/client/index.js
+++ b/client/index.js
@@ -50,20 +50,57 @@ window.signMeInAsTester = username => {
   return signMeInCommon({ username, roles: [{ name: 'TESTER' }] });
 };
 
-window.signMeInAsVendor = username => {
+/**
+ * @param {string} username
+ * @param {'vispero'|'nvAccess'|'apple'} vendor
+ * @returns {Promise<void>}
+ */
+window.signMeInAsVendor = (username, vendor = 'vispero') => {
+  let company = {
+    id: '1',
+    name: 'vispero',
+    ats: [
+      {
+        id: '1',
+        name: 'JAWS'
+      }
+    ]
+  };
+
+  switch (vendor.trim()) {
+    case 'nvAccess':
+      company = {
+        id: '6',
+        name: 'nvAccess',
+        ats: [
+          {
+            id: '2',
+            name: 'NVDA'
+          }
+        ]
+      };
+      break;
+    case 'apple':
+      company = {
+        id: '4',
+        name: 'apple',
+        ats: [
+          {
+            id: '3',
+            name: 'VoiceOver for macOS'
+          }
+        ]
+      };
+      break;
+    default:
+      // maintain default vispero selection
+      break;
+  }
+
   return signMeInCommon({
     username,
     roles: [{ name: 'VENDOR' }],
-    company: {
-      id: '1',
-      name: 'vispero',
-      ats: [
-        {
-          id: '1',
-          name: 'JAWS'
-        }
-      ]
-    }
+    company
   });
 };
 
diff --git a/docs/local-development.md b/docs/local-development.md
index dc96f3817..96328b169 100644
--- a/docs/local-development.md
+++ b/docs/local-development.md
@@ -46,6 +46,14 @@ Another way to log in as either a tester or admin, useful for quick testing and
         ```
           signMeInAsVendor("joe-the-vendor")
         ```
+      By default, you will be signed in as a "vispero (JAWS)" vendor but to sign in as any others, you can provide the vendor's company name as the second parameter. eg:
+        ```
+          signMeInAsVendor("joe-the-vendor", "apple")
+        ```
+      The list of applicable constants is currently:
+        1. vispero (JAWS)
+        2. nvAccess (NVDA)
+        3. apple (VoiceOver for macOS)
 
 The part in quotes is the username, feel free to change the username to whatever you prefer.
 
diff --git a/server/models/services/TestPlanVersionService.js b/server/models/services/TestPlanVersionService.js
index bdf5da210..060e4807d 100644
--- a/server/models/services/TestPlanVersionService.js
+++ b/server/models/services/TestPlanVersionService.js
@@ -328,10 +328,42 @@ const updateTestPlanVersionById = async ({
   });
 };
 
+/**
+ * @param {object} options
+ * @param {number} id - id of the TestPlanVersion record to be updated
+ * @param {number} testId
+ * @param {object[]} viewers
+ * @param {*} options.transaction - Sequelize transaction
+ * @returns {Promise<void>}
+ */
+const updateTestViewersOnTestPlanVersion = async ({
+  id,
+  testId,
+  viewers = [],
+  transaction
+}) => {
+  await ModelService.rawQuery(
+    `
+      update "TestPlanVersion"
+      set tests = ( select jsonb_agg(case when element ->> 'id' = '${testId}'
+                                            then jsonb_set(element, '{viewers}', '${JSON.stringify(
+                                              viewers
+                                            )}'::jsonb) else element end)
+                    from jsonb_array_elements(tests) as element )
+      where id = ${id}
+        and tests @> '[{"id": "${testId}"}]';
+    `,
+    { transaction }
+  );
+};
+
 module.exports = {
   // Basic CRUD
   getTestPlanVersionById,
   getTestPlanVersions,
   createTestPlanVersion,
-  updateTestPlanVersionById
+  updateTestPlanVersionById,
+
+  // Custom functions
+  updateTestViewersOnTestPlanVersion
 };
diff --git a/server/resolvers/TestPlanReportOperations/promoteVendorReviewStatusResolver.js b/server/resolvers/TestPlanReportOperations/promoteVendorReviewStatusResolver.js
index bc82d12ad..bda738034 100644
--- a/server/resolvers/TestPlanReportOperations/promoteVendorReviewStatusResolver.js
+++ b/server/resolvers/TestPlanReportOperations/promoteVendorReviewStatusResolver.js
@@ -1,14 +1,22 @@
+const { AuthenticationError } = require('apollo-server-errors');
 const {
   updateTestPlanReportById
 } = require('../../models/services/TestPlanReportService');
 const populateData = require('../../services/PopulatedData/populateData');
+const checkUserRole = require('../helpers/checkUserRole');
 
 const promoteVendorReviewStatusResolver = async (
   { parentContext: { id: testPlanReportId } },
   { vendorReviewStatus },
   context
 ) => {
-  const { transaction } = context;
+  const { user, transaction } = context;
+
+  const isAdmin = checkUserRole.isAdmin(user?.roles);
+  const isVendor = checkUserRole.isVendor(user?.roles);
+  if (!(isAdmin || isVendor)) {
+    throw new AuthenticationError();
+  }
 
   let values = { vendorReviewStatus };
 
diff --git a/server/resolvers/TestPlanVersionOperations/updatePhaseResolver.js b/server/resolvers/TestPlanVersionOperations/updatePhaseResolver.js
index 141c7a44d..6c82d34bf 100644
--- a/server/resolvers/TestPlanVersionOperations/updatePhaseResolver.js
+++ b/server/resolvers/TestPlanVersionOperations/updatePhaseResolver.js
@@ -225,9 +225,13 @@ const updatePhaseResolver = async (
       if (phase === 'CANDIDATE') {
         updateParams = {
           ...updateParams,
-          metrics: { ...testPlanReport.metrics, ...metrics },
-          vendorReviewStatus: 'READY'
+          metrics: { ...testPlanReport.metrics, ...metrics }
         };
+
+        // In the instance where an older result's status is being copied over
+        if (!testPlanReport.vendorReviewStatus) {
+          updateParams = { ...updateParams, vendorReviewStatus: 'READY' };
+        }
       } else if (phase === 'RECOMMENDED') {
         updateParams = {
           ...updateParams,
diff --git a/server/resolvers/addViewerResolver.js b/server/resolvers/addViewerResolver.js
index 389dc854d..2aeef4985 100644
--- a/server/resolvers/addViewerResolver.js
+++ b/server/resolvers/addViewerResolver.js
@@ -3,16 +3,14 @@ const {
   getTestPlanVersionById,
   updateTestPlanVersionById
 } = require('../models/services/TestPlanVersionService');
+const checkUserRole = require('./helpers/checkUserRole');
 
 const addViewerResolver = async (_, { testPlanVersionId, testId }, context) => {
   const { user, transaction } = context;
 
-  if (
-    !(
-      user?.roles.find(role => role.name === 'ADMIN') ||
-      user?.roles.find(role => role.name === 'VENDOR')
-    )
-  ) {
+  const isAdmin = checkUserRole.isAdmin(user?.roles);
+  const isVendor = checkUserRole.isVendor(user?.roles);
+  if (!(isAdmin || isVendor)) {
     throw new AuthenticationError();
   }
 
diff --git a/server/resolvers/helpers/checkUserRole.js b/server/resolvers/helpers/checkUserRole.js
new file mode 100644
index 000000000..1f2e967a9
--- /dev/null
+++ b/server/resolvers/helpers/checkUserRole.js
@@ -0,0 +1,15 @@
+const ROLES = {
+  TESTER: 'TESTER',
+  ADMIN: 'ADMIN',
+  VENDOR: 'VENDOR'
+};
+
+const isTester = (roles = []) => roles.find(role => role.name === ROLES.TESTER);
+const isVendor = (roles = []) => roles.find(role => role.name === ROLES.VENDOR);
+const isAdmin = (roles = []) => roles.find(role => role.name === ROLES.ADMIN);
+
+module.exports = {
+  isTester,
+  isVendor,
+  isAdmin
+};
diff --git a/server/resolvers/helpers/processCopiedReports.js b/server/resolvers/helpers/processCopiedReports.js
index a634d757a..fa4a17e91 100644
--- a/server/resolvers/helpers/processCopiedReports.js
+++ b/server/resolvers/helpers/processCopiedReports.js
@@ -1,5 +1,6 @@
 const {
-  getTestPlanVersionById
+  getTestPlanVersionById,
+  updateTestViewersOnTestPlanVersion
 } = require('../../models/services/TestPlanVersionService');
 const {
   getTestPlanReports,
@@ -328,6 +329,9 @@ const processCopiedReports = async ({
     );
 
     for (const oldTestPlanRun of oldTestPlanReport.testPlanRuns) {
+      const oldTestPlanRunVendorReviewStatus =
+        oldTestPlanReport.vendorReviewStatus;
+
       // Track which old test results need to be preserved
       const keptTestResultsByTestId = getKeptTestResultsByTestId(
         oldTestPlanRun.testResults,
@@ -358,6 +362,7 @@ const processCopiedReports = async ({
         },
         transaction
       });
+      let allResultsPreserved = true;
       const newTestResults = [];
 
       for (const testResultToSaveTestId of Object.keys(
@@ -375,6 +380,10 @@ const processCopiedReports = async ({
           { testId: testResultToSaveTestId },
           { context }
         );
+        const { test: oldTest } = await populateData(
+          { testResultId: oldTestResult.id },
+          { context }
+        );
 
         // Re-run createTestResultSkeleton to avoid unexpected scenario index matching issues when saving
         // future results; override newly generated test results with old results if exists
@@ -403,6 +412,7 @@ const processCopiedReports = async ({
           // Unknown combination of command + settings when compared with last version
           const oldScenarioResult = scenarioResultsByScenarioIds[rawScenarioId];
           if (!oldScenarioResult) {
+            allResultsPreserved = false;
             newTestResult.completedAt = null;
             continue;
           }
@@ -428,10 +438,24 @@ const processCopiedReports = async ({
             const oldAssertionResult =
               assertionResultsByAssertionIds[rawAssertionId];
             if (!oldAssertionResult) {
+              allResultsPreserved = false;
               newTestResult.completedAt = null;
               continue;
             }
 
+            // Update TestPlanVersion.tests to include the viewers from the old
+            // TestPlanVersion.tests
+            // TODO: Move viewers to TestPlanReport; more appropriate and
+            //  understandable database structure
+            if (oldTest.viewers) {
+              await updateTestViewersOnTestPlanVersion({
+                id: newTestPlanVersionId,
+                testId: testResultToSaveTestId,
+                viewers: oldTest.viewers,
+                transaction
+              });
+            }
+
             eachAssertionResult.passed = oldAssertionResult.passed;
           }
         }
@@ -439,6 +463,18 @@ const processCopiedReports = async ({
         newTestResults.push(newTestResult);
       }
 
+      // Since no substantive changes, preserve the TestPlanReport's
+      // vendorReviewStatus if exists
+      if (allResultsPreserved && oldTestPlanRunVendorReviewStatus) {
+        await updateTestPlanReportById({
+          id: newTestPlanReport.id,
+          values: {
+            vendorReviewStatus: oldTestPlanRunVendorReviewStatus
+          },
+          transaction
+        });
+      }
+
       // Run updated metrics calculations for new TestPlanRun test results to be used in metrics calculations
       await updateMetricsAndMarkedFinalAtForTestPlanReport({
         newTestPlanReport,
diff --git a/server/resources/ats.json b/server/resources/ats.json
index 4d344e72d..21a0770e9 100644
--- a/server/resources/ats.json
+++ b/server/resources/ats.json
@@ -32,7 +32,7 @@
         "id": 2,
         "name": "NVDA",
         "key": "nvda",
-        "vendorId": null,
+        "vendorId": 6,
         "defaultConfigurationInstructionsHTML": "Configure NVDA with default settings. For help, read &lt;a href=&quot;https://github.com/w3c/aria-at/wiki/Configuring-Screen-Readers-for-Testing&quot;&gt;Configuring Screen Readers for Testing&lt;/a&gt;.",
         "assertionTokens": {
             "screenReader": "NVDA",
diff --git a/server/seeders/20241030144705-addNvAccessVendor.js b/server/seeders/20241030144705-addNvAccessVendor.js
new file mode 100644
index 000000000..cf7765433
--- /dev/null
+++ b/server/seeders/20241030144705-addNvAccessVendor.js
@@ -0,0 +1,70 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction(async transaction => {
+      // Create NVDA vendor and retrieve id to use with 'At' table
+      const [vendor] = await queryInterface.sequelize.query(
+        `insert into "Vendor" (name, "createdAt", "updatedAt")
+         values ('nvAccess', now(), now())
+         returning id`,
+        {
+          type: Sequelize.QueryTypes.INSERT,
+          transaction
+        }
+      );
+
+      // Update NVDA's vendorId column value
+      const nvAccessVendorId = vendor[0].id;
+      await queryInterface.sequelize.query(
+        `update "At"
+         set "vendorId" = :vendorId
+         where "name" = 'NVDA'`,
+        {
+          replacements: { vendorId: nvAccessVendorId },
+          transaction
+        }
+      );
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction(async transaction => {
+      // Get the vendor id for NVDA to use to remove from the 'At' table
+      const [vendor] = await queryInterface.sequelize.query(
+        `select id
+         from "Vendor"
+         where name = 'nvAccess'
+         limit 1`,
+        {
+          type: Sequelize.QueryTypes.SELECT,
+          transaction
+        }
+      );
+
+      if (vendor) {
+        const nvAccessVendorId = vendor.id;
+        await queryInterface.sequelize.query(
+          `update "At"
+           set "vendorId" = null
+           where "vendorId" = :vendorId`,
+          {
+            replacements: { vendorId: nvAccessVendorId },
+            transaction
+          }
+        );
+
+        await queryInterface.sequelize.query(
+          `delete
+           from "Vendor"
+           where id = :vendorId`,
+          {
+            replacements: { vendorId: nvAccessVendorId },
+            transaction
+          }
+        );
+      }
+    });
+  }
+};
diff --git a/server/tests/integration/dataManagement.test.js b/server/tests/integration/dataManagement.test.js
index 6fe4c3920..f574bad6a 100644
--- a/server/tests/integration/dataManagement.test.js
+++ b/server/tests/integration/dataManagement.test.js
@@ -256,6 +256,43 @@ const markAsFinal = (testPlanReportId, { transaction }) => {
   );
 };
 
+const updateVendorReviewStatus = (
+  testPlanReportId,
+  reviewStatus,
+  { transaction }
+) => {
+  return mutate(
+    gql`
+      mutation {
+        testPlanReport(id: ${testPlanReportId}) {
+          promoteVendorReviewStatus(vendorReviewStatus: "${reviewStatus}") {
+            testPlanReport {
+              id
+              vendorReviewStatus
+            }
+          }
+        }
+      }
+    `,
+    { transaction }
+  );
+};
+
+const submitTestResult = (testResultId, testResult, { transaction }) => {
+  return mutate(
+    gql`
+      mutation SubmitTestResult($input: TestResultInput!) {
+        testResult(id: "${testResultId}") {
+          submitTestResult(input: $input) {
+            locationOfData
+          }
+        }
+      }
+    `,
+    { variables: { input: testResult }, transaction }
+  );
+};
+
 const countCompletedTests = testPlanReports => {
   return testPlanReports.reduce((acc, testPlanReport) => {
     return (
@@ -935,4 +972,219 @@ describe('data management', () => {
       );
     });
   });
+
+  it('keeps approval status across version updates if no substantial changes', async () => {
+    await dbCleaner(async transaction => {
+      // The difference between them is that there have been updated settings for VoiceOver tests;
+      // 2 were switched from 'quickNavOn' to 'singleQuickKeyNavOn'
+      //
+      // Based on https://github.com/w3c/aria-at/compare/d9a19f8...565a87b#diff-4e3dcd0a202f268ebec2316344f136c3a83d6e03b3f726775cb46c57322ff3a0,
+      // only 'navForwardsToButton' and 'navBackToButton' tests were affected. The individual tests for
+      // 'reqInfoAboutButton' should still match.
+      //
+      // This means that only VO + Safari tests will have changed and that vendor approval result cannot
+      // be brought forward if the results are copied.
+      //
+      // The JAWS and NVDA reports should have unaffected results and their vendor approval status can be copied.
+      const [oldCommandButtonVersion, newCommandButtonVersion] =
+        await getTestableCommandButtonVersions(transaction);
+
+      // Move the old version to CANDIDATE (all the reports are already final)
+      await updateVersionToPhaseQuery(oldCommandButtonVersion.id, 'CANDIDATE', {
+        transaction
+      });
+
+      // Make sure the reports are all approved
+      for (const testPlanReport of oldCommandButtonVersion.testPlanReports) {
+        // Have to pass 'READY' first for it to move to 'IN_PROGRESS', then
+        // 'IN_PROGRESS' to move to 'APPROVED'
+        //
+        // TODO: Avoid this unnecessary state management based way to avoid
+        //  confusion; better to just pass the intended status
+        await updateVendorReviewStatus(testPlanReport.id, 'READY', {
+          transaction
+        });
+        await updateVendorReviewStatus(testPlanReport.id, 'IN_PROGRESS', {
+          transaction
+        });
+      }
+
+      const afterOldVersionVendorUpdateStatus = await query(
+        gql`
+          query {
+            testPlanVersion(id: ${oldCommandButtonVersion.id}) {
+              id
+              phase
+              testPlanReports {
+                id
+                markedFinalAt
+                vendorReviewStatus
+              }
+            }
+          }
+        `,
+        { transaction }
+      );
+
+      // Move the new version to DRAFT
+      await updateVersionToPhaseQuery(newCommandButtonVersion.id, 'DRAFT', {
+        testPlanVersionDataToIncludeId: oldCommandButtonVersion.id,
+        transaction
+      });
+
+      // Confirm all the reports have been copied and marked as final
+      const afterNewVersionPhaseUpdateStatus = await query(
+        gql`
+          query {
+            testPlanVersion(id: ${newCommandButtonVersion.id}) {
+              id
+              phase
+              testPlanReports {
+                id
+                markedFinalAt
+                vendorReviewStatus
+                draftTestPlanRuns {
+                  id
+                  testResults {
+                    id
+                    scenarioResults {
+                      id
+                      output
+                      assertionResults {
+                        id
+                        passed
+                      }
+                    }
+                    test {
+                      id
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `,
+        { transaction }
+      );
+
+      // Confirm that a few on VO still need to be updated to be marked as final
+      for (const testPlanReport of afterNewVersionPhaseUpdateStatus
+        .testPlanVersion.testPlanReports) {
+        // The 'copied' vendor review status would be available with the results
+        // copy process
+        if (!testPlanReport.vendorReviewStatus) {
+          // Only 1 tester is assigned in this test scenario
+          const testPlanRun = testPlanReport.draftTestPlanRuns[0];
+
+          for (const testResult of testPlanRun.testResults) {
+            let baseTestResult = {
+              id: testResult.id,
+              scenarioResults: testResult.scenarioResults
+            };
+
+            // This needs to be populated since some tests will be missing data
+            if (
+              baseTestResult.scenarioResults.some(
+                scenarioResult => scenarioResult.output === null
+              )
+            ) {
+              baseTestResult = {
+                ...baseTestResult,
+                atVersionId: 3, // for this test, we know it uses a specific VO version
+                browserVersionId: 3, // for this test, we know it uses a specific Safari version
+                scenarioResults: baseTestResult.scenarioResults.map(
+                  scenarioResult => {
+                    if (scenarioResult.output === null) {
+                      return {
+                        ...scenarioResult,
+                        output: 'sample output',
+                        assertionResults: scenarioResult.assertionResults.map(
+                          assertionResult => ({
+                            ...assertionResult,
+                            passed: false
+                          })
+                        ),
+                        unexpectedBehaviors: []
+                      };
+                    } else return scenarioResult;
+                  }
+                )
+              };
+            }
+            await submitTestResult(testResult.id, baseTestResult, {
+              transaction
+            });
+          }
+        }
+        // Mark all reports as final
+        await markAsFinal(testPlanReport.id, { transaction });
+      }
+
+      // Advance new version to CANDIDATE as well
+      await updateVersionToPhaseQuery(newCommandButtonVersion.id, 'CANDIDATE', {
+        transaction
+      });
+
+      // Confirm the NVDA and JAWS versions are still approved but VO is marked as "In Progress"
+      const { testPlanVersion: newCommandButtonVersionAfterFinalPhaseUpdate } =
+        await query(
+          gql`
+        query {
+          testPlanVersion(id: ${newCommandButtonVersion.id}) {
+            id
+            phase
+            testPlanReports {
+              id
+              at {
+                id
+              }
+              browser {
+                id
+              }
+              vendorReviewStatus
+            }
+          }
+        }
+        `,
+          { transaction }
+        );
+
+      expect(
+        afterOldVersionVendorUpdateStatus.testPlanVersion.testPlanReports.every(
+          report => report.vendorReviewStatus === 'APPROVED'
+        )
+      ).toBe(true);
+      expect(
+        afterOldVersionVendorUpdateStatus.testPlanVersion.testPlanReports.length
+      ).toEqual(3);
+      expect(
+        afterNewVersionPhaseUpdateStatus.testPlanVersion.testPlanReports.filter(
+          report => report.vendorReviewStatus === 'APPROVED'
+        ).length
+      ).toEqual(2);
+      expect(
+        afterNewVersionPhaseUpdateStatus.testPlanVersion.testPlanReports.length
+      ).toEqual(3);
+      expect(newCommandButtonVersionAfterFinalPhaseUpdate.phase).toBe(
+        'CANDIDATE'
+      );
+      expect(
+        newCommandButtonVersionAfterFinalPhaseUpdate.testPlanReports.length
+      ).toEqual(3);
+      expect(
+        newCommandButtonVersionAfterFinalPhaseUpdate.testPlanReports.filter(
+          report => report.vendorReviewStatus === 'APPROVED'
+        ).length
+      ).toEqual(2);
+      // Confirm only the Safari + VO combination is not marked as approved
+      expect(
+        newCommandButtonVersionAfterFinalPhaseUpdate.testPlanReports.find(
+          report => report.vendorReviewStatus !== 'APPROVED'
+        ).at.id === '3' &&
+          newCommandButtonVersionAfterFinalPhaseUpdate.testPlanReports.find(
+            report => report.vendorReviewStatus !== 'APPROVED'
+          ).browser.id === '3'
+      ).toBe(true);
+    });
+  });
 });