From 9316a4b4944a4ee4bca8d06f7e33f66477d4cb58 Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Sun, 15 Feb 2026 01:16:01 +0100
Subject: [PATCH] Version management: fix upgrade polling, branch dropdown, log
 visibility

- Fix ReferenceError: use $timeout instead of timeout, store timer for cancel
- Add v2.5.5-dev to Select Branch dropdown (remove dev filter)
- Limit branch list to latest 10 by version
- Fix Upgrade Progress Log text visibility (light text on dark bg)
---
 .../baseTemplate/custom-js/system-status.js   |  6 +-
 .../baseTemplate/versionManagment.html        | 56 +++++++++++++------
 .../baseTemplate/custom-js/system-status.js   |  6 +-
 .../baseTemplate/custom-js/system-status.js   |  6 +-
 4 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/baseTemplate/static/baseTemplate/custom-js/system-status.js b/baseTemplate/static/baseTemplate/custom-js/system-status.js
index 9afb9976d..f26ebe047 100644
--- a/baseTemplate/static/baseTemplate/custom-js/system-status.js
+++ b/baseTemplate/static/baseTemplate/custom-js/system-status.js
@@ -579,6 +579,7 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
     $scope.updateFinish = true;
     $scope.couldNotConnect = true;
 
+    var upgradeStatusTimer = null;
 
     $scope.upgrade = function () {
 
@@ -660,7 +661,8 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
             if (response.data.upgradeStatus === 1) {
 
                 if (response.data.finished === 1) {
-                    $timeout.cancel();
+                    if (upgradeStatusTimer) $timeout.cancel(upgradeStatusTimer);
+                    upgradeStatusTimer = null;
                     $scope.upgradelogBox = false;
                     $scope.upgradeLog = response.data.upgradeLog;
                     $scope.upgradeLoading = true;
@@ -672,7 +674,7 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
                 } else {
                     $scope.upgradelogBox = false;
                     $scope.upgradeLog = response.data.upgradeLog;
-                    timeout(getUpgradeStatus, 2000);
+                    upgradeStatusTimer = $timeout(getUpgradeStatus, 2000);
                 }
             }
 
diff --git a/baseTemplate/templates/baseTemplate/versionManagment.html b/baseTemplate/templates/baseTemplate/versionManagment.html
index b4b8a566a..202db35ec 100644
--- a/baseTemplate/templates/baseTemplate/versionManagment.html
+++ b/baseTemplate/templates/baseTemplate/versionManagment.html
@@ -199,9 +199,9 @@
             word-break: break-all;
         }
         
