fix: Remove TestQueue v1 and update Test Queue e2e tests (#1146)

* Move AssignTesterDropdown * Removed original components/TestQueue and revised tests * Additional removal of files * Rename TestQueue2 -> TestQueue * Address TODOs on removing Test Queue v1 vs v2 conditionals * Remove unnecessary TODO
w3c · Jul 10, 2024 · fd6e86f · fd6e86f
1 parent 6a2ad32
commit fd6e86f
Show file tree

Hide file tree

Showing 37 changed files with 1,358 additions and 3,181 deletions.
diff --git a/client/components/AddTestToQueueWithConfirmation/index.jsx b/client/components/AddTestToQueueWithConfirmation/index.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Button } from 'react-bootstrap';
 import BasicModal from '../common/BasicModal';
 import { useMutation, useQuery } from '@apollo/client';
-import { ADD_TEST_QUEUE_MUTATION } from '../TestQueue/queries';
 import { LoadingStatus, useTriggerLoad } from '../common/LoadingStatus';
 import {
   getBotUsernameFromAtBrowser,
@@ -12,9 +11,10 @@ import {
 import './AddTestToQueueWithConfirmation.css';
 import {
   SCHEDULE_COLLECTION_JOB_MUTATION,
-  EXISTING_TEST_PLAN_REPORTS
+  EXISTING_TEST_PLAN_REPORTS,
+  ADD_TEST_QUEUE_MUTATION
 } from './queries';
-import { TEST_QUEUE_PAGE_QUERY } from '../TestQueue2/queries';
+import { TEST_QUEUE_PAGE_QUERY } from '../TestQueue/queries';
 import { TEST_PLAN_REPORT_STATUS_DIALOG_QUERY } from '../TestPlanReportStatusDialog/queries';
 import { ME_QUERY } from '../App/queries';
 

diff --git a/client/components/AddTestToQueueWithConfirmation/queries.js b/client/components/AddTestToQueueWithConfirmation/queries.js
@@ -48,3 +48,38 @@ export const EXISTING_TEST_PLAN_REPORTS = gql`
     }
   }
 `;
+
+export const ADD_TEST_QUEUE_MUTATION = gql`
+  mutation AddTestPlanReport(
+    $testPlanVersionId: ID!
+    $atId: ID!
+    $exactAtVersionId: ID
+    $minimumAtVersionId: ID
+    $browserId: ID!
+    $copyResultsFromTestPlanVersionId: ID
+  ) {
+    createTestPlanReport(
+      input: {
+        testPlanVersionId: $testPlanVersionId
+        atId: $atId
+        exactAtVersionId: $exactAtVersionId
+        minimumAtVersionId: $minimumAtVersionId
+        browserId: $browserId
+        copyResultsFromTestPlanVersionId: $copyResultsFromTestPlanVersionId
+      }
+    ) {
+      testPlanReport {
+        id
+        at {
+          id
+        }
+        browser {
+          id
+        }
+      }
+      testPlanVersion {
+        id
+      }
+    }
+  }
+`;
diff --git a/client/components/BotRunTestStatusList/index.js b/client/components/BotRunTestStatusList/index.js
@@ -5,16 +5,6 @@ import { useQuery } from '@apollo/client';
 import styled from '@emotion/styled';
 import ReportStatusDot from '../common/ReportStatusDot';
 
-// TODO: Remove when Test Queue v1 is removed
-const BotRunTestStatusUnorderedList = styled.ul`
-  list-style-type: none;
-  background-color: #f6f8fa;
-  font-size: 0.9rem !important;
-  padding: 0.5rem 0;
-  margin: 0.5rem 0;
-  white-space: nowrap;
-`;
-
 const BotRunTestContainer = styled.div`
   font-size: 0.875rem !important;
   padding: 0.5rem 0;
@@ -26,7 +16,7 @@ const BotRunTestContainer = styled.div`
   white-space: nowrap;
 `;
 
-const BotRunTestStatusUnorderedListV2 = styled.ul`
+const BotRunTestStatusUnorderedList = styled.ul`
   list-style-type: none;
 `;
 
@@ -49,10 +39,7 @@ const testCountString = (count, status) =>
 
 const pollInterval = 2000;
 
-const BotRunTestStatusList = ({
-  testPlanReportId,
-  fromTestQueueV2 = false // TODO: Remove when Test Queue v1 is removed
-}) => {
+const BotRunTestStatusList = ({ testPlanReportId }) => {
   const {
     data: testPlanRunsQueryResult,
     startPolling,
@@ -104,75 +91,43 @@ const BotRunTestStatusList = ({
 
   return (
     <>
-      {fromTestQueueV2 ? (
-        <BotRunTestContainer>
-          Bot Status:
-          <BotRunTestStatusUnorderedListV2 className="text-secondary">
-            {RUNNING > 0 && (
-              <li>
-                <ReportStatusDot className="tests-running" />
-                {testCountString(RUNNING, 'Running')}
-              </li>
-            )}
-            {ERROR > 0 && (
-              <li>
-                <ReportStatusDot className="tests-error" />
-                {testCountString(ERROR, 'Error')}
-              </li>
-            )}
-            <li>
-              <ReportStatusDot className="tests-complete" />
-              {testCountString(COMPLETED, 'Completed')}
-            </li>
-            <li>
-              <ReportStatusDot className="tests-queued" />
-              {testCountString(QUEUED, 'Queued')}
-            </li>
-            {CANCELLED > 0 && (
-              <li>
-                <ReportStatusDot className="tests-cancelled" />
-                {testCountString(CANCELLED, 'Cancelled')}
-              </li>
-            )}
-          </BotRunTestStatusUnorderedListV2>
-        </BotRunTestContainer>
-      ) : (
-        <BotRunTestStatusUnorderedList className="text-secondary fs-6">
+      <BotRunTestContainer>
+        Bot Status:
+        <BotRunTestStatusUnorderedList className="text-secondary">
           {RUNNING > 0 && (
-            <li className="m-2">
+            <li>
               <ReportStatusDot className="tests-running" />
               {testCountString(RUNNING, 'Running')}
             </li>
           )}
           {ERROR > 0 && (
-            <li className="m-2">
+            <li>
               <ReportStatusDot className="tests-error" />
               {testCountString(ERROR, 'Error')}
             </li>
           )}
-          <li className="m-2">
+          <li>
             <ReportStatusDot className="tests-complete" />
             {testCountString(COMPLETED, 'Completed')}
           </li>
-          <li className="m-2">
+          <li>
             <ReportStatusDot className="tests-queued" />
             {testCountString(QUEUED, 'Queued')}
           </li>
           {CANCELLED > 0 && (
-            <li className="m-2">
+            <li>
               <ReportStatusDot className="tests-cancelled" />
               {testCountString(CANCELLED, 'Cancelled')}
             </li>
           )}
         </BotRunTestStatusUnorderedList>
-      )}
+      </BotRunTestContainer>
     </>
   );
 };
 
 BotRunTestStatusList.propTypes = {
-  testPlanReportId: PropTypes.string.isRequired,
-  fromTestQueueV2: PropTypes.bool
+  testPlanReportId: PropTypes.string.isRequired
 };
 
 export default BotRunTestStatusList;
diff --git a/client/components/ManageBotRunDialog/WithButton.jsx b/client/components/ManageBotRunDialog/WithButton.jsx
@@ -11,7 +11,6 @@ const ManageBotRunDialogWithButton = ({
   testPlanReportId,
   runnableTestsLength,
   testers,
-  includeIcon = false,
   onChange
 }) => {
   const { runIsFinished } = useTestPlanRunIsFinished(testPlanRun.id);
@@ -28,8 +27,7 @@ const ManageBotRunDialogWithButton = ({
           setShowDialog(true);
         }}
       >
-        {/* TODO: Include by default after removing Test Queue v1 content */}
-        {includeIcon ? <FontAwesomeIcon icon={faRobot} /> : null}
+        <FontAwesomeIcon icon={faRobot} />
         Manage {testPlanRun?.tester?.username} Run
       </Button>
       {showDialog ? (
@@ -55,7 +53,6 @@ ManageBotRunDialogWithButton.propTypes = {
   testPlanReportId: PropTypes.string.isRequired,
   runnableTestsLength: PropTypes.number.isRequired,
   testers: PropTypes.array.isRequired,
-  includeIcon: PropTypes.bool,
   onChange: PropTypes.func.isRequired
 };
 

diff --git a/client/components/ManageBotRunDialog/index.jsx b/client/components/ManageBotRunDialog/index.jsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import BasicModal from '../common/BasicModal';
-import AssignTesterDropdown from '../TestQueue/AssignTesterDropdown';
+import AssignTesterDropdown from '../common/AssignTesterDropdown';
 import { useMutation, useQuery } from '@apollo/client';
 import {
   COLLECTION_JOB_ID_BY_TEST_PLAN_RUN_ID_QUERY,

diff --git a/client/components/ManageTestQueue/ManageAtVersions.jsx b/client/components/ManageTestQueue/ManageAtVersions.jsx
@@ -11,7 +11,7 @@ import {
   ADD_AT_VERSION_MUTATION,
   DELETE_AT_VERSION_MUTATION,
   EDIT_AT_VERSION_MUTATION
-} from '@components/TestQueue/queries';
+} from './queries';
 import { useTriggerLoad } from '@components/common/LoadingStatus';
 import { THEMES, useThemedModal } from '@client/hooks/useThemedModal';
 import PropTypes from 'prop-types';
@@ -357,24 +357,20 @@ const ManageAtVersions = ({ ats = [], triggerUpdate = () => {} }) => {
             </Form.Group>
             <div className="disclosure-buttons-row">
               <button
-                // ref={addAtVersionButtonRef}
                 ref={ref => setFocusRef(ref)}
                 onClick={() => onOpenAtVersionModalClick('add')}
               >
                 Add a New Version
               </button>
               <button
-                // ref={editAtVersionButtonRef}
                 ref={ref => setFocusRef(ref)}
                 onClick={() => onOpenAtVersionModalClick('edit')}
               >
                 <FontAwesomeIcon icon={faEdit} />
                 Edit
               </button>
               <button
-                // ref={deleteAtVersionButtonRef}
                 ref={ref => setFocusRef(ref)}
-                // onClick={onRemoveClick}
                 onClick={() => onOpenAtVersionModalClick('delete')}
               >
                 <FontAwesomeIcon icon={faTrashAlt} />

diff --git a/client/components/ManageTestQueue/queries.js b/client/components/ManageTestQueue/queries.js
@@ -0,0 +1,58 @@
+import { gql } from '@apollo/client';
+
+export const ADD_AT_VERSION_MUTATION = gql`
+  mutation AddAtVersion($atId: ID!, $name: String!, $releasedAt: Timestamp!) {
+    at(id: $atId) {
+      findOrCreateAtVersion(input: { name: $name, releasedAt: $releasedAt }) {
+        id
+        name
+        releasedAt
+      }
+    }
+  }
+`;
+
+export const EDIT_AT_VERSION_MUTATION = gql`
+  mutation EditAtVersion(
+    $atVersionId: ID!
+    $name: String!
+    $releasedAt: Timestamp!
+  ) {
+    atVersion(id: $atVersionId) {
+      updateAtVersion(input: { name: $name, releasedAt: $releasedAt }) {
+        id
+        name
+        releasedAt
+      }
+    }
+  }
+`;
+
+export const DELETE_AT_VERSION_MUTATION = gql`
+  mutation DeleteAtVersion($atVersionId: ID!) {
+    atVersion(id: $atVersionId) {
+      deleteAtVersion {
+        isDeleted
+        failedDueToTestResults {
+          testPlanVersion {
+            id
+            title
+          }
+          # To be used when listing the conflicting results
+          testResult {
+            id
+          }
+          # To be used when providing more details on the conflicting results
+          testPlanReport {
+            at {
+              name
+            }
+            browser {
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+`;
diff --git a/client/components/TestQueue2/Actions.jsx → client/components/TestQueue/Actions.jsx b/client/components/TestQueue2/Actions.jsx → client/components/TestQueue/Actions.jsx
@@ -16,7 +16,6 @@ import {
   MARK_TEST_PLAN_REPORT_AS_FINAL_MUTATION,
   REMOVE_TEST_PLAN_REPORT_MUTATION,
   TEST_QUEUE_PAGE_QUERY
-  // TEST_PLAN_REPORT_QUERY
 } from './queries';
 import useForceUpdate from '../../hooks/useForceUpdate';
 import BasicThemedModal from '../common/BasicThemedModal';
@@ -273,7 +272,6 @@ const Actions = ({
             runnableTestsLength={testPlanReport.runnableTestsLength}
             testers={testers}
             onChange={triggerUpdate}
-            includeIcon
           />
         )}
         {isAdmin && (

diff --git a/...t/components/TestQueue2/AssignTesters.jsx → ...nt/components/TestQueue/AssignTesters.jsx b/...t/components/TestQueue2/AssignTesters.jsx → ...nt/components/TestQueue/AssignTesters.jsx
diff --git a/...Queue2/CompletionStatusListItem/index.jsx → ...tQueue/CompletionStatusListItem/index.jsx b/...Queue2/CompletionStatusListItem/index.jsx → ...tQueue/CompletionStatusListItem/index.jsx
@@ -32,7 +32,6 @@ const CompletionStatusListItem = ({
         id={`BotTestCompletionStatus_${rowId}`}
         testPlanRun={testPlanRun}
         runnableTestsLength={testPlanReport.runnableTestsLength}
-        fromTestQueueV2
       />
     );
   } else {
@@ -51,7 +50,6 @@ const CompletionStatusListItem = ({
         id={`PreviouslyAutomatedTestCompletionStatus_${rowId}`}
         testPlanRunId={testPlanRun.id}
         runnableTestsLength={testPlanReport.runnableTestsLength}
-        fromTestQueueV2
       />
     ) : (
       <em>