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

Jump to bottom

[ui] Fixes logger height issue when sidebar has events #15759

Merged
merged 2 commits into from
Jan 13, 2023
Merged

[ui] Fixes logger height issue when sidebar has events #15759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edc713
Fixes logger height issue when sidebar has events
philrenaud Jan 11, 2023
66f908a
Much simpler grid method for height calc
philrenaud Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/15759.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Scale down logger height in the UI when the sidebar container also has task events
```
3 changes: 1 addition & 2 deletions ui/app/components/task-context-sidebar.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Portal @target="log-sidebar-portal">
<div
class="sidebar task-context-sidebar has-subnav {{if this.wide "wide"}} {{if this.isSideBarOpen "open"}} {{if this.isSideBarOpen "open"}}"
class="sidebar task-context-sidebar has-subnav {{if this.wide "wide"}} {{if @task.events.length "has-events"}} {{if this.isSideBarOpen "open"}}"
{{on-click-outside
@fns.closeSidebar
capture=true
Expand Down Expand Up @@ -74,7 +74,6 @@
</ListTable>
</div>
</div>
<hr />
{{/if}}

<TaskLog
Expand Down
43 changes: 22 additions & 21 deletions ui/app/styles/components/sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ $subNavOffset: 49px;
}

.task-context-sidebar {
display: grid;
gap: 1rem;
grid-template-rows: auto 1fr;

&.has-events {
grid-template-rows: auto minmax(auto, 25%) 1fr;
}
header {
display: grid;
justify-content: left;
Expand Down Expand Up @@ -120,30 +127,24 @@ $subNavOffset: 49px;
}
}

.task-events .boxed-section-body {
height: 250px;
overflow: auto;
table {
height: 100%;
}
& > .task-events,
& > .task-log {
overflow: hidden;
}

// Instead of trying to calculate on the fly with JS, let's use vh and offset nav and headers above.
// We can make this a LOT more streamlined when CSS Container Queries are available.
$sidebarTopOffset: 161px;
$sidebarInnerPadding: 48px;
$sidebarHeaderOffset: 74px;
$cliHeaderOffset: 54.5px;
$offsetWithoutEvents: $sidebarTopOffset + $sidebarInnerPadding +
$sidebarHeaderOffset + $cliHeaderOffset;
$sidebarEventsHeight: 250px + 44px + 44px; // table + table header + horizontal rule
.task-events,
.task-log {
display: grid;
grid-template-rows: auto 1fr;
.boxed-section-body {
overflow: auto;
}
.notification {
grid-row: -1;
}
}

.cli-window {
height: calc(100vh - $offsetWithoutEvents);
}
&.has-events {
.cli-window {
height: calc(100vh - $offsetWithoutEvents - $sidebarEventsHeight);
}
height: 100%;
}
}
3 changes: 2 additions & 1 deletion ui/mirage/factories/task-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ const TASK_STATUSES = ['pending', 'running', 'finished', 'failed'];
const REF_TIME = new Date();

export default Factory.extend({
name: () => '!!!this should be set by the allocation that owns this task state!!!',
name: () =>
'!!!this should be set by the allocation that owns this task state!!!',
state: () => faker.helpers.randomize(TASK_STATUSES),
kind: null,
startedAt: () => faker.date.past(2 / 365, REF_TIME),
Expand Down