Redirect to apply logs upon confirming plan

leg100 · Nov 12, 2022 · 8bfd6fe · 8bfd6fe
1 parent f698d72
commit 8bfd6fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/http/html/run.go b/http/html/run.go
@@ -139,7 +139,7 @@ func (app *Application) applyRun(w http.ResponseWriter, r *http.Request) {
 		writeError(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	http.Redirect(w, r, getRunPath(runRequest{workspaceRequest{r}}), http.StatusFound)
+	http.Redirect(w, r, getRunPath(runRequest{workspaceRequest{r}})+"#apply", http.StatusFound)
 }
 
 func (app *Application) discardRun(w http.ResponseWriter, r *http.Request) {

diff --git a/http/html/static/css/main.css b/http/html/static/css/main.css
@@ -538,4 +538,5 @@ button.delete:hover {
 #run-confirm-container {
   display: flex;
   gap: 1em;
+  margin-bottom: 1em;
 }
diff --git a/http/html/static/js/main.js b/http/html/static/js/main.js
@@ -118,6 +118,12 @@ function watchRunUpdates(path, stream, run) {
         var actions = document.getElementById('run-confirm-container');
         if (obj['run-status'] == 'planned') {
             actions.style.display = 'flex';
+            // if user is at/near very bottom of page then scroll down to
+            // bring buttons into view.
+            atBottom = (Math.floor(window.scrollY) + window.innerHeight) >= (document.body.scrollHeight - 100);
+            if (atBottom) {
+                document.body.scrollIntoView(false);
+            }
         } else {
             actions.style.display = 'none';
         }