pg_eventstore 1.5.0 → 1.7.0

data/lib/pg_eventstore/subscriptions/queries/subscriptions_set_command_queries.rb

@@ -55,9 +55,11 @@ module PgEventstore
         conn.exec_params(sql, [command_name, subscriptions_set_id, data])
       end
       deserialize(pg_result.to_a.first)
+    rescue PG::ForeignKeyViolation
+      raise RecordNotFound.new("subscriptions_set", subscriptions_set_id)
     end
 
-    # @param subscriptions_set_id [Integer]
+    # @param subscriptions_set_id [Integer, nil]
     # @return [Array<PgEventstore::SubscriptionFeederCommands::Base>]
     def find_commands(subscriptions_set_id)
       sql_builder =

data/lib/pg_eventstore/subscriptions/subscription_feeder.rb

@@ -6,37 +6,25 @@ module PgEventstore
   class SubscriptionFeeder
     extend Forwardable
 
-    def_delegators :@basic_runner, :start, :stop, :restore, :state, :wait_for_finish, :stop_async
-    def_delegators :@subscriptions_lifecycle, :force_lock!
+    attr_reader :config_name
+
+    def_delegators :@basic_runner, :start, :stop, :restore, :state, :wait_for_finish, :stop_async, :running?
 
     # @param config_name [Symbol]
-    # @param set_name [String]
-    # @param max_retries [Integer] max number of retries of failed SubscriptionsSet
-    # @param retries_interval [Integer] a delay between retries of failed SubscriptionsSet
-    def initialize(config_name:, set_name:, max_retries:, retries_interval:)
+    # @param subscriptions_set_lifecycle [PgEventstore::SubscriptionsSetLifecycle]
+    # @param subscriptions_lifecycle [PgEventstore::SubscriptionsLifecycle]
+    def initialize(config_name:, subscriptions_set_lifecycle:, subscriptions_lifecycle:)
       @config_name = config_name
       @basic_runner = BasicRunner.new(0.2, 0)
-      @subscriptions_set_lifecycle = SubscriptionsSetLifecycle.new(
-        @config_name,
-        { name: set_name, max_restarts_number: max_retries, time_between_restarts: retries_interval }
-      )
-      @subscriptions_lifecycle = SubscriptionsLifecycle.new(@config_name, @subscriptions_set_lifecycle)
+      @subscriptions_set_lifecycle = subscriptions_set_lifecycle
+      @subscriptions_lifecycle = subscriptions_lifecycle
       @commands_handler = CommandsHandler.new(@config_name, self, @subscriptions_lifecycle.runners)
       attach_runner_callbacks
     end
 
-    # @return [Integer]
+    # @return [Integer, nil]
     def id
-      @subscriptions_set_lifecycle.persisted_subscriptions_set.id
-    end
-
-    # Adds SubscriptionRunner to the set
-    # @param runner [PgEventstore::SubscriptionRunner]
-    # @return [PgEventstore::SubscriptionRunner]
-    def add(runner)
-      assert_proper_state!
-      @subscriptions_lifecycle.runners.push(runner)
-      runner
+      @subscriptions_set_lifecycle.subscriptions_set&.id
     end
 
     # Starts all SubscriptionRunners. This is only available if SubscriptionFeeder's runner is alive.
@@ -57,20 +45,6 @@ module PgEventstore
       self
     end
 
-    # Produces a copy of currently running Subscriptions. This is needed, because original Subscriptions objects are
-    # dangerous to use - users may incidentally break their state.
-    # @return [Array<PgEventstore::Subscription>]
-    def read_only_subscriptions
-      @subscriptions_lifecycle.subscriptions.map(&:dup)
-    end
-
-    # Produces a copy of current SubscriptionsSet. This is needed, because original SubscriptionsSet object is
-    # dangerous to use - users may incidentally break its state.
-    # @return [PgEventstore::SubscriptionsSet, nil]
-    def read_only_subscriptions_set
-      @subscriptions_set_lifecycle.subscriptions_set&.dup
-    end
-
     private
 
     # @return [void]
@@ -133,19 +107,5 @@ module PgEventstore
         SubscriptionFeederHandlers.setup_handler(:update_subscriptions_set_restarts, @subscriptions_set_lifecycle)
       )
     end