-        /* Progress log */
+        /* Progress log - dark background for terminal-style visibility */
         .log-container {
-            background: var(--text-primary, #1e1e1e);
+            background: #1e1e1e;
             border-radius: 8px;
             padding: 20px;
             margin-top: 20px;
@@ -215,11 +215,12 @@
             min-height: 300px;
             background: transparent;
             border: none;
-            color: var(--bg-secondary, #f0f0f0);
+            color: #e8e8e8;
             font-family: 'SF Mono', Monaco, monospace;
             font-size: 13px;
             line-height: 1.6;
             resize: vertical;
+            caret-color: #e8e8e8;
         }
         
         .log-textarea:focus {
@@ -337,30 +338,51 @@
     </div>
 
     <script>
-        // Function to populate the branch dropdown
-        function populateBranches(branches) {
-            var branchSelect = document.getElementById("branchSelect");
-            for (let i = branches.length - 1; i >= 0; i--) {
-                const branch = branches[i];
-                var option = document.createElement("option");
-                option.value = branch;
-                option.text = branch;
-                if (branch.startsWith("v") && branch.indexOf("dev") === -1 && branch.indexOf("version-counter") === -1) {
-                    branchSelect.appendChild(option);
-                }
-            }
+        // Sort key for version branches: v2.5.5-dev > v2.5.5 > v2.4.4
+        function versionSortKey(name) {
+            var m = name.match(/^v(\d+)\.(\d+)(?:\.(\d+))?(?:-(.+))?$/);
+            if (!m) return [0, 0, 0, 0];
+            var major = parseInt(m[1], 10) || 0;
+            var minor = parseInt(m[2], 10) || 0;
+            var patch = parseInt(m[3], 10) || 0;
+            var suffix = (m[4] === 'dev') ? 1 : 0;
+            return [major, minor, patch, suffix];
+        }
 
+        function compareBranches(a, b) {
+            var ka = versionSortKey(a), kb = versionSortKey(b);
+            for (var i = 0; i < 4; i++) {
+                if (ka[i] !== kb[i]) return kb[i] - ka[i];
+            }
+            return 0;
+        }
+
+        // Function to populate the branch dropdown (latest 10 only)
+        function populateBranches(branches) {
+            var filtered = branches.filter(function(b) {
+                return b.startsWith("v") && b.indexOf("version-counter") === -1;
+            });
+            filtered.sort(compareBranches);
+            var latest = filtered.slice(0, 10);
+
+            var branchSelect = document.getElementById("branchSelect");
+            for (var i = 0; i < latest.length; i++) {
+                var option = document.createElement("option");
+                option.value = latest[i];
+                option.text = latest[i];
+                branchSelect.appendChild(option);
+            }
         }
 
         function getBranches(url, branches, page) {
             if (!page) page = 1;
-            fetch(url + '?page=' + page)
+            fetch(url + '?per_page=100&page=' + page)
                 .then((response) => response.json())
                 .then((data) => {
                     if (data.length === 0) {
                         populateBranches(branches);
                     } else {
-                        const branchNames = data.map(branch => branch.name);
+                        var branchNames = data.map(function(b) { return b.name; });
                         branches = branches.concat(branchNames);
                         getBranches(url, branches, page + 1);
                     }
diff --git a/public/static/baseTemplate/custom-js/system-status.js b/public/static/baseTemplate/custom-js/system-status.js
index e017d31e1..83680b1d5 100644
--- a/public/static/baseTemplate/custom-js/system-status.js
+++ b/public/static/baseTemplate/custom-js/system-status.js
@@ -553,6 +553,7 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
     $scope.updateFinish = true;
     $scope.couldNotConnect = true;
 
+    var upgradeStatusTimer = null;
 
     $scope.upgrade = function () {
 
@@ -623,7 +624,8 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
             if (response.data.upgradeStatus === 1) {
 
                 if (response.data.finished === 1) {
-                    $timeout.cancel();
+                    if (upgradeStatusTimer) $timeout.cancel(upgradeStatusTimer);
+                    upgradeStatusTimer = null;
                     $scope.upgradelogBox = false;
                     $scope.upgradeLog = response.data.upgradeLog;
                     $scope.upgradeLoading = true;
@@ -635,7 +637,7 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
                 } else {
                     $scope.upgradelogBox = false;
                     $scope.upgradeLog = response.data.upgradeLog;
-                    $timeout(getUpgradeStatus, 2000);
+                    upgradeStatusTimer = $timeout(getUpgradeStatus, 2000);
                 }
             }
 
diff --git a/static/baseTemplate/custom-js/system-status.js b/static/baseTemplate/custom-js/system-status.js
index 76353b1e4..b1cd8acc7 100644
--- a/static/baseTemplate/custom-js/system-status.js
+++ b/static/baseTemplate/custom-js/system-status.js
@@ -579,6 +579,7 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
     $scope.updateFinish = true;
     $scope.couldNotConnect = true;
 
+    var upgradeStatusTimer = null;
 
     $scope.upgrade = function () {
 
@@ -660,7 +661,8 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
             if (response.data.upgradeStatus === 1) {
 
                 if (response.data.finished === 1) {
-                    $timeout.cancel();
+                    if (upgradeStatusTimer) $timeout.cancel(upgradeStatusTimer);
+                    upgradeStatusTimer = null;
                     $scope.upgradelogBox = false;
                     $scope.upgradeLog = response.data.upgradeLog;
                     $scope.upgradeLoading = true;
@@ -672,7 +674,7 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
                 } else {
                     $scope.upgradelogBox = false;
                     $scope.upgradeLog = response.data.upgradeLog;
-                    timeout(getUpgradeStatus, 2000);
+                    upgradeStatusTimer = $timeout(getUpgradeStatus, 2000);
                 }
             }