From d2290b09ddf2e7d11dd2f5484e36b8e3537e240c Mon Sep 17 00:00:00 2001 From: Jackson Thetford Date: Thu, 8 Feb 2024 13:18:41 -0600 Subject: [PATCH 1/3] added see files button to jobs toolbar --- .../_components/JobsToolbar/JobsToolbar.tsx | 29 +++++++++++++++---- .../components/jobs/JobDetail/JobDetail.tsx | 3 -- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx b/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx index 00bc531d2..e84d6d47e 100644 --- a/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx +++ b/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx @@ -2,9 +2,10 @@ import React, { useState } from 'react'; import { Button } from 'reactstrap'; import { Icon } from 'tapis-ui/_common'; import styles from './JobsToolbar.module.scss'; -import { useLocation } from 'react-router-dom'; +import { useLocation, useHistory } from 'react-router-dom'; import ConfirmModal from 'tapis-ui/_common/ConfirmModal'; -import { useCancel } from 'tapis-hooks/jobs'; +import { useCancel, useDetails } from 'tapis-hooks/jobs'; +import { Jobs } from "@tapis/tapis-typescript"; type ToolbarButtonProps = { text: string; @@ -43,24 +44,41 @@ const JobsToolbar: React.FC<{ jobUuid: string }> = ({ jobUuid }) => { const [modal, setModal] = useState(undefined); const { pathname } = useLocation(); const { isLoading, isError, isSuccess, error, cancel } = useCancel(); + const { data } = useDetails(jobUuid); + const job: Jobs.Job | undefined = data?.result; const toggle = () => { setModal(undefined); }; + const history = useHistory(); + const handleClickFiles = () => { + if (job) { + const path = `/files/${job.execSystemId}${job.execSystemOutputDir}`; + history.push(path); + } + }; + return (
{pathname && ( -
+
+ setModal('ConfirmModal')} + onClick={() => setModal("ConfirmModal")} aria-label="createSystem" /> - {modal === 'ConfirmModal' && ( + {modal === "ConfirmModal" && ( { @@ -80,4 +98,3 @@ const JobsToolbar: React.FC<{ jobUuid: string }> = ({ jobUuid }) => { export default JobsToolbar; -// JobUuid = pathname.split("/")[2] diff --git a/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx b/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx index 7f04d875c..14ae350fa 100644 --- a/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx +++ b/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx @@ -15,9 +15,6 @@ const JobDetail: React.FC<{ jobUuid: string }> = ({ jobUuid }) => {

{job?.name}

{job?.uuid}
- - See Files - {job && }
); From 44366dbde5f032897adf3d3e6ae5cec8bbb68272 Mon Sep 17 00:00:00 2001 From: Jackson Thetford Date: Thu, 8 Feb 2024 13:21:08 -0600 Subject: [PATCH 2/3] fixed compile error --- src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx b/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx index 14ae350fa..cfcd40918 100644 --- a/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx +++ b/src/tapis-ui/components/jobs/JobDetail/JobDetail.tsx @@ -3,7 +3,6 @@ import { useDetails } from 'tapis-hooks/jobs'; import { Jobs } from '@tapis/tapis-typescript'; import { DescriptionList } from 'tapis-ui/_common'; import { QueryWrapper } from 'tapis-ui/_wrappers'; -import { Link } from 'react-router-dom'; const JobDetail: React.FC<{ jobUuid: string }> = ({ jobUuid }) => { const { data, isLoading, error } = useDetails(jobUuid); From 651000ff5c776b0e01cce07170f67e1d4f63f8c7 Mon Sep 17 00:00:00 2001 From: Jackson Thetford Date: Thu, 8 Feb 2024 13:38:04 -0600 Subject: [PATCH 3/3] ran prettier and linting --- .../Jobs/_components/JobsToolbar/JobsToolbar.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx b/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx index e84d6d47e..e9749b4a1 100644 --- a/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx +++ b/src/tapis-app/Jobs/_components/JobsToolbar/JobsToolbar.tsx @@ -5,7 +5,7 @@ import styles from './JobsToolbar.module.scss'; import { useLocation, useHistory } from 'react-router-dom'; import ConfirmModal from 'tapis-ui/_common/ConfirmModal'; import { useCancel, useDetails } from 'tapis-hooks/jobs'; -import { Jobs } from "@tapis/tapis-typescript"; +import { Jobs } from '@tapis/tapis-typescript'; type ToolbarButtonProps = { text: string; @@ -55,14 +55,14 @@ const JobsToolbar: React.FC<{ jobUuid: string }> = ({ jobUuid }) => { const handleClickFiles = () => { if (job) { const path = `/files/${job.execSystemId}${job.execSystemOutputDir}`; - history.push(path); + history.push(path); } }; return (
{pathname && ( -
+
= ({ jobUuid }) => { text="Cancel Job" icon="trash" disabled={false} - onClick={() => setModal("ConfirmModal")} + onClick={() => setModal('ConfirmModal')} aria-label="createSystem" /> - {modal === "ConfirmModal" && ( + {modal === 'ConfirmModal' && ( { @@ -97,4 +97,3 @@ const JobsToolbar: React.FC<{ jobUuid: string }> = ({ jobUuid }) => { }; export default JobsToolbar; -