medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: #Logs and similar in the address bar to load relevant section (#306) (#310)

This commit is contained in:
James Read 2024-05-13 13:12:04 +01:00 committed by GitHub
parent f43ece4263
commit 1ab35fdb36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webui.dev/index.html
View File

@ -25,13 +25,13 @@
<nav> <nav>
<ul id = "navigation-links"> <ul id = "navigation-links">
<li title = "Actions"> <li title = "Actions">
<a id = "showActions" href = "#actions">Actions</a> <a id = "showActions" href = "#Actions">Actions</a>
</li> </li>
</ul> </ul>
<ul id = "supplemental-links"> <ul id = "supplemental-links">
<li title = "Logs"> <li title = "Logs">
<a id = "showLogs" href = "#logs">Logs</a> <a id = "showLogs" href = "#Logs">Logs</a>
</li> </li>
</ul> </ul>
</nav> </nav>

29
webui.dev/js/marshaller.js
View File

@ -12,6 +12,8 @@ export function initMarshaller () {
window.logEntries = {} window.logEntries = {}
window.initialHash = window.location.hash
window.addEventListener('EventExecutionFinished', onExecutionFinished) window.addEventListener('EventExecutionFinished', onExecutionFinished)
} }
@ -20,9 +22,10 @@ export function marshalDashboardComponentsJsonToHtml (json) {
marshalDashboardStructureToHtml(json) marshalDashboardStructureToHtml(json)
document.getElementById('username').innerText = json.authenticatedUser document.getElementById('username').innerText = json.authenticatedUser
document.body.setAttribute('initial-marshal-complete', 'true')
changeDirectory(null) changeDirectory(null)
document.body.setAttribute('initial-marshal-complete', 'true')
} }
function marshalActionsJsonToHtml (json) { function marshalActionsJsonToHtml (json) {
@ -95,7 +98,7 @@ function onExecutionFinished (evt) {
function showSection (title) { function showSection (title) {
for (const section of document.querySelectorAll('section')) { for (const section of document.querySelectorAll('section')) {
if (section.title === title) { if (section.title.replace(' ', '') === title) {
section.style.display = 'block' section.style.display = 'block'
} else { } else {
section.style.display = 'none' section.style.display = 'none'
@ -188,9 +191,9 @@ function marshalDashboardStructureToHtml (json) {
const navigationA = document.createElement('a') const navigationA = document.createElement('a')
navigationA.title = dashboard.title navigationA.title = dashboard.title
navigationA.innerText = dashboard.title navigationA.innerText = dashboard.title
navigationA.setAttribute('href', '#' + dashboard.title) navigationA.setAttribute('href', '#' + dashboard.title.replace(' ', ''))
navigationA.onclick = () => { navigationA.onclick = () => {
showSection(dashboard.title) showSection(dashboard.title.replace(' ', ''))
} }
const navigationLi = document.createElement('li') const navigationLi = document.createElement('li')
@ -208,12 +211,16 @@ function marshalDashboardStructureToHtml (json) {
} }
} }
if (rootGroup.querySelectorAll('action-button').length === 0 && json.dashboards.length > 0) { if (window.initialHash !== '' && document.body.getAttribute('initial-marshal-complete') === null) {
nav.querySelector('li[title="Actions"]').style.display = 'none' showSection(window.initialHash.replace('#', ''))
showSection(json.dashboards[0].title)
} else { } else {
showSection('Actions') if (rootGroup.querySelectorAll('action-button').length === 0 && json.dashboards.length > 0) {
nav.querySelector('li[title="Actions"]').style.display = 'none'
showSection(json.dashboards[0].title)
} else {
showSection('Actions')
}
} }
} }
@ -384,12 +391,8 @@ function changeDirectory (selected) {
document.title = title.innerText document.title = title.innerText
if (selected === null) { if (selected === null) {
window.location.hash = null
window.history.pushState({ dir: null }, null, '#') window.history.pushState({ dir: null }, null, '#')
} else { } else {
window.location.hash = selected
window.history.pushState({ dir: selected }, null, '#' + selected) window.history.pushState({ dir: selected }, null, '#' + selected)
} }
} }