karafka-web 0.8.1 → 0.9.0.rc1

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

@@ -4,21 +4,27 @@
   <meta name="description" content="Karafka application dashboard">
   <meta name="author" content="Maciej Mensfeld">
 
-  <title>Karafka</title>
+  <title>Karafka Web UI</title>
+
+  <link href="<%= asset_path('stylesheets/libs/bootstrap.min.css') %>" rel="stylesheet">
+  <link href="<%= asset_path('stylesheets/libs/highlight.min.css') %>" rel="stylesheet">
+  <link href="<%= asset_path('stylesheets/libs/datepicker.min.css') %>" rel="stylesheet">
 
-  <link href="<%= asset_path('stylesheets/bootstrap.min.css') %>" rel="stylesheet">
-  <link href="<%= asset_path('stylesheets/highlight.min.css') %>" rel="stylesheet">
-  <link href="<%= asset_path('stylesheets/datepicker.min.css') %>" rel="stylesheet">
   <link href="<%= asset_path('stylesheets/application.css') %>" rel="stylesheet">
 
-  <script type="text/javascript" src="<%= asset_path('javascripts/chart.min.js') %>"></script>
-  <script type="text/javascript" src="<%= asset_path('javascripts/timeago.min.js') %>"></script>
-  <script type="text/javascript" src="<%= asset_path('javascripts/bootstrap.min.js') %>"></script>
-  <script type="text/javascript" src="<%= asset_path('javascripts/highlight.min.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/libs/chart.min.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/libs/timeago.min.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/libs/bootstrap.min.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/libs/highlight.min.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/libs/datepicker.js') %>"></script>
+
   <script type="text/javascript" src="<%= asset_path('javascripts/live_poll.js') %>"></script>
-  <script type="text/javascript" src="<%= asset_path('javascripts/tabs.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/tabs_manager.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/charts/dataset_state_manager.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/charts/data_formatting_utility.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/charts/types/line.js') %>"></script>
+  <script type="text/javascript" src="<%= asset_path('javascripts/charts/types/bar.js') %>"></script>
   <script type="text/javascript" src="<%= asset_path('javascripts/charts.js') %>"></script>
-  <script type="text/javascript" src="<%= asset_path('javascripts/datepicker.js') %>"></script>
   <script type="text/javascript" src="<%= asset_path('javascripts/offset_datetime.js') %>"></script>
   <script type="text/javascript" src="<%= asset_path('javascripts/application.js') %>"></script>
 

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

@@ -9,11 +9,13 @@
         Dashboard
       </a>
     </li>
+
     <li class="nav-item ms-3">
       <a class="nav-link <%= nav_class(start_with: '/consumers') %>" href="<%= root_path('consumers') %>">
         Consumers
       </a>
     </li>
+
     <li class="nav-item ms-3">
       <a class="nav-link <%= nav_class(start_with: '/jobs') %>" href="<%= root_path('jobs/running') %>">
         Jobs
@@ -21,35 +23,47 @@
     </li>
 
     <li class="nav-item ms-3">
-      <a class="nav-link text-muted <%= nav_class(start_with: '/health') %>" href="<%= root_path('health') %>" title="Pro feature">
+      <a class="nav-link text-muted" href="<%= root_path('health') %>" title="Pro feature">
         Health
       </a>
     </li>
+
     <li class="nav-item ms-3">
       <a class="nav-link <%= nav_class(start_with: '/routing') %>" href="<%= root_path('routing') %>">
         Routing
       </a>
     </li>
+
     <li class="nav-item ms-3">
-      <a class="nav-link text-muted <%= nav_class(start_with: '/explorer') %>" href="<%= root_path('explorer') %>" title="Pro feature">
+      <a class="nav-link text-muted" href="<%= root_path('explorer') %>" title="Pro feature">
         Explorer
       </a>
     </li>
+
     <li class="nav-item ms-3">
       <a class="nav-link <%= nav_class(start_with: '/errors') %>" href="<%= root_path('errors') %>">
         Errors
       </a>
     </li>
+
     <li class="nav-item ms-3">
-      <a class="nav-link text-muted <%= nav_class(start_with: '/dlq') %>" href="<%= root_path('dlq') %>" title="Pro feature">
+      <a class="nav-link text-muted" href="<%= root_path('dlq') %>" title="Pro feature">
         Dead
       </a>
     </li>
+
     <li class="nav-item ms-3">
       <a class="nav-link <%= nav_class(start_with: '/cluster') %>" href="<%= root_path('cluster') %>">
         Cluster
       </a>
     </li>
