karafka-web 0.6.2 → 0.6.3

data/lib/karafka/web/ui/pro/controllers/explorer.rb

@@ -18,11 +18,10 @@ module Karafka
         module Controllers
           # Data explorer controller
           class Explorer < Ui::Controllers::Base
-            include Ui::Lib::Paginations
-
             # Lists all the topics we can explore
             def index
-              @topics = Models::ClusterInfo
+              @topics = Karafka::Admin
+                        .cluster_info
                         .topics
                         .reject { |topic| topic[:topic_name] == '__consumer_offsets' }
                         .sort_by { |topic| topic[:topic_name] }
@@ -30,34 +29,6 @@ module Karafka
               respond
             end
 
-            # Displays aggregated messages from (potentially) all partitions of a topic
-            #
-            # @param topic_id [String]
-            #
-            # @note This view may not be 100% accurate because we merge multiple partitions data
-            #   into a single view and this is never accurate. It can be used however to quickly
-            #   look at most recent data flowing, etc, hence it is still useful for aggregated
-            #   metrics information
-            #
-            # @note We cannot use offset references here because each of the partitions may have
-            #   completely different values
-            def topic(topic_id)
-              @topic_id = topic_id
-              @partitions_count = Models::ClusterInfo.partitions_count(topic_id)
-
-              @active_partitions, materialized_page, @limited = Paginators::Partitions.call(
-                @partitions_count, @params.current_page
-              )
-
-              @messages, next_page = Models::Message.topic_page(
-                topic_id, @active_partitions, materialized_page
-              )
-
-              paginate(@params.current_page, next_page)
-
-              respond
-            end
-
             # Shows messages available in a given partition
             #
             # @param topic_id [String]
@@ -65,16 +36,13 @@ module Karafka
             def partition(topic_id, partition_id)
               @topic_id = topic_id
               @partition_id = partition_id
-              @watermark_offsets = Ui::Models::WatermarkOffsets.find(topic_id, partition_id)
-              @partitions_count = Models::ClusterInfo.partitions_count(topic_id)
 
-              previous_offset, @messages, next_offset = current_partition_data
+              @watermark_offsets = Ui::Models::WatermarkOffsets.find(topic_id, partition_id)
 
