Manually backport #7304 (fixes #7301) to v3.10.x

Author: michaelklishin

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

@@ -55,8 +55,8 @@ for (var i = 0; i < permissions.length; i++) {
           <td>
             <input type="hidden" name="vhost" value="<%= fmt_string(parent.name) %>"/>
             <select name="username">
-              <% for (var i = 0; i < users.items.length; i++) { %>
-              <option value="<%= fmt_string(users.items[i].name) %>"><%= fmt_string(users.items[i].name) %></option>
+              <% for (var i = 0; i < users.length; i++) { %>
+                <option value="<%= fmt_string(users[i].name) %>"><%= fmt_string(users[i].name) %></option>
               <% } %>
             </select>
           </td>

deps/rabbitmq_management/priv/www/js/tmpl/topic-permissions.ejs

@@ -56,8 +56,8 @@ for (var i = 0; i < topic_permissions.length; i++) {
           <td>
             <input type="hidden" name="vhost" value="<%= fmt_string(parent.name) %>"/>
             <select name="username">
-              <% for (var i = 0; i < users.items.length; i++) { %>
-              <option value="<%= fmt_string(users.items[i].name) %>"><%= fmt_string(users.items[i].name) %></option>
+              <% for (var i = 0; i < users.length; i++) { %>
+                <option value="<%= fmt_string(users[i].name) %>"><%= fmt_string(users[i].name) %></option>
               <% } %>
             </select>
           </td>

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

@@ -8,11 +8,11 @@
 <% } %>
 
 <% if (!disable_stats) { %>
-<div class="section">
+  <div class="section" id="overview">
   <h2>Overview</h2>
   <div class="hider updatable">
     <%= queue_lengths('lengths-vhost', vhost) %>
-<% if (rates_mode != 'none') { %>
+<% if (rates_mode != 'none' && vhost.message_stats) { %>
     <%= message_rates('msg-rates-vhost', vhost.message_stats) %>
 <% } %>
     <%= data_rates('data-rates-vhost', vhost, 'Data rates') %>
@@ -51,7 +51,7 @@
 
 <%= format('topic-permissions', {'mode': 'vhost', 'topic_permissions': topic_permissions, 'users':users, 'parent': vhost, 'exchanges': exchanges}) %>
 
-<div class="section-hidden">
+<div class="section-hidden" id="delete-vhost">
 <h2>Delete this vhost</h2>
 <div class="hider">
 <form action="#/vhosts" method="delete" class="confirm">

deps/rabbitmq_management/selenium/test/pageobjects/AdminTab.js

@@ -2,15 +2,32 @@ const { By, Key, until, Builder } = require('selenium-webdriver')
 
 const OverviewPage = require('./OverviewPage')
 
+const SELECTED_ADMIN_TAB = By.css('div#menu ul#tabs li a.selected[href="#/users"]')
+
 const ALL_USERS_SECTION = By.css('div#users-section')
 const USER_LINK = By.css('div#menu ul#tabs li a[href="#/connections"]')
+
 const FILTER_USER = By.css('input#users-name')
 const CHECKBOX_REGEX = By.css('input#filter-regex-mode')
 const FILTERED_USER = By.css('span.filter-highlight')
 
+// RHM : RIGHT HAND MENU
+const USERS_ON_RHM = By.css('div#rhs ul li a[href="#/users"]')
+const LIMITS_ON_RHM = By.css('div#rhs ul li a[href="#/limits"]')
+const VHOSTS_ON_RHM = By.css('div#rhs ul li a[href="#/vhosts"]')
+
 module.exports = class AdminTab extends OverviewPage {
   async isLoaded () {
-    await this.waitForDisplayed(ADMIN_TAB)
+    await this.waitForDisplayed(SELECTED_ADMIN_TAB)
+  }
+  async clickOnUsers() {
+    await this.click(USERS_ON_RHM)
+  }
+  async clickOnLimits() {
+    await this.click(LIMITS_ON_RHM)
+  }
+  async clickOnVhosts() {
+    await this.click(VHOSTS_ON_RHM)
   }
 
   async searchForUser(user, regex = false) {
@@ -27,4 +44,4 @@ module.exports = class AdminTab extends OverviewPage {
     return await this.driver.findElement(filtered_user) != undefined
   }
 
-}
+}