Merge pull request #1199 from w3c/releases

August 26, 2024 Production Release which includes the following changes: * #1161, to address #1045 * #1196, to address #1176 * #1186, to address #1166, #1167 and #1168 * #1188 * #1175
w3c · Aug 26, 2024 · d8f58cc · d8f58cc
2 parents 7cc97aa + c138558
commit d8f58cc
Show file tree

Hide file tree

Showing 236 changed files with 16,607 additions and 19,905 deletions.
diff --git a/.gitignore b/.gitignore
@@ -122,8 +122,13 @@ deploy/provision.retry
 # Migration generated files
 server/migrations/pg_dump_test_plan_target.sql
 server/migrations/test_plan_target_id.csv
+server/migrations/dumps/dumpDatabase_*.sql
+server/migrations/dumps/dumpTable_*.sql
 
 # Private Key files (installed by deploy)
 jwt-signing-key.pem
 
 client/resources
+
+#temp files for import-tests
+server/scripts/import-tests/tmp
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## [1.7.0](https://github.com/w3c/aria-at-app/compare/v1.6.0...v1.7.0) (2024-08-26)
+
+
+### Features
+
+* Content updates to Candidate Review page ([#1186](https://github.com/w3c/aria-at-app/issues/1186)) ([c64e584](https://github.com/w3c/aria-at-app/commit/c64e5843443f94949e2fca0c62499c9386ad5f07))
+* Test navigation via URI fragment ([#1188](https://github.com/w3c/aria-at-app/issues/1188)) ([b2b0560](https://github.com/w3c/aria-at-app/commit/b2b056087ffca4a596566ad6f264198b22987dc4))
+* Use standardized gql fragments in queries.js files ([#1147](https://github.com/w3c/aria-at-app/issues/1147)) ([dd4b8c2](https://github.com/w3c/aria-at-app/commit/dd4b8c26fff84600db05f89a58de76eef5135861)), closes [#876](https://github.com/w3c/aria-at-app/issues/876)
+
+
+### Bug Fixes
+
+* Basic snapshot testing ([#1175](https://github.com/w3c/aria-at-app/issues/1175)) ([84e269d](https://github.com/w3c/aria-at-app/commit/84e269d213169369cdf33a93b9144b04aabd4fa3))
+* Only match with single alphanumeric keys in "Assign Testers" dropdown search, ignore Tab ([#1196](https://github.com/w3c/aria-at-app/issues/1196)) ([a80b80b](https://github.com/w3c/aria-at-app/commit/a80b80b447be82eaac7dbc0e15724ebae0c51cca))
+* Radio buttons for assertion verdicts ([#1161](https://github.com/w3c/aria-at-app/issues/1161)) ([eb8f9ea](https://github.com/w3c/aria-at-app/commit/eb8f9ea86a450644da3795f3e2d1325f766504d0)), closes [#1045](https://github.com/w3c/aria-at-app/issues/1045)
+* Update and expand `/client` tests ([#1169](https://github.com/w3c/aria-at-app/issues/1169)) ([abe3086](https://github.com/w3c/aria-at-app/commit/abe3086feb8b7cdc5eff72890c88b3717d08ccc6))
+
 ## [1.6.0](https://github.com/w3c/aria-at-app/compare/v1.5.0...v1.6.0) (2024-07-29)
 
 

diff --git a/client/components/AddTestToQueueWithConfirmation/index.jsx b/client/components/AddTestToQueueWithConfirmation/index.jsx
@@ -66,7 +66,13 @@ function AddTestToQueueWithConfirmation({
   );
 
   const existingTestPlanReports =
-    existingTestPlanReportsData?.existingTestPlanVersion?.testPlanReports;
+    existingTestPlanReportsData?.existingTestPlanVersion?.testPlanReports.filter(
+      tpr =>
+        tpr.at?.id === at?.id &&
+        tpr.browser?.id === browser?.id &&
+        tpr.minimumAtVersion?.id === minimumAtVersion?.id &&
+        tpr.exactAtVersion?.id === exactAtVersion?.id
+    );
 
   let latestOldVersion;
   let oldReportToCopyResultsFrom;

diff --git a/client/components/AddTestToQueueWithConfirmation/queries.js b/client/components/AddTestToQueueWithConfirmation/queries.js
@@ -13,10 +13,11 @@ export const EXISTING_TEST_PLAN_REPORTS = gql`
   query ExistingTestPlanReports($testPlanVersionId: ID!, $directory: String!) {
     existingTestPlanVersion: testPlanVersion(id: $testPlanVersionId) {
       id
+      metadata
       testPlanReports {
         id
-        markedFinalAt
         isFinal
+        markedFinalAt
         draftTestPlanRuns {
           initiatedByAutomation
         }
@@ -27,14 +28,14 @@ export const EXISTING_TEST_PLAN_REPORTS = gql`
           id
         }
       }
-      metadata
     }
     oldTestPlanVersions: testPlanVersions(
       phases: [CANDIDATE, RECOMMENDED]
       directory: $directory
     ) {
       id
       updatedAt
+      metadata
       testPlanReports {
         id
         at {
@@ -44,7 +45,6 @@ export const EXISTING_TEST_PLAN_REPORTS = gql`
           id
         }
       }
-      metadata
     }
   }
 `;

diff --git a/client/components/App/queries.js b/client/components/App/queries.js
@@ -1,11 +1,11 @@
 import { gql } from '@apollo/client';
+import { ME_FIELDS } from '@components/common/fragments';
 
 export const ME_QUERY = gql`
+  ${ME_FIELDS}
   query Me {
     me {
-      id
-      username
-      roles
+      ...MeFields
     }
   }
 `;
diff --git a/client/components/CandidateReview/CandidateTestPlanRun/index.jsx b/client/components/CandidateReview/CandidateTestPlanRun/index.jsx
@@ -17,12 +17,11 @@ import Col from 'react-bootstrap/Col';
 import Button from 'react-bootstrap/Button';
 import { useParams, useNavigate, Navigate } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
-import { getMetrics } from 'shared';
+import { getMetrics, dates } from 'shared';
 import './CandidateTestPlanRun.css';
 import '../../TestRun/TestRun.css';
 import '../../App/App.css';
 import { useMediaQuery } from 'react-responsive';
-import { convertDateToString } from '../../../utils/formatter';
 import TestPlanResultsTable from '../../common/TestPlanResultsTable';
 import ProvideFeedbackModal from '../CandidateModals/ProvideFeedbackModal';
 import ThankYouModal from '../CandidateModals/ThankYouModal';
@@ -31,6 +30,8 @@ import DisclosureComponent from '../../common/DisclosureComponent';
 import createIssueLink, {
   getIssueSearchLink
 } from '../../../utils/createIssueLink';
+import RunHistory from '../../common/RunHistory';
+import { useUrlTestIndex } from '../../../hooks/useUrlTestIndex';
 
 const CandidateTestPlanRun = () => {
   const { atId, testPlanVersionId } = useParams();
@@ -56,14 +57,16 @@ const CandidateTestPlanRun = () => {
   const [reviewStatus, setReviewStatus] = useState('');
   const [firstTimeViewing, setFirstTimeViewing] = useState(false);
   const [viewedTests, setViewedTests] = useState([]);
-  const [currentTestIndex, setCurrentTestIndex] = useState(0);
+  const [testsLength, setTestsLength] = useState(0);
+  const [currentTestIndex, setCurrentTestIndex] = useUrlTestIndex(testsLength);
   const [showTestNavigator, setShowTestNavigator] = useState(true);
   const [isFirstTest, setIsFirstTest] = useState(true);
   const [isLastTest, setIsLastTest] = useState(false);
   const [feedbackModalShowing, setFeedbackModalShowing] = useState(false);
   const [thankYouModalShowing, setThankYouModalShowing] = useState(false);
   const [showInstructions, setShowInstructions] = useState(false);
   const [showBrowserBools, setShowBrowserBools] = useState([]);
+  const [showRunHistory, setShowRunHistory] = useState(false);
   const [showBrowserClicks, setShowBrowserClicks] = useState([]);
 
   const isLaptopOrLarger = useMediaQuery({
@@ -182,7 +185,7 @@ const CandidateTestPlanRun = () => {
           return bools;
         });
       });
-
+      setTestsLength(tests.length);
       setShowBrowserClicks(browserClicks);
     }
   }, [data]);
@@ -282,7 +285,7 @@ const CandidateTestPlanRun = () => {
 
   const reviewStatusText = vendorReviewStatusMap[reviewStatus];
 
-  const targetCompletionDate = convertDateToString(
+  const targetCompletionDate = dates.convertDateToString(
     new Date(recommendedPhaseTargetDate),
     'MMMM D, YYYY'
   );
@@ -376,7 +379,8 @@ const CandidateTestPlanRun = () => {
       </span>
       <h1>
         {`${currentTest.seq}. ${currentTest.title}`}{' '}
-        <span className="using">using</span> {`${at}`}
+        <span className="using">using</span> {`${at}`}{' '}
+        {`${testPlanReport?.latestAtVersionReleasedAt?.name ?? ''}`}
         {viewedTests.includes(currentTest.id) && !firstTimeViewing && ' '}
         {viewedTests.includes(currentTest.id) && !firstTimeViewing && (
           <Badge className="viewed-badge" pill variant="secondary">
@@ -392,9 +396,11 @@ const CandidateTestPlanRun = () => {
       <div className="test-info-entity apg-example-name">
         <div className="info-label">
           <b>Candidate Test Plan:</b>{' '}
-          {`${
-            testPlanVersion.title || testPlanVersion.testPlan?.directory || ''
-          }`}
+          <a href={`/test-review/${testPlanVersion.id}`}>
+            {`${
+              testPlanVersion.title || testPlanVersion.testPlan?.directory || ''
+            } ${testPlanVersion.versionString}`}
+          </a>
         </div>
       </div>
       <div className="test-info-entity review-status">
@@ -461,13 +467,15 @@ const CandidateTestPlanRun = () => {
           'Test Instructions',
           ...testPlanReports.map(
             testPlanReport => `Test Results for ${testPlanReport.browser.name}`
-          )
+          ),
+          'Run History'
         ]}
         onClick={[
           () => setShowInstructions(!showInstructions),
-          ...showBrowserClicks
+          ...showBrowserClicks,
+          () => setShowRunHistory(!showRunHistory)
         ]}
-        expanded={[showInstructions, ...showBrowserBools]}
+        expanded={[showInstructions, ...showBrowserBools, showRunHistory]}
         disclosureContainerView={[
           <InstructionsRenderer
             key={`instructions-${currentTest.id}`}
@@ -498,7 +506,12 @@ const CandidateTestPlanRun = () => {
                 />
               </>
             );
-          })
+          }),
+          <RunHistory
+            key="run-history"
+            testPlanReports={testPlanReports}
+            testId={currentTest.id}
+          />
         ]}
         stacked
       ></DisclosureComponent>