-              paginate(
-                previous_offset,
-                @params.current_offset,
-                next_offset,
-                @messages.map(&:offset)
+              @previous_page, @messages, @next_page, @partitions_count = Ui::Models::Message.page(
+                @topic_id,
+                @partition_id,
+                @params.current_page
               )
 
               respond
@@ -106,19 +74,6 @@ module Karafka
 
               respond
             end
-
-            private
-
-            # Fetches current page data
-            # @return [Array] fetched data with pagination information for the requested partition
-            def current_partition_data
-              Ui::Models::Message.offset_page(
-                @topic_id,
-                @partition_id,
-                @params.current_offset,
-                @watermark_offsets
-              )
-            end
           end
         end
       end

data/lib/karafka/web/ui/pro/views/errors/_breadcrumbs.erb

@@ -1,16 +1,14 @@
 <li class="breadcrumb-item">
-  <a href="<%= root_path('errors') %>">
+  <a href="<%= root_path('errors', 0) %>">
     Errors
   </a>
 </li>
 
-<% if @partition_id %>
-  <li class="breadcrumb-item">
-    <a href="<%= root_path('errors', @partition_id) %>">
-      Partition <%= @partition_id %>
-    </a>
-  </li>
-<% end %>
+<li class="breadcrumb-item">
+  <a href="<%= root_path('errors', @partition_id) %>">
+    Partition <%= @partition_id %>
+  </a>
+</li>
 
 <% if @offset %>
   <li class="breadcrumb-item">

data/lib/karafka/web/ui/pro/views/errors/_error.erb

@@ -1,4 +1,4 @@
-<% if error_msg.is_a?(Array) %>
+<% if error_msg.is_a?(Integer) %>
   <tr>
     <td colspan="5" class="text-center text-muted">
       This error has either been removed or compacted and is no longer available.

data/lib/karafka/web/ui/pro/views/errors/_partition_option.erb

@@ -3,5 +3,5 @@
 <% else %>
   <option value="<%= root_path('errors', partition) %>">
 <% end %>
-  <%= partition || 'All' %>
+  <%= partition %>
 </option>

data/lib/karafka/web/ui/pro/views/errors/index.erb

@@ -1,18 +1,65 @@
-<%== partial('errors/title_with_select') %>
+<div class="container mb-4">
+  <div class="row">
+    <div class="col">
+      <h3>
+        Errors
+      </h3>
+    </div>
+
+    <div class="col">
+        <div class="col-auto text-end">
+           <label class="col-form-label">Partition</label>
+        </div>
+    </div>
+
+    <div class="col pt-1 mb-0 pb-0">
+        <div class="col-auto">
+          <select class="form-select form-select-sm mb-0 form-control" id="current-partition">
+            <%==
+              each_partial(
+                @partitions_count.times.to_a,
+                'errors/partition_option',
+                local: :partition
+              )
+            %>
+          </select>
+        </div>
+    </div>
+  </div>
+
+  <hr>
+</div>
 
 <div class="container">
   <div class="row mb-5">
     <div class="col-sm-12">
-      <%== partial('explorer/topic/partitions') %>
-
-      <% if @limited %>
-        <%== partial('explorer/topic/limited') %>
-      <% end %>
+      <%== partial('explorer/partition/watermark_offsets') %>
 
-      <% if @error_messages.empty? && params.current_page == 1 %>
-        <%== partial 'explorer/topic/empty' %>
+      <% if @watermark_offsets.empty? %>
+        <%== partial 'errors/no_errors' %>
+      <% elsif @watermark_offsets.cleaned? %>
+        <%== partial 'errors/cleaned' %>
       <% else %>
-        <%== partial 'errors/table' %>
+        <table class="processes bg-white table table-hover table-bordered table-striped mb-0 align-middle">
+          <thead>
+            <tr class="align-middle">
+              <th>Origin</th>
+              <th>Process name</th>
+              <th>Error</th>
+              <th>Occurred at</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%==
+              each_partial(
+                @error_messages,
+                'errors/error',
+                local: :error_msg
+              )
+            %>
+          </tbody>
+        </table>
       <% end %>
     </div>
   </div>

data/lib/karafka/web/ui/pro/views/explorer/_breadcrumbs.erb

@@ -6,7 +6,7 @@
 
 <% if @topic_id %>
   <li class="breadcrumb-item">
-    <a href="<%= root_path('explorer', @topic_id) %>">
+    <a href="<%= root_path('explorer', @topic_id, 0) %>">
       <%= @topic_id %>
     </a>
   </li>

data/lib/karafka/web/ui/pro/views/explorer/_message.erb

@@ -1,10 +1,7 @@
-<% if message.is_a?(Array) %>
+<% if message.is_a?(Integer) %>
   <tr>
     <td class="text-muted">
-      <%= message[0] %>
-    </td>
-    <td class="text-muted">
-      <%= message[1] %>
+      <%= message %>
     </td>
     <td colspan="3" class="text-center text-muted">
       This message has either been removed or compacted and is no longer available.
@@ -12,9 +9,6 @@
   </tr>
 <% else %>
   <tr>
-    <td>
-      <%= message.partition %>
-    </td>
     <td>
       <%= message.offset %>
     </td>

data/lib/karafka/web/ui/pro/views/explorer/_partition_option.erb

@@ -3,5 +3,5 @@
 <% else %>
   <option value="<%= root_path('explorer', @topic_id, partition) %>">
 <% end %>
-  <%= partition || 'All' %>
+  <%= partition %>
 </option>

data/lib/karafka/web/ui/pro/views/explorer/_topic.erb

@@ -2,7 +2,7 @@
   <div class="card" >
     <div class="card-body p-2">
       <p class="card-text mb-0 p-2">
-        <a href="<%= root_path('explorer', topic[:topic_name]) %>">
+        <a href="<%= root_path('explorer', topic[:topic_name], 0) %>">
           <%= topic[:topic_name] %> /
           <%= topic[:partition_count] %>
         </a>

data/lib/karafka/web/ui/pro/views/explorer/partition/_messages.erb

@@ -1,7 +1,6 @@
 <table class="processes bg-white table table-hover table-bordered table-striped mb-0 align-middle">
   <thead>
     <tr class="align-middle">
-      <th>Partition</th>
       <th>Offset</th>
       <th>Timestamp</th>
       <th>Key</th>

data/lib/karafka/web/ui/pro/views/explorer/partition.erb

@@ -17,7 +17,7 @@
           <select class="form-select form-select-sm mb-0 form-control" id="current-partition">
             <%==
               each_partial(
-                [nil] + @partitions_count.times.to_a,
+                @partitions_count.times.to_a,
                 'explorer/partition_option',
                 local: :partition
               )

data/lib/karafka/web/ui/pro/views/shared/_navigation.erb

@@ -31,7 +31,7 @@
       </a>
     </li>
     <li class="nav-item ms-3">
-      <a class="nav-link <%= nav_class(start_with: '/errors') %>" href="<%= root_path('errors') %>">
+      <a class="nav-link <%= nav_class(start_with: '/errors') %>" href="<%= root_path('errors/0') %>">
         Errors
       </a>
     </li>

data/lib/karafka/web/ui/views/cluster/_partition.erb

@@ -3,7 +3,7 @@
 <% if topic[:topic_name] != '__consumer_offsets' %>
   <tr>
     <td>
-      <a href="<%= root_path('explorer', topic[:topic_name]) %>">
+      <a href="<%= root_path('explorer', topic[:topic_name], 0) %>">
         <%= topic[:topic_name] %>
       </a>
     <td>

data/lib/karafka/web/ui/views/errors/_error.erb

@@ -1,4 +1,4 @@
-<% if error_msg.is_a?(Array) %>
+<% if error_msg.is_a?(Integer) %>
   <tr>
     <td colspan="5" class="text-center text-muted">
       This error has either been removed or compacted and is no longer available.

data/lib/karafka/web/ui/views/shared/_pagination.erb

@@ -1,32 +1,28 @@
-<% if @pagination && @pagination.paginate? %>
+<% if @current_page && (@current_page > 1 || @next_page) %>
   <div id="pagination" class="container mb-5">
     <div class="row">
       <nav>
         <ul class="pagination justify-content-center">
-          <li class="page-item <%= 'disabled' unless @pagination.first_offset? %>">
-            <a class="page-link" href="<%= current_path(@pagination.offset_key => @pagination.first_offset) %>">
+          <li class="page-item <%= 'disabled' if @current_page <= 1 %>">
+            <a class="page-link" href="<%= current_path(page: 1) %>">
               <span>&laquo;</span>
             </a>
           </li>
 
-          <li class="page-item <%= 'disabled' unless @pagination.previous_offset? %>">
-            <a class="page-link" href="<%= current_path(@pagination.offset_key => @pagination.previous_offset) %>">
+          <li class="page-item <%= 'disabled' if @current_page <= 1 %>">
+            <a class="page-link" href="<%= current_path(page: @current_page - 1) %>">
               <span>&lsaquo; Prev</span>
             </a>
           </li>
 
-          <% if @pagination.current_offset? %>
-            <li class="page-item active disabled">
-              <a class="page-link" href="<%= current_path(@pagination.offset_key => @pagination.current_offset) %>">
-                <span>
-                  <%= @pagination.current_label %>
-                </span>
-              </a>
-            </li>
-          <% end %>
+          <li class="page-item active disabled">
+            <a class="page-link" href="<%= current_path(page: @current_page) %>">
+              <span><%= @current_page %></span>
+            </a>
+          </li>
 
-          <li class="page-item <%= 'disabled' unless @pagination.next_offset? %>">
-            <a class="page-link" href="<%= current_path(@pagination.offset_key => @pagination.next_offset) %>">
+          <li class="page-item <%= 'disabled' unless @next_page %>">
+            <a class="page-link" href="<%= current_path(page: @next_page) %>">
               <span>Next &rsaquo;</span>
             </a>
           </li>

data/lib/karafka/web/version.rb

@@ -3,6 +3,6 @@
 module Karafka
   module Web
     # Current gem version
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-web
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -218,15 +218,7 @@ files:
 - lib/karafka/web/ui/controllers/status.rb
 - lib/karafka/web/ui/helpers/application_helper.rb
 - lib/karafka/web/ui/lib/hash_proxy.rb
-- lib/karafka/web/ui/lib/paginations/base.rb
-- lib/karafka/web/ui/lib/paginations/offset_based.rb
-- lib/karafka/web/ui/lib/paginations/page_based.rb
-- lib/karafka/web/ui/lib/paginations/paginators/arrays.rb
-- lib/karafka/web/ui/lib/paginations/paginators/base.rb
-- lib/karafka/web/ui/lib/paginations/paginators/partitions.rb
-- lib/karafka/web/ui/lib/paginations/paginators/sets.rb
-- lib/karafka/web/ui/lib/ttl_cache.rb
-- lib/karafka/web/ui/models/cluster_info.rb
+- lib/karafka/web/ui/lib/paginate_array.rb
 - lib/karafka/web/ui/models/consumer_group.rb
 - lib/karafka/web/ui/models/counters.rb
 - lib/karafka/web/ui/models/health.rb
@@ -272,10 +264,7 @@ files:
 - lib/karafka/web/ui/pro/views/errors/_breadcrumbs.erb
 - lib/karafka/web/ui/pro/views/errors/_error.erb
 - lib/karafka/web/ui/pro/views/errors/_partition_option.erb
-- lib/karafka/web/ui/pro/views/errors/_table.erb
-- lib/karafka/web/ui/pro/views/errors/_title_with_select.erb
 - lib/karafka/web/ui/pro/views/errors/index.erb
-- lib/karafka/web/ui/pro/views/errors/partition.erb
 - lib/karafka/web/ui/pro/views/errors/show.erb
 - lib/karafka/web/ui/pro/views/explorer/_breadcrumbs.erb
 - lib/karafka/web/ui/pro/views/explorer/_detail.erb
@@ -291,10 +280,6 @@ files:
 - lib/karafka/web/ui/pro/views/explorer/partition/_messages.erb
 - lib/karafka/web/ui/pro/views/explorer/partition/_watermark_offsets.erb
 - lib/karafka/web/ui/pro/views/explorer/show.erb
-- lib/karafka/web/ui/pro/views/explorer/topic.erb
-- lib/karafka/web/ui/pro/views/explorer/topic/_empty.erb
-- lib/karafka/web/ui/pro/views/explorer/topic/_limited.erb
-- lib/karafka/web/ui/pro/views/explorer/topic/_partitions.erb
 - lib/karafka/web/ui/pro/views/health/_breadcrumbs.erb
 - lib/karafka/web/ui/pro/views/health/_partition.erb
 - lib/karafka/web/ui/pro/views/health/index.erb

data/lib/karafka/web/ui/lib/paginations/base.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Karafka
-  module Web
-    module Ui
-      module Lib
-        # Namespace for all the types of pagination engines we want to support
-        module Paginations
-          # Abstraction on top of pagination, so we can alter pagination key and other things
-          # for non-standard pagination views (non page based, etc)
-          #
-          # @note We do not use `_page` explicitly to indicate, that the page scope may not operate
-          #   on numerable pages (1,2,3,4) but can operate on offsets or times, etc. `_offset` is
-          #   more general and may refer to many types of pagination.
-          class Base
-            attr_reader :previous_offset, :current_offset, :next_offset
-
-            # @return [Boolean] Should we show pagination at all
-            def paginate?
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-
-            # @return [Boolean] Should first offset link be active. If false, the first offset link
-            #   will be disabled
-            def first_offset?
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-
-            # @return [String] first offset url value
-            def first_offset
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-
-            # @return [Boolean] Should previous offset link be active. If false, the previous
-            #   offset link will be disabled
-            def previous_offset?
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-
-            # @return [Boolean] Should we show current offset. If false, the current offset link
-            #   will not be visible at all. Useful for non-linear pagination.
-            def current_offset?
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-
-            # @return [Boolean] Should we show next offset pagination. If false, next offset link
-            #   will be disabled.
-            def next_offset?
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-
-            # @return [String] the url offset key
-            def offset_key
-              raise NotImplementedError, 'Implement in a subclass'
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/karafka/web/ui/lib/paginations/offset_based.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-module Karafka
-  module Web
-    module Ui
-      module Lib
-        module Paginations
-          # Kafka offset based pagination backend
-          #
-          # Allows us to support paginating over offsets
-          class OffsetBased < Base
-            # @param previous_offset [Integer, false] previous offset or false if should not be
-            #   presented
-            # @param current_offset [Integer] current offset
-            # @param next_offset [Integer, Boolean] should we show next offset page button. If
-            #   false it will not be presented.
-            # @param visible_offsets [Array<Integer>] offsets that are visible in the paginated
-            #   view. It is needed for the current page label
-            def initialize(
-              previous_offset,
-              current_offset,
-              next_offset,
-              visible_offsets
-            )
-              @previous_offset = previous_offset
-              @current_offset = current_offset
-              @next_offset = next_offset
-              @visible_offsets = visible_offsets
-              super()
-            end
-
-            # Show pagination only when there is more than one page of results to be presented
-            #
-            # @return [Boolean]
-            def paginate?
-              @current_offset && (!!@previous_offset || !!@next_offset)
-            end
-
-            # @return [Boolean] active only when we are not on the first page. First page is always
-            #   indicated by the current offset being -1. If there is someone that sets up the
-            #   current offset to a value equal to the last message in the topic partition, we do
-            #   not consider it as a first page and we allow to "reset" to -1 via the first page
-            #   button
-            def first_offset?
-              @current_offset != -1
-            end
-
-            # @return [Boolean] first page offset is always nothing because we use the default -1
-            #   for the offset.
-            def first_offset
-              false
-            end
-
-            # @return [Boolean] Active previous page link when it is not the first page
-            def previous_offset?
-              !!@previous_offset
-            end
-
-            # @return [Boolean] We show current label with offsets that are present on the given
-            #   page
-            def current_offset?
-              true
-            end
-
-            # @return [Boolean] move to the next page if not false. False indicates, that there is
-            #   no next page to move to
-            def next_offset?
-              !!@next_offset
-            end
-
-            # If there is no next offset, we point to 0 as there should be no smaller offset than
-            # that in Kafka ever
-            # @return [Integer]
-            def next_offset
-              next_offset? ? @next_offset : 0
-            end
-
-            # @return [String] label of the current page. It is combined out of the first and
-            #   the last offsets to show the range where we are. It will be empty if no offsets
-            #   but this is not a problem as then we should not display pagination at all
-            def current_label
-              first = @visible_offsets.first
-              last = @visible_offsets.last
-              [first, last].compact.uniq.join(' - ').to_s
-            end
-
-            # @return [String] for offset based pagination we use the offset param name
-            def offset_key
-              'offset'
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/karafka/web/ui/lib/paginations/page_based.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Karafka
-  module Web
-    module Ui
-      module Lib
-        module Paginations
-          # Regular page-based pagination engine
-          class PageBased < Base
-            # @param current_offset [Integer] current page
-            # @param show_next_offset [Boolean] should we show next page
-            #   (value is computed automatically)
-            def initialize(
-              current_offset,
-              show_next_offset
-            )
-              @previous_offset = current_offset - 1
-              @current_offset = current_offset
-              @next_offset = show_next_offset ? current_offset + 1 : false
-              super()
-            end
-
-            # Show pagination only when there is more than one page
-            # @return [Boolean]
-            def paginate?
-              @current_offset && (@current_offset > 1 || !!@next_offset)
-            end
-
-            # @return [Boolean] active the first page link when we are not on the first page
-            def first_offset?
-              @current_offset > 1
-            end
-
-            # @return [Boolean] first page for page based pagination is always empty as it moves us
-            #   to the initial page so we do not include any page info
-            def first_offset
-              false
-            end
-
-            # @return [Boolean] Active previous page link when it is not the first page
-            def previous_offset?
-              @current_offset > 1
-            end
-
-            # @return [Boolean] always show current offset pagination value
-            def current_offset?
-              true
-            end
-
-            # @return [String] label of the current page
-            def current_label
-              @current_offset.to_s
-            end
-
-            # @return [Boolean] move to the next page if not false. False indicates, that there is
-            #   no next page to move to
-            def next_offset?
-              @next_offset
-            end
-
-            # @return [String] for page pages pagination, always use page as the url value
-            def offset_key
-              'page'
-            end
-          end
-        end
-      end
-    end
-  end
-end