Skip to content
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.

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

Update desktop edition #2492

Merged
merged 13 commits into from
Jun 25, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Confirm modal cancel job (#2469)
robertbasti authored Jun 11, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit c0ef02efd06940204720112685d872d3b98becf7
49 changes: 42 additions & 7 deletions Src/WitsmlExplorer.Frontend/components/ContentViews/JobsView.tsx
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ import JobInfoContextMenu, {
JobInfoContextMenuProps
} from "components/ContextMenus/JobInfoContextMenu";
import formatDateString from "components/DateFormatter";
import ConfirmModal from "components/Modals/ConfirmModal";
import { ReportModal } from "components/Modals/ReportModal";
import { generateReport } from "components/ReportCreationHelper";
import { Button } from "components/StyledComponents/Button";
@@ -20,6 +21,7 @@ import { useGetJobInfo } from "hooks/query/useGetJobInfo";
import { useGetServers } from "hooks/query/useGetServers";
import useExport from "hooks/useExport";
import JobStatus from "models/jobStatus";
import JobInfo from "models/jobs/jobInfo";
import ReportType from "models/reportType";
import { Server } from "models/server";
import {
@@ -50,6 +52,8 @@ export const JobsView = (): React.ReactElement => {

const { exportData } = useExport();

const [cancellingJobs, setCancellingJobs] = useState<string[]>([]);

const onContextMenu = (
event: React.MouseEvent<HTMLLIElement>,
selectedItem: any
@@ -68,6 +72,27 @@ export const JobsView = (): React.ReactElement => {
});
};

const onClickCancel = async (jobId: string) => {
const confirmation = (
<ConfirmModal
heading={"Confirm job cancellation"}
content={
<Typography>Do you really want to cancel this job?</Typography>
}
onConfirm={() => {
cancelJob(jobId);
}}
confirmColor={"danger"}
confirmText={"Yes"}
cancelText={"No"}
switchButtonPlaces={true}
/>
);
dispatchOperation({
type: OperationType.DisplayModal,
payload: confirmation
});
};
const onClickReport = async (jobId: string) => {
const report = await JobService.getReport(jobId);
if (report.downloadImmediately === true) {
@@ -89,6 +114,15 @@ export const JobsView = (): React.ReactElement => {
}
};

const getJobStatus = (jobInfo: JobInfo, cancellingJobs: string[]) => {
const isCancelling = cancellingJobs.includes(jobInfo.id);
if (jobInfo.status === JobStatus.Started) {
if (isCancelling) return "Cancelling";
if (jobInfo.progress) return `${Math.round(jobInfo.progress * 100)}%`;
}
return jobInfo.status;
};

const columns: ContentTableColumn[] = [
{ property: "startTime", label: "Start time", type: ContentType.DateTime },
{ property: "jobType", label: "Job Type", type: ContentType.String },
@@ -127,7 +161,9 @@ export const JobsView = (): React.ReactElement => {

const cancelJob = async (jobId: string) => {
dispatchOperation({ type: OperationType.HideContextMenu });
JobService.cancelJob(jobId);
dispatchOperation({ type: OperationType.HideModal });
setCancellingJobs((jobs) => [...jobs, jobId]);
await JobService.cancelJob(jobId);
};

const jobInfoRows = useMemo(
@@ -140,17 +176,16 @@ export const JobsView = (): React.ReactElement => {
wellName: jobInfo.wellName,
wellboreName: jobInfo.wellboreName,
objectName: jobInfo.objectName,
status:
jobInfo.progress && jobInfo.status === JobStatus.Started
? `${Math.round(jobInfo.progress * 100)}%`
: jobInfo.status,
status: getJobStatus(jobInfo, cancellingJobs),
cancel:
jobInfo.isCancelable === true && jobInfo.status === "Started" ? (
jobInfo.isCancelable === true &&
jobInfo.status === JobStatus.Started &&
!cancellingJobs.includes(jobInfo.id) ? (
<Button
key="cancelJob"
color="danger"
variant="table_icon"
onClick={() => cancelJob(jobInfo.id)}
onClick={() => onClickCancel(jobInfo.id)}
>
<Icon name="clear" size={18} />
</Button>
Original file line number Diff line number Diff line change
@@ -10,10 +10,8 @@ import {
} from "contexts/operationStateReducer";
import OperationType from "contexts/operationType";
import { refreshJobInfoQuery } from "hooks/query/queryRefreshHelpers";
import JobStatus from "models/jobStatus";
import JobInfo from "models/jobs/jobInfo";
import React from "react";
import JobService from "services/jobService";
import { colors } from "styles/Colors";

export interface JobInfoContextMenuProps {
@@ -38,11 +36,6 @@ const JobInfoContextMenu = (
});
};

const onClickCancelAction = async () => {
dispatchOperation({ type: OperationType.HideContextMenu });
JobService.cancelJob(jobInfo.id);
};

return (
<ContextMenu
menuItems={[
@@ -59,17 +52,6 @@ const JobInfoContextMenu = (
/>
<Typography color={"primary"}>Refresh</Typography>
</MenuItem>,
<MenuItem
key={"cancelaction"}
disabled={
jobInfo.isCancelable === false ||
jobInfo.status !== JobStatus.Started
}
onClick={onClickCancelAction}
>
<StyledIcon name="clear" color={colors.interactive.primaryResting} />
<Typography color={"primary"}>Cancel job</Typography>
</MenuItem>,
<Divider key={"divider"} />,
<MenuItem key={"properties"} onClick={onClickProperties}>
<StyledIcon
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ interface ConfirmProps {
confirmText?: string;
switchButtonPlaces?: boolean;
showCancelButton?: boolean;
cancelText?: string;
}

const ConfirmModal = (props: ConfirmProps): React.ReactElement => {
@@ -19,6 +20,7 @@ const ConfirmModal = (props: ConfirmProps): React.ReactElement => {
onSubmit={props.onConfirm}
isLoading={false}
confirmText={props.confirmText ?? "Yes"}
cancelText={props.cancelText}
confirmColor={props.confirmColor}
switchButtonPlaces={props.switchButtonPlaces}
showCancelButton={props.showCancelButton}
6 changes: 4 additions & 2 deletions Src/WitsmlExplorer.Frontend/components/Modals/ModalDialog.tsx
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ interface ModalDialogProps {
showConfirmButton?: boolean;
showCancelButton?: boolean;
buttonPosition?: ControlButtonPosition;
cancelText?: string;
}

const ModalDialog = (props: ModalDialogProps): React.ReactElement => {
@@ -42,7 +43,8 @@ const ModalDialog = (props: ModalDialogProps): React.ReactElement => {
width = ModalWidth.MEDIUM,
showConfirmButton = true,
showCancelButton = true,
buttonPosition: ButtonPosition = ControlButtonPosition.BOTTOM
buttonPosition: ButtonPosition = ControlButtonPosition.BOTTOM,
cancelText
} = props;
const context = React.useContext(OperationContext);
const [confirmButtonIsFocused, setConfirmButtonIsFocused] =
@@ -101,7 +103,7 @@ const ModalDialog = (props: ModalDialogProps): React.ReactElement => {
color={confirmColor ?? "primary"}
variant="outlined"
>
Cancel
{cancelText ?? "Cancel"}
</StyledButton>
) : (
<></>
31 changes: 28 additions & 3 deletions Src/WitsmlExplorer.Frontend/components/Modals/ReportModal.tsx
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ import JobService from "services/jobService";
import NotificationService from "services/notificationService";
import styled from "styled-components";
import { Colors } from "styles/Colors";
import ConfirmModal from "./ConfirmModal";

export interface ReportModal {
report?: BaseReport;
@@ -85,9 +86,32 @@ export const ReportModal = (props: ReportModal): React.ReactElement => {
[report]
);

const onCancelButtonClick = () => {
JobService.cancelJob(jobId);
const cancelJob = async (jobId: string) => {
dispatchOperation({ type: OperationType.HideContextMenu });
dispatchOperation({ type: OperationType.HideModal });
await JobService.cancelJob(jobId);
};

const onClickCancel = async () => {
const confirmation = (
<ConfirmModal
heading={"Confirm job cancellation"}
content={
<Typography>Do you really want to cancel this job?</Typography>
}
onConfirm={() => {
cancelJob(jobId);
}}
confirmColor={"danger"}
confirmText={"Yes"}
cancelText={"No"}
switchButtonPlaces={true}
/>
);
dispatchOperation({
type: OperationType.DisplayModal,
payload: confirmation
});
};

return (
@@ -96,6 +120,7 @@ export const ReportModal = (props: ReportModal): React.ReactElement => {
heading={report ? report.title : "Loading report..."}
confirmText="Ok"
showCancelButton={!fetchedReport && isCancelable}
cancelText="Cancel job"
content={
<ContentLayout>
{report ? (
@@ -173,7 +198,7 @@ export const ReportModal = (props: ReportModal): React.ReactElement => {
</ContentLayout>
}
onSubmit={() => dispatchOperation({ type: OperationType.HideModal })}
onCancel={() => onCancelButtonClick()}
onCancel={() => onClickCancel()}
isLoading={false}
/>
);