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.

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

TASK-6489 - Unable to view logs for killed jobs in IVA #955

Merged
merged 7 commits into from
Aug 6, 2024
Merged

TASK-6489 - Unable to view logs for killed jobs in IVA #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b85e4d2
wc: Remove ABORTED from the list of job status without logs #TASK-6489
jmjuanes Aug 2, 2024
de33b12
wc: Remove unused class btn-small in job-detail-log #TASK-6489
jmjuanes Aug 2, 2024
0b7c10e
wc: Fix icon padding in buttons of job-detail-log #TASK-6489
jmjuanes Aug 2, 2024
7194b11
wc: Fix detail logs buttons and remove unused styles #TASK-6489
jmjuanes Aug 2, 2024
14fa000
styles: Restore rotate animation styles in global.css #TASK-6489
jmjuanes Aug 2, 2024
01499eb
wc: Fix icon padding in refresh button of job grid #TASK-6489
jmjuanes Aug 2, 2024
de2f204
Merge branch 'release-3.2.x' into TASK-6489
jmjuanes Aug 6, 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
70 changes: 18 additions & 52 deletions src/webcomponents/job/job-detail-log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {LitElement, html} from "lit";
import UtilsNew from "../../core/utils-new.js";
import NotificationUtils from "../commons/utils/notification-utils.js";


export default class JobDetailLog extends LitElement {

constructor() {
Expand Down Expand Up @@ -115,7 +114,7 @@ export default class JobDetailLog extends LitElement {
}

async fetchContent(job, params = {}, append = false) {
const statusWithoutLogs = ["PENDING", "ABORTED", "QUEUED"];
const statusWithoutLogs = ["PENDING", "QUEUED"];
if (!append) {
this.content = "";
}
Expand Down Expand Up @@ -170,29 +169,9 @@ export default class JobDetailLog extends LitElement {
render() {
return html`
<style>
.wrapper {
height: 35px;
margin-top: 5px;
}

.log-wrapper {
min-height: 150px;
}

.wrapper fieldset.log-type {
float: left;
width: 200px;
}

.wrapper-label {
color: grey;
vertical-align: text-bottom;
}

.jobs-details-log .content-pills {
margin: 10px 30px 10px 0;
}

.cursor {
width: 7px;
height: 16px;
Expand All @@ -203,15 +182,6 @@ export default class JobDetailLog extends LitElement {
-moz-animation: blink 1s infinite;
animation: blink 1s infinite;
}

.jobs-details-log .fa-sync-alt {
margin-left: 10px;
}

.jobs-details-log .fa-sync-alt.disabled {
color: #c5c5c5;
}

@keyframes blink {
0% {
opacity: 0;
Expand All @@ -224,28 +194,24 @@ export default class JobDetailLog extends LitElement {
}
}
</style>
<div class="jobs-details-log">
<div class="btn-group content-pills" role="toolbar" aria-label="toolbar">
<div class="btn-group command-buttons" role="group">
<button type="button" class="btn btn-light btn-small ${this.command === "head" ? "active" : ""}" @click="${() => this.setCommand("head")}">
<i class="fas fa-align-left icon-padding"></i> Head
</button>
<button type="button" class="btn btn-light btn-small ${this.command === "tail" ? "active" : ""}" @click="${() => this.setCommand("tail")}">
<i class="fas fa-align-left icon-padding"></i>
Tail
<i class="fas fa-sync-alt ${this.command === "tail" && this.job.internal.status.name === "RUNNING" ? "anim-rotate" : "disabled"}"></i>
</button>
</div>
<div class="mb-3">
<div class="btn-group me-2">
<button type="button" class="btn btn-light ${this.command === "head" ? "active" : ""}" @click="${() => this.setCommand("head")}">
<i class="fas fa-align-left me-1"></i> Head
</button>
<button type="button" class="btn btn-light ${this.command === "tail" ? "active" : ""}" @click="${() => this.setCommand("tail")}">
<i class="fas fa-align-left me-1"></i>
Tail
<i class="fas fa-sync-alt ${this.command === "tail" && this.job.internal.status.name === "RUNNING" ? "anim-rotate" : "text-secondary"} ms-2"></i>
</button>
</div>
<div class="btn-group content-pills" role="toolbar" aria-label="toolbar">
<div class="btn-group" role="group" style="margin-left: 0px">
<button type="button" class="btn btn-light btn-small ${this.type === "stderr" ? "active" : ""}" @click="${() => this.setType("stderr")}">
<i class="fas fa-exclamation icon-padding"></i> Stderr
</button>
<button type="button" class="btn btn-light btn-small ${this.type === "stdout" ? "active" : ""}" @click="${() => this.setType("stdout")}">
<i class="fas fa-info icon-padding"></i> Stdout
</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-light ${this.type === "stderr" ? "active" : ""}" @click="${() => this.setType("stderr")}">
<i class="fas fa-exclamation me-1"></i> Stderr
</button>
<button type="button" class="btn btn-light ${this.type === "stdout" ? "active" : ""}" @click="${() => this.setType("stdout")}">
<i class="fas fa-info me-1"></i> Stdout
</button>
</div>
</div>
<pre class="overflow-x-scroll cmd log-wrapper ${this.command} rounded">${this.content}\n${this.renderCursor()}</pre>
Expand Down
2 changes: 1 addition & 1 deletion src/webcomponents/job/job-grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ export default class JobGrid extends LitElement {
{
render: () => html`
<button type="button" data-cy="job-refresh" class="btn btn-light" @click="${() => this.table.bootstrapTable("refresh")}">
<i class="fas fa-sync-alt"></i> Refresh
<i class="fas fa-sync-alt me-1"></i> Refresh
</button>
`,
}
Expand Down
9 changes: 9 additions & 0 deletions styles/css/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,15 @@ select.no-data + .select2-container--bootstrap-5.select2-container--open.select2
.anim-spaceOutUp {
animation: spaceOutUp .5s infinite;
}
.anim-rotate {
animation: rotate 1.5s linear infinite;
}

@keyframes rotate {
to {
transform: rotate(360deg);
}
}

@keyframes float {
0% {
Expand Down
Loading