Fix toprow sync with the extension versions

The toprow in server.py didn't sync at all the list of columns depending on the found extension versions, as diagnosed by Pierre Giraud. Looking a bit deeper the sync code in database.py was also wrong as the plan time column requires pgss 1.8.
powa-team · Jul 28, 2024 · c8d480c · c8d480c
1 parent e5f49c1
commit c8d480c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 29 deletions.
diff --git a/powa/database.py b/powa/database.py
@@ -987,21 +987,27 @@ def dashboard(self):
 
         toprow = [{
                        # query
-                   }, {
-                       # plan time
-                   }, {
-                       'name': 'Execution',
-                       'colspan': 3
-                   }, {
-                       'name': 'Blocks',
-                       'colspan': 4,
-                   }, {
-                       'name': 'Temp blocks',
-                       'colspan': 2
-                   }, {
-                       'name': 'I/O Time',
-                       'colspan': 2
                    }]
+
+        if pgss18:
+            toprow.extend([{
+                       # plan time
+                   }])
+
+        toprow.extend([{
+                'name': 'Execution',
+                'colspan': 3
+            }, {
+                'name': 'Blocks',
+                'colspan': 4,
+            }, {
+                'name': 'Temp blocks',
+                'colspan': 2
+            }, {
+                'name': 'I/O Time',
+                'colspan': 2
+            }])
+
         if pgss18:
             toprow.extend([{
                        'name': 'WALs',

diff --git a/powa/server.py b/powa/server.py
@@ -1760,26 +1760,38 @@ def dashboard(self):
 
         toprow = [{
                        # database
-                   }, {
+                   }]
+
+        if pgss18:
+            toprow.extend([{
                        # plan time
-                   }, {
-                       'name': 'Execution',
-                       'colspan': 3
-                   }, {
-                       'name': 'Blocks',
-                       'colspan': 4,
-                   }, {
-                       'name': 'Temp blocks',
-                       'colspan': 2
-                   }, {
-                       'name': 'I/O',
-                   }, {
+                   }])
+
+        toprow.extend([{
+                   'name': 'Execution',
+                   'colspan': 3
+               }, {
+                   'name': 'Blocks',
+                   'colspan': 4,
+               }, {
+                   'name': 'Temp blocks',
+                   'colspan': 2
+               }, {
+                   'name': 'I/O',
+               }])
+
+        if pgss18:
+            toprow.extend([{
                        'name': 'WAL',
                        'colspan': 3
-                   }, {
+                       }])
+
+        if pgss110:
+            toprow.extend([{
                        'name': 'JIT',
                        'colspan': 2
-                   }]
+                       }])
+
         dashes = [graphs,
                   [Grid("Details for all databases",
                         toprow=toprow,