-
-    # This method helps to ensure that no Subscription is added after SubscriptionFeeder's runner is working
-    # @return [void]
-    # @raise [RuntimeError]
-    def assert_proper_state!
-      return if @basic_runner.initial? || @basic_runner.stopped?
-      subscriptions_set = @subscriptions_set_lifecycle.persisted_subscriptions_set
-
-      error_message = <<~TEXT
-        Could not add subscription - #{subscriptions_set.name}##{subscriptions_set.id} must be \
-        either in the initial or in the stopped state, but it is in the #{@basic_runner.state} state now.
-      TEXT
-      raise error_message
-    end
   end
 end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands/ping.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionFeederCommands
+    # @!visibility private
+    class Ping < Base
+      # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
+      # @return [void]
+      def exec_cmd(subscription_feeder)
+        queries(subscription_feeder.config_name).update(subscriptions_set_id, {})
+      end
+
+      private
+
+      # @param config_name [Symbol]
+      # @return [PgEventstore::SubscriptionsSetQueries]
+      def queries(config_name)
+        SubscriptionsSetQueries.new(PgEventstore.connection(config_name))
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'subscription_feeder_commands/base'
+require_relative 'subscription_feeder_commands/ping'
 require_relative 'subscription_feeder_commands/restore'
 require_relative 'subscription_feeder_commands/start_all'
 require_relative 'subscription_feeder_commands/stop'

data/lib/pg_eventstore/subscriptions/subscriptions_lifecycle.rb

@@ -13,12 +13,12 @@ module PgEventstore
 
     # @param config_name [Symbol]
     # @param subscriptions_set_lifecycle [PgEventstore::SubscriptionsSetLifecycle]
-    def initialize(config_name, subscriptions_set_lifecycle)
+    def initialize(config_name, subscriptions_set_lifecycle, force_lock: false)
       @config_name = config_name
       @subscriptions_set_lifecycle = subscriptions_set_lifecycle
       @runners = []
       @subscriptions_pinged_at = Time.at(0)
-      @force_lock = false
+      @force_lock = force_lock
     end
 
     # Locks all Subscriptions behind the current SubscriptionsSet
@@ -59,6 +59,11 @@ module PgEventstore
     # locked by the new SubscriptionsSet.
     # @return [void]
     def force_lock!
+      message = <<~TEXT
+        Usage of #force_lock! is deprecated and will be removed in v2. Please pass :force_lock keyword argument when \
+        initializing SubscriptionsManager. Example: PgEventstore.subscriptions_manager(force_lock: true)
+      TEXT
+      Utils.deprecation_warning(message)
       @force_lock = true
     end
 

data/lib/pg_eventstore/subscriptions/subscriptions_manager.rb

@@ -36,20 +36,32 @@ module PgEventstore
     attr_reader :config
     private :config
 
-    def_delegators :@subscription_feeder, :stop, :force_lock!
+    def_delegators :@subscription_feeder, :stop, :running?
+    def_delegators :@subscriptions_lifecycle, :force_lock!
 
     # @param config [PgEventstore::Config]
     # @param set_name [String]
     # @param max_retries [Integer, nil] max number of retries of failed SubscriptionsSet
     # @param retries_interval [Integer, nil] a delay between retries of failed SubscriptionsSet
-    def initialize(config:, set_name:, max_retries: nil, retries_interval: nil)
+    # @param force_lock [Boolean] whether to force-lock subscriptions
+    def initialize(config:, set_name:, max_retries: nil, retries_interval: nil, force_lock: false)
       @config = config
       @set_name = set_name
+      @subscriptions_set_lifecycle = SubscriptionsSetLifecycle.new(
+        config_name,
+        {
+          name: set_name,
+          max_restarts_number: max_retries || config.subscriptions_set_max_retries,
+          time_between_restarts: retries_interval || config.subscriptions_set_retries_interval
+        }
+      )
+      @subscriptions_lifecycle = SubscriptionsLifecycle.new(
+        config_name, @subscriptions_set_lifecycle, force_lock: force_lock
+      )
       @subscription_feeder = SubscriptionFeeder.new(
-        config_name: config.name,
-        set_name: set_name,
-        max_retries: max_retries || config.subscriptions_set_max_retries,
-        retries_interval: retries_interval || config.subscriptions_set_retries_interval
+        config_name: config_name,
+        subscriptions_set_lifecycle: @subscriptions_set_lifecycle,
+        subscriptions_lifecycle: @subscriptions_lifecycle
       )
     end
 
@@ -97,30 +109,52 @@ module PgEventstore
         failed_subscription_notifier: failed_subscription_notifier
       )
 
-      @subscription_feeder.add(runner)
+      @subscriptions_lifecycle.runners.push(runner)
       true
     end
 
     # @return [Array<PgEventstore::Subscription>]
     def subscriptions
