From 332ca5cd455332f5282fe95464be0ec1dfd94215 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Thu, 14 Sep 2017 13:49:57 -0700
Subject: [PATCH 1/3] Format node names consistently

This change ensures that nodes whose name begins with `rabbit@` have that leading text removed. This saves UI space as, in production environments, the default node name is `rabbit@`.
---
 deps/rabbitmq_management/.gitignore           |  2 ++
 .../priv/www/js/formatters.js                 | 26 ++++++++++++++-----
 .../priv/www/js/tmpl/overview.ejs             |  2 +-
 .../priv/www/js/tmpl/partition.ejs            |  2 +-
 .../priv/www/js/tmpl/queues.ejs               |  2 +-
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/deps/rabbitmq_management/.gitignore b/deps/rabbitmq_management/.gitignore
index 178da03512..26dd0a0739 100644
--- a/deps/rabbitmq_management/.gitignore
+++ b/deps/rabbitmq_management/.gitignore
@@ -2,6 +2,8 @@
 .*.sw?
 *.beam
 *.pem
+erl_crash.dump
+MnesiaCore.*
 .erlang.mk/
 /cover/
 /debug/
diff --git a/deps/rabbitmq_management/priv/www/js/formatters.js b/deps/rabbitmq_management/priv/www/js/formatters.js
index 1abfdd5a78..51c3561ea7 100644
--- a/deps/rabbitmq_management/priv/www/js/formatters.js
+++ b/deps/rabbitmq_management/priv/www/js/formatters.js
@@ -7,8 +7,12 @@ PROCESS_THRESHOLDS=[[0.75, 'red'],
                     [0.5, 'yellow']];
 
 function fmt_string(str, unknown) {
-    if (unknown == undefined) unknown = UNKNOWN_REPR;
-    if (str == undefined) return unknown;
+    if (unknown == undefined) {
+        unknown = UNKNOWN_REPR;
+    }
+    if (str == undefined) {
+        return unknown;
+    }
     return fmt_escape_html("" + str);
 }
 
@@ -490,11 +494,19 @@ function fmt_maybe_wrap(txt, encoding) {
     return fmt_escape_html(res);
 }
 
+// Note: since the default node name is 'rabbit'
+// we strip it off here to save UI space
 function fmt_node(node_host) {
-    var both = node_host.split('@');
-    var node = both.slice(0, 1);
-    var host = both.slice(1);
-    return node == 'rabbit' ? host : (node + '@' + host);
+    var fmt_node_re = /^rabbit@(.*)$/;
+    function do_fmt_node(nh) {
+        var rslt = null;
+        if (rslt = fmt_node_re.exec(nh)) {
+            return fmt_string(rslt[1]);
+        } else {
+            return fmt_string(nh);
+        }
+    };
+    return do_fmt_node(node_host);
 }
 
 function fmt_object_state(obj) {
@@ -643,7 +655,7 @@ function link_user(name) {
 }
 
 function link_node(name) {
-    return _link_to(name, '#/nodes/' + esc(name))
+    return _link_to(fmt_node(name), '#/nodes/' + esc(name))
 }
 
 function link_policy(vhost, name) {
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
index 60dbb25d1d..8f430a3d03 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
@@ -72,7 +72,7 @@
 
 <div class="hider updatable">
 <% if (nodes.length == 1) { %>
-    <p>Node: <%= nodes[0].name %> <a href="#/nodes/<%= esc(nodes[0].name) %>">(More about this node)</a></p>
+    <p>Node: <%= fmt_node(nodes[0].name) %> <a href="#/nodes/<%= esc(nodes[0].name) %>">(More about this node)</a></p>
 <% } %>
 
 <table class="list">
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/partition.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/partition.ejs
index bc22fe27d5..0777ba5e34 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/partition.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/partition.ejs
@@ -30,7 +30,7 @@
      var partition = partitions[i];
 %>
     <tr<%= alt_rows(i)%>>
-      <td><%= partition.node %></td>
+      <td><%= fmt_node(partition.node) %></td>
       <td>
 <%
    for (var j = 0; j < partition.others.length; j++) {
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
index 9b312fb075..6d51f740ef 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
@@ -223,7 +223,7 @@
           <td>
             <select name="node">
               <% for (var i = 0; i < nodes.length; i++) { %>
-              <option value="<%= fmt_string(nodes[i].name) %>"><%= nodes[i].name %></option>
+              <option value="<%= nodes[i].name %>"><%= fmt_node(nodes[i].name) %></option>
               <% } %>
             </select>
           </td>

From 707710f6c32648977728604177bacca0fe7e0641 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Thu, 14 Sep 2017 13:53:21 -0700
Subject: [PATCH 2/3] Ensure node name is html formatted as option

---
 deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
index 6d51f740ef..cb2a51f81a 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
@@ -223,7 +223,7 @@
           <td>
             <select name="node">
               <% for (var i = 0; i < nodes.length; i++) { %>
-              <option value="<%= nodes[i].name %>"><%= fmt_node(nodes[i].name) %></option>
+              <option value="<%= fmt_string(nodes[i].name) %>"><%= fmt_node(nodes[i].name) %></option>
               <% } %>
             </select>
           </td>

From ddf8e74eb406fae21c71797b49d461fcb59afc26 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Mon, 18 Sep 2017 10:49:00 -0700
Subject: [PATCH 3/3] Do not remove rabbit@ prefix

---
 deps/rabbitmq_management/priv/www/js/formatters.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/deps/rabbitmq_management/priv/www/js/formatters.js b/deps/rabbitmq_management/priv/www/js/formatters.js
index 51c3561ea7..3ace1cc4eb 100644
--- a/deps/rabbitmq_management/priv/www/js/formatters.js
+++ b/deps/rabbitmq_management/priv/www/js/formatters.js
@@ -494,19 +494,8 @@ function fmt_maybe_wrap(txt, encoding) {
     return fmt_escape_html(res);
 }
 
-// Note: since the default node name is 'rabbit'
-// we strip it off here to save UI space
 function fmt_node(node_host) {
-    var fmt_node_re = /^rabbit@(.*)$/;
-    function do_fmt_node(nh) {
-        var rslt = null;
-        if (rslt = fmt_node_re.exec(nh)) {
-            return fmt_string(rslt[1]);
-        } else {
-            return fmt_string(nh);
-        }
-    };
-    return do_fmt_node(node_host);
+    return fmt_string(node_host);
 }
 
 function fmt_object_state(obj) {