ahoy_captain 0.8 → 0.9

data/app/views/ahoy_captain/roots/show.html.erb

@@ -1,4 +1,4 @@
-<main class='bg-base-300 min-h-screen pb-4 max-w-6xl mx-auto' data-controller="application">
+<main class='min-h-screen pb-4 max-w-6xl mx-auto' data-controller="application">
   <%= render AhoyCaptain::StickyNavComponent.new do |nav| %>
     <% nav.with_realtime_update do %>
       <%= turbo_frame_tag :realtime, src: realtime_path, data: { controller:  "realtime" }, loading: :lazy %>
@@ -14,83 +14,83 @@
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Top Sources') do |component| %>
       <% component.with_display_links do %>
-        <div data-controller='link' data-link-top_sources-class="text-primary underline">
-        <a href="<%= sources_path(search_params) %>" data-turbo-frame="sources" data-action='click->link#changeTopSources' data-link-target='top_sourcesLink'>All</a>
-        <%= render AhoyCaptain::DropdownLinkComponent.new(title: "Campaign") do |dropdown| %>
-          <% %w{utm_source utm_medium utm_term utm_content utm_campaign}.each do |source| %>
-            <% dropdown.with_option do %>
-              <a href="<%= public_send("campaign_#{source}_path".to_sym, **search_params) %>" data-turbo-frame="sources" data-action='click->link#changeTopSources' data-link-target='top_sourcesLink'>
-                <%= source.titleize.gsub("Utm", "UTM") %>
-              </a>
+        <div data-controller="active-links">
+          <a href="<%= sources_path(search_params) %>" data-turbo-frame="sources" class="" data-active-links-target="link">All</a>
+          <%= render AhoyCaptain::DropdownLinkComponent.new(title: "Campaign") do |dropdown| %>
+            <% %w{utm_source utm_medium utm_term utm_content utm_campaign}.each do |source| %>
+              <% dropdown.with_option do %>
+                <a href="<%= public_send("campaign_#{source}_path".to_sym, **search_params) %>" class="" data-turbo-frame="sources"   data-active-links-target="link">
+                  <%= source.titleize.gsub("Utm", "UTM") %>
+                </a>
+              <% end %>
             <% end %>
           <% end %>
-        <% end %>
         </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :sources, src: sources_path(search_params), loading: :lazy %>
       <% end %>
       <% component.with_details_cta do %>
-        <button data-action="click->details-modal#openModal" data-controller="details-modal" data-details-modal-target-value="#sources" class="link no-underline">Details</button>
+        <button data-action="click->details-modal#openModal" data-controller="details-modal" data-details-modal-target-value="#sources" class="link no-underline ">Details</button>
       <% end %>
     <% end %>
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Top Pages') do |component| %>
       <% component.with_display_links do %>
-      <div data-controller='link' data-link-top_pages-class="text-primary underline" >
-        <a href="<%= top_pages_path(search_params) %>" data-turbo-frame="pages" data-action='click->link#changeTopPages' data-link-target='top_pagesLink'>Top Pages</a>
-        <a href="<%= entry_pages_path(search_params) %>" data-turbo-frame="pages" data-action='click->link#changeTopPages' data-link-target='top_pagesLink'>Entry Pages</a>
-        <a href="<%= exit_pages_path(search_params) %>" data-turbo-frame="pages" data-action='click->link#changeTopPages' data-link-target='top_pagesLink'>Exit Pages</a>
-      </div>
+        <div data-controller='active-links'>
+          <a href="<%= top_pages_path(search_params) %>" data-turbo-frame="pages" class=" text-sm" data-active-links-target="link">Top Pages</a>
+          <a href="<%= entry_pages_path(search_params) %>" data-turbo-frame="pages" class=" text-sm"  data-active-links-target="link">Entry Pages</a>
+          <a href="<%= exit_pages_path(search_params) %>" data-turbo-frame="pages" class=" text-sm"  data-active-links-target="link">Exit Pages</a>
+        </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :pages, src: top_pages_path(search_params), loading: :lazy %>
       <% end %>
       <% component.with_details_cta do %>