-      @subscription_feeder.read_only_subscriptions
+      @subscriptions_lifecycle.subscriptions.map(&:dup)
     end
 
     # @return [PgEventstore::SubscriptionsSet, nil]
     def subscriptions_set
-      @subscription_feeder.read_only_subscriptions_set
+      @subscriptions_set_lifecycle.subscriptions_set&.dup
+    end
+
+    # @return [PgEventstore::BasicRunner]
+    # @raise [PgEventstore::SubscriptionAlreadyLockedError]
+    def start!
+      run_cli_callbacks do
+        @subscription_feeder.start
+      end
     end
 
     # @return [PgEventstore::BasicRunner, nil]
     def start
-      @subscription_feeder.start
+      start!
     rescue PgEventstore::SubscriptionAlreadyLockedError => e
       PgEventstore.logger&.warn(e.message)
       nil
     end
 
+    # @return [Symbol]
+    def config_name
+      @config.name
+    end
+
     private
 
+    # @return [Object] the result of the passed block
+    def run_cli_callbacks
+      return yield unless defined?(::PgEventstore::CLI)
+
+      PgEventstore::CLI.callbacks.run_callbacks(:start_manager, self) do
+        yield
+      end
+    end
+
     # @param middlewares [Array<Symbol>, nil]
     # @param handler [#call]
     # @return [Proc]

data/lib/pg_eventstore/subscriptions/subscriptions_set_lifecycle.rb

@@ -27,7 +27,7 @@ module PgEventstore
 
     # @return [PgEventstore::SubscriptionsSet]
     def persisted_subscriptions_set
-      @subscriptions_set ||= SubscriptionsSet.using_connection(@config_name).create(**@subscriptions_set_attrs)
+      @subscriptions_set ||= SubscriptionsSet.using_connection(@config_name).create(@subscriptions_set_attrs)
     end
 
     # @return [void]

data/lib/pg_eventstore/utils.rb

@@ -69,6 +69,38 @@ module PgEventstore
       def original_global_position(raw_event)
         raw_event['link'] ? raw_event['link']['global_position'] : raw_event['global_position']
       end
+
+      # @param message [String]
+      # @return [void]
+      def deprecation_warning(message)
+        PgEventstore.logger&.warn("\e[31m[DEPRECATED]: #{message}\e[0m")
+      end
+
+      # @param file_path [String]
+      # @param content [String]
+      # @return [void]
+      def write_to_file(file_path, content)
+        file = File.open(file_path, "w")
+        file.write(content)
+        file.close
+      end
+
+      # @param file_path [String]
+      # @return [void]
+      def remove_file(file_path)
+        File.delete(file_path)
+      rescue Errno::ENOENT
+      end
+
+      # @param file_path [String]
+      # @return [String, nil]
+      def read_pid(file_path)
+        file = File.open(file_path, "r")
+        file.readline.strip.tap do
+          file.close
+        end
+      rescue Errno::ENOENT
+      end
     end
   end
 end

data/lib/pg_eventstore/version.rb

@@ -2,5 +2,5 @@
 
 module PgEventstore
   # @return [String]
-  VERSION = "1.5.0"
+  VERSION = "1.7.0"
 end

data/lib/pg_eventstore/web/application.rb

