From 346adc86affcddc4ad1cafc08b5d4eae9ad593e0 Mon Sep 17 00:00:00 2001 From: Gabriele Santomaggio Date: Tue, 14 Sep 2021 17:18:49 +0200 Subject: [PATCH] Add counters on detail pages closes https://github.com/rabbitmq/rabbitmq-server/issues/3416 --- deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs | 2 +- deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs | 2 +- deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs | 6 +++--- deps/rabbitmq_stream_management/priv/www/js/stream.js | 2 +- .../priv/www/js/tmpl/streamConnection.ejs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs index 5ecd7f801ea8..0eae88802fe8 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs @@ -74,7 +74,7 @@
-

Consumers

+

Consumers (<%=(channel.consumer_details.length)%>)

<%= format('consumers', {'mode': 'channel', 'consumers': channel.consumer_details}) %>
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs index aff8ce65d1da..f107a3981c1a 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs @@ -76,7 +76,7 @@
-

Channels

+

Channels (<%=(channels.length)%>)

<%= format('channels-list', {'channels': channels, 'mode': 'connection'}) %>
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs index cf5afe508e78..3fda046f81c3 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs @@ -130,7 +130,7 @@ <% if(queue.consumers) { %> - Consumers + Consumers%> <%= fmt_string(queue.consumers) %> <% } else if(queue.hasOwnProperty('consumer_details')) { %> @@ -273,7 +273,7 @@ <% if(!disable_stats) { %>
-

Consumers

+

Consumers (<%=(queue.consumer_details.length)%>)

<%= format('consumers', {'mode': 'queue', 'consumers': queue.consumer_details}) %>
@@ -281,7 +281,7 @@ <% } %>
-

Bindings

+

Bindings (<%=(bindings.length)%>)

<%= format('bindings', {'mode': 'queue', 'bindings': bindings}) %> diff --git a/deps/rabbitmq_stream_management/priv/www/js/stream.js b/deps/rabbitmq_stream_management/priv/www/js/stream.js index baa9fe808a33..5dfbae994312 100644 --- a/deps/rabbitmq_stream_management/priv/www/js/stream.js +++ b/deps/rabbitmq_stream_management/priv/www/js/stream.js @@ -20,7 +20,7 @@ dispatcher_add(function(sammy) { if (is_stream(queue)) { var publishers = extraContent['extra_stream_publishers']; if (publishers !== undefined) { - return '

Stream publishers

' + + return '

Stream publishers (' + Object.keys(publishers).length +')

' + format('streamPublishersList', {'publishers': publishers, 'mode': 'queue'}) + '
'; } else { diff --git a/deps/rabbitmq_stream_management/priv/www/js/tmpl/streamConnection.ejs b/deps/rabbitmq_stream_management/priv/www/js/tmpl/streamConnection.ejs index 524ad71ebd22..571293bf4837 100644 --- a/deps/rabbitmq_stream_management/priv/www/js/tmpl/streamConnection.ejs +++ b/deps/rabbitmq_stream_management/priv/www/js/tmpl/streamConnection.ejs @@ -116,14 +116,14 @@ <% } %>
-

Publishers

+

Publishers (<%=(publishers.length)%>)

<%= format('streamPublishersList', {'publishers': publishers, 'mode' : 'connection'}) %>
-

Consumers

+

Consumers (<%=(consumers.length)%>)

<%= format('streamConsumersList', {'consumers': consumers}) %>