Create August 26, 2024 Release

.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

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;

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
     }
   }
 `;

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
     }
   }
 `;

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>

client/components/CandidateReview/CandidateTestPlanRun/queries.js

@@ -1,4 +1,15 @@
 import { gql } from '@apollo/client';
+import {
+  AT_FIELDS,
+  AT_VERSION_FIELDS,
+  BROWSER_FIELDS,
+  BROWSER_VERSION_FIELDS,
+  ISSUE_FIELDS,
+  ME_FIELDS,
+  SCENARIO_RESULT_FIELDS,
+  TEST_FIELDS,
+  TEST_RESULT_FIELDS
+} from '@components/common/fragments';
 
 export const ADD_VIEWER_MUTATION = gql`
   mutation AddViewerMutation($testPlanVersionId: ID!, $testId: ID!) {
@@ -25,15 +36,22 @@ export const PROMOTE_VENDOR_REVIEW_STATUS_REPORT_MUTATION = gql`
 `;
 
 export const CANDIDATE_REPORTS_QUERY = gql`
+  ${AT_FIELDS}
+  ${AT_VERSION_FIELDS}
+  ${BROWSER_FIELDS}
+  ${BROWSER_VERSION_FIELDS}
+  ${ISSUE_FIELDS('all')}
+  ${ME_FIELDS}
+  ${TEST_FIELDS()}
+  ${TEST_RESULT_FIELDS}
+  ${SCENARIO_RESULT_FIELDS('all')}
   query CandidateReportsQuery(
     $atId: ID!
     $testPlanVersionId: ID
     $testPlanVersionIds: [ID]
   ) {
     me {
-      id
-      roles
-      username
+      ...MeFields
     }
     testPlanReports(
       atId: $atId
@@ -45,104 +63,47 @@ export const CANDIDATE_REPORTS_QUERY = gql`
       id
       vendorReviewStatus
       issues {
-        author
-        isCandidateReview
-        feedbackType
-        testNumberFilteredByAt
-        link
+        ...IssueFieldsAll
       }
       at {
-        id
-        name
+        ...AtFields
       }
       latestAtVersionReleasedAt {
-        id
-        name
-        releasedAt
+        ...AtVersionFields
       }
       browser {
-        id
-        name
+        ...BrowserFields
       }
       testPlanVersion {
         id
         title
         phase
         gitSha
-        testPlan {
-          directory
-        }
-        metadata
-        testPageUrl
-        updatedAt
         versionString
+        updatedAt
         candidatePhaseReachedAt
         recommendedPhaseTargetDate
+        testPageUrl
+        metadata
+        testPlan {
+          directory
+        }
       }
       runnableTests {
-        id
-        title
-        rowNumber
-        renderedUrl
+        ...TestFieldsSimple
         renderableContent
         viewers {
           username
         }
       }
       finalizedTestResults {
-        id
-        completedAt
+        ...TestResultFields
         test {
-          id
-          rowNumber
-          title
-          renderedUrl
+          ...TestFieldsSimple
           renderableContent
         }
         scenarioResults {
-          id
-          scenario {
-            commands {
-              id
-              text
-            }
-          }
-          output
-          assertionResults {
-            id
-            assertion {
-              text
-              phrase
-            }
-            passed
-          }
-          mustAssertionResults: assertionResults(priority: MUST) {
-            assertion {
-              text
-              phrase
-            }
-            passed
-          }
-          shouldAssertionResults: assertionResults(priority: SHOULD) {
-            assertion {
-              text
-              phrase
-            }
-            passed
-          }
-          mayAssertionResults: assertionResults(priority: MAY) {
-            assertion {
-              text
-              phrase
-            }
-            passed
-          }
-          unexpectedBehaviors {
-            id
-            text
-            impact
-            details
-          }
+          ...ScenarioResultFieldsAll
         }
       }
       draftTestPlanRuns {
@@ -153,18 +114,16 @@ export const CANDIDATE_REPORTS_QUERY = gql`
           id
         }
         testResults {
+          ...TestResultFields
           test {
             id
           }
           atVersion {
-            id
-            name
+            ...AtVersionFields
           }
           browserVersion {
-            id
-            name
+            ...BrowserVersionFields
           }
-          completedAt
         }
       }
     }