-        <button data-action="click->details-modal#openModal" data-controller="details-modal" data-details-modal-target-value="#pages" class="link no-underline">Details</button>
+        <button data-action="click->details-modal#openModal" data-controller="details-modal"  data-details-modal-target-value="#pages" class="link no-underline ">Details</button>
       <% end %>
     <% end %>
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Countries') do |component| %>
       <% component.with_display_links do %>
-      <div data-controller='link' data-link-countries-class="text-primary underline">
-        <a href="<%= countries_path(search_params) %>" data-turbo-frame="geography" data-action='click->link#changeCountries' data-link-target='countriesLink'>Countries</a>
-        <a href="<%= regions_path(search_params) %>" data-turbo-frame="geography" data-action='click->link#changeCountries' data-link-target='countriesLink'>Regions</a>
-        <a href="<%= cities_path(search_params) %>" data-turbo-frame="geography" data-action='click->link#changeCountries' data-link-target='countriesLink'>Cities</a>
-      </div>
+        <div data-controller="active-links">
+          <a href="<%= countries_path(search_params) %>" data-turbo-frame="geography" class=" text-sm"  data-active-links-target="link">Countries</a>
+          <a href="<%= regions_path(search_params) %>" data-turbo-frame="geography" class=" text-sm"   data-active-links-target="link">Regions</a>
+          <a href="<%= cities_path(search_params) %>" data-turbo-frame="geography" class=" text-sm"   data-active-links-target="link">Cities</a>
+        </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :geography, src: countries_path(search_params), loading: :lazy %>
       <% end %>
       <% component.with_details_cta do %>
-        <button data-action="click->details-modal#openModal" data-controller="details-modal" data-details-modal-target-value="#geography" class="link no-underline">Details</button>
+        <button data-action="click->details-modal#openModal" data-controller="details-modal"  data-details-modal-target-value="#geography" class="link no-underline ">Details</button>
       <% end %>
     <% end %>
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Devices') do |component| %>
       <% component.with_display_links do %>
-      <div data-controller='link' data-link-devices-class="text-primary underline">
-        <a href="<%= devices_browsers_path(search_params) %>" data-turbo-frame="devices" data-action='click->link#changeDevices' data-link-target='devicesLink'>Browser</a>
-        <a href="<%= devices_operating_systems_path(search_params) %>" data-turbo-frame="devices" data-action='click->link#changeDevices' data-link-target='devicesLink'>OS</a>
-        <a href="<%= devices_device_types_path(search_params) %>" data-turbo-frame="devices" data-action='click->link#changeDevices' data-link-target='devicesLink'>Size</a>
-      </div>
+        <div data-controller="active-links">
+          <a href="<%= devices_browsers_path(search_params) %>" data-turbo-frame="devices" class=" text-sm"   data-active-links-target="link">Browser</a>
+          <a href="<%= devices_operating_systems_path(search_params) %>" data-turbo-frame="devices" class=" text-sm"   data-active-links-target="link">OS</a>
+          <a href="<%= devices_device_types_path(search_params) %>" data-turbo-frame="devices"  class=" text-sm"  data-active-links-target="link">Size</a>
+        </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :devices, src: devices_browsers_path(search_params), loading: :lazy %>
       <% end %>
       <% component.with_details_cta do %>
-        <button data-action="click->details-modal#openModal" data-controller="details-modal" data-details-modal-target-value="#devices" class="link no-underline">Details</button>
+        <button data-action="click->details-modal#openModal" data-controller="details-modal" data-details-modal-target-value="#devices" class="link no-underline ">Details</button>
       <% end %>
     <% end %>
     <%= render AhoyCaptain::TileComponent.new(wide: true) do |component| %>
       <% component.with_display_links do %>