+
+    <li class="nav-item ms-3">
+      <a class="nav-link text-muted" href="<%= root_path('topics') %>" title="Pro feature">
+        Topics
+      </a>
+    </li>
+
     <li class="nav-item ms-3">
       <a class="nav-link <%= nav_class(start_with: '/status') %>" href="<%= root_path('status') %>">
         Status

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

@@ -0,0 +1,5 @@
+<tr>
+  <td colspan="100" class="text-center text-muted">
+    This offset does not contain meaningful data. The message may have been compacted or is a system entry.
+  </td>
+</tr>

data/lib/karafka/web/ui/views/shared/alerts/_info.erb

@@ -0,0 +1,3 @@
+<div class="alert alert-info" role="alert">
+  <%= message %>
+</div>

data/lib/karafka/web/ui/views/shared/charts/_bar.erb

@@ -0,0 +1,7 @@
+<div class="chartjs-wrapper">
+  <canvas
+    id="<%= id %>-chart"
+    class="chartjs chartjs-bar"
+    data-datasets="<%= data %>"
+  ></canvas>
+</div>

data/lib/karafka/web/ui/views/shared/{_chart.erb → charts/_line.erb}

@@ -6,7 +6,7 @@
 <div class="mt-4 chartjs-wrapper">
   <canvas
     id="<%= id %>-chart"
-    class="chartjs <%= 'blurred' if blurred %>"
+    class="chartjs chartjs-line <%= 'blurred' if blurred %>"
     data-datasets="<%= data %>"
     data-label_type_y="<%= label_type_y %>"
     data-label_type_x="<%= label_type_x %>"

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

@@ -23,7 +23,7 @@
           <ul class="mb-5 text-start">
             <li>You have visited the <a href="<%= root_path('status') %>">Status</a> page to troubleshoot any potential issues</li>
             <li>All the topics required by Karafka Web exist</li>
-            <li>You have used <code>bundle exec karafka-web install</code> to initialize the Web UI</li>
+            <li>You have used <code>bundle exec karafka-web migrate</code> to initialize the Web UI</li>
             <li>You have a working connection with your Kafka cluster</li>
             <li>The resource you requested exists</li>
           </ul>

data/lib/karafka/web/ui/views/status/show.erb

@@ -1,4 +1,4 @@
-<%== view_title('Web UI status details') %>
+<%== view_title('Web UI Status Details', hr: true) %>
 
 <div class="container">
   <div class="row">

data/lib/karafka/web/version.rb

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

data/lib/karafka/web.rb

@@ -15,8 +15,9 @@ module Karafka
     class << self
       # @return [WaterDrop::Producer, nil] waterdrop messages producer or nil if not yet fully
       #   initialized. It may not be fully initialized until the configuration is done
+      # @note Do NOT memoize producer as it may be updated after forking
       def producer
-        @producer ||= Web.config.producer
+        Web.config.producer
       end
 
       # @return [String] root path of this gem
@@ -27,7 +28,13 @@ module Karafka
       # Sets up the whole configuration
       # @param [Block] block configuration block
       def setup(&block)
+        Pro::Loader.pre_setup_all(config) if Karafka.pro?
+
         Config.configure(&block)
+
+        Pro::Loader.post_setup_all(config) if Karafka.pro?
+
+        @configured = true
       end
 
       # @return [Karafka::Web::Config] config instance
@@ -38,6 +45,9 @@ module Karafka
       # Activates all the needed routing and sets up listener, etc
       # This needs to run **after** the optional configuration of the web component
       def enable!
+        # Run the setup to initialize components if user did not run it prior himself
+        setup unless @configured
+
         # Make sure config is as expected
         # It should be configured before enabling the Web UI
         Contracts::Config.new.validate!(config.to_h)
@@ -49,6 +59,13 @@ module Karafka
         # custom values provided by our user
         App.engine.plugin(:sessions, **config.ui.sessions.to_h)
       end
+
+      # @return [Array<String>] Web UI slogans we use to encourage people to support Karafka
+      def slogans
+        @slogans ||= YAML.load_file(
+          gem_root.join('config', 'locales', 'slogans.yml')
+        ).dig('en', 'slogans')
+      end
     end
   end
 end
@@ -58,7 +75,7 @@ require_relative 'web/inflector'
 loader = Zeitwerk::Loader.new
 
 # Make sure pro is not loaded unless Pro
-loader.ignore(Karafka::Web.gem_root.join('lib/karafka/web/ui/pro'))
+loader.ignore(Karafka::Web.gem_root.join('lib/karafka/web/pro'))
 
 # If license is detected, we can use loader without limitations
 Karafka::Licenser.detect do