diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5b3c07..b894802c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,6 @@ - [Improvement] Link `counters` counter to jobs page. - [Improvement] Include a sticky footer with the most important links and copyrights. - [Improvement] Store lag in counters for performance improvement and historical metrics. -- [Improvement] Move top navbar content to the left to gain space for new features. - [Improvement] Introduce in-memory cluster state cached to improve performance. - [Improvement] Switch to offset based pagination instead of per-page pagination. - [Improvement] Avoid double-reading of watermark offsets for explorer and errors display. diff --git a/lib/karafka/web/ui/pro/views/routing/_consumer_group.erb b/lib/karafka/web/ui/pro/views/routing/_consumer_group.erb index 3b3858ae..1f67a3bd 100644 --- a/lib/karafka/web/ui/pro/views/routing/_consumer_group.erb +++ b/lib/karafka/web/ui/pro/views/routing/_consumer_group.erb @@ -20,12 +20,14 @@ - <% consumer_group.subscription_groups.each do |subscription_group| %> + <% consumer_group.topics.each do |topic| %> <%== - each_partial( - subscription_group.topics, + partial( 'routing/topic', - locals: { subscription_group: subscription_group } + locals: { + subscription_group: topic.subscription_group, + topic: topic + } ) %> <% end %> diff --git a/lib/karafka/web/ui/pro/views/routing/_topic.erb b/lib/karafka/web/ui/pro/views/routing/_topic.erb index 2df0477b..0f30dc36 100644 --- a/lib/karafka/web/ui/pro/views/routing/_topic.erb +++ b/lib/karafka/web/ui/pro/views/routing/_topic.erb @@ -1,6 +1,6 @@ - <%= subscription_group.id %> + <%= subscription_group %> <%= topic.name %> diff --git a/lib/karafka/web/ui/views/routing/_consumer_group.erb b/lib/karafka/web/ui/views/routing/_consumer_group.erb index 48fdf144..e5ba4bcb 100644 --- a/lib/karafka/web/ui/views/routing/_consumer_group.erb +++ b/lib/karafka/web/ui/views/routing/_consumer_group.erb @@ -19,12 +19,14 @@ - <% consumer_group.subscription_groups.each do |subscription_group| %> + <% consumer_group.topics.each do |topic| %> <%== - each_partial( - subscription_group.topics, + partial( 'routing/topic', - locals: { subscription_group: subscription_group } + locals: { + subscription_group: topic.subscription_group, + topic: topic + } ) %> <% end %> diff --git a/lib/karafka/web/ui/views/routing/_topic.erb b/lib/karafka/web/ui/views/routing/_topic.erb index 5d4b0b31..f13560d2 100644 --- a/lib/karafka/web/ui/views/routing/_topic.erb +++ b/lib/karafka/web/ui/views/routing/_topic.erb @@ -1,6 +1,6 @@ - <%= subscription_group.id %> + <%= subscription_group %> <%= topic.name %>