ahoy_captain 0.77 → 0.82

data/lib/ahoy_captain/ahoy/event_methods.rb

@@ -4,104 +4,58 @@ module AhoyCaptain
       extend ActiveSupport::Concern
 
       included do
-        ransacker :route do |parent|
-          Arel.sql(AhoyCaptain.config.event[:url_column].gsub("properties", "ahoy_events.properties"))
+        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)
-        }
-
-        scope :route_in, ->(*args) {
-          url_in(*args)
-        }
+        ransacker :entry_page do |parent|
+          Arel.sql("entry_pages.url")
+        end
 
-        scope :route_not_in, ->(*args) {
-          url_not_in(*args)
-        }
+        ransacker :exit_page do |parent|
+          Arel.sql("exit_pages.url")
+        end
 
-        scope :route_i_cont, ->(arg) {
-          url_i_cont(arg)
+        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 :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_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_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_routes, -> { where(AhoyCaptain.config.event[:url_exists]) }
 
-        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 :with_url, -> {
+          select(Arel.sql("#{AhoyCaptain.config.event.url_column} AS url"))
         }
 
-        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 :distinct_url, -> {
+          distinct(Arel.sql("#{AhoyCaptain.config.event.url_column}"))
         }
 
-        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 :property_name_eq, ->(value) {
+          where("properties ? :key", key: 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_eq, ->(value) {
+          where("properties @> ?", value)
         }
 
+        scope :properties_not_eq, ->(value) do
+          where.not("properties::jsonb @> ?", value)
+        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"] + 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/configuration.rb

@@ -16,8 +16,8 @@ module AhoyCaptain
       end
       @event = ActiveSupport::OrderedOptions.new.tap do |option|
         option.view_name = "$view"
-        option.url_column = "CONCAT(properties->>'controller', '#', properties->>'action')"
-        option.url_exists = "JSONB_EXISTS(properties, 'controller') AND JSONB_EXISTS(properties, 'action')"
+        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')"
       end
       @models = ActiveSupport::OrderedOptions.new.tap do |option|
         option.event = "::Ahoy::Event"

data/lib/ahoy_captain/engine.rb

@@ -6,6 +6,7 @@ require 'view_component'
 require 'chartkick'
 require 'groupdate'
 require 'pagy'
+require 'zip'
 
 module AhoyCaptain
   class Engine < Rails::Engine

data/lib/ahoy_captain/goals.rb

@@ -1,19 +1,31 @@
 module AhoyCaptain
   class Goal
     attr_accessor :id
-    attr_reader :title, :event_name
+    attr_reader :title, :event_query
     def initialize
       @id = nil
       @title = nil
-      @event_name = nil
+      @event_query = nil
     end
 
     def label(value)
       @title = value
     end
 
+    def name(value)
+      @event_query = -> { ::AhoyCaptain.event.where(name: value) }
+    end
+
     def event(value)
-      @event_name = value
+      ActiveSupport::Deprecation.warn(
+        "event is deprecated. " \
+    "Use name instead."
+      )
+      name(value)
+    end
+
+    def query(&block)
+      @event_query = block
     end
   end
 

data/lib/ahoy_captain/period_collection.rb

@@ -51,7 +51,7 @@ module AhoyCaptain
       }.each do |param, options|
         instance.add(param, options[:label], options[:range])
       end
-      instance.default = :mtd
+      instance.default = :'30d'
       instance
     end
 

data/lib/ahoy_captain/version.rb

@@ -1,3 +1,3 @@
 module AhoyCaptain
-  VERSION = "0.77"
+  VERSION = "0.82"
 end

data/lib/generators/ahoy_captain/migration_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators"
+require "rails/generators/active_record"
+
+module AhoyCaptain
+  module Generators
+    class MigrationGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
+
+      def copy_templates
+        migration_template "migration.rb", "db/migrate/create_ahoy_captain_indexes.rb", migration_version: migration_version
+      end
+
+      private
+
+      def migration_version
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+      end
+    end
+  end
+end

data/lib/generators/ahoy_captain/templates/config.rb.tt

@@ -1,4 +1,4 @@
-AhoyCaptain.configure do
+AhoyCaptain.configure do |config|
   # ==> Event tracking
   #
   # View name
@@ -74,6 +74,12 @@ AhoyCaptain.configure do
   #
   # And handle the default range, which will be used if no range is given:
   # config.ranges.default = '3d'
+  #
+  # The max range if a custom range is sent
+  # config.ranges.max = 180.days
+  #
+  # Set to false to disable custom ranges
+  # config.ranges.custom = true
 
   # ==> Caching
   # config.cache.enabled = false
@@ -91,14 +97,23 @@ AhoyCaptain.configure do
   #
   #   config.goal :unique_id do
   #     label "Some label here"
-  #     event "The event name you're tracking in your Ahoy::Event table"
+  #     name "The event name you're tracking in your Ahoy::Event table"
   #   end
   #
   # Real-world example:
   #
   #   config.goal :appointment_paid do
   #     label "Appointment Paid"
-  #     event "$appointment.paid"
+  #     name "$appointment.paid"
+  #   end
+  #
+  # You can also use queries:
+  #
+  #   config.goal :appointment_paid do
+  #     label "Appointment Paid"
+  #     query do
+  #       ::Ahoy::Event.where(...)
+  #     end
   #   end
 
   # ==> Funnels

data/lib/generators/ahoy_captain/templates/migration.rb.tt

@@ -0,0 +1,7 @@
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_index :<%= ::AhoyCaptain.visit.table_name %>, :started_at unless index_exists?(:<%= ::AhoyCaptain.visit.table_name %>, :started_at)
+    add_index :<%= ::AhoyCaptain.event.table_name %>, :visit_id unless index_exists?(:<%= ::AhoyCaptain.event.table_name %>, :visit_id)
+    add_index :<%= ::AhoyCaptain.event.table_name %>, :time unless index_exists?(:<%= ::AhoyCaptain.event.table_name %>, :time)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_captain
 version: !ruby/object:Gem::Version
-  version: '0.77'
+  version: '0.82'
 platform: ruby
 authors:
 - joshmn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-30 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -264,17 +278,20 @@ files:
 - app/assets/images/ahoy_captain/logo.png
 - app/assets/images/ahoy_captain/safari-pinned-tab.svg
 - app/assets/javascript/ahoy_captain/application.js
+- app/assets/javascript/ahoy_captain/controllers/active_links_controller.js
 - app/assets/javascript/ahoy_captain/controllers/application.js
 - app/assets/javascript/ahoy_captain/controllers/application_controller.js
 - app/assets/javascript/ahoy_captain/controllers/details_modal_controller.js
 - app/assets/javascript/ahoy_captain/controllers/dropdown_label_controller.js
-- app/assets/javascript/ahoy_captain/controllers/filter_controller.js
+- app/assets/javascript/ahoy_captain/controllers/filter_form_controller.js
 - app/assets/javascript/ahoy_captain/controllers/filter_tag_controller.js
 - app/assets/javascript/ahoy_captain/controllers/funnel_chart_controller.js
 - app/assets/javascript/ahoy_captain/controllers/index.js
-- app/assets/javascript/ahoy_captain/controllers/link_controller.js
-- app/assets/javascript/ahoy_captain/controllers/navigation_controller.js
+- app/assets/javascript/ahoy_captain/controllers/interval_controller.js
+- app/assets/javascript/ahoy_captain/controllers/line_chart_controller.js
+- app/assets/javascript/ahoy_captain/controllers/predicate_select_controller.js
 - app/assets/javascript/ahoy_captain/controllers/realtime_controller.js
+- app/assets/javascript/ahoy_captain/controllers/search_select_controller.js
 - app/assets/manifest/ahoy_captain/manifest.js
 - app/components/ahoy_captain/dropdown_button_component.html.erb
 - app/components/ahoy_captain/dropdown_button_component.rb
@@ -292,6 +309,18 @@ files:
 - app/components/ahoy_captain/sticky_nav_component.rb
 - app/components/ahoy_captain/table_component.html.erb
 - app/components/ahoy_captain/table_component.rb
+- app/components/ahoy_captain/tables/headers/devices_header_component.html.erb
+- app/components/ahoy_captain/tables/headers/devices_header_component.rb
+- app/components/ahoy_captain/tables/headers/goals_header_component.html.erb
+- app/components/ahoy_captain/tables/headers/goals_header_component.rb
+- app/components/ahoy_captain/tables/headers/header_component.html.erb
+- app/components/ahoy_captain/tables/headers/header_component.rb
+- app/components/ahoy_captain/tables/rows/devices_row_component.html.erb
+- app/components/ahoy_captain/tables/rows/devices_row_component.rb
+- app/components/ahoy_captain/tables/rows/goals_row_component.html.erb
+- app/components/ahoy_captain/tables/rows/goals_row_component.rb
+- app/components/ahoy_captain/tables/rows/row_component.html.erb
+- app/components/ahoy_captain/tables/rows/row_component.rb
 - app/components/ahoy_captain/tile_component.html.erb
 - app/components/ahoy_captain/tile_component.rb
 - app/components/ahoy_captain/tooltip_component.html.erb
@@ -303,6 +332,7 @@ files:
 - app/controllers/ahoy_captain/devices_controller.rb
 - app/controllers/ahoy_captain/entry_pages_controller.rb
 - app/controllers/ahoy_captain/exit_pages_controller.rb
+- app/controllers/ahoy_captain/exports_controller.rb
 - app/controllers/ahoy_captain/filters/base_controller.rb
 - app/controllers/ahoy_captain/filters/locations_controller.rb
 - app/controllers/ahoy_captain/filters/operating_systems/names_controller.rb
@@ -310,6 +340,8 @@ files:
 - app/controllers/ahoy_captain/filters/pages/actions_controller.rb
 - app/controllers/ahoy_captain/filters/pages/entry_pages_controller.rb
 - app/controllers/ahoy_captain/filters/pages/exit_pages_controller.rb
+- app/controllers/ahoy_captain/filters/properties/names_controller.rb
+- app/controllers/ahoy_captain/filters/properties/values_controller.rb
 - app/controllers/ahoy_captain/filters/screens_controller.rb
 - app/controllers/ahoy_captain/filters/sources_controller.rb
 - app/controllers/ahoy_captain/filters/utms_controller.rb
@@ -340,18 +372,23 @@ files:
 - app/decorators/ahoy_captain/source_decorator.rb
 - app/decorators/ahoy_captain/top_page_decorator.rb
 - app/helpers/ahoy_captain/application_helper.rb
-- app/models/ahoy_captain/current.rb
+- app/models/ahoy_captain/export.rb
 - app/models/ahoy_captain/rangeable.rb
-- app/models/ahoy_captain/url_helpers.rb
 - app/models/ahoy_captain/widget.rb
 - app/models/concerns/ahoy_captain/range_options.rb
 - app/presenters/ahoy_captain/dashboard_presenter.rb
 - app/presenters/ahoy_captain/funnel_presenter.rb
 - app/presenters/ahoy_captain/goals_presenter.rb
 - app/queries/ahoy_captain/application_query.rb
+- app/queries/ahoy_captain/campaign_query.rb
+- app/queries/ahoy_captain/city_query.rb
+- app/queries/ahoy_captain/country_query.rb
+- app/queries/ahoy_captain/device_query.rb
 - app/queries/ahoy_captain/entry_pages_query.rb
 - app/queries/ahoy_captain/event_query.rb
 - app/queries/ahoy_captain/exit_pages_query.rb
+- app/queries/ahoy_captain/region_query.rb
+- app/queries/ahoy_captain/source_query.rb
 - app/queries/ahoy_captain/stats/average_views_per_visit_query.rb
 - app/queries/ahoy_captain/stats/average_visit_duration_query.rb
 - app/queries/ahoy_captain/stats/bounce_rates_query.rb
@@ -360,6 +397,7 @@ files:
 - app/queries/ahoy_captain/stats/unique_visitors_query.rb
 - app/queries/ahoy_captain/stats/views_per_visit_query.rb
 - app/queries/ahoy_captain/stats/visit_duration_query.rb
+- app/queries/ahoy_captain/top_page_query.rb
 - app/queries/ahoy_captain/visit_query.rb
 - app/views/ahoy_captain/campaigns/index.html+details.erb
 - app/views/ahoy_captain/campaigns/index.html.erb
@@ -367,6 +405,7 @@ files:
 - app/views/ahoy_captain/cities/index.html.erb
 - app/views/ahoy_captain/countries/index.html+details.erb
 - app/views/ahoy_captain/countries/index.html.erb
+- app/views/ahoy_captain/devices/_table.html.erb
 - app/views/ahoy_captain/devices/index.html+details.erb
 - app/views/ahoy_captain/devices/index.html.erb
 - app/views/ahoy_captain/entry_pages/index.html+details.erb
@@ -400,7 +439,9 @@ files:
 - lib/ahoy_captain/railtie.rb
 - lib/ahoy_captain/version.rb
 - lib/generators/ahoy_captain/install_generator.rb
+- lib/generators/ahoy_captain/migration_generator.rb
 - lib/generators/ahoy_captain/templates/config.rb.tt
+- lib/generators/ahoy_captain/templates/migration.rb.tt
 homepage:
 licenses:
 - MIT

data/app/assets/javascript/ahoy_captain/controllers/filter_controller.js

@@ -1,145 +0,0 @@
-import {Controller} from "@hotwired/stimulus"
-import SlimSelect from 'slim-select'
-
-export default class extends Controller {
-  static values = {
-    url: String,
-    column: String,
-  };
-  static targets = ["select", 'predicate'];
-  connect() {
-    this.selectTargets.forEach(async (target) => {
-      const url = target.dataset.filterUrlValue;
-      const optionsSearch = this.fetchOptions(url, target);
-      const select = await new SlimSelect({
-        select: target,
-        data: [],
-        settings: {
-          contentPosition: 'relative',
-          contentLocation: target.closest('fieldset'),
-          searchText: 'Sorry, no results found',
-          searchPlaceholder: 'Type to populate results',
-          placeholderText: `Search for ${target.dataset.filterColumnValue}`,
-          searchHighlight: true
-        },
-        events: {
-          beforeOpen: async () => {
-            if (!this.#hasData(target) & !this.#hasSelections(target) ) {
-              const data = await optionsSearch();
-              target.slim.setData(data);
-            }
-          },
-          search: async (search, currentData) => {
-            const data = await optionsSearch(search);
-            const filteredData = data.filter(item => !currentData.some((selectedItem) => selectedItem.text == item.text ))
-            return filteredData;
-          },
-          beforeChange: this.#beforeChange(target, url),
-        }
-      });
-      const json = JSON.parse(target.dataset.filterSelected)
-      if(json.length) {
-        select.setData(json.map(item => ({ "text": item, "value": item })))
-        select.setSelected(json)
-      }
-    })
-  }
-
-  fetchOptions(url, target) {
-    return async (search) => {
-      const query = this.#buildQueryFilters(search, target);
-      const response = await fetch(`${url}?${query.toString()}`);
-      const data = await response.json();
-      return data;
-    }
-  }
-
-  #buildQueryFilters(search, target) {
-    const query = new URLSearchParams(window.location.search);
-    const otherFilters = this.selectTargets.filter(filter => filter != target);
-    otherFilters.forEach(function(filter) {
-      filter.slim.getSelected().forEach(val => {
-        const filterName = `${filter.name}[]`
-        if(query.has(filterName)) {
-          console.log("has the filter")
-          if(!query.get(`${filter.name}[]`).includes(val)) {
-            query.append(filterName, value)
-          }
-        } else {
-          query.append(filterName, value)
-        }
-      })
-    });
-    query.set(`q[${target.dataset.filterColumnValue}_i_cont]`, search || "");
-    return query;
-  }
-
-  #beforeChange(target, url) {
-    return () => {
-      const otherFilters = this.selectTargets.filter(filter => filter != target);
-      otherFilters.forEach(async target => {
-        if (this.#hasData(target)) {
-          const selected = target.slim.getSelected()
-          target.slim.setData(selected.map(text => ({ text })))
-          // setting data triggers a slim render, so need to also set selected again
-          target.slim.setSelected(selected)
-        }
-      })
-    return true;
-    }
-  }
-
-  #hasData(target) {
-    return target.slim.getData().length !== 0;
-  }
-
-  #hasSelections(target) {
-    return target.slim.getSelected().length !== 0;
-  }
-
-  #filtersForQuery() {
-    const predicates = this.predicateTargets.map(el => ({name: el.name, column_predicate: el.value}));
-    const filterValues = this.selectTargets.map(el => ({name: el.name, selections: el.slim.getSelected()}));
-    const mergedData = predicates.map(predicate => {
-      const matchingFilter = filterValues.find(filter => filter.name === predicate.name);
-      if (matchingFilter.selections.length > 0) {
-        return {...predicate, ...matchingFilter}
-      }
-    }).filter(el => el !== undefined);
-    return mergedData;
-  }
-
-  resetFilters(event) {
-    this.selectTargets.forEach(el => {
-      el.slim.setSelected([])
-    })
-    this.applyFilters(event)
-  }
-
-  applyFilters(e) {
-    e.preventDefault();
-    const searchParams = new URLSearchParams(window.location.search);
-    const filters = this.#filtersForQuery();
-    filters.forEach(filter => {
-      const name = `q[${filter.column_predicate}][]`
-      const selectedValues = searchParams.getAll(name)
-      filter.selections.forEach(selection => {
-        if(selectedValues) {
-          if(!selectedValues.includes(selection)) {
-            searchParams.append(name, selection)
-          }
-        } else {
-          searchParams.append(name, selection)
-        }
-      })
-    });
-    ['input[name="start_date"]', 'input[name="end_date"]'].forEach(selector => {
-      const el = document.querySelector(selector)
-      if(el.value.length) {
-        searchParams.delete("period")
-      }
-      searchParams.set(el.name, el.value);
-    });
-    Turbo.visit(window.location.pathname.replace(/\/$/, "")  + `?${searchParams.toString()}`)
-  }
-}