-        <a href="<%= goals_path(search_params) %>" data-turbo-frame="goals" class="link link-primary">
+        <a href="<%= goals_path(search_params) %>" data-turbo-frame="goals" class="link ">
           Goals
         </a>
         <%= render AhoyCaptain::DropdownLinkComponent.new(title: "Funnels") do |dropdown| %>
           <% AhoyCaptain.config.funnels.each do |id, funnel| %>
             <% dropdown.with_option do %>
-              <a href="<%= funnel_path(id, search_params) %>" data-turbo-frame="goals" class="link link-primary">
+              <a href="<%= funnel_path(id, search_params) %>" data-turbo-frame="goals" class="link ">
                 <%= funnel.title %>
               </a>
             <% end %>
@@ -98,76 +98,14 @@
         <% end %>
 
       <% end %>
-        <% component.with_statistic_display do %>
+      <% component.with_statistic_display do %>
         <%= turbo_frame_tag :goals, src: goals_path(search_params), loading: :lazy %>
       <% end %>
     <% end %>
   </div>
 </main>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Page", id: "pageModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Action", column: :route, url: filters_actions_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Entry page", column: :entry_page, url: filters_entry_pages_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Exit page", column: :exit_page, url: filters_exit_pages_path, predicates: [:in, :not_in]) %>
-  <% end %>
-<% end %>
-
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Country", id: "countryModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Country", column: :country, url: filters_locations_countries_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Region", column: :region, url: filters_locations_regions_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "City", column: :city, url: filters_locations_cities_path, predicates: [:in, :not_in]) %>
-  <% end %>
-<% end %>
-
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Source", id: "sourceModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Source", column: :referring_domain, url: filters_sources_path, predicates: [:in, :not_in]) %>
-  <% end %>
-<% end %>
-
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Screen size", id: "screenModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Screen size", column: :device_type, url: filters_screens_path, predicates: [:in, :not_in]) %>
-  <% end %>
-<% end %>
-
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Browser", id: "osModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Operating System", column: :os, url: filters_names_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Operating System Version", column: :os_version, url: filters_versions_path, predicates: [:in, :not_in]) %>
-  <% end %>
-<% end %>
-
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Campaign", id: "utmModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Medium", column: :utm_medium, url: filters_utm_mediums_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Source", column: :utm_source, url: filters_utm_sources_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Campaign", column: :utm_campaign, url: filters_utm_campaigns_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Term", column: :utm_term, url: filters_utm_terms_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Content", column: :utm_content, url: filters_utm_contents_path, predicates: [:in, :not_in]) %>
-  <% end %>
-<% end %>
-
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Custom Range", id: "customRangeModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <div class="flex gap-2 w-full">
-      <div class="form-control w-full max-w-xs">
-        <label class="label">
-          <span class="label-text">Start Date</span>
-        </label>
-        <input type="datetime-local" name="start_date" class="input input-bordered w-full" value="<%= params[:start_date] %>" />
-      </div>
-      <div class="form-control w-full max-w-xs">
-        <label class="label">
-          <span class="label-text">End Date</span>
-        </label>
-        <input type="datetime-local" name="end_date" class="input input-bordered w-full" value="<%= params[:end_date] %>" />
-      </div>
-    </div>
-  <% end %>
-<% end %>
+<%= render 'filters' %>
 
 <dialog id="detailsModal" class="modal">
   <div class="modal-box w-11/12 max-w-5xl">

data/app/views/ahoy_captain/stats/base/index.html.erb

@@ -1,14 +1,11 @@
 <%= turbo_frame_tag :chart do %>
-  <div class="flex justify-end ...">
+  <div class="flex justify-end gap-3 items-center">
+    <a href="<%= export_path(request.query_parameters) %>" class="link text-sm" target="_blank" data-turbo-frame="false">Download</a>
     <%= form_with url: url_for(params.permit!), method: :get, data: { controller: "interval" } do %>
