Copy results when adding to Test Queue

client/components/AddTestToQueueWithConfirmation/index.jsx

@@ -23,23 +23,26 @@ function AddTestToQueueWithConfirmation({
     buttonText = 'Add to Test Queue',
     triggerUpdate = () => {}
 }) {
-    const [errorMessage, setErrorMessage] = useState(false);
+    const [showPreserveReportDataMessage, setShowPreserveReportDataMessage] =
+        useState(false);
     const [showConfirmation, setShowConfirmation] = useState(false);
+    const [canUseOldResults, setCanUseOldResults] = useState(false);
     const [addTestPlanReport] = useMutation(ADD_TEST_QUEUE_MUTATION);
     const [scheduleCollection] = useMutation(SCHEDULE_COLLECTION_JOB_MUTATION);
     const { data: existingTestPlanReportsData } = useQuery(
         EXISTING_TEST_PLAN_REPORTS,
         {
             variables: {
-                testPlanVersionId: testPlanVersion?.id
+                testPlanVersionId: testPlanVersion?.id,
+                directory: testPlanVersion?.testPlan?.directory
             },
             fetchPolicy: 'cache-and-network',
             skip: !testPlanVersion?.id
         }
     );
 
     const existingTestPlanReports =
-        existingTestPlanReportsData?.testPlanVersion.testPlanReports;
+        existingTestPlanReportsData?.existingTestPlanVersion?.testPlanReports;
 
     const conflictingReportExists = existingTestPlanReports?.some(report => {
         return (
@@ -49,6 +52,31 @@ function AddTestToQueueWithConfirmation({
         );
     });
 
+    let latestOldVersion;
+    let oldReportToCopyResultsFrom;
+
+    // Prioritize a conflicting report for the current version, otherwise
+    // check if any results data available from a previous result
+    if (
+        !conflictingReportExists &&
+        existingTestPlanReportsData?.oldTestPlanVersions?.length
+    ) {
+        latestOldVersion =
+            existingTestPlanReportsData?.oldTestPlanVersions?.reduce((a, b) =>
+                new Date(a.updatedAt) > new Date(b.updatedAt) ? a : b
+            );
+
+        if (
+            new Date(latestOldVersion?.updatedAt) <
+            new Date(testPlanVersion?.updatedAt)
+        ) {
+            oldReportToCopyResultsFrom = latestOldVersion?.testPlanReports.some(
+                ({ at: { id: atId }, browser: { id: browserId } }) =>
+                    atId == at?.id && browserId == browser?.id
+            );
+        }
+    }
+
     const { triggerLoad, loadingMessage } = useTriggerLoad();
     const buttonRef = useRef();
 
@@ -104,7 +132,14 @@ function AddTestToQueueWithConfirmation({
             actions.push({
                 label: 'Add and run later',
                 onClick: async () => {
-                    await addTestToQueue();
+                    await addTestToQueue(
+                        canUseOldResults
+                            ? {
+                                  copyResultsFromTestPlanReportId:
+                                      latestOldVersion.id
+                              }
+                            : {}
+                    );
                     await closeWithUpdate();
                 }
             });
@@ -113,7 +148,14 @@ function AddTestToQueueWithConfirmation({
                 actions.push({
                     label: 'Add and run with bot',
                     onClick: async () => {
-                        const testPlanReport = await addTestToQueue();
+                        const testPlanReport = await addTestToQueue(
+                            canUseOldResults
+                                ? {
+                                      copyResultsFromTestPlanReportId:
+                                          latestOldVersion.id
+                                  }
+                                : {}
+                        );
                         await scheduleCollectionJob(testPlanReport);
                         await closeWithUpdate();
                     }
@@ -141,48 +183,94 @@ function AddTestToQueueWithConfirmation({
         );
     };
 
-    const renderErrorDialog = () => {
+    const renderPreserveReportDataDialog = () => {
+        let title;
+        let content;
+        let actions = [];
+
+        if (oldReportToCopyResultsFrom) {
+            title = 'Older Results Data Found';
+            content =
+                'Older results with the same AT, browser and test plan ' +
+                'were found for the report being created. Would you like ' +
+                'to copy the older results into the report or create a ' +
+                'completely new report?';
+            actions = [
+                {
+                    label: 'Create empty report',
+                    onClick: async () => {
+                        setShowPreserveReportDataMessage(false);
+                        if (hasAutomationSupport) {
+                            setShowConfirmation(true);
+                        } else {
+                            await addTestToQueue();
+                        }
+                    }
+                },
+                {
+                    label: 'Copy older results',
+                    onClick: async () => {
+                        setShowPreserveReportDataMessage(false);
+                        setCanUseOldResults(true);
+
+                        if (hasAutomationSupport) {
+                            setShowConfirmation(true);
+                        } else {
+                            await addTestToQueue({
+                                copyResultsFromTestPlanReportId:
+                                    latestOldVersion.id
+                            });
+                        }
+                    }
+                }
+            ];
+        } else {
+            title = 'Conflicting Report Found';
+            content =
+                'The report could not be created because an existing ' +
+                'report was found on the reports page with the same AT, ' +
+                'browser and test plan version. Would you like to return ' +
+                'the existing report back to the test queue?';
+            actions = [
+                {
+                    label: 'Proceed',
+                    onClick: async () => {
+                        setShowPreserveReportDataMessage(false);
+                        if (hasAutomationSupport) {
+                            setShowConfirmation(true);
+                        } else {
+                            await addTestToQueue();
+                        }
+                    }
+                }
+            ];
+        }
+
         return (
             <BasicModal
-                show={errorMessage}
-                title="Conflicting Report Found"
-                content={
-                    'The report could not be created because an existing ' +
-                    'report was found on the reports page with the same AT, ' +
-                    'browser and test plan version. Would you like to return ' +
-                    'the existing report back to the test queue?'
-                }
+                show={showPreserveReportDataMessage}
+                title={title}
+                content={content}
                 closeLabel="Cancel"
                 staticBackdrop={true}
-                actions={[
-                    {
-                        label: 'Proceed',
-                        onClick: async () => {
-                            setErrorMessage(false);
-                            if (hasAutomationSupport) {
-                                setShowConfirmation(true);
-                            } else {
-                                await addTestToQueue();
-                            }
-                        }
-                    }
-                ]}
+                actions={actions}
                 useOnHide
                 handleClose={async () => {
-                    setErrorMessage(false);
+                    setShowPreserveReportDataMessage(false);
                 }}
             />
         );
     };
 
-    const addTestToQueue = async () => {
+    const addTestToQueue = async ({ copyResultsFromTestPlanReportId } = {}) => {
         let tpr;
         await triggerLoad(async () => {
             const res = await addTestPlanReport({
                 variables: {
                     testPlanVersionId: testPlanVersion.id,
                     atId: at.id,
-                    browserId: browser.id
+                    browserId: browser.id,
+                    copyResultsFromTestPlanReportId
                 }
             });
             const testPlanReport =
@@ -212,8 +300,8 @@ function AddTestToQueueWithConfirmation({
                 disabled={disabled}
                 variant="secondary"
                 onClick={async () => {
-                    if (conflictingReportExists) {
-                        setErrorMessage(true);
+                    if (conflictingReportExists || oldReportToCopyResultsFrom) {
+                        setShowPreserveReportDataMessage(true);
                     } else {
                         if (hasAutomationSupport) {
                             setShowConfirmation(true);
@@ -227,7 +315,7 @@ function AddTestToQueueWithConfirmation({
             >
                 {buttonText}
             </Button>
-            {renderErrorDialog()}
+            {renderPreserveReportDataDialog()}
             {renderConfirmation()}
         </LoadingStatus>
     );

client/components/AddTestToQueueWithConfirmation/queries.js

@@ -10,8 +10,11 @@ export const SCHEDULE_COLLECTION_JOB_MUTATION = gql`
 `;
 
 export const EXISTING_TEST_PLAN_REPORTS = gql`
-    query ExistingTestPlanReports($testPlanVersionId: ID!) {
-        testPlanVersion(id: $testPlanVersionId) {
+    query ExistingTestPlanReports(
+        $testPlanVersionId: ID!
+        $directory: String!
+    ) {
+        existingTestPlanVersion: testPlanVersion(id: $testPlanVersionId) {
             id
             testPlanReports {
                 id
@@ -28,5 +31,21 @@ export const EXISTING_TEST_PLAN_REPORTS = gql`
                 }
             }
         }
+        oldTestPlanVersions: testPlanVersions(
+            phases: [CANDIDATE, RECOMMENDED]
+            directory: $directory
+        ) {
+            id
+            updatedAt
+            testPlanReports {
+                id
+                at {
+                    id
+                }
+                browser {
+                    id
+                }
+            }
+        }
     }
 `;

client/components/TestQueue/queries.js

@@ -222,12 +222,14 @@ export const ADD_TEST_QUEUE_MUTATION = gql`
         $testPlanVersionId: ID!
         $atId: ID!
         $browserId: ID!
+        $copyResultsFromTestPlanReportId: ID
     ) {
         findOrCreateTestPlanReport(
             input: {
                 testPlanVersionId: $testPlanVersionId
                 atId: $atId
                 browserId: $browserId
+                copyResultsFromTestPlanReportId: $copyResultsFromTestPlanReportId
             }
         ) {
             populatedData {

client/tests/__mocks__/GraphQLMocks/TestPlanReportStatusDialogMock.js

@@ -282,7 +282,7 @@ export const mockedTestPlanVersion = {
 export default (
     meQuery,
     testPlanReportStatusDialogQuery,
-    initiatedByAutomationQuery
+    existingTestPlanReportsQuery
 ) => [
     {
         request: {
@@ -386,14 +386,15 @@ export default (
     },
     {
         request: {
-            query: initiatedByAutomationQuery,
+            query: existingTestPlanReportsQuery,
             variables: {
-                testPlanVersionId: '7'
+                testPlanVersionId: '7',
+                directory: 'combobox-select-only'
             }
         },
         result: {
             data: {
-                testPlanVersion: {
+                existingTestPlanVersion: {
                     id: '7',
                     testPlanReports: [
                         {
@@ -411,7 +412,8 @@ export default (
                             }
                         }
                     ]
-                }
+                },
+                oldTestPlanVersions: []
             }
         }
     }

client/tests/__mocks__/GraphQLMocks/TestQueuePageBaseMock.js

@@ -1,7 +1,4 @@
-export default (
-    testPlanReportAtBrowserQuery,
-    initiatedByAutomationRunQuery
-) => [
+export default (testPlanReportAtBrowserQuery, existingTestPlanReportsQuery) => [
     {
         request: {
             query: testPlanReportAtBrowserQuery,
@@ -73,14 +70,15 @@ export default (
     },
     {
         request: {
-            query: initiatedByAutomationRunQuery,
+            query: existingTestPlanReportsQuery,
             variables: {
-                testPlanVersionId: '1'
+                testPlanVersionId: '1',
+                directory: 'alert'
             }
         },
         result: {
             data: {
-                testPlanVersion: {
+                existingTestPlanVersion: {
                     id: '1',
                     testPlanReports: [
                         {
@@ -98,7 +96,8 @@ export default (
                             }
                         }
                     ]
-                }
+                },
+                oldTestPlanVersions: []
             }
         }
     }

server/graphql-schema.js

@@ -1016,6 +1016,7 @@ const graphqlSchema = gql`
         testPlanVersionId: ID!
         atId: ID!
         browserId: ID!
+        copyResultsFromTestPlanReportId: ID
     }
 
     """
@@ -1101,7 +1102,10 @@ const graphqlSchema = gql`
         """
         Get all TestPlanVersions.
         """
-        testPlanVersions(phases: [TestPlanVersionPhase]): [TestPlanVersion]!
+        testPlanVersions(
+            phases: [TestPlanVersionPhase]
+            directory: String
+        ): [TestPlanVersion]!
         """
         Get a particular TestPlanVersion by ID.
         """