karafka-web 0.11.0.beta3 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbb446937174f7dd3cab032906c346093d389ec59084557f05e56294f127b3c
-  data.tar.gz: 02b0435ccb4a655bd1870a508ac9173d310e8f82442af82b6e1e35a573b6ae4e
+  metadata.gz: 323655d05b3e4b77ddce36c63cee362ef711c89256cbcb97db6ea57c8939a398
+  data.tar.gz: c26e39271b910a860a85a22296a85f37367706754448fd96379cf6d0e4d4f101
 SHA512:
-  metadata.gz: dfeaf8bc767470dd2a90619757bf57ab9e7695f2487006658d8cc186c83e4bfd8786924e0b622013ff6c366dfa5a669e12fd782f1cbfcd26d179c81a14ec93c9
-  data.tar.gz: dc043752038cf5225319453dd6f2471115824d56961cd6016e2f7d753c56fdfc0788bd59ea75d266cf6ed3872c2b9782d226e72b5ec3c9a29c505d44f266b8e9
+  metadata.gz: 9632693f31939e911fba49a2a2ecb6c85e8cd468a01daa275d910d2c23b3e9b39a1ebc83d99cf5ed552fe794d9c7c1fe05097e4a5fa718190c8c1979df0ce743
+  data.tar.gz: d90eeb89e20b214a94450896a8cc65b7fceb73e1b1f7c02aedddb0af3953b500c97b50e70bc993b9a54de074179650b680f96f4b36c0aefc9bc490784720e10d

data/CHANGELOG.md

@@ -52,6 +52,7 @@
 - [Fix] Allow for using default search matchers in Karafka Web UI topics including Errors.
 - [Fix] Ensure that when flashes or alerts are visible, pages are not auto-refreshed (would cause them to dissapear).
 - [Fix] Time selector in the explorer does not disappear after clicking out.
+- [Fix] Tombstone message presentation epoch doesn't make sense.
 - [Maintenance] Require `karafka-core` `>= 2.4.8` and `karafka` `>= 2.4.16`.
 - [Maintenance] Update `AirDatepicker` to `3.6.0`.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka-web (0.11.0.beta3)
+    karafka-web (0.11.0.rc1)
       erubi (~> 1.4)
       karafka (>= 2.5.0.beta1, < 2.6.0)
       karafka-core (>= 2.5.0, < 2.6.0)
@@ -24,7 +24,7 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
     bigdecimal (3.1.9)
     byebug (12.0.0)
     concurrent-ruby (1.3.5)
@@ -35,7 +35,7 @@ GEM
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (6.5.1)
+    factory_bot (6.5.3)
       activesupport (>= 6.1.0)
     ffi (1.17.2)
     ffi (1.17.2-aarch64-linux-gnu)
@@ -53,16 +53,16 @@ GEM
       raabro (~> 1.4)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    karafka (2.5.0.beta1)
+    karafka (2.5.0.rc1)
       base64 (~> 0.2)
       karafka-core (>= 2.5.0, < 2.6.0)
-      karafka-rdkafka (>= 0.19.2)
+      karafka-rdkafka (>= 0.19.5)
       waterdrop (>= 2.8.3, < 3.0.0)
       zeitwerk (~> 2.3)
-    karafka-core (2.5.0)
+    karafka-core (2.5.1)
       karafka-rdkafka (>= 0.19.2, < 0.21.0)
       logger (>= 1.6.0)
-    karafka-rdkafka (0.19.2)
+    karafka-rdkafka (0.19.5)
       ffi (~> 1.15)
       mini_portile2 (~> 2.6)
       rake (> 12)
