Skip to content

Mapping the actions into job detail page and adjust layout of appbar … #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 31, 2019
Merged

Mapping the actions into job detail page and adjust layout of appbar … #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/dashboard/src/Constants/WarnConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export const SUCCESSFULLYAPPROVED = "Successfully approved";
export const SUCCESSFULLYPAUSED = "Successfully paused";
export const SUCCESSFULLYRESUMED = "Successfully resumed";
export const SUCCESSFULLYAPPROVED = "Successfully scheduled for approving";
export const SUCCESSFULLYPAUSED = "Successfully scheduled for pausing";
export const SUCCESSFULLYRESUMED = "Successfully scheduled for resuming";
export const SUCCESSFULLYUPDATEDPRIORITY = "Successfully updated priority";
export const SUCESSFULKILLED = "Successfully killed";
export const SUCESSFULKILLED = "Successfully scheduled for killing";
export const SUCCESSFULSUBMITTED = "Job submitted successfully";
export const SUCCESSFULTEMPLATEDELETE = "Template deleted";
export const SUCCESSFULTEMPLATEDSAVE = "Template saved";
2 changes: 1 addition & 1 deletion src/dashboard/src/layout/AppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ const DashboardAppBar: React.FC = () => {
<Grid item >
<TeamMenu />
</Grid>
<Grid item style={{ marginLeft:'5' }}>
<Grid item style={{ marginLeft:'10px' }}>
<UserButton />
</Grid>
<Grid item>
Expand Down
161 changes: 154 additions & 7 deletions src/dashboard/src/pages/Job/Details/Brief.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
import React, { useCallback, useContext } from 'react';
import React, {Fragment, useCallback, useContext, useState} from 'react';
import {
Button,
Card,
List,
ListItem,
ListItemText,
ListItemText, SvgIcon, TextField, Tooltip,
} from '@material-ui/core';
import useFetch from 'use-http';

import Context from './Context';
import DoneIcon from "@material-ui/icons/Done";
import ClearIcon from "@material-ui/icons/Clear";
import {green, red} from "@material-ui/core/colors";
import IconButton from "@material-ui/core/IconButton";
import DeleteIcon from '@material-ui/icons/Delete';
import CheckIcon from "@material-ui/icons/Check";
import {JobsOperationDialog} from "../../Jobs/components/JobsOperationDialog";
import {
SUCESSFULKILLED,
SUCCESSFULLYPAUSED,
SUCCESSFULLYRESUMED, SUCCESSFULLYAPPROVED
} from "../../../Constants/WarnConstants";
import {DLTSSnackbar} from "../../CommonComponents/DLTSSnackbar";

interface BriefProps {
readonly?: boolean;
Expand All @@ -28,17 +38,122 @@ const Brief: React.FC<BriefProps> = ({ readonly = false }) => {
status === 'pausing' ||
status === 'paused'
), []);

const isPausable = useCallback((status: string) => (
status === 'running' ||
status === 'scheduling' ||
status === 'queued' ||
status === 'unapproved' ||
status === 'pausing'
), []);
const isApproveable = useCallback((status: string) => (status === 'unapproved'),[]);
const isResumeable = useCallback((status: string) => (status === 'paused'), []);
const api = useFetch('/api');

const kill = useCallback(async () => {
await api.put(`/clusters/${clusterId}/jobs/${jobId}/status`, {"status":"killing"});
}, [clusterId, jobId]);
const operations = {
KILLING: 'killing',
APPROVED: 'approved',
PAUSING: 'pausing',
QUEUED: 'queued'
}
const actionHandle = useCallback(async (operation: string) => {
const body = {"status":operation};
const data = await api.put(`/clusters/${clusterId}/jobs/${jobId}/status`, body);
return data;
}, [api, clusterId, jobId]);

const isPauseDisplay = !readonly && isPausable(job['jobStatus']);
const isKillDisplay = !readonly && isKillable(job['jobStatus']);
const isResumeDisplay = !readonly && isResumeable(job['jobStatus']);
const isApproveDisplay = !readonly && isApproveable(job['jobStatus']);

const[open, setOpen] = React.useState(false);
const[openApprove, setOpenApprove] = React.useState(false);
const[openResumeWarn, setOpenResumeWarn] = React.useState(false);
const[openPause, setOpenPause] = React.useState(false);
const[openResume, setOpenResume] = React.useState(false);
const[openUpdatePriority,setOpenUpdatePriority] = React.useState(false);
const[openApproveWarn, setOpenApproveWarn] = React.useState(false);
const[openPauseWarn, setOpenPauseWarn] = React.useState(false);
const [message,setMessage] = useState('');
const[openKillWarn, setOpenKillWarn] = React.useState(false);

const handleClose = () => {
setOpen(false);
setOpenApprove(false);
setOpenPause(false);
setOpenResume(false);
}
const handleKill = useCallback(()=>{
setOpen(true)
},[])
const handlePause = useCallback(()=>{
setOpenPause(true)
},[])
const handleResume = useCallback(()=>{
setOpenResume(true)
},[])
const handleApprove = useCallback(()=>{
setOpenApprove(true)
},[])
const handleWarnClose = () => {
setOpenKillWarn(false);
setOpenApproveWarn(false);
setOpenPauseWarn(false)
setOpenResumeWarn(false)
}
const handleConfirm = useCallback(()=>{
if (open) {
actionHandle(operations.KILLING).then((res)=>{
if (res) {
setOpenKillWarn(true);
setOpen(false);
setMessage(SUCESSFULKILLED);
} else {
alert('kill fail');
}
})
} else if (openPause){
actionHandle(operations.PAUSING).then((res)=>{
if (res) {
setOpenKillWarn(true);
setOpenPause(false);
setMessage(SUCCESSFULLYPAUSED);
} else {
alert("pause fail");
}
})
} else if (openResume) {
actionHandle(operations.QUEUED).then((res)=>{
if (res) {
setOpenResumeWarn(true);
setOpenResume(false);
setMessage(SUCCESSFULLYRESUMED);
} else {
alert("approve fail")
}
})
} else if (openApprove) {
actionHandle(operations.APPROVED).then((res)=>{
if (res) {
setOpenApproveWarn(true);
setOpenApprove(false);
setMessage(SUCCESSFULLYAPPROVED);
} else {
alert("resume fail")
}
})
}
},[actionHandle, open, openApprove, openPause, openResume, operations.APPROVED, operations.KILLING, operations.PAUSING, operations.QUEUED]);
return (
<Card>
<JobsOperationDialog handleClose={handleClose}
titleStyle={{color:red[200]}}
title={"Info"}
handleConfirm={handleConfirm}
job={job}
openApprove={openApprove}
openPause={openPause} openResume={openResume} openUpdatePriority={openUpdatePriority} open={open}
/>
<List>
<ListItem><ListItemText primary="Job Id" secondary={job['jobId']}/></ListItem>
<ListItem><ListItemText primary="Job Name" secondary={job['jobName']}/></ListItem>
Expand Down Expand Up @@ -83,11 +198,43 @@ const Brief: React.FC<BriefProps> = ({ readonly = false }) => {
<ListItem><ListItemText primary="Job Status" secondary={
<>
{job['jobStatus']}
{isKillDisplay && <Button color="secondary" onClick={kill}>Kill</Button>}
</>
}/></ListItem>
<ListItem><ListItemText primary="Job Submission Time" secondary={job['jobTime']}/></ListItem>
<ListItem><ListItemText primary="Actions" secondary={
<>
{isKillDisplay && <Tooltip title="Kill Job">
<IconButton color="secondary" size="small" onClick={handleKill}>
<DeleteIcon />
</IconButton>
</Tooltip>}
{isPauseDisplay && <Tooltip title="Pause Job">
<IconButton color="secondary" size="small" onClick={handlePause}>
<SvgIcon>
<path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/><path d="M0 0h24v24H0z" fill="none"/>
</SvgIcon>
</IconButton>
</Tooltip>}
{isResumeDisplay &&<Tooltip title="Resume Job">
<IconButton style={{ color:green[400] }} size="small" onClick={handleResume}>
<SvgIcon>
<path d="M8 5v14l11-7z"/><path d="M0 0h24v24H0z" fill="none"/>
</SvgIcon>
</IconButton>
</Tooltip>}
{isApproveDisplay && <Tooltip title="Approve Job">
<IconButton color="primary" size={"small"} onClick={handleApprove}>
<CheckIcon />
</IconButton>
</Tooltip>}
</>
}/></ListItem>
</List>
<DLTSSnackbar message={message}
open = {openKillWarn || openApproveWarn || openPauseWarn || openResumeWarn}
handleWarnClose={handleWarnClose}
autoHideDuration={2000}
/>
</Card>
);
};
Expand Down