Merge pull request #1285 from w3c/releases

Includes changes recently included in the [releases branch](https://github.com/w3c/aria-at-app/tree/releases) through #1284. [Latest CHANGELOG.md update: v1.11.0](https://github.com/w3c/aria-at-app/blob/releases/CHANGELOG.md#1110-2024-12-10).
w3c · Dec 10, 2024 · fed3203 · fed3203
2 parents 20cd8d1 + e934f1b
commit fed3203
Show file tree

Hide file tree

Showing 19 changed files with 557 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [1.11.0](https://github.com/w3c/aria-at-app/compare/v1.10.0...v1.11.0) (2024-12-10)
+
+
+### Features
+
+* Track vendor approvals across version updates through result copy process ([#1267](https://github.com/w3c/aria-at-app/issues/1267)) ([90807df](https://github.com/w3c/aria-at-app/commit/90807df4b71ea13b25b2e2dd1a0ca03a5976c743))
+
+
+### Bug Fixes
+
+* Allow AT and Browser versions to be edited when bot run is assigned to manual tester for evaluation ([#1279](https://github.com/w3c/aria-at-app/issues/1279)) ([a6c0bda](https://github.com/w3c/aria-at-app/commit/a6c0bda680b9be6ac10966c9cad9603adf6c24ac))
+
 ## [1.10.0](https://github.com/w3c/aria-at-app/compare/v1.9.3...v1.10.0) (2024-11-07)
 
 

diff --git 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/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/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/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
@@ -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,37 +247,37 @@ <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>
                   <div class="form-group">
                     <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"
@@ -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"
@@ -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,15 +2044,15 @@ <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>
                   <div role="list" aria-setsize="2" class="css-1bj5ml9">
                     <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,15 +2099,15 @@ <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>
                   <div role="list" aria-setsize="2" class="css-1bj5ml9">
                     <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"
@@ -2407,15 +2407,15 @@ <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>
                   <div role="list" aria-setsize="2" class="css-1bj5ml9">
                     <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"
@@ -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