-      <%= select_tag :interval, options_for_select(available_intervals.collect { |interval| [interval.titleize, interval] }, selected: selected_interval), class: "select select-bordered select-sm w-full max-w-sm", 'data-action': "change->interval#handleChange" %>
+      <%= select_tag :interval, options_for_select(available_intervals.collect { |interval| [interval.titleize, interval] }, selected: selected_interval), class: "select text-primary select-sm w-full max-w-sm", 'data-action': "change->interval#handleChange" %>
     <% end %>
-
   </div>
-
   <div>
-
-
-    <%= line_chart @stats %>
+    <canvas  style="height:300px;width:100%;" data-controller="line-chart" data-line-chart-label-value="<%= @label %>" data-line-chart-data-value="<%= @stats.to_json %>"></canvas>
   </div>
 <% end %>

data/app/views/ahoy_captain/stats/show.html.erb

@@ -1,56 +1,11 @@
 <%= turbo_frame_tag :stats do %>
   <dl class="grid grid-cols-1 divide-y divide-base-200 overflow-hidden rounded-lg grid-cols-2 md:grid-cols-6 md:divide-y-0 -mt-4 mb-4">
-    <a  href="<%= stats_unique_visitors_url(search_params) %>" data-turbo-frame="chart">
-      <dt class="text-base font-normal text-base-content">Unique Visitors</dt>
-      <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
-        <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= number_with_delimiter @presenter.unique_visitors %>
-        </div>
-      </dd>
-    </a>
-    <a href="<%= stats_total_visits_path(search_params) %>" data-turbo-frame="chart">
-      <dt class="text-base font-normal text-base-content">Total Visits</dt>
-      <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
-        <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= number_with_delimiter @presenter.total_visits %>
-        </div>
-      </dd>
-    </a>
-    <a href="<%= stats_total_pageviews_path(search_params) %>" data-turbo-frame="chart">
-      <dt class="text-base font-normal text-base-content">Total Pageviews</dt>
-      <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
-        <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= number_with_delimiter @presenter.total_pageviews %>
-        </div>
-      </dd>
-    </a>
-    <a href="<%= stats_views_per_visits_path(search_params) %>" data-turbo-frame="chart">
-
-      <dt class="text-base font-normal text-base-content">Views per visit</dt>
-      <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
-        <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= number_with_delimiter @presenter.views_per_visit %>
-        </div>
-      </dd>
-    </a>
-    <a href="<%= stats_bounce_rates_path(search_params) %>" data-turbo-frame="chart">
-
-      <dt class="text-base font-normal text-base-content">Bounce rate</dt>
-      <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
-        <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= number_with_delimiter @presenter.bounce_rate %>%
-        </div>
-      </dd>
-    </a>
-    <a href="<%= stats_visit_durations_path(search_params) %>" data-turbo-frame="chart">
-
-      <dt class="text-base font-normal text-base-content">Visit duration</dt>
-      <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
-        <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= @presenter.visit_duration %>
-        </div>
-      </dd>
-    </a>
+    <%= render ::AhoyCaptain::Stats::ContainerComponent.new(stats_unique_visitors_url(search_params), "Unique Visits", number_with_delimiter(@presenter.unique_visitors)) %>
+    <%= render ::AhoyCaptain::Stats::ContainerComponent.new(stats_total_visits_path(search_params), "Total Visits", number_with_delimiter(@presenter.total_visits)) %>
+    <%= render ::AhoyCaptain::Stats::ContainerComponent.new(stats_total_pageviews_path(search_params), "Total Pageviews", number_with_delimiter(@presenter.total_pageviews)) %>
+    <%= render ::AhoyCaptain::Stats::ContainerComponent.new(stats_views_per_visits_path(search_params), "Views per Visit", number_with_delimiter(@presenter.views_per_visit)) %>
+    <%= render ::AhoyCaptain::Stats::ContainerComponent.new(stats_bounce_rates_path(search_params), "Bounce Rate", "#{number_with_delimiter(@presenter.bounce_rate)}%") %>
+    <%= render ::AhoyCaptain::Stats::ContainerComponent.new(stats_visit_durations_url(search_params), "Visit Duration", @presenter.visit_duration) %>
   </dl>
   <%= turbo_frame_tag :chart, src: stats_unique_visitors_path(search_params) do %>
   <% end %>

