corysanin/archery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

qol improvements to build.js

Browse Source
This commit is contained in:
Cory Sanin
2025-09-17 23:15:38 -05:00
parent eeac35a0a6
commit 8f19175c3a
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build.js
View File

@@ -2,6 +2,7 @@ document.addEventListener('DOMContentLoaded', function () {
const logContainer = this.getElementById('logs'); const logContainer = this.getElementById('logs');
const followLogsBtn = this.getElementById('followCheckmark'); const followLogsBtn = this.getElementById('followCheckmark');
const buildStatusTxt = this.getElementById('buildStatus'); const buildStatusTxt = this.getElementById('buildStatus');
let started = logContainer.childElementCount > 0;
/** /**
* Get the correct path to establish a ws connection * Get the correct path to establish a ws connection
@@ -32,6 +33,10 @@ document.addEventListener('DOMContentLoaded', function () {
} }
} }
function handleScrollToggleClick() {
window.scrollTo(0, followLogsBtn.checked ? document.body.scrollHeight : 0);
}
/** /**
* Split string by newline char * Split string by newline char
* @param {string} str * @param {string} str
@@ -53,9 +58,16 @@ document.addEventListener('DOMContentLoaded', function () {
ws.onmessage = function (message) { ws.onmessage = function (message) {
const buildEvent = JSON.parse(message.data); const buildEvent = JSON.parse(message.data);
if (!started) {
started = true;
buildStatusTxt.replaceChild(document.createTextNode('running'), buildStatusTxt.firstChild);
}
if (buildEvent.type === 'finish') { if (buildEvent.type === 'finish') {
ws.close(); ws.close();
buildStatusTxt.replaceChild(document.createTextNode(buildEvent.message), buildStatusTxt.firstChild); buildStatusTxt.replaceChild(document.createTextNode(buildEvent.message), buildStatusTxt.firstChild);
appendLines([`finished: ${buildEvent.message}`]);
const cancelBtn = document.getElementById('cancelRow');
cancelBtn.parentElement.removeChild(cancelBtn);
} }
else { else {
appendLines(splitLines(buildEvent.message), buildEvent.type === 'err'); appendLines(splitLines(buildEvent.message), buildEvent.type === 'err');
@@ -66,5 +78,5 @@ document.addEventListener('DOMContentLoaded', function () {
connect(); connect();
followLogsBtn.checked = false; followLogsBtn.checked = false;
followLogsBtn.addEventListener('change', scrollToBottom); followLogsBtn.addEventListener('change', handleScrollToggleClick);
}); });

4
views/build.ejs
View File

@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<% if (!ended) { %> <% if (!ended) { %>
<div> <div id="cancelRow">
<a href="/build/<%= build.sqid %>/cancel" class="button">Cancel build</a> <a href="/build/<%= build.sqid %>/cancel" class="button">Cancel build</a>
</div> </div>
<% } %> <% } %>
@@ -37,7 +37,7 @@
<%- include("footer", locals) %> <%- include("footer", locals) %>
<script src="/assets/js/timezone.js?v1" nonce="<%= cspNonce %>"></script> <script src="/assets/js/timezone.js?v1" nonce="<%= cspNonce %>"></script>
<% if (!ended) { %> <% if (!ended) { %>
<script src="/assets/js/build.js?v2" nonce="<%= cspNonce %>"></script> <script src="/assets/js/build.js?v3" nonce="<%= cspNonce %>"></script>
<% } %> <% } %>
</body> </body>
</html> </html>