From d75d8c43716194ba27d512b2493e1711301944dc Mon Sep 17 00:00:00 2001
From: Mohamed Khelif <mohamed.khelif@mongodb.com>
Date: Thu, 29 Feb 2024 13:39:53 -0500
Subject: [PATCH] Fix tests

---
 cypress/integration/taskQueue/route.ts      | 33 ++++++---------------
 src/components/SearchableDropdown/index.tsx |  1 +
 src/components/Table/BaseTable.tsx          |  1 +
 src/pages/taskQueue/index.tsx               | 12 ++++----
 4 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/cypress/integration/taskQueue/route.ts b/cypress/integration/taskQueue/route.ts
index 4cbbe72088..a425813d4b 100644
--- a/cypress/integration/taskQueue/route.ts
+++ b/cypress/integration/taskQueue/route.ts
@@ -9,24 +9,16 @@ describe("Task Queue", () => {
 
   it("Uses distro param in url to query queue and renders table", () => {
     cy.visit("/task-queue/osx-108");
-
     cy.dataCy("task-queue-table").should("exist");
-
-    cy.visit("/task-queue/debian71-test");
-
-    cy.dataCy("task-queue-table").should("not.exist");
+    cy.contains("osx-108").should("exist");
   });
 
   it("Selecting a distro queries the queue for that distro", () => {
     cy.visit("/task-queue/debian71-test");
-
-    cy.get(".ant-table-row").should("have.length", 0);
-
+    cy.contains("No tasks found in queue").should("exist");
     cy.dataCy("distro-dropdown").click();
-
     cy.get("div").contains("osx-108").click();
-
-    cy.get(".ant-table-row").should("have.length", 13);
+    cy.dataCy("leafygreen-table-row").should("have.length", 13);
   });
 
   it("Renders link to host page filtered to that particular distro", () => {
@@ -38,30 +30,23 @@ describe("Task Queue", () => {
 
   it("Searching for a distro shows results that match search term", () => {
     cy.visit("/task-queue/debian71-test");
-
-    cy.dataCy("distro-dropdown").click();
+    cy.dataCy("distro-dropdown").should("have.attr", "aria-disabled", "false");
+    cy.dataCy("distro-dropdown").click({ force: true });
+    cy.dataCy("distro-dropdown-search-input").should("exist");
     cy.dataCy("distro-dropdown-search-input").type("osx");
     cy.dataCy("distro-dropdown-options").within(() => {
       cy.contains("debian71-test").should("not.exist");
       cy.contains("osx-108").should("exist");
     });
   });
-
-  it("Bogus distro url param values do not display any results", () => {
-    cy.visit("/task-queue/peace");
-    cy.get(".ant-table-row").should("have.length", 0);
-  });
-
   it("Scrolls to current task if taskId param in url", () => {
     cy.visit(
       "/task-queue/osx-108?taskId=evergreen_lint_lint_service_patch_5e823e1f28baeaa22ae00823d83e03082cd148ab_5e4ff3abe3c3317e352062e4_20_02_21_15_13_48",
     );
     cy.dataCy("task-queue-table").should("exist");
-    cy.get(".ant-table-row-selected").should("exist");
-    cy.get(".ant-table-row-selected").should("contain.text", "13");
-
-    cy.contains("osx-108").should("not.be.visible");
-    cy.get(".ant-table-row-selected").should("be.visible");
+    cy.get("[data-selected='true']").should("exist");
+    cy.get("[data-selected='true']").should("have.length", 1);
+    cy.get("[data-selected='true']").should("be.visible");
   });
 
   it("Task links goes to Spruce for both patches and mainline commits", () => {
diff --git a/src/components/SearchableDropdown/index.tsx b/src/components/SearchableDropdown/index.tsx
index ce9724cd1a..d28ae8fea4 100644
--- a/src/components/SearchableDropdown/index.tsx
+++ b/src/components/SearchableDropdown/index.tsx
@@ -156,6 +156,7 @@ const SearchableDropdown = <T extends {}>({
           }
           onClose={resetSearch}
           ref={DropdownRef}
+          aria-disabled={disabled}
         >
           <TextInput
             data-cy={`${dataCy}-search-input`}
diff --git a/src/components/Table/BaseTable.tsx b/src/components/Table/BaseTable.tsx
index e93602bb19..37e319b96f 100644
--- a/src/components/Table/BaseTable.tsx
+++ b/src/components/Table/BaseTable.tsx
@@ -200,6 +200,7 @@ const RenderableRow = <T extends LGRowData>({
         font-weight:bold;
         `}
     `}
+    data-selected={isSelected}
     virtualRow={virtualRow}
   >
     {row.getVisibleCells().map((cell) => (
diff --git a/src/pages/taskQueue/index.tsx b/src/pages/taskQueue/index.tsx
index 0e5b678db8..34164b6c42 100644
--- a/src/pages/taskQueue/index.tsx
+++ b/src/pages/taskQueue/index.tsx
@@ -33,9 +33,9 @@ const TaskQueue = () => {
     undefined,
   );
   const navigate = useNavigate();
-  const [selectedDistro, setSelectedDistro] = useState<TaskQueueDistro | null>(
-    null,
-  );
+  const [selectedDistro, setSelectedDistro] = useState<
+    TaskQueueDistro | undefined
+  >(undefined);
   const dispatchToast = useToastContext();
   usePageTitle(`Task Queue - ${distro}`);
   const { data: distrosData, loading: loadingDistrosData } = useQuery<
@@ -78,6 +78,7 @@ const TaskQueue = () => {
   const handleSearch = (options: TaskQueueDistro[], match: string) =>
     options.filter((d) => d.id.toLowerCase().includes(match.toLowerCase()));
 
+  console.log({ selectedDistro, loadingDistrosData });
   return (
     <StyledPageWrapper>
       <StyledH2>Task Queue</StyledH2>
@@ -85,9 +86,10 @@ const TaskQueue = () => {
         <SearchableDropdown
           data-cy="distro-dropdown"
           label="Distro"
-          disabled={loadingDistrosData}
+          disabled={selectedDistro === undefined}
           options={distrosData?.taskQueueDistros}
           searchFunc={handleSearch}
+          valuePlaceholder="Select a distro"
           optionRenderer={(option, onClick) => (
             <DistroOption
               option={option}
@@ -112,7 +114,7 @@ const TaskQueue = () => {
       </SearchableDropdownWrapper>
       {
         /* Only show name & link if distro exists. */
-        distro && (
+        !loadingDistrosData && (
           <TableHeader>
             <StyledH3>{distro}</StyledH3>
             <StyledRouterLink to={getAllHostsRoute({ distroId: distro })}>