data/config/routes.rb

@@ -12,6 +12,7 @@ AhoyCaptain::Engine.routes.draw do
     get "/devices/#{k}" => 'devices#index', defaults: { devices_type: v }, as: "devices_#{k}"
   end
 
+  resource :export, only: [:show]
   resource :realtime, only: [:show]
   resources :funnels, only: [:show]
   resources :goals, only: [:index]
@@ -41,6 +42,12 @@ AhoyCaptain::Engine.routes.draw do
     %w{country region city}.each do |type|
       get "locations/#{type.pluralize}" => "locations#index", defaults: { type: type }
     end
+
+    namespace :properties do
+      resources :names, only: [:index]
+      resources :values, only: [:index]
+    end
+
     resources :sources, only: [:index]
     resources :screens, only: [:index]
     scope :operating_systems, module: :operating_systems do

data/lib/ahoy_captain/ahoy/event_methods.rb

@@ -4,104 +4,67 @@ module AhoyCaptain
       extend ActiveSupport::Concern
 
       included do
-        ransacker :route do |parent|
+        ransacker :route do |_parent|
           Arel.sql(AhoyCaptain.config.event[:url_column])
         end
 
-        scope :with_routes, -> { where(AhoyCaptain.config.event[:url_exists]) }
-
-        scope :with_url, -> {
-          select(Arel.sql("#{AhoyCaptain.config.event.url_column} AS url"))
-        }
-
-        scope :distinct_url, -> {
-          distinct(Arel.sql("#{AhoyCaptain.config.event.url_column}"))
-        }
-
-        scope :url_in, ->(*args) {
-          where("#{AhoyCaptain.config.event.url_column} IN (?)", args)
-        }
-
-        scope :url_eq, ->(arg) {
-          if arg.is_a?(Array)
-            arg = arg[0]
-          end
-          where("#{AhoyCaptain.config.event.url_column} = ?", arg)
-        }
-
-        scope :url_not_in, ->(*args) {
-          where("#{AhoyCaptain.config.event.url_column} NOT IN (?)", args)
-        }
-
-        scope :url_i_cont, ->(arg) {
-          where("#{AhoyCaptain.config.event.url_column} ILIKE ?", "%#{arg}%")
-        }
-
-        scope :route_eq, ->(arg) {
-          url_eq(arg)
-        }
+        ransacker :entry_page do |parent|
+          Arel.sql("entry_pages.url")
+        end
 
-        scope :route_in, ->(*args) {
-          url_in(*args)
-        }
+        ransacker :exit_page do |parent|
+          Arel.sql("exit_pages.url")
+        end
 
