Skip to content

Commit dca1ff7

Browse files
fix(workflow-details): make step labels less prominent (reanahub#397)
Closes reanahub#352
1 parent 59e24eb commit dca1ff7

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

reana-ui/src/components/WorkflowBadges.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import styles from "./WorkflowBadges.module.scss";
2+
import PropTypes from "prop-types";
23
import { Label } from "semantic-ui-react";
34
import { JupyterNotebookIcon } from "~/components";
45
import { INTERACTIVE_SESSION_URL } from "~/client";
@@ -7,7 +8,7 @@ import { getReanaToken } from "~/selectors";
78
import { useSelector } from "react-redux";
89
import { statusMapping } from "~/util";
910

10-
export default function WorkflowBadges({ workflow }) {
11+
export default function WorkflowBadges({ workflow, badgeSize = "tiny" }) {
1112
const reanaToken = useSelector(getReanaToken);
1213
const {
1314
id,
@@ -24,7 +25,7 @@ export default function WorkflowBadges({ workflow }) {
2425
<div className={styles.badgesContainer}>
2526
{workflow.duration && (
2627
<Label
27-
size="tiny"
28+
size={badgeSize}
2829
content={workflow.duration}
2930
icon="clock"
3031
as="a"
@@ -37,7 +38,7 @@ export default function WorkflowBadges({ workflow }) {
3738
)}
3839
{hasDiskUsage && (
3940
<Label
40-
size="tiny"
41+
size={badgeSize}
4142
content={size.human_readable}
4243
icon="hdd"
4344
as="a"
@@ -49,7 +50,7 @@ export default function WorkflowBadges({ workflow }) {
4950
)}
5051
{isSessionOpen && (
5152
<Label
52-
size="tiny"
53+
size={badgeSize}
5354
content={" Notebook"}
5455
icon={<JupyterNotebookIcon size={12} />}
5556
as="a"
@@ -64,3 +65,8 @@ export default function WorkflowBadges({ workflow }) {
6465
</>
6566
);
6667
}
68+
69+
WorkflowBadges.propTypes = {
70+
workflow: PropTypes.object.isRequired,
71+
badgeSize: PropTypes.string,
72+
};

reana-ui/src/pages/workflowDetails/WorkflowDetails.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export default function WorkflowDetails() {
145145
<Container className={styles["workflow-details-container"]}>
146146
<WorkflowInfo workflow={workflow} />
147147
<div className={styles["badges-and-actions"]}>
148-
<WorkflowBadges workflow={workflow} withDivider={false} />
148+
<WorkflowBadges workflow={workflow} badgeSize="medium" />
149149
<div className={styles.actionsContainer}>
150150
<WorkflowActionsPopup workflow={workflow} />
151151
</div>

reana-ui/src/pages/workflowDetails/components/WorkflowLogs.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ function JobLogs({ logs }) {
7171

7272
const steps = Object.entries(logs).map(([id, log]) => ({
7373
key: id,
74-
text: log.job_name || log.backend_job_id,
74+
text:
75+
(log.job_name || log.backend_job_id) +
76+
(log.duration !== null ? ` (${log.duration})` : ``),
7577
icon: {
7678
name: "dot circle outline",
7779
size: "small",
@@ -100,14 +102,8 @@ function JobLogs({ logs }) {
100102
</div>
101103
{log && (
102104
<div className={styles["step-tags"]}>
103-
<Label color={statusMapping[log.status].color}>
105+
<Label basic color={statusMapping[log.status].color}>
104106
{log.status}
105-
{log.duration && (
106-
<span className={styles["step-duration"]}>
107-
{" "}
108-
{statusMapping[log.status].preposition} {log.duration}
109-
</span>
110-
)}
111107
</Label>
112108
<Label>
113109
<Icon name="cloud" />

0 commit comments

Comments
 (0)