karafka-web 0.11.3 → 0.11.5

data/lib/karafka/web/ui/models/health.rb

@@ -57,10 +57,15 @@ module Karafka
                 pt_id = partition.id
 
                 stats[cg_id] ||= { topics: {} }
-                stats[cg_id][:topics][t_name] ||= {}
-                stats[cg_id][:topics][t_name][pt_id] = partition
-                stats[cg_id][:topics][t_name][pt_id][:process] = process
-                stats[cg_id][:topics][t_name][pt_id][:subscription_group_id] = sg_id
+
+                stats[cg_id][:topics][t_name] ||= {
+                  partitions: {},
+                  partitions_count: topic.partitions_cnt
+                }
+
+                stats[cg_id][:topics][t_name][:partitions][pt_id] = partition
+                stats[cg_id][:topics][t_name][:partitions][pt_id][:process] = process
+                stats[cg_id][:topics][t_name][:partitions][pt_id][:subscription_group_id] = sg_id
               end
             end
 
@@ -74,7 +79,7 @@ module Karafka
 
                 ages = consumer_group[:subscription_groups].values.map do |sub_group_details|
                   rebalance_age_ms = sub_group_details[:state][:rebalance_age] || 0
-                  dispatched_at - rebalance_age_ms / 1_000
+                  dispatched_at - (rebalance_age_ms / 1_000)
                 end
 
                 stats[cg_name][:rebalance_ages] ||= Set.new
@@ -119,15 +124,15 @@ module Karafka
               stats.each_value do |cg_data|
                 topics = cg_data[:topics]
 
-                topics.each do |topic_name, t_data|
-                  topics[topic_name] = Hash[t_data.sort_by { |key, _| key }]
+                topics.each_value do |t_data|
+                  t_data[:partitions] = t_data[:partitions].sort_by { |key, _| key }.to_h
                 end
 
-                cg_data[:topics] = Hash[topics.sort_by { |key, _| key }]
+                cg_data[:topics] = topics.sort_by { |key, _| key }.to_h
               end
 
               # Ensure that all consumer groups are always in the same order
-              Hash[stats.sort_by { |key, _| key }]
+              stats.sort_by { |key, _| key }.to_h
             end
           end
         end

data/lib/karafka/web/ui/models/jobs.rb

@@ -30,16 +30,14 @@ module Karafka
           end
 
           # Creates a new Jobs object with selected jobs
-          # @param block [Proc] select proc
           # @return [Jobs] selected jobs enclosed with the Jobs object
-          def select(&block)
-            self.class.new(super(&block))
+          def select(&)
+            self.class.new(super)
           end
 
           # Allows for iteration over jobs
-          # @param block [Proc] block to call for each job
-          def each(&block)
-            @jobs_array.each(&block)
+          def each(&)
+            @jobs_array.each(&)
           end
         end
       end

data/lib/karafka/web/ui/models/message.rb

@@ -146,9 +146,9 @@ module Karafka
             # @param page [Integer] which page we want to get
             def topic_page(topic_id, partitions_ids, page)
               # This is the bottleneck, for each partition we make one request :(
-              offsets = partitions_ids.map do |partition_id|
+              offsets = partitions_ids.to_h do |partition_id|
                 [partition_id, Models::WatermarkOffsets.find(topic_id, partition_id)]
-              end.to_h
+              end
 
               # Count number of elements we have in each partition
               # This assumes linear presence until low. If not, gaps will be filled like we fill
@@ -158,7 +158,7 @@ module Karafka
               # Establish initial offsets for the iterator (where to start) per partition
               # We do not use the negative lookup iterator because we already can compute starting
               # offsets. This saves a lot of calls to Kafka
-              ranges = Sets.call(counts, page).map do |partition_position, partition_range|
+              ranges = Sets.call(counts, page).to_h do |partition_position, partition_range|
                 partition_id = partitions_ids.to_a[partition_position]
                 watermarks = offsets[partition_id]
 