-        scope :route_not_in, ->(*args) {
-          url_not_in(*args)
+        scope :with_entry_pages, -> {
+          with(entry_pages: self.select("MIN(ahoy_events.id) as min_id, #{Arel.sql("#{AhoyCaptain.config.event.url_column} AS url")}").where(name: AhoyCaptain.config.event[:view_name]).group("ahoy_events.properties")).joins("INNER JOIN entry_pages ON entry_pages.min_id = ahoy_events.id")
         }
-
-        scope :route_i_cont, ->(arg) {
-          url_i_cont(arg)
+        scope :with_exit_pages, -> {
+          with(exit_pages: self.select("MAX(ahoy_events.id) as max_id, #{Arel.sql("#{AhoyCaptain.config.event.url_column} AS url")}").where(name: AhoyCaptain.config.event[:view_name]).group("ahoy_events.properties")).joins("INNER JOIN exit_pages ON exit_pages.max_id = ahoy_events.id")
         }
 
-        scope :entry_page_in, ->(*args) {
-          table_alias = "first_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MIN(id) as min_id").where(name: AhoyCaptain.config.event[:view_name]).route_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.min_id")
-        }
+        scope :with_routes, -> { where(AhoyCaptain.config.event[:url_exists]) }
 
-        scope :entry_page_not_in, ->(*args) {
-          table_alias = "first_events_#{SecureRandom.hex.first(6)}"
-          subquery = self.select("MIN(id) as min_id").where(name: AhoyCaptain.config.event[:view_name]).route_not_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.min_id")
+        scope :with_url, -> {
+          select(Arel.sql("#{AhoyCaptain.config.event.url_column} AS url"))
         }
 
-        scope :entry_page_i_cont, ->(arg) {
-          table_alias = "first_events_#{SecureRandom.hex.first(6)}"
-          subquery = self.select("MIN(id) as min_id").where(name: AhoyCaptain.config.event[:view_name]).route_i_cont(arg).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.min_id")
+        scope :distinct_url, -> {
+          distinct(Arel.sql("#{AhoyCaptain.config.event.url_column}"))
         }
 
-        scope :exit_page_in, ->(*args) {
-          table_alias = "last_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MAX(id) as max_id").where(name: AhoyCaptain.config.event[:view_name]).route_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.max_id")
+        scope :property_name_eq, ->(value) {
+          where("properties ? :key", key: value)
         }
 
-        scope :exit_page_not_in, ->(*args) {
-          table_alias = "last_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MAX(id) as max_id").where(name: AhoyCaptain.config.event[:view_name]).route_not_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.max_id")
+        scope :properties_eq, ->(value) {
+          where("properties @> ?", value)
         }
 
-        scope :exit_page_i_cont, ->(arg) {
-          table_alias = "last_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MAX(id) as max_id").where(name: AhoyCaptain.config.event[:view_name]).route_i_cont(*arg).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.max_id")
-        }
+        scope :properties_not_eq, ->(value) do
+          where.not("properties::jsonb @> ?", value)
+        end
 
+        ransacker :goal,
+                  formatter: ->(value) {
+                    ::Arel::Nodes::SqlLiteral.new(
+                      ::AhoyCaptain.config.goals[value].event_query.call.select(:id).to_sql
+                    )
+                  } do |parent|
+          parent.table[:id]
+        end
       end
 
       class_methods do
         def ransackable_attributes(auth_object = nil)
-          super + ["action", "controller", "id", "id_property", "name", "name_property", "page", "properties", "time", "url", "user_id", "visit_id"] + self._ransackers.keys
+          super + ["action", "controller", "id", "id_property", "name", "page", "properties", "time", "url", "user_id", "visit_id", "property_name", "goal"] + self._ransackers.keys
         end
 
         def ransackable_scopes(auth_object = nil)
-          super + [:entry_page_in, :entry_page_not_in, :exit_page_in, :entry_page_not_in, :route_in, :route_not_in, :route_i_cont, :entry_page_i_cont, :exit_page_i_cont]
+          super + [
+            :properties_eq,
+            :properties_not_eq
+          ]
         end
 
         def ransackable_associations(auth_object = nil)

data/lib/ahoy_captain/ahoy/visit_methods.rb

@@ -5,7 +5,7 @@ module AhoyCaptain
 
       included do
         ransacker :ref_domain do
-          Arel.sql("(substring(referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)'))")
+          Arel.sql("(substring(#{self.table_name}.referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)'))")
         end
       end
 

data/lib/ahoy_captain/configuration.rb

@@ -1,9 +1,10 @@
 require 'ahoy_captain/period_collection'
+require 'ahoy_captain/filters_configuration'
 
 module AhoyCaptain
   class Configuration
     attr_accessor :view_name, :theme
-    attr_reader :goals, :funnels, :cache, :ranges, :disabled_widgets, :event, :models
+    attr_reader :goals, :funnels, :cache, :ranges, :disabled_widgets, :event, :models, :filters, :predicate_labels
     def initialize
       @goals = GoalCollection.new
       @funnels = FunnelCollection.new
@@ -16,13 +17,22 @@ module AhoyCaptain
       end
       @event = ActiveSupport::OrderedOptions.new.tap do |option|
         option.view_name = "$view"
-        option.url_column = "CONCAT(ahoy_events.properties->>'controller', '#', ahoy_events.properties->>'action')"
-        option.url_exists = "JSONB_EXISTS(ahoy_events.properties, 'controller') AND JSONB_EXISTS(ahoy_events.properties, 'action')"
+        option.url_column = "COALESCE(ahoy_events.properties->>'url', CONCAT(ahoy_events.properties->>'controller', '#', ahoy_events.properties->>'action'))"
+        option.url_exists = "(JSONB_EXISTS(ahoy_events.properties, 'controller') AND JSONB_EXISTS(ahoy_events.properties, 'action')) OR (JSONB_EXISTS(ahoy_events.properties, 'url'))"
       end
       @models = ActiveSupport::OrderedOptions.new.tap do |option|
         option.event = "::Ahoy::Event"
         option.visit = "::Ahoy::Visit"
       end
+      @filters = FiltersConfiguration.load_default
+      @predicate_labels = {
+        eq: 'equals',
+        not_eq: 'not equals',
+        cont: 'contains',
+        in: 'in',
+        not_in: 'not in',
+      }
+
       @disabled_widgets = []
     end
 

data/lib/ahoy_captain/engine.rb

@@ -6,6 +6,24 @@ require 'view_component'
 require 'chartkick'
 require 'groupdate'
 require 'pagy'
+require 'zip'
+
+module Ransack
+  module Nodes
+    class Condition
+
+      # allows for sql from a formatter
+      # see https://github.com/activerecord-hackery/ransack/issues/702
+      def casted_array?(predicate)
+        return unless predicate.is_a?(Arel::Nodes::Casted)
+
+        predicate.value.is_a?(Array)
+      end
+
+    end
+  end
+end
+
 
 module AhoyCaptain
   class Engine < Rails::Engine

data/lib/ahoy_captain/filter_configuration/filter.rb

@@ -0,0 +1,16 @@
+module AhoyCaptain
+  class FilterConfiguration
+    class Filter
+      attr_reader :column, :label, :url, :predicates, :multiple, :position
+
+      def initialize(label:, column:, url:, predicates: [:in, :not_in], multiple: true, position: nil)
+        @column = column
+        @label = label
+        @url = url
+        @predicates = predicates
+        @multiple = multiple
+        @position = position
+      end
+    end
+  end
+end

data/lib/ahoy_captain/filter_configuration/filter_collection.rb

@@ -0,0 +1,48 @@
+module AhoyCaptain
+  class FilterConfiguration
+    class FilterCollection
+      def initialize(label)
+        @label = label
+        @registry = []
+      end
+
+      def filter(label:, column:, url:, predicates: [:in, :not_in], multiple: true, position: nil)
+        position ||= @registry.size
+        if item = find(column)
+          @registry.delete(item)
+        end
+
+        @registry << FilterConfiguration::Filter.new(label: label, column: column, url: url, predicates: predicates, multiple: multiple, position: position)
+        @registry = @registry.sort_by { |filter| filter.position }
+      end
+
+      def each(&block)
+        @registry.each(&block)
+      end
+
+      def modal_name
+        "#{@label.parameterize.underscore}Modal"
+      end
+
+      def find(column)
+        @registry.find { |filter| filter.column == column.to_sym }
+      end
+
+      def delete(name)
+        @registry.delete_if { |filter| filter.column == name }
+      end
+
+      def filters
+        @registry
+      end
+
+      def [](name)
+        find(name)
+      end
+
+      def include?(name)
+        find(name).present?
+      end
+    end
+  end
+end