fix: Bug that caused duplicate links (eg Diagnostics and Logs) in the nav bar (#595)

service/internal/executor/executor_windows.go

@@ -5,8 +5,8 @@ package executor
 
 import (
 	"context"
-	"os/exec"
 	"os"
+	"os/exec"
 )
 
 func (e *Executor) Kill(execReq *InternalLogEntry) error {

service/internal/servicehost/servicehost_windows.go

@@ -99,6 +99,7 @@ func cdToExecutableDir() {
 	}
 }
 
+//gocyclo:ignore
 func startServiceHandler(mode string) {
 	cdToExecutableDir()
 

service/internal/updatecheck/updateCheck.go

@@ -2,10 +2,10 @@ package updatecheck
 
 import (
 	"encoding/json"
+	"github.com/Masterminds/semver"
 	config "github.com/OliveTin/OliveTin/internal/config"
 	"github.com/OliveTin/OliveTin/internal/installationinfo"
 	"github.com/robfig/cron/v3"
-	"github.com/Masterminds/semver"
 	log "github.com/sirupsen/logrus"
 	"io"
 	"net/http"

service/internal/updatecheck/updateCheck_test.go

@@ -1,8 +1,8 @@
 package updatecheck
 
 import (
-	"testing"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestVersionLater(t *testing.T) {

webui.dev/js/NavigationBar.js

@@ -1,33 +1,37 @@
 export class NavigationBar {
-	constructor() {
+  constructor () {
-		this.navbar = document.getElementsByTagName('nav')[0]
+    this.navbar = document.getElementsByTagName('nav')[0]
-		this.mainLinks = document.getElementById('navigation-links')
+    this.mainLinks = document.getElementById('navigation-links')
-		this.supplementalLinks = document.getElementById('supplemental-links')
+    this.supplementalLinks = document.getElementById('supplemental-links')
-	}
+  }
 
-	createLink(title, url, isSupplemental) {
+  createLink (title, url, isSupplemental) {
-		const linkA = document.createElement('a')
+    let parent = (isSupplemental) ? this.supplementalLinks : this.mainLinks
-		linkA.href = url
-		linkA.innerText = title
 
-		const navigationLi = document.createElement('li')
+    const existsAlready = Array.from(parent.querySelectorAll('li')).some(el => el.title === title)
-		navigationLi.appendChild(linkA)
-		navigationLi.title = title
 
-		if (isSupplemental) {
+    if (existsAlready) {
-			this.supplementalLinks.appendChild(navigationLi)
+      return
-		} else {
+    }
-			this.mainLinks.appendChild(navigationLi)
-		}
-	}
 
-	refreshSectionPolicyLinks(policy) {
+    const linkA = document.createElement('a')
-		if (policy.showDiagnostics) {
+    linkA.href = url
-			this.createLink('Diagnostics', '/diagnostics', true)
+    linkA.innerText = title
-		}
 
-		if (policy.showLogList) {
+    const navigationLi = document.createElement('li')
-			this.createLink('Logs', '/logs', true)
+    navigationLi.appendChild(linkA)
-		}
+    navigationLi.title = title
-	}
+
+    parent.appendChild(navigationLi)
+  }
+
+  refreshSectionPolicyLinks (policy) {
+    if (policy.showDiagnostics) {
+      this.createLink('Diagnostics', '/diagnostics', true)
+    }
+
+    if (policy.showLogList) {
+      this.createLink('Logs', '/logs', true)
+    }
+  }
 }