data/app/assets/javascript/ahoy_captain/controllers/link_controller.js

@@ -1,43 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["countriesLink", "top_pagesLink", "devicesLink", "top_sourcesLink"]
-  static classes = ["countries", "top_pages", "devices", "top_sources"]
-
-  changeCountries(event) {
-    console.log(...this.countriesClasses)
-    event.currentTarget.classList.add(...this.countriesClasses)
-    this.countriesLinkTargets.forEach((target) => {
-      if (target != event.currentTarget) {
-        target.classList.remove(...this.countriesClasses)
-      }
-    })
-  }
-
-  changeTopSources(event) {
-    event.currentTarget.classList.add(...this.top_sourcesClasses)
-    this.top_sourcesLinkTargets.forEach((target) => {
-      if (target != event.currentTarget) {
-        target.classList.remove(...this.top_sourcesClasses)
-      }
-    })
-  }
-  
-  changeTopPages(event) {
-    event.currentTarget.classList.add(...this.top_pagesClasses)
-    this.top_pagesLinkTargets.forEach((target) => {
-      if (target != event.currentTarget) {
-        target.classList.remove(...this.top_pagesClasses)
-      }
-    })
-  }
-
-  changeDevices(event) {
-    event.currentTarget.classList.add(...this.devicesClasses)
-    this.devicesLinkTargets.forEach((target) => {
-      if (target != event.currentTarget) {
-        target.classList.remove(...this.devicesClasses)
-      }
-    })
-  }
-}

