From fa3e9ec761cd08837cc20d09c0cf7e525ead2e5b Mon Sep 17 00:00:00 2001
From: Ken Hibino <ken.hibino7@gmail.com>
Date: Sat, 5 Dec 2020 14:31:33 -0800
Subject: [PATCH] Make cancel button functional in ActiveTasksTable

---
 ui/src/components/ActiveTasksTable.tsx | 43 ++++++++++++++++++--------
 ui/src/reducers/tasksReducer.ts        |  2 +-
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ui/src/components/ActiveTasksTable.tsx b/ui/src/components/ActiveTasksTable.tsx
index a763cc5..26c818c 100644
--- a/ui/src/components/ActiveTasksTable.tsx
+++ b/ui/src/components/ActiveTasksTable.tsx
@@ -21,14 +21,17 @@ import KeyboardArrowDownIcon from "@material-ui/icons/KeyboardArrowDown";
 import Typography from "@material-ui/core/Typography";
 import SyntaxHighlighter from "react-syntax-highlighter";
 import syntaxHighlightStyle from "react-syntax-highlighter/dist/esm/styles/hljs/github";
-import { listActiveTasksAsync } from "../actions/tasksActions";
+import {
+  listActiveTasksAsync,
+  cancelActiveTaskAsync,
+} from "../actions/tasksActions";
 import { AppState } from "../store";
-import { ActiveTask } from "../api";
 import TablePaginationActions, {
   rowsPerPageOptions,
   defaultPageSize,
 } from "./TablePaginationActions";
 import { usePolling } from "../hooks";
+import { ActiveTaskExtended } from "../reducers/tasksReducer";
 
 const useStyles = makeStyles({
   table: {
@@ -44,7 +47,7 @@ function mapStateToProps(state: AppState) {
   };
 }
 
-const mapDispatchToProps = { listActiveTasksAsync };
+const mapDispatchToProps = { listActiveTasksAsync, cancelActiveTaskAsync };
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
@@ -90,11 +93,11 @@ function ActiveTasksTable(props: Props & ReduxProps) {
     );
   }
 
-  const columns = [
-    { label: "" },
-    { label: "ID" },
-    { label: "Type" },
-    { label: "Actions" },
+  const columns: { label: string; align: "left" | "center" | "right" }[] = [
+    { label: "", align: "left" },
+    { label: "ID", align: "left" },
+    { label: "Type", align: "left" },
+    { label: "Actions", align: "center" },
   ];
 
   return (
@@ -108,14 +111,22 @@ function ActiveTasksTable(props: Props & ReduxProps) {
         <TableHead>
           <TableRow>
             {columns.map((col) => (
-              <TableCell key={col.label}>{col.label}</TableCell>
+              <TableCell key={col.label} align={col.align}>
+                {col.label}
+              </TableCell>
             ))}
           </TableRow>
         </TableHead>
         <TableBody>
           {/* TODO: loading and empty state */}
           {props.tasks.map((task) => (
-            <Row key={task.id} task={task} />
+            <Row
+              key={task.id}
+              task={task}
+              onCancelClick={() => {
+                props.cancelActiveTaskAsync(queue, task.id);
+              }}
+            />
           ))}
         </TableBody>
         <TableFooter>
@@ -149,7 +160,7 @@ const useRowStyles = makeStyles({
   },
 });
 
-function Row(props: { task: ActiveTask }) {
+function Row(props: { task: ActiveTaskExtended; onCancelClick: () => void }) {
   const { task } = props;
   const [open, setOpen] = React.useState(false);
   const classes = useRowStyles();
@@ -169,8 +180,14 @@ function Row(props: { task: ActiveTask }) {
           {task.id}
         </TableCell>
         <TableCell>{task.type}</TableCell>
-        <TableCell>
-          <Button>Cancel</Button>
+        <TableCell align="center">
+          <Button
+            color="primary"
+            onClick={props.onCancelClick}
+            disabled={task.requestPending || task.canceling}
+          >
+            {task.canceling ? "Canceling..." : "Cancel"}
+          </Button>
         </TableCell>
       </TableRow>
       <TableRow>
diff --git a/ui/src/reducers/tasksReducer.ts b/ui/src/reducers/tasksReducer.ts
index c1a112f..16db987 100644
--- a/ui/src/reducers/tasksReducer.ts
+++ b/ui/src/reducers/tasksReducer.ts
@@ -27,7 +27,7 @@ import {
   ScheduledTask,
 } from "../api";
 
-interface ActiveTaskExtended extends ActiveTask {
+export interface ActiveTaskExtended extends ActiveTask {
   // Indicates that a request has been sent for this
   // task and awaiting for a response.
   requestPending: boolean;