From 66f908a70499f835626ee52b84db8aefc77f0026 Mon Sep 17 00:00:00 2001
From: Phil Renaud <phil@riotindustries.com>
Date: Thu, 12 Jan 2023 12:14:01 -0500
Subject: [PATCH] Much simpler grid method for height calc

---
 ui/app/components/task-context-sidebar.hbs |  3 +-
 ui/app/styles/components/sidebar.scss      | 43 +++++++++++-----------
 ui/mirage/factories/task-state.js          |  3 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/ui/app/components/task-context-sidebar.hbs b/ui/app/components/task-context-sidebar.hbs
index e98d7fee4228..a8dd65f5e5b9 100644
--- a/ui/app/components/task-context-sidebar.hbs
+++ b/ui/app/components/task-context-sidebar.hbs
@@ -1,6 +1,6 @@
 <Portal @target="log-sidebar-portal">
 	<div
-		class="sidebar task-context-sidebar has-subnav {{if this.wide "wide"}} {{if @task?.events?.length "has-events"}} {{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
@@ -74,7 +74,6 @@
 					</ListTable>
 				</div>
 			</div>
-			<hr />
 		{{/if}}
 
 		<TaskLog
diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss
index 9f189ef6b0cd..2791d4d756f5 100644
--- a/ui/app/styles/components/sidebar.scss
+++ b/ui/app/styles/components/sidebar.scss
@@ -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;
@@ -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%;
   }
 }
diff --git a/ui/mirage/factories/task-state.js b/ui/mirage/factories/task-state.js
index 8afa68d0bae0..7cbcbf4f2d60 100644
--- a/ui/mirage/factories/task-state.js
+++ b/ui/mirage/factories/task-state.js
@@ -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),