data/app/assets/javascript/ahoy_captain/controllers/navigation_controller.js

@@ -1,25 +0,0 @@
-import {Controller} from "@hotwired/stimulus"
-
-export default class extends Controller {
-  connect() {
-    this.queryString = new URLSearchParams(window.location.search);
-    this.baseURL = window.location.pathname.replace(/\/$/, "");
-  }
-  
-  navigate() {
-    const url = `${this.baseURL}?${this.queryString.toString()}`;
-    Turbo.visit(url, { action: "replace"})
-  }
-
-  addQueryParam({ detail: { paramKey, paramValue } }) {
-    this.queryString.append(paramKey, paramValue)
-  }
-  
-  removeQueryParam({ detail: { paramKey, paramValue } }) {
-    if (!this.queryString.has(paramKey)) {
-      paramKey += "[]"
-    }
-    this.queryString.delete(paramKey,paramValue)
-    this.navigate()
-  }
-}

data/app/models/ahoy_captain/current.rb

@@ -1,9 +0,0 @@
-module AhoyCaptain
-  class Current < ActiveSupport::CurrentAttributes
-    attribute :request
-
-    after_reset do
-      self.request = nil
-    end
-  end
-end

data/app/models/ahoy_captain/url_helpers.rb

@@ -1,6 +0,0 @@
-module AhoyCaptain
-  class UrlHelpers
-    include AhoyCaptain::Engine.routes.url_helpers
-    include Singleton
-  end
-end