Skip to content

Fix breakpoints on Projects show page #4829

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

Open
Bubballoo3 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix breakpoints on Projects show page #4829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33c0b5e
format breakpoints in show page
Bubballoo3 Nov 28, 2025
cff51b7
use % instead of vw
Bubballoo3 Nov 29, 2025
c0c580b
sub underscores for dashes in ids
Bubballoo3 Dec 4, 2025
496c977
add aria-live to jobs panel
Bubballoo3 Dec 4, 2025
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
59 changes: 59 additions & 0 deletions apps/dashboard/app/assets/stylesheets/projects.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,62 @@
margin: .2rem 0px;
text-wrap:nowrap;
}

#project_jobs_files_col {
padding-right: 0px;

.jobs-files-item {
padding-right: 0px;
}

#jobs_item {
@media (min-width: 992px) {
padding-right: calc(var(--bs-gutter-x) * 0.5);
}
}
}

.pill-box {
display: flex;
justify-content: space-evenly;
margin: 0px;
padding: 0px;

.job-pill {
width: min-content;
padding: 0rem 1rem;

button.badge {
color: var(--bs-btn-hover-color);
}

button.badge.collapsed {
color: var(--bs-badge-color);
}

button.badge.collapsed:hover {
color: var(--bs-btn-hover-color);
}
}

.job-popup {
position: absolute;
left: 5.75%;
width: 88.5%; // 2*left + width should always = 100

@media (min-width: 576px) {
left: 37%;
width: 59.5%;
}

@media (min-width: 992px) {
left: 18.5%;
width: 30.5%;
}

@media (min-width: 1600px) {
left: 18%;
width: 31.9%;
}
Copy link
Contributor Author

@Bubballoo3 Bubballoo3 Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A possible alternative to the magic numbers here would have us move the job-info pane outside of the pill div to anchor it to the div.pill-box. However doing this requires us to customize the default popup behavior, and compute the height offset to correctly place the popup. Given how much more complex it is to do any of that with custom javascript, the approach taken here is an intentional compromise. I would also be open to adding system tests to ensure that the popup never overflows the jobs container, (similar to some of the positional testing we will have to do with workflows) but that should wait until after 4.1

}
}
2 changes: 1 addition & 1 deletion apps/dashboard/app/javascript/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function moveCompletedPanel(id, newHTML) {

const div = document.createElement('div');
div.id = id;
div.classList.add('col-md-4');
div.classList.add('job-pill');

const row = document.getElementById('completed_jobs');
row.appendChild(div);
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/views/projects/_job_details.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
data-job-cluster="<%= job.cluster %>"
data-job-id="<%= job.id %>"
data-job-status="<%= job.status.to_s %>"
class="col-md-4">
class="job-pill">

<div class="d-flex justify-content-center">
<div class="spinner-border" role="status">
Expand Down
6 changes: 3 additions & 3 deletions apps/dashboard/app/views/projects/_job_details_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
-%>

<div>
<button class="badge <%= status_class(job.status.to_s) %> rounded-pill border-0 btn" type="button" data-bs-toggle="collapse" data-bs-target="#<%= id %>_data">
<button class="badge <%= status_class(job.status.to_s) %> rounded-pill border-0 btn collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<%= id %>_data">
<span>
<%= job.id %> <%= status_text(job.status.to_s) %>
<%= job.id %> <%= status_text(job.status.to_s) unless job.status.to_s == 'completed' %>
</span>
</button>
<div class="collapse" id="<%= id %>_data">
<div class="collapse job-popup" id="<%= id %>_data">
<div class="card card-body">
<table class="table table-bordered table-sm m-0 mb-2">
<% job.to_human_display.each do |name, value| %>
Expand Down
62 changes: 32 additions & 30 deletions apps/dashboard/app/views/projects/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</div>

<div class="row mb-3">
<div class="col-md-2 mt-3">
<div class="col-sm-4 col-lg-2 mt-3">
<div class="list-group bg-white rounded">
<a class="list-group-item list-group-item-action bg-light font-weight-bold list-toggler"
data-bs-toggle="collapse" data-bs-target="#launcher_list"
Expand Down Expand Up @@ -59,41 +59,43 @@
<%= render partial: 'workflows/workflow', locals: { project: @project, workflows: @workflows } %>
</div>

<div class="col-md-4">
<div class="border border-2 p-3 mt-3 mb-5 bg-white rounded">
<div class="row">
<h2 class="lead fw-bolder d-flex justify-content-center">Active Jobs</h2>
<%= render(partial: 'job_details', collection: @project.active_jobs, as: :job, locals: { project: @project }) %>
</div>
<div id="project_jobs_files_col" class="row col-sm-8 col-lg-10 d-flex">
<div id="jobs_item" class="col-12 col-lg-5 jobs-files-item" aria-live="assertive">
<div class="border border-2 p-3 mt-3 mb-5 bg-white rounded">
<div class="row pill-box">
<h2 class="lead fw-bolder d-flex justify-content-center">Active Jobs</h2>
<%= render(partial: 'job_details', collection: @project.active_jobs, as: :job, locals: { project: @project }) %>
</div>

<div class="row">
<h2 class="lead fw-bolder d-flex justify-content-center">Completed Jobs</h2>
<div id="completed_jobs" class="row">
<%- @project.completed_jobs.each do |job| -%>
<div class="col-md-4" id="<%= "job_#{job.cluster}_#{job.id}" %>">
<%= render(partial: 'job_details_content', locals: { job: job, project: @project }) %>
<div class="row">
<h2 class="lead fw-bolder d-flex justify-content-center">Completed Jobs</h2>
<div id="completed_jobs" class="row pill-box">
<%- @project.completed_jobs.each do |job| -%>
<div class="job-pill" id="<%= "job_#{job.cluster}_#{job.id}" %>">
<%= render(partial: 'job_details_content', locals: { job: job, project: @project }) %>
</div>
<%- end -%>
</div>
<%- end -%>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div id="directory_browser" class="border border-2 p-3 mt-3 mb-5 bg-white rounded">
<h2 class="lead fw-bolder d-flex justify-content-center"><%= "#{t('dashboard.project')} #{t('dashboard.directory')}" %>: &nbsp<i><%= @project.id %></i></h2>
<hr>
<%= turbo_frame_tag 'project_directory',
src: directory_frame_path(
files: @files,
path: @project&.directory
) do
%>
<div class="d-flex justify-content-center">
<div id="loading-icon" class="spinner-border rem-5" role="status">
<span class="sr-only">Loading...</span>
<div class="col-12 col-lg-7 jobs-files-item">
<div id="directory_browser" class="border border-2 p-3 mt-3 mb-5 bg-white rounded">
<h2 class="lead fw-bolder d-flex justify-content-center"><%= "#{t('dashboard.project')} #{t('dashboard.directory')}" %>: &nbsp<i><%= @project.id %></i></h2>
<hr>
<%= turbo_frame_tag 'project_directory',
src: directory_frame_path(
files: @files,
path: @project&.directory
) do
%>
<div class="d-flex justify-content-center">
<div id="loading-icon" class="spinner-border rem-5" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
</div>
<%- end -%>
<%- end -%>
</div>
</div>
</div>
</div>
Expand Down