Add support for isBot

w3c · May 16, 2024 · 9908f00 · 9908f00
1 parent a66a407
commit 9908f00
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/client/components/TestQueue2/AssignTesters.jsx b/client/components/TestQueue2/AssignTesters.jsx
@@ -4,7 +4,6 @@ import styled from '@emotion/styled';
 import { Button, Dropdown } from 'react-bootstrap';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCheck, faRobot, faUser } from '@fortawesome/free-solid-svg-icons';
-import { isBot } from '../../utils/automation';
 import useConfirmationModal from '../../hooks/useConfirmationModal';
 import BasicThemedModal from '../common/BasicThemedModal';
 import { LoadingStatus, useTriggerLoad } from '../common/LoadingStatus';
@@ -224,7 +223,7 @@ const AssignTesters = ({ me, testers, testPlanReport }) => {
         let icon;
         if (isAssigned) {
             icon = faCheck;
-        } else if (isBot(tester)) {
+        } else if (tester.isBot) {
             icon = faRobot;
         }
 
@@ -290,7 +289,7 @@ const AssignTesters = ({ me, testers, testPlanReport }) => {
                     const { username } = tester;
 
                     let userLink;
-                    if (isBot(tester)) {
+                    if (tester.isBot) {
                         userLink = (
                             <span>
                                 <FontAwesomeIcon icon={faRobot} />

diff --git a/client/components/TestQueue2/index.jsx b/client/components/TestQueue2/index.jsx
@@ -43,6 +43,7 @@ const MetadataContainer = styled.div`
     gap: 1.25em;
     margin: 0.5rem 1.25rem;
     align-items: center;
+    min-height: 40px; /* temp because the status dialog button keeps disappearing */
 
     & button {
         margin-bottom: 0;
@@ -168,7 +169,7 @@ const TestQueue = () => {
         return [...testPlanVersions]
             .filter(testPlanVersion => testPlanVersion.testPlanReports.length)
             .sort((a, b) => {
-                return a.versionString.localeCompare(b.versionString);
+                return b.versionString.localeCompare(a.versionString);
             })
             .map(testPlanVersion => {
                 return {

diff --git a/client/components/TestQueue2/queries.js b/client/components/TestQueue2/queries.js
@@ -10,6 +10,7 @@ export const TEST_QUEUE_PAGE_QUERY = gql`
         users {
             id
             username
+            isBot
             roles
         }
         ats {

diff --git a/client/components/TestQueueRow/index.jsx b/client/components/TestQueueRow/index.jsx
@@ -105,7 +105,7 @@ const TestQueueRow = ({
             testPlanRunId: run.id,
             ...run.tester
         }))
-        .filter(tester => !isBot(tester));
+        .filter(tester => !tester.isBot);
 
     const getTestPlanRunIdByUserId = userId => {
         return draftTestPlanRuns.find(({ tester }) => tester.id === userId).id;