@@ -9,6 +9,7 @@ module PgEventstore
       set :environment, -> { (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV'])&.to_sym || :development }
       set :logging, -> { environment == :development || environment == :test }
       set :erb, layout: :'layouts/application'
+      set :host_authorization, { allow_if: ->(_env) { true } }
 
       helpers(Paginator::Helpers, Subscriptions::Helpers) do
         # @return [Array<Hash>, nil]
@@ -19,6 +20,12 @@ module PgEventstore
           end&.reject { _1.empty? }
         end
 
+        # @return [String, nil]
+        def system_stream
+          params in { filter: { system_stream: String => system_stream } }
+          system_stream if Stream::KNOWN_SYSTEM_STREAMS.include?(system_stream)
+        end
+
         # @return [Array<String>, nil]
         def events_filter
           params in { filter: { events: Array => events } }
@@ -31,6 +38,8 @@ module PgEventstore
           PgEventstore.available_configs.include?(config) ? config : :default
         end
 
+        # @param val [Object]
+        # @return [void]
         def current_config=(val)
           response.set_cookie('current_config', { value: val.to_s, http_only: true, same_site: :lax })
         end
@@ -40,7 +49,7 @@ module PgEventstore
           PgEventstore.connection(current_config)
         end
 
-        # @param collection [PgEventstore::Paginator::BaseCollection]
+        # @param collection [PgEventstore::Web::Paginator::BaseCollection]
         # @return [void]
         def paginated_json_response(collection)
           halt 200, {
@@ -85,7 +94,8 @@ module PgEventstore
           options: {
             filter: { event_types: events_filter, streams: streams_filter },
             resolve_link_tos: resolve_link_tos?
-          }
+          },
+          system_stream: system_stream
         )
 
         if request.xhr?

data/lib/pg_eventstore/web/paginator/events_collection.rb

@@ -19,10 +19,21 @@ module PgEventstore
         #   count instead because of the potential performance degradation.
         MAX_NUMBER_TO_COUNT = 10_000
 
+        # @param config_name [Symbol]
+        # @param starting_id [String, Integer, nil]
+        # @param per_page [Integer]
+        # @param order [Symbol] :asc or :desc
+        # @param options [Hash] additional options to filter the collection
+        # @param system_stream [String, nil] a name of system stream
+        def initialize(config_name, starting_id:, per_page:, order:, options: {}, system_stream: nil)
+          super(config_name, starting_id: starting_id, per_page: per_page, order: order, options: options)
+          @stream = system_stream ? PgEventstore::Stream.system_stream(system_stream) : PgEventstore::Stream.all_stream
+        end
+
         # @return [Array<PgEventstore::Event>]
         def collection
           @_collection ||= PgEventstore.client(config_name).read(
-            PgEventstore::Stream.all_stream,
+            @stream,
             options: options.merge(from_position: starting_id, max_count: per_page, direction: order),
             middlewares: []
           )
@@ -33,7 +44,8 @@ module PgEventstore
           return unless collection.size == per_page
 
           from_position = event_global_position(collection.first)
-          sql_builder = QueryBuilders::EventsFiltering.all_stream_filtering(
+          sql_builder = QueryBuilders::EventsFiltering.events_filtering(
+            @stream,
             options.merge(from_position: from_position, max_count: 1, direction: order)
           ).to_sql_builder.unselect.select('global_position').offset(per_page)
           global_position(sql_builder)
@@ -42,7 +54,8 @@ module PgEventstore
         # @return [Integer, nil]
         def prev_page_starting_id
           from_position = event_global_position(collection.first) || starting_id
-          sql_builder = QueryBuilders::EventsFiltering.all_stream_filtering(
+          sql_builder = QueryBuilders::EventsFiltering.events_filtering(
+            @stream,
             options.merge(from_position: from_position, max_count: per_page, direction: order == :asc ? :desc : :asc)
           ).to_sql_builder.unselect.select('global_position').offset(1)
           sql, params = sql_builder.to_exec_params
@@ -57,7 +70,7 @@ module PgEventstore
           @_total_count ||=
             begin
               sql_builder =
-                QueryBuilders::EventsFiltering.all_stream_filtering(options).
+                QueryBuilders::EventsFiltering.events_filtering(@stream, options).
                   to_sql_builder.remove_limit.remove_group.remove_order
               count = estimate_count(sql_builder)
               return count if count > MAX_NUMBER_TO_COUNT
@@ -68,7 +81,7 @@ module PgEventstore
 
         private
 
-        # @param event [PgEventstore::Event]
+        # @param event [PgEventstore::Event, nil]
         # @return [Integer, nil]
         def event_global_position(event)
           event&.link&.global_position || event&.global_position

data/lib/pg_eventstore/web/public/javascripts/pg_eventstore.js

@@ -60,6 +60,13 @@ $(function(){
         });
     }
 
+    let initSystemStreamFilterAutocomplete = function($filter){
+        let $streamNameSelect = $filter.find('select');
+        $streamNameSelect.select2({
+            allowClear: true
+        });
+    }
+
     let initEventTypeFilterAutocomplete = function($filter) {
         let $eventTypeSelect = $filter.find('select');
         $eventTypeSelect.select2({
@@ -86,6 +93,8 @@ $(function(){
     let $filtersForm = $('#filters-form');
     // Stream filter template
     let streamFilterTmpl = $('#stream-filter-tmpl').text();
+    // System stream filter template
+    let systemStreamFilterTmpl = $('#system-stream-filter-tmpl').text();
     // Event type filter template
     let eventFilterTmpl = $('#event-type-filter-tmpl').text();
 
@@ -93,21 +102,34 @@ $(function(){
     $filtersForm.on('click', '.remove-filter', function(){
         $(this).parents('.form-row').remove();
     });
-    // Add stream filter button
+    // "Add stream filter" button
     $filtersForm.on('click', '.add-stream-filter', function(){
         let filtersNum = $filtersForm.find('.stream-filters').children().length + '';
         $filtersForm.find('.stream-filters').append(streamFilterTmpl.replace(/%NUM%/g, filtersNum));
         initStreamFilterAutocomplete($filtersForm.find('.stream-filters').children().last());
     });
-    // Add event type filter button
+    // "Add system stream filter" button
+    $filtersForm.on('click', '.add-system-stream-filter', function(){
+        if($filtersForm.find('.system-stream-filter').children().length > 0)
+            return;
+
+        $filtersForm.find('.system-stream-filter').append(systemStreamFilterTmpl);
+        initSystemStreamFilterAutocomplete($filtersForm.find('.system-stream-filter').children().last());
+    });
+    // "Add event type filter" button
     $filtersForm.on('click', '.add-event-filter', function(){
         $filtersForm.find('.event-filters').append(eventFilterTmpl);
         initEventTypeFilterAutocomplete($filtersForm.find('.event-filters').children().last());
     });
+
     // Init select2 for stream filters which were initially rendered
     $filtersForm.find('.stream-filters').children().each(function(){
         initStreamFilterAutocomplete($(this));
     });
+    // Init select2 for system stream filter which were initially rendered
+    $filtersForm.find('.system-stream-filter').children().each(function(){
+        initSystemStreamFilterAutocomplete($(this));
+    });
     // Init select2 for event type filters which were initially rendered
     $filtersForm.find('.event-filters').children().each(function(){
         initEventTypeFilterAutocomplete($(this));

data/lib/pg_eventstore/web/views/home/dashboard.erb

@@ -1,6 +1,9 @@
 <script type="text/html" id="stream-filter-tmpl">
   <%= erb :'home/partials/stream_filter', { layout: false }, { stream: {} } %>
 </script>
+<script type="text/html" id="system-stream-filter-tmpl">
+  <%= erb :'home/partials/system_stream_filter', { layout: false }, { stream: nil } %>
+</script>
 <script type="text/html" id="event-type-filter-tmpl">
   <%= erb :'home/partials/event_filter', { layout: false }, { event_type: '' } %>
 </script>
@@ -27,6 +30,11 @@
             <form id="filters-form" action="<%= url('/') %>" method="GET" data-parsley-validate class="form-horizontal form-label-left">
               <input type="hidden" name="per_page" value="<%= params[:per_page].to_i %>">
               <input type="hidden" name="resolve_link_tos" value="<%= resolve_link_tos? %>">
+              <div class="system-stream-filter">
+                <% if system_stream %>
+                  <%= erb :'home/partials/system_stream_filter', { layout: false }, { stream: system_stream } %>
+                <% end %>
+              </div>
               <div class="stream-filters">
                 <% streams_filter&.each do |attrs| %>
                   <%= erb :'home/partials/stream_filter', { layout: false }, { stream: attrs } %>
@@ -48,6 +56,7 @@
                       </button>
                       <div class="dropdown-menu">
                         <a class="dropdown-item add-stream-filter" href="javascript: void(0)">Add stream filter</a>
+                        <a class="dropdown-item add-system-stream-filter" href="javascript: void(0)">Add system stream filter</a>
                         <a class="dropdown-item add-event-filter" href="javascript: void(0)">Add event filter</a>
                       </div>
                     </div>

data/lib/pg_eventstore/web/views/home/partials/event_filter.erb

@@ -3,7 +3,7 @@
     <select name="filter[events][]" class="form-control mb-2" data-placeholder="Event type" data-url="<%= url('/event_types_filtering') %>">
       <option></option>
       <% if event_type %>
-        <option value="<%= event_type %>" selected><%= event_type %></option>
+        <option value="<%= h event_type %>" selected><%= h event_type %></option>
       <% end %>
     </select>
   </div>

data/lib/pg_eventstore/web/views/home/partials/events.erb

@@ -2,14 +2,17 @@
   <tr>
     <td><%= event.global_position %></td>
     <td><%= event.stream_revision %></td>
-    <td><%= event.stream.context %></td>
-    <td><%= event.stream.stream_name %></td>
+    <td><%= h event.stream.context %></td>
+    <td><%= h event.stream.stream_name %></td>
     <td><a href="<%= stream_path(event) %>"><%= event.stream.stream_id %></a></td>
     <td>
-      <%= event.type %>
+      <p class="float-left"><%= h event.type %></p>
       <% if event.link %>
-        <i class="fa fa-link"></i>
+        <p class="float-left ml-2">
+          <i class="fa fa-link"></i>
+        </p>
       <% end %>
+      <div class="clearfix"></div>
     </td>
     <td><%= event.created_at.strftime('%F %T') %></td>
     <td><%= event.id %></td>
@@ -19,9 +22,9 @@
   <tr class="event-payload d-none">
     <td colspan="8">
       <strong>Data:</strong>
-      <pre><%= JSON.pretty_generate(event.data) %></pre>
+      <pre><%= h JSON.pretty_generate(event.data) %></pre>
       <strong>Metadata:</strong>
-      <pre><%= JSON.pretty_generate(event.metadata) %></pre>
+      <pre><%= h JSON.pretty_generate(event.metadata) %></pre>
     </td>
   </tr>
 <% end %>

data/lib/pg_eventstore/web/views/home/partials/stream_filter.erb

@@ -3,7 +3,7 @@
     <select name="filter[streams][][context]" class="form-control mb-2" data-placeholder="Context" data-url="<%= url('/stream_contexts_filtering') %>">
       <option></option>
       <% if stream[:context] %>
-        <option value="<%= stream[:context] %>" selected><%= stream[:context] %></option>
+        <option value="<%= h stream[:context] %>" selected><%= h stream[:context] %></option>
       <% end %>
     </select>
   </div>
@@ -11,7 +11,7 @@
     <select name="filter[streams][][stream_name]" class="form-control mb-2" data-placeholder="Stream name" data-url="<%= url('/stream_names_filtering') %>">
       <option></option>
       <% if stream[:stream_name] %>
-        <option value="<%= stream[:stream_name] %>" selected><%= stream[:stream_name] %></option>
+        <option value="<%= h stream[:stream_name] %>" selected><%= h stream[:stream_name] %></option>
       <% end %>
     </select>
   </div>
@@ -19,7 +19,7 @@
     <select name="filter[streams][][stream_id]" class="form-control mb-2" data-placeholder="Stream ID" data-url="<%= url('/stream_ids_filtering') %>">
       <option></option>
       <% if stream[:stream_id] %>
-        <option value="<%= stream[:stream_id] %>" selected><%= stream[:stream_id] %></option>
+        <option value="<%= h stream[:stream_id] %>" selected><%= h stream[:stream_id] %></option>
       <% end %>
     </select>
   </div>

data/lib/pg_eventstore/web/views/home/partials/system_stream_filter.erb

@@ -0,0 +1,15 @@
+<div class="form-row align-items-center">
+  <div class="col-3">
+    <select name="filter[system_stream]" class="form-control mb-2" data-placeholder="Select system stream">
+      <option></option>
+      <% PgEventstore::Stream::KNOWN_SYSTEM_STREAMS.each do |stream_name| %>
+        <option value="<%= stream_name %>" <% if stream == stream_name %> selected <% end %>><%= stream_name %></option>
+      <% end %>
+    </select>
+  </div>
+  <div class="col-1">
+    <a class="btn btn-default remove-filter" href="javascript: void(0);">
+      <i class="fa fa-minus-circle"></i>
+    </a>
+  </div>
+</div>

data/lib/pg_eventstore/web/views/layouts/application.erb

@@ -82,13 +82,13 @@
           <ul class="navbar-right" style="height: 29px;">
             <li class="nav-item dropdown open" style="padding-left: 15px;">
               <a href="javascript: void(0);" class="user-profile dropdown-toggle" aria-haspopup="true" id="navbarDropdown" data-toggle="dropdown" aria-expanded="false">
-                <strong>Current config:</strong> <%= current_config.inspect %>
+                <strong>Current config:</strong> <%= h current_config.inspect %>
               </a>
               <div class="dropdown-menu dropdown-usermenu pull-right" aria-labelledby="navbarDropdown">
                 <% PgEventstore.available_configs.each do |config| %>
                   <form action="<%= url('/change_config') %>" method="POST">
-                    <input type="hidden" name="config" value="<%= config %>">
-                    <button type="submit" class="dropdown-item"><%= config.inspect %></button>
+                    <input type="hidden" name="config" value="<%= h config.to_s %>">
+                    <button type="submit" class="dropdown-item"><%= h config.inspect %></button>
                   </form>
                 <% end %>
               </div>