Merge pull request #14227 from DefectDojo/bugfix

Release 2.55.0: Merge Bugfix into Dev

Author: rossops

docs/assets/images/import_scan_ui.png

@@ -1 +1,60 @@
-// Put your custom JS code here
+// custom js
+
+
+// version toggler
+(() => {
+    "use strict";
+
+    console.log("[VersionToggle] custom.js loaded");
+
+    const setVersion = (version) => {
+        console.log("[VersionToggle] Setting version to:", version);
+
+        document.querySelectorAll(".version-opensource, .version-pro").forEach(el => {
+            el.style.display = el.classList.contains(`version-${version}`) ? "" : "none";
+        });
+
+        localStorage.setItem("version", version);
+        console.log("[VersionToggle] localStorage updated:", localStorage.getItem("version"));
+
+        // Update dropdown
+        const selects = document.querySelectorAll("#version-select");
+        selects.forEach(sel => {
+            sel.value = version;
+            sel.dataset.version = version;
+            sel.style.visibility = "visible";
+        });
+
+        // unhide sidebar after version is applied
+        const sidebar = document.querySelector(".docs-sidebar");
+        if (sidebar) {
+            sidebar.style.visibility = "visible";
+            console.log("[VersionToggle] Sidebar revealed");
+        }
+    };
+
+    const initVersionToggle = () => {
+        const storedVersion = localStorage.getItem("version") || "opensource";
+        console.log("[VersionToggle] Stored version:", storedVersion);
+        setVersion(storedVersion);
+    };
+
+    // Delegated listener on body
+    document.body.addEventListener("change", (e) => {
+        if (e.target && e.target.id === "version-select") {
+            console.log("[VersionToggle] Dropdown changed to:", e.target.value);
+            setVersion(e.target.value);
+        }
+    });
+
+    // Run on DOM ready
+    window.addEventListener("DOMContentLoaded", initVersionToggle);
+
+    // MutationObserver to detect dynamically replaced sidebar
+    const observer = new MutationObserver(() => {
+        // Re-run init to make sure menus match stored version
+        initVersionToggle();
+    });
+    observer.observe(document.body, { childList: true, subtree: true });
+
+})();

docs/assets/images/metrics_image1.png

@@ -43,4 +43,38 @@
   .DocSearch-Modal {
     position: fixed !important;
   }
+}
+
+.logo-darkmode {
+  display: none;
+}
+
+[data-bs-theme="dark"] .logo-lightmode {
+  display: none;
+}
+
+[data-bs-theme="dark"] .logo-darkmode {
+  display: inline-block;
+}
+
+html {
+  font-size: 85%; /* scales all rem/em fonts */
+}
+
+/* Hide sidebar until version is resolved */
+.docs-sidebar {
+  visibility: hidden;
+}
+
+
+#version-select[data-version="opensource"] {
+  background-color: #003964b7;
+  border: 2px solid #003864;
+  color: white;
+}
+
+#version-select[data-version="pro"] {
+  background-color: #a84e32b7;
+  border: 2px solid #a84e32;
+  color: white;
 }

docs/assets/images/metrics_image2.png

@@ -1,28 +1,48 @@
 [[main]]
-  name = "Docs Home"
-  url = "/en/about_defectdojo/about_docs/"
+  name = "Get started ⏷"
+  url = "/get_started/about/about_defectdojo"
   weight = 10
 
 [[main]]
-  name = "Supported Tools"
-  url = "/supported_tools/"
-  weight = 11
+  name = "Import data ⏷"
+  url = "/import_data/import_intro/comparison/"
+  weight = 12
 
 [[main]]
-  name = "Pro Features"
-  url = "/en/about_defectdojo/pro_features"
+  name = "Triage Findings ⏷"
+  url = "/triage_findings/findings_workflows/intro_to_findings/"
   weight = 12
 
 [[main]]
-  name = "Changelog"
-  url = "/en/changelog/changelog/"
+  name = "Model your assets ⏷"
+  url = "/asset_modelling/hierarchy/pro__assets_organizations/"
   weight = 13
 
 [[main]]
-  name = "Support"
-  url = "/en/about_defectdojo/contact_defectdojo_support"
+  name = "Metrics & reports ⏷"
+  url = "/metrics_reports/dashboards/introduction_dashboard/"
   weight = 14
 
+[[main]]
+  name = "Admin ⏷"
+  url = "/admin/admin_intro/intro/"
+  weight = 16
+
+[[main]]
+  name = "Issue tracking ⏷"
+  url = "/issue_tracking/intro/intro/"
+  weight = 15
+
+[[main]]
+  name = "Automation ⏷"
+  url = "/automation/api/api-v2-docs/"
+  weight = 15
+
+[[main]]
+  name = "Supported tools ⏷"
+  url = "/supported_tools/"
+  weight = 16
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/assets/images/metrics_image3.png

@@ -44,9 +44,21 @@ mainSections = ["docs"]
   bootstrapJavascript = false # false (default) or true
 
   # Nav
-  sectionNav = ["docs", "en", "supported_tools"] # ["docs"] (default) or list of sections (e.g. ["docs", "guides"])
+  sectionNav = [
+    "docs",
+    "en",
+    "supported_tools",
+    "get_started",
+    "import_data",
+    "triage_findings",
+    "metrics_reports",
+    "admin",
+    "automation",
+    "asset_modelling",
+    "issue_tracking"] # ["docs"] (default) or list of sections (e.g. ["docs", "guides"])
+
   toTopButton = false # false (default) or true
-  breadcrumbTrail = true # false (default) or true
+  breadcrumbTrail = false # false (default) or true
   headlineHash = true # true (default) or false
   scrollSpy = true # true (default) or false