Merge pull request #60392 from ClickHouse/fix-duplicate-chart-rendering

alexey-milovidov · web-flow · commit b71ae80fa9c2 · 2024-02-26T19:24:52.000+03:00
Fix duplicate and dangling charts on the Dashboard
diff --git a/programs/server/dashboard.html b/programs/server/dashboard.html
@@ -255,8 +255,6 @@
             font-weight: bold;
             user-select: none;
             cursor: pointer;
-            padding-left: 0.5rem;
-            padding-right: 0.5rem;
             background: var(--new-chart-background-color);
             color: var(--new-chart-text-color);
             float: right;
@@ -275,7 +273,6 @@
             width: 36%;
         }
 
-
         #global-error {
             align-self: center;
             width: 60%;
@@ -1273,8 +1270,11 @@
 }
 
 let firstLoad = true;
-
+let is_drawing = false; // Prevent race condition leading to duplicate/dangling charts.
 async function drawAll() {
+    if (is_drawing) return;
+    is_drawing = true;
+
     let params = getParamsForURL();
     const chartsArray = document.getElementsByClassName('chart');
 
@@ -1301,12 +1301,12 @@
             document.getElementById('edit').style.display = 'inline-block';
             document.getElementById('search-span').style.display = '';
             hideError();
-        }
-        else {
-            const charts = document.getElementById('charts')
-            charts.style.height = '0px';
+        } else {
+            document.getElementById('charts').style.height = '0px';
         }
     });
+
+    is_drawing = false;
 }
 
 function resize() {