@@ -169,7 +169,7 @@ module Karafka
 
                 # This range represents offsets we want to fetch
                 [partition_id, lowest..highest]
-              end.to_h
+              end
 
               # We start on our topic from the lowest offset for each expected partition
               iterator = Karafka::Pro::Iterator.new(
@@ -208,18 +208,17 @@ module Karafka
               end
 
               [
-                aggregated.values.map(&:values).map(&:reverse).reduce(:+),
+                aggregated.values.sum([]) { |partition| partition.values.reverse },
                 !Sets.call(counts, page + 1).empty?
               ]
             end
 
             private
 
-            # @param args [Object] anything required by the admin `#read_topic`
             # @return [Array<Karafka::Messages::Message>, false] topic partition messages or false
             #   in case we hit a non-existing offset
-            def read_topic(*args)
-              Lib::Admin.read_topic(*args)
+            def read_topic(*)
+              Lib::Admin.read_topic(*)
             rescue Rdkafka::RdkafkaError => e
               return false if e.code == :auto_offset_reset
 

data/lib/karafka/web/ui/models/metrics/aggregated.rb

@@ -103,10 +103,10 @@ module Karafka
                   base = sample.last.dup
 
                   DELTA_KEYS.each do |key|
-                    base[key] = previous.last[key] + (sample.last[key] - previous.last[key]) / 2
+                    base[key] = previous.last[key] + ((sample.last[key] - previous.last[key]) / 2)
                   end
 
-                  filled << [previous.first + (sample.first - previous.first) / 2, base]
+                  filled << [previous.first + ((sample.first - previous.first) / 2), base]
                 end
 
                 filled << sample
@@ -182,12 +182,12 @@ module Karafka
             # @param current [Hash]
             # @return [Hash] delta computed values
             def compute_deltas(previous, current)
-              DELTA_KEYS.map do |delta_key|
+              DELTA_KEYS.to_h do |delta_key|
                 [
                   delta_key,
                   current.fetch(delta_key) - previous.fetch(delta_key)
                 ]
-              end.to_h
+              end
             end
           end
         end

data/lib/karafka/web/ui/models/metrics/charts/aggregated.rb

@@ -38,8 +38,7 @@ module Karafka
               # @return [String] JSON with data about all the charts we were interested in
               def with(*args)
                 args
-                  .map { |name| [name.to_sym, public_send(name)] }
-                  .to_h
+                  .to_h { |name| [name.to_sym, public_send(name)] }
                   .to_json
               end
 

data/lib/karafka/web/ui/models/metrics/charts/topics.rb

@@ -36,11 +36,11 @@ module Karafka
                 end
 
                 # Extract the lag stored only from all the data
-                per_topic = @data.to_h.map do |topic, metrics|
+                per_topic = @data.to_h.to_h do |topic, metrics|
                   extracted = metrics.map { |metric| [metric.first, metric.last[:lag_hybrid]] }
 
                   [topic, extracted]
-                end.to_h
+                end
 
                 # We name it with a space because someone may have a topic called "total" and we
                 # want to avoid collisions

data/lib/karafka/web/ui/models/metrics/topics.rb

@@ -43,9 +43,9 @@ module Karafka
 
                 # Always align the order of topics in hash based on their name so it is
                 # independent from the reported order
-                extracted[range] = range_extracted.keys.sort.map do |key|
+                extracted[range] = range_extracted.keys.sort.to_h do |key|
                   [key, range_extracted[key]]
-                end.to_h
+                end
               end
 
               extracted
@@ -67,8 +67,7 @@ module Karafka
                              .select { |val| val.is_a?(Hash) }
                              .flat_map(&:keys)
                              .uniq
-                             .map { |key| [key, nil] }
-                             .to_h
+                             .to_h { |key| [key, nil] }
                              .freeze
 
               # Normalize data in between topics reportings

data/lib/karafka/web/ui/models/recurring_tasks/schedule.rb

@@ -50,7 +50,7 @@ module Karafka
                 new(candidate.payload)
               rescue Rdkafka::RdkafkaError => e
                 # If any of "topic missing" is raised, we return false but other errors we re-raise
-                raise(e) unless EXPECTED_RDKAFKA_ERRORS.any? { |code| e.code == code }
+                raise(e) unless EXPECTED_RDKAFKA_ERRORS.include?(e.code)
 
                 false
               end

data/lib/karafka/web/ui/public/stylesheets/application.min.css

@@ -2431,6 +2431,9 @@
     --btn-shadow: 0 0 0 0 oklch(0% 0 0/0), 0 0 0 0 oklch(0% 0 0/0);
     isolation: isolate;
   }
