From 21e27ec19c752eeafb2decfbcb8fcc513ecdac77 Mon Sep 17 00:00:00 2001
From: Mohamed Khelif <mohamed.khelif@mongodb.com>
Date: Tue, 19 Dec 2023 17:31:33 -0500
Subject: [PATCH] Remove useeffect

---
 src/pages/taskQueue/TaskQueueTable/index.tsx |  4 +-
 src/pages/taskQueue/index.tsx                | 41 +++++++++-----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/pages/taskQueue/TaskQueueTable/index.tsx b/src/pages/taskQueue/TaskQueueTable/index.tsx
index 0ca1dd5528..8c9d3119bd 100644
--- a/src/pages/taskQueue/TaskQueueTable/index.tsx
+++ b/src/pages/taskQueue/TaskQueueTable/index.tsx
@@ -6,6 +6,7 @@ import { Body, Disclaimer } from "@leafygreen-ui/typography";
 import { useTaskQueueAnalytics } from "analytics";
 import { StyledRouterLink, WordBreak } from "components/styles";
 import { BaseTable } from "components/Table/BaseTable";
+import { TablePlaceholder } from "components/Table/TablePlaceholder";
 import {
   getVersionRoute,
   getTaskRoute,
@@ -23,7 +24,7 @@ interface TaskQueueTableProps {
 
 const TaskQueueTable: React.FC<TaskQueueTableProps> = ({
   loading,
-  taskQueue,
+  taskQueue = [],
 }) => {
   const taskQueueAnalytics = useTaskQueueAnalytics();
   const tableContainerRef = useRef<HTMLDivElement>(null);
@@ -46,6 +47,7 @@ const TaskQueueTable: React.FC<TaskQueueTableProps> = ({
       table={table}
       loading={loading && taskQueue?.length === 0}
       shouldAlternateRowColor
+      emptyComponent={<TablePlaceholder message="No tasks found in queue." />}
     />
   );
 };
diff --git a/src/pages/taskQueue/index.tsx b/src/pages/taskQueue/index.tsx
index fd8c1d09b2..3813946028 100644
--- a/src/pages/taskQueue/index.tsx
+++ b/src/pages/taskQueue/index.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo } from "react";
+import { useState } from "react";
 import { useQuery } from "@apollo/client";
 import styled from "@emotion/styled";
 import Badge from "@leafygreen-ui/badge";
@@ -24,7 +24,6 @@ import {
 import { DISTRO_TASK_QUEUE, TASK_QUEUE_DISTROS } from "gql/queries";
 import { usePageTitle } from "hooks";
 import { DistroOption } from "./DistroOption";
-import TaskQueueTable from "./TaskQueueTable";
 
 const TaskQueue = () => {
   const taskQueueAnalytics = useTaskQueueAnalytics();
@@ -37,34 +36,29 @@ const TaskQueue = () => {
   const { data: distrosData } = useQuery<
     TaskQueueDistrosQuery,
     TaskQueueDistrosQueryVariables
-  >(TASK_QUEUE_DISTROS, { fetchPolicy: "cache-and-network" });
+  >(TASK_QUEUE_DISTROS, {
+    fetchPolicy: "cache-and-network",
+    onCompleted: (data) => {
+      const { taskQueueDistros } = data;
+      const firstDistroInList = taskQueueDistros[0]?.id;
+      const defaultDistro = distro ?? firstDistroInList;
+      setSelectedDistro(taskQueueDistros.find((d) => d.id === defaultDistro));
+      console.log("Redirecting");
+      navigate(getTaskQueueRoute(defaultDistro, taskId), { replace: true });
+    },
+  });
 
   const { data: taskQueueItemsData, loading } = useQuery<
     DistroTaskQueueQuery,
     DistroTaskQueueQueryVariables
   >(DISTRO_TASK_QUEUE, {
-    variables: { distroId: distro },
     fetchPolicy: "cache-and-network",
+    variables: { distroId: distro },
   });
 
-  const { distroTaskQueue } = taskQueueItemsData ?? {};
-  const distros = useMemo(
-    () => distrosData?.taskQueueDistros ?? [],
-    [distrosData]
-  );
-  const firstDistroInList = distros[0]?.id;
-
-  // SET DEFAULT DISTRO AFTER DISTROS HAVE BEEN OBTAINED
-  useEffect(() => {
-    if (distros.length) {
-      const defaultDistro = distro ?? firstDistroInList;
-      setSelectedDistro(distros.find((d) => d.id === defaultDistro));
-      navigate(getTaskQueueRoute(defaultDistro, taskId), { replace: true });
-    }
-  }, [firstDistroInList, distro, navigate, taskId, distros]);
-
   const onChangeDistroSelection = (val: { id: string }) => {
     taskQueueAnalytics.sendEvent({ name: "Select Distro", distro: val.id });
+    setSelectedDistro(val);
   };
 
   const handleSearch = (options: { id: string }[], match: string) =>
@@ -82,7 +76,7 @@ const TaskQueue = () => {
               <SearchableDropdown
                 data-cy="distro-dropdown"
                 label="Distro"
-                options={distros}
+                options={distrosData?.taskQueueDistros ?? []}
                 searchFunc={handleSearch}
                 optionRenderer={(option, onClick) => (
                   <DistroOption
@@ -122,7 +116,10 @@ const TaskQueue = () => {
             )
           }
 
-          <TaskQueueTable taskQueue={distroTaskQueue} loading={loading} />
+          {/* <TaskQueue Table
+            taskQueue={taskQueueItemsData?.distroTaskQueue}
+            loading={loading}
+          /> */}
         </>
       )}
     </PageWrapper>