@@ -100,19 +100,19 @@ GEM
     rake (13.2.1)
     roda (3.92.0)
       rack
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.4)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.4)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.3)
+    rspec-support (3.13.4)
     securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -123,9 +123,9 @@ GEM
     tilt (2.6.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    waterdrop (2.8.3)
+    waterdrop (2.8.4)
       karafka-core (>= 2.4.9, < 3.0.0)
-      karafka-rdkafka (>= 0.19.1)
+      karafka-rdkafka (>= 0.19.2)
       zeitwerk (~> 2.3)
     webrick (1.9.1)
     zeitwerk (2.6.18)

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

@@ -1,125 +1,35 @@
 <%# This code is part of Karafka Pro, a commercial component not licensed under LGPL. %>
 <%# See LICENSE for details. %>
 
-<% safe_key = ::Karafka::Web::Pro::Ui::Lib::SafeRunner.new { message.key } %>
-
 <% if message.is_a?(Array) %>
-  <tr>
-    <td class="text-muted">
-      <%= message[0] %>
-    </td>
-    <td class="text-muted">
-      <%= message[1] %>
-    </td>
-    <td colspan="8" class="text-center text-muted">
-      This offset does not contain any data. The message may have been compacted or is a system entry.
-    </td>
-  </tr>
+  <%==
+    partial(
+      'scheduled_messages/explorer/message/compacted',
+      locals: { message: message }
+    )
+  %>
 <% else %>
-  <% type = message.headers['schedule_source_type'] %>
-  <tr>
-    <td>
-      <%= message.partition %>
-    </td>
-    <td>
-      <%= message.offset %>
-    </td>
-    <td>
-      <% if type == 'tombstone' %>
-        <%== badge_secondary type %>
-      <% end %>
-
-      <% if type == 'cancel' %>
-        <%== badge_warning type %>
-      <% end %>
-
-      <% if type == 'schedule' %>
-        <%== badge_primary type %>
-      <% end %>
-    </td>
-    <td>
-      <%= message.headers['schedule_schema_version'] %>
-    </td>
+  <%==
+    safe_key = ::Karafka::Web::Pro::Ui::Lib::SafeRunner.new { message.key }
+    type = message.headers['schedule_source_type']
+    path = 'scheduled_messages/explorer/message/'
 
-    <% if type == 'cancel' %>
-      <td>
-        <%== relative_time(message.timestamp) %>
-      </td>
-      <td class="text-center text-muted">
-        N/A
-      </td>
-      <td>
-        <%==
-          partial(
-            'scheduled_messages/explorer/key',
-            locals: { message: message, safe_key: safe_key }
-          )
-        %>
-      </td>
-      <td colspan="2" class="text-center text-muted">
-        N/A
-      </td>
-    <% else %>
-      <td>
-        <%== relative_time(message.timestamp) %>
-      </td>
-      <td>
-        <%== relative_time message.headers['schedule_target_epoch'].to_i %>
-      </td>
-      <td>
-        <%==
-          partial(
-            'scheduled_messages/explorer/key',
-            locals: { message: message, safe_key: safe_key }
-          )
-        %>
-      </td>
-      <td>
-        <%= message.headers['schedule_target_topic'] %>
-      </td>
-      <td>
-        <% if @visibility_filter.key?(message) %>
-          <%= message.headers['schedule_target_key'] %>
-        <% else %>
-          <span class="text-muted">[Filtered]</span>
-        <% end %>
-      </td>
-    <% end %>
+    partial = case type
+              when 'cancel'
+                'cancel'
+              when 'tombstone'
+                'tombstone'
+              when 'schedule'
+                'schedule'
+              else
+                'unknown'
+              end
 
-    <td>
-      <% if type == 'schedule' %>
-        <%
-          cancel_path = root_path(
-            "scheduled_messages/messages",
-            message.topic,
-            message.partition,
-            message.offset,
-            'cancel'
-          )
-        %>
-        <form
-          action="<%= cancel_path %>"
-          method="post"
-          class="inline"
-        >
-          <%== csrf_tag(cancel_path) %>
-          <button
-            type="submit"
-            class="btn btn-error btn-sm confirm-action"
-            title="Cancel dispatch of this scheduled message"
-          >
-            <%== icon(:x_circle) %>
-          </button>
-        </form>
-      <% end %>
+    full_path = "#{path}/#{partial}"
 
-      <%==
-        link_button_primary_sm(
-          icon(:info_circle),
-          explorer_topics_path(message.topic, message.partition, message.offset),
-          title: 'Display details of this message'
-        )
-      %>
-    </td>
-  </tr>
+    partial(
+      full_path,
+      locals: { message: message, safe_key: safe_key, type: type }
+    )
+  %>
 <% end %>

data/lib/karafka/web/pro/ui/views/scheduled_messages/explorer/message/_cancel.erb

@@ -0,0 +1,49 @@
+<%# This code is part of Karafka Pro, a commercial component not licensed under LGPL. %>
+<%# See LICENSE for details. %>
+
+<tr>
+  <td>
+    <%= message.partition %>
+  </td>
+
+  <td>
+    <%= message.offset %>
+  </td>
+
+  <td>
+    <%== badge_warning type %>
+  </td>
+
+  <td>
+    <%= message.headers['schedule_schema_version'] %>
+  </td>
+
+  <td>
+    <%== relative_time(message.timestamp) %>
+  </td>
+  <td class="text-center text-muted">
+    N/A
+  </td>
+  <td>
+    <%==
+      partial(
+        'scheduled_messages/explorer/key',
+        locals: { message: message, safe_key: safe_key }
+      )
+    %>
+  </td>
+
+  <td colspan="2" class="text-center text-muted">
+    N/A
+  </td>
+
+  <td>
+    <%==
+      link_button_primary_sm(
+        icon(:info_circle),
+        explorer_topics_path(message.topic, message.partition, message.offset),
+        title: 'Display details of this message'
+      )
+    %>
+  </td>
+</tr>

data/lib/karafka/web/pro/ui/views/scheduled_messages/explorer/message/_compacted.erb

@@ -0,0 +1,16 @@
+<%# This code is part of Karafka Pro, a commercial component not licensed under LGPL. %>
+<%# See LICENSE for details. %>
+
+<tr>
+  <td class="text-muted">
+    <%= message[0] %>
+  </td>
+
+  <td class="text-muted">
+    <%= message[1] %>
+  </td>
+
+  <td colspan="8" class="text-center text-muted">
+    This offset does not contain any data. The message may have been compacted or is a system entry.
+  </td>
+</tr>

data/lib/karafka/web/pro/ui/views/scheduled_messages/explorer/message/_schedule.erb

@@ -0,0 +1,83 @@
+<%# This code is part of Karafka Pro, a commercial component not licensed under LGPL. %>
+<%# See LICENSE for details. %>
+
+<tr>
+  <td>
+    <%= message.partition %>
+  </td>
+
+  <td>
+    <%= message.offset %>
+  </td>
+
+  <td>
+    <%== badge_primary type %>
+  </td>
+
+  <td>
+    <%= message.headers['schedule_schema_version'] %>
+  </td>
+
+  <td>
+    <%== relative_time(message.timestamp) %>
+  </td>
+
+  <td>
+    <%== relative_time message.headers['schedule_target_epoch'].to_i %>
+  </td>
+
+  <td>
+    <%==
+      partial(
+        'scheduled_messages/explorer/key',
+        locals: { message: message, safe_key: safe_key }
+      )
+    %>
+  </td>
+
+  <td>
+    <%= message.headers['schedule_target_topic'] %>
+  </td>
+
+  <td>
+    <% if @visibility_filter.key?(message) %>
+      <%= message.headers['schedule_target_key'] %>
+    <% else %>
+      <span class="text-muted">[Filtered]</span>
+    <% end %>
+  </td>
+
+  <td>
+    <%
+      cancel_path = root_path(
+        "scheduled_messages/messages",
+        message.topic,
+        message.partition,
+        message.offset,
+        'cancel'
+      )
+    %>
+    <form
+      action="<%= cancel_path %>"
+      method="post"
+      class="inline"
+    >
+      <%== csrf_tag(cancel_path) %>
+      <button
+        type="submit"
+        class="btn btn-error btn-sm confirm-action"
+        title="Cancel dispatch of this scheduled message"
+      >
+        <%== icon(:x_circle) %>
+      </button>
+    </form>
+
+    <%==
+      link_button_primary_sm(
+        icon(:info_circle),
+        explorer_topics_path(message.topic, message.partition, message.offset),
+        title: 'Display details of this message'
+      )
+    %>
+  </td>
+</tr>

data/lib/karafka/web/pro/ui/views/scheduled_messages/explorer/message/_tombstone.erb

@@ -0,0 +1,69 @@
+<%# This code is part of Karafka Pro, a commercial component not licensed under LGPL. %>
+<%# See LICENSE for details. %>
+
+<tr>
+  <td>
+    <%= message.partition %>
+  </td>
+
+  <td>
+    <%= message.offset %>
+  </td>
+
+  <td>
+    <%== badge_secondary type %>
+  </td>
+
+  <td>
+    <%= message.headers['schedule_schema_version'] %>
+  </td>
+
+  <td>
+    <%== relative_time(message.timestamp) %>
+  </td>
+
+  <td class="text-center text-muted">
+    N/A
+  </td>
+
+  <td>
+    <%==
+      partial(
+        'scheduled_messages/explorer/key',
+        locals: { message: message, safe_key: safe_key }
+      )
+    %>
+  </td>
+
+  <td>
+    <%= message.headers['schedule_target_topic'] %>
+  </td>
+
+  <td>
+    <% if @visibility_filter.key?(message) %>
+      <%= message.headers['schedule_target_key'] %>
+    <% else %>
+      <span class="text-muted">[Filtered]</span>
+    <% end %>
+  </td>
+
+  <td>
+    <%
+      cancel_path = root_path(
+        "scheduled_messages/messages",
+        message.topic,
+        message.partition,
+        message.offset,
+        'cancel'
+      )
+    %>
+
+    <%==
+      link_button_primary_sm(
+        icon(:info_circle),
+        explorer_topics_path(message.topic, message.partition, message.offset),
+        title: 'Display details of this message'
+      )
+    %>
+  </td>
+</tr>

data/lib/karafka/web/pro/ui/views/scheduled_messages/explorer/message/_unknown.erb

@@ -0,0 +1,26 @@
+<%# This code is part of Karafka Pro, a commercial component not licensed under LGPL. %>
+<%# See LICENSE for details. %>
+
+<tr>
+  <td class="text-muted">
+    <%= message.partition %>
+  </td>
+
+  <td class="text-muted">
+    <%= message.offset %>
+  </td>
+
+  <td colspan="7" class="text-center text-muted">
+    This offset does not contain any recognized data type.
+  </td>
+
+  <td>
+    <%==
+      link_button_primary_sm(
+        icon(:info_circle),
+        explorer_topics_path(message.topic, message.partition, message.offset),
+        title: 'Display details of this message'
+      )
+    %>
+  </td>
+</tr>

data/lib/karafka/web/pro/ui/views/scheduled_messages/schedules/show.erb

@@ -38,7 +38,20 @@
           <%== relative_time(details[:dispatched_at]) %>
         </span>
 
-        <span class="badge badge-<%= details[:state] == 'loaded' ? 'success' : 'warning' %>">
+        <%
+          state = details[:state]
+
+          type = case state
+                 when 'loaded'
+                   'success'
+                 when 'stopped'
+                   'error'
+                 else
+                   'warning'
+                 end
+        %>
+
+        <span class="badge badge-<%= type %>">
           State: <%= details[:state] %>
         </span>
       </p>

data/lib/karafka/web/version.rb

@@ -3,6 +3,6 @@
 module Karafka
   module Web
     # Current gem version
-    VERSION = '0.11.0.beta3'
+    VERSION = '0.11.0.rc1'
   end
 end