Merge pull request #8302 from rabbitmq/mergify/bp/v3.11.x/pr-8300

Fix #8276 (backport #8289) (backport #8300)

Author: michaelklishin

deps/rabbitmq_management/priv/www/js/global.js

@@ -638,6 +638,76 @@ var exchange_types;
 // Used for access control
 var user_tags;
 var user;
+<<<<<<< HEAD
+=======
+var ac = new AccessControl();
+var display = new DisplayControl();
+
+var ui_data_model = {
+  vhosts: [],
+  nodes: [],
+
+};
+
+// Access control
+
+function AccessControl() {
+
+  this.update = function(user, ui_data_model) {
+    this.user = user;
+    this.user_tags = expand_user_tags(user.tags);
+    this.ui_data_model = ui_data_model;
+  };
+  this.isMonitoringUser = function() {
+    if (this.user_tags)
+      return this.user_tags.includes("monitoring");
+    else return false;
+  };
+  this.isAdministratorUser = function() {
+    if (this.user_tags)
+      return this.user_tags.includes("administrator");
+    else return false;
+  };
+  this.isPolicyMakerUser = function() {
+    if (this.user_tags)
+      return this.user_tags.includes("policymaker");
+    else return false;
+  };
+  this.canAccessVhosts = function() {
+    if (this.ui_data_model)
+      return this.ui_data_model.vhosts.length > 0;
+    else return false;
+  };
+  this.canListNodes = function() {
+    if (this.ui_data_model)
+      return this.isMonitoringUser() && this.ui_data_model.nodes.length > 1;
+    else return false;
+  };
+
+};
+
+function DisplayControl() {
+  this.nodes = false
+  this.vhosts = false
+  this.rabbitmqVersions = false
+
+  this.update = function(overview, ui_data_model) {    
+    this.nodes = ac.canListNodes() && ui_data_model.nodes.length > 1
+    this.vhosts = ac.canAccessVhosts()
+    this.rabbitmqVersions = false
+    var v = '';
+    for (var i = 0; i < ui_data_model.nodes.length; i++) {
+        var v1 = fmt_rabbit_version(ui_data_model.nodes[i].applications);
+        if (v1 != 'unknown') {
+            if (v != '' && v != v1) this.rabbitmqVersions = true;
+            v = v1;
+        }
+    }
+    this.data = ui_data_model;
+  }
+
+}
+>>>>>>> cc4fc57d0b (Fix #8276)
 
 // Set up the above vars
 function setup_global_vars() {

deps/rabbitmq_management/priv/www/js/main.js

@@ -111,7 +111,22 @@ function check_login () {
   if (!isNaN(user_login_session_timeout)) {
     update_login_session_timeout(user_login_session_timeout)
   }
+<<<<<<< HEAD
   setup_global_vars()
+=======
+
+  ui_data_model.vhosts = JSON.parse(sync_get('/vhosts'));
+  ac.update(user, ui_data_model)
+  if (ac.isMonitoringUser()) {
+    ui_data_model.nodes = JSON.parse(sync_get('/nodes'))
+  }
+  var overview = JSON.parse(sync_get('/overview'))
+
+  display.update(overview, ui_data_model)
+
+  setup_global_vars(overview)
+
+>>>>>>> cc4fc57d0b (Fix #8276)
   setup_constant_events()
   update_vhosts()
   update_interval()

deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs

@@ -8,7 +8,7 @@
 <table class="list">
  <thead>
   <tr>
-    <%= group_heading('queues', 'Overview', [vhosts_interesting, nodes_interesting, true]) %>
+    <%= group_heading('queues', 'Overview', [display.vhosts, display.nodes, true]) %>
 <% if(disable_stats && enable_queue_totals) { %>
     <%= group_heading('queues', 'Messages', []) %>
 <% } else { %>
@@ -284,8 +284,13 @@
         </tr>
 <% } %>
 <%
+<<<<<<< HEAD
   if (nodes_interesting) {
    var nodes = JSON.parse(sync_get('/nodes'));
+=======
+  if (ac.canListNodes()) {
+   var nodes = display.data.nodes
+>>>>>>> 30184053c9 (Fix member variable for datamodel in Display)
 %>
         <tr>
           <th><label>Node:</label></th>