Skip to content

Frontend - adjusted job metadata section #2272

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
drosetti merged 2 commits into from
Apr 18, 2024
Merged

Frontend - adjusted job metadata section #2272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5dc90e
adjusted JobInfoCard
carellamartina Apr 16, 2024
1ebfc3d
fixed fitView in chrome
carellamartina Apr 18, 2024
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
96 changes: 76 additions & 20 deletions frontend/src/components/jobs/result/JobInfoCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@ import { PlaybookTag } from "../../common/PlaybookTag";
import { StatusTag } from "../../common/StatusTag";
import { TLPTag } from "../../common/TLPTag";
import { JobInfoIcon } from "./JobInfoIcon";
import { JobIsRunningAlert } from "./JobIsRunningAlert";
import { JobFinalStatuses } from "../../../constants/jobConst";

export function JobInfoCard({ job }) {
const navigate = useNavigate();
// local state
const [isOpen, setIsOpen] = React.useState(false);
const [isOpenJobInfoCard, setIsOpenJobInfoCard] = React.useState(false);
const [isOpenJobWarnings, setIsOpenJobWarnings] = React.useState(false);
const [isOpenJobErrors, setIsOpenJobErrors] = React.useState(false);

return (
<div id="JobInfoCardSection">
Expand Down Expand Up @@ -92,25 +96,25 @@ export function JobInfoCard({ job }) {
<Col sm={12} md={1} className="d-flex justify-content-end">
<Button
className="bg-darker border-0"
onClick={() => setIsOpen(!isOpen)}
onClick={() => setIsOpenJobInfoCard(!isOpenJobInfoCard)}
id="JobInfoCardDropDown"
>
<ArrowToggleIcon isExpanded={isOpen} />
<ArrowToggleIcon isExpanded={isOpenJobInfoCard} />
</Button>
<UncontrolledTooltip placement="left" target="JobInfoCardDropDown">
Toggle Job Metadata
</UncontrolledTooltip>
</Col>
</Row>
</ContentSection>
<Collapse isOpen={isOpen} id="JobInfoCardCollapse">
<Collapse isOpen={isOpenJobInfoCard} id="JobInfoCardCollapse">
<ContentSection className="border-top-0 bg-body ps-0 pe-1 py-1">
<ListGroup
horizontal
className="align-items-start flex-wrap flex-lg-nowrap"
>
{[
["Status", <StatusTag status={job.status} />],
["Status", <StatusTag status={job.status} className="py-0" />],
["TLP", <TLPTag value={job.tlp} />],
["User", job.user?.username],
["MD5", job.md5],
Expand All @@ -136,7 +140,7 @@ export function JobInfoCard({ job }) {
),
],
].map(([key, value]) => (
<ListGroupItem key={key}>
<ListGroupItem className="mx-2" key={key}>
<small className="fw-bold text-light">{key}</small>
<div className="bg-dark p-1 text-light">{value}</div>
</ListGroupItem>
Expand All @@ -157,33 +161,85 @@ export function JobInfoCard({ job }) {
],
[
"Tags",
job.tags.map((tag) => (
<JobTag key={tag.label} tag={tag} className="me-2" />
)),
job.tags.length ? (
job.tags.map((tag) => (
<JobTag key={tag.label} tag={tag} className="me-2" />
))
) : (
<small className="fst-italic text-gray">None</small>
),
],
[
"Warning(s)",
<ul className="text-warning">
{job.warnings.map((error) => (
<li>{error}</li>
))}
</ul>,
<>
<div className="d-flex text-warning align-items-center justify-content-between mx-2">
{job.warnings.length} warnings
<Button
className="bg-dark border-0 p-0"
onClick={() => setIsOpenJobWarnings(!isOpenJobWarnings)}
id="JobWarningsDropDown"
>
<ArrowToggleIcon isExpanded={isOpenJobWarnings} />
</Button>
<UncontrolledTooltip
placement="left"
target="JobWarningsDropDown"
>
Toggle Job Warnings
</UncontrolledTooltip>
</div>
<Collapse isOpen={isOpenJobWarnings} id="JobWarningsCollapse">
<ul className="text-warning">
{job.warnings.map((error) => (
<li>{error}</li>
))}
</ul>
</Collapse>
</>,
],
[
"Error(s)",
<ul className="text-danger">
{job.errors.map((error) => (
<li>{error}</li>
))}
</ul>,
<>
<div className="d-flex text-danger align-items-center justify-content-between mx-2">
{job.errors.length} errors
<Button
className="bg-dark border-0 p-0"
onClick={() => setIsOpenJobErrors(!isOpenJobErrors)}
id="JobErrorsDropDown"
>
<ArrowToggleIcon isExpanded={isOpenJobErrors} />
</Button>
<UncontrolledTooltip
placement="left"
target="JobErrorsDropDown"
>
Toggle Job Errors
</UncontrolledTooltip>
</div>
<Collapse isOpen={isOpenJobErrors} id="JobErrorsCollapse">
<ul className="text-danger">
{job.errors.map((error) => (
<li>{error}</li>
))}
</ul>
</Collapse>
</>,
],
].map(([key, value]) => (
<ListGroupItem key={key}>
<ListGroupItem className="mx-2" key={key}>
<small className="fw-bold text-light">{key}</small>
<div className="bg-dark p-1">{value}</div>
</ListGroupItem>
))}
</ListGroup>
{Object.values(JobFinalStatuses).includes(job.status) && (
<div
className="my-4 d-flex justify-content-center"
style={{ width: "100%" }}
>
<JobIsRunningAlert job={job} />
</div>
)}
</ContentSection>
</Collapse>
</div>
Expand Down
33 changes: 19 additions & 14 deletions frontend/src/components/jobs/result/JobIsRunningAlert.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "reactflow/dist/style.css";
import { IconButton } from "@certego/certego-ui";

import CustomJobPipelineNode from "./CustomJobPipelineNode";
import { JobStatuses } from "../../../constants/jobConst";
import { JobStatuses, JobFinalStatuses } from "../../../constants/jobConst";
import { areYouSureConfirmDialog } from "../../common/areYouSureConfirmDialog";

import {
Expand Down Expand Up @@ -146,7 +146,11 @@ export function JobIsRunningAlert({ job }) {

return (
<>
<div className="bg-body" style={{ width: "100vw", height: "15vh" }}>
<div
id="JobPipelineFlow"
className="bg-body"
style={{ width: 2000, height: 90 }}
>
<ReactFlow
nodes={nodes}
edges={edges}
Expand All @@ -162,18 +166,19 @@ export function JobIsRunningAlert({ job }) {
/>
</div>
<div className="d-flex-center">
{job.permissions?.kill && (
<IconButton
id="killjob-iconbutton"
Icon={killJobIcon}
size="xs"
title="Stop Job Process"
color="danger"
titlePlacement="top"
onClick={onKillJobBtnClick}
className="mt-0"
/>
)}
{job.permissions?.kill &&
!Object.values(JobFinalStatuses).includes(job.status) && (
<IconButton
id="killjob-iconbutton"
Icon={killJobIcon}
size="xs"
title="Stop Job Process"
color="danger"
titlePlacement="top"
onClick={onKillJobBtnClick}
className="mt-4"
/>
)}
</div>
</>
);
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/components/jobs/result/JobOverview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,10 @@ export function JobOverview({
</Col>
</Row>
{isRunningJob && (
<Row>
<Row
className="my-4 d-flex justify-content-center"
style={{ width: "100%" }}
>
<JobIsRunningAlert job={job} />
</Row>
)}
Expand Down
Loading