reorganization of drawing

karafka · Sep 13, 2023 · 21722ff · 21722ff
1 parent b388c25
commit 21722ff
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git 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
@@ -20,12 +20,14 @@
         </tr>
       </thead>
       <tbody>
-        <% 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
@@ -1,6 +1,6 @@
 <tr>
   <td>
-    <%= subscription_group.id %>
+    <%= subscription_group %>
   </td>
   <td>
     <%= topic.name %>

diff --git a/lib/karafka/web/ui/views/routing/_consumer_group.erb b/lib/karafka/web/ui/views/routing/_consumer_group.erb
@@ -19,12 +19,14 @@
         </tr>
       </thead>
       <tbody>
-        <% 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
@@ -1,6 +1,6 @@
 <tr>
   <td>
-    <%= subscription_group.id %>
+    <%= subscription_group %>
   </td>
   <td>
     <%= topic.name %>