+  .isolate {
+    isolation: isolate;
+  }
   .stack {
     display: inline-grid;
     grid-template-columns: 3px 4px 1fr 4px 3px;
@@ -3861,6 +3864,9 @@
   .alert {
     border-radius: var(--radius-sm);
   }
+  .rounded {
+    border-radius: 0.25rem;
+  }
   .rounded-box {
     border-radius: var(--radius-box);
   }

data/lib/karafka/web/ui/routes/errors.rb

@@ -11,10 +11,10 @@ module Karafka
               controller = build(Controllers::ErrorsController)
 
               r.get Integer do |offset|
-                if params.current_offset != -1
-                  r.redirect root_path('errors', params.current_offset)
-                else
+                if params.current_offset == -1
                   controller.show(offset)
+                else
+                  r.redirect root_path('errors', params.current_offset)
                 end
               end
 

data/lib/karafka/web/ui/views/shared/exceptions/unhandled_error.erb

@@ -0,0 +1,42 @@
+<div class="hidden">
+  <%== partial 'shared/controls' %>
+</div>
+
+<main class="flex items-center justify-center min-h-screen">
+  <div id="content" class="max-w-2xl w-full mx-auto">
+    <div class="flex items-center justify-center vh-100">
+      <div class="text-center">
+        <h1 class="text-8xl font-bold">500</h1>
+
+        <p class="text-3xl mt-5">
+          <span class="text-red-500">Oops!</span> Internal Server Error.
+        </p>
+
+        <div class="mt-5">
+          <p class="mb-10 text-lg font-light">
+            Something went wrong while processing your request.
+          </p>
+
+          <p class="text-lg font-light mb-5">This error has been reported and logged. Please try the following:</p>
+
+          <ul class="list-disc text-left text-lg mb-10 pl-5 font-light">
+            <li>Visit the <a href="<%= root_path('status') %>" class="text-blue-500 underline">Status</a> page to check if there are any system issues</li>
+            <li>Check the <a href="<%= root_path('errors') %>" class="text-blue-500 underline">Errors</a> page for details about this error</li>
+            <li>Verify that all required topics exist and are accessible</li>
+            <li>Ensure you have a working connection with your Kafka cluster</li>
+            <li>Try refreshing the page or navigating back to retry your action</li>
+          </ul>
+
+          <p class="mb-10 text-lg font-light">
+            If the problem persists, please check your application logs for more details.
+          </p>
+
+          <p>
+            <a href="<%= root_path %>" class="btn btn-primary mr-2 rounded-md py-1">Go Home</a>
+            <a href="<%= root_path('status') %>" class="btn btn-success text-white rounded-md">Status page</a>
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

data/lib/karafka/web/version.rb

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

data/lib/karafka/web.rb

@@ -26,8 +26,7 @@ module Karafka
       end
 
       # Sets up the whole configuration
-      # @param [Block] block configuration block
-      def setup(&block)
+      def setup(&)
         # You should never reconfigure Web UI after it has been enabled
         raise Errors::LateSetupError, 'Always call #setup before #enable!' if config.enabled
 
@@ -38,7 +37,7 @@ module Karafka
           Pro::Loader.pre_setup_all(config)
         end
 
-        Config.configure(&block)
+        Config.configure(&)
 
         Pro::Loader.post_setup_all(config) if Karafka.pro?