ahoy_captain 0.9 → 0.10.0

data/lib/ahoy_captain/engine.rb

@@ -24,6 +24,10 @@ module Ransack
   end
 end
 
+Ransack.configure do |config|
+  config.add_predicate 'json_cont', arel_predicate: 'contains', formatter: proc { |v| JSON.parse(v) }
+  config.add_predicate 'json_eq', arel_predicate: 'eq', formatter: proc { |v| JSON.parse(v) }
+end
 
 module AhoyCaptain
   class Engine < Rails::Engine

data/lib/ahoy_captain/filters_configuration.rb

@@ -30,13 +30,17 @@ module AhoyCaptain
           filter column: :os_version, label: "OS Version", url: :filters_versions_path, predicates: [:in, :not_in]
         end
 
-        config.register("UTM Tag") do
+        config.register("UTM Tags") do
           filter column: :utm_medium, label: "UTM Medium", url: :filters_utm_mediums_path, predicates: [:in, :not_in]
           filter column: :utm_source, label: "UTM Source", url: :filters_utm_sources_path, predicates: [:in, :not_in]
           filter column: :utm_campaign, label: "UTM Campaign", url: :filters_utm_campaigns_path, predicates: [:in, :not_in]
           filter column: :utm_term, label: "UTM Term", url: :filters_utm_terms_path, predicates: [:in, :not_in]
           filter column: :utm_content, label: "UTM Content", url: :filters_utm_contents_path, predicates: [:in, :not_in]
         end
+
+        config.register("Goal") do
+          filter column: :goal, label: "Goal", url: :filters_goals_path, predicates: [:in]
+        end
       end
     end
 

data/lib/ahoy_captain/version.rb

@@ -1,3 +1,3 @@
 module AhoyCaptain
-  VERSION = "0.9"
+  VERSION = "0.10.0"
 end

data/lib/ahoy_captain.rb

@@ -28,11 +28,12 @@ module AhoyCaptain
         pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
         pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
         pin "application", to: "ahoy_captain/application.js", preload: true
-        pin "slim-select", to: "https://ga.jspm.io/npm:slim-select@2.6.0/dist/slimselect.es.js", preload: true
         pin "chartkick", to: "chartkick.js"
         pin "Chart.bundle", to: "Chart.bundle.js"
         pin "chartjs-plugin-datalabels", to: "https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2", preload: true
+        pin "classnames", to: "https://cdnjs.cloudflare.com/ajax/libs/classnames/2.3.2/index.min.js", preload: true
         pin_all_from AhoyCaptain::Engine.root.join("app/assets/javascript/ahoy_captain/controllers"), under: "controllers", to: "ahoy_captain/controllers"
+        pin_all_from AhoyCaptain::Engine.root.join("app/assets/javascript/ahoy_captain/helpers"), under: "helpers", to: "ahoy_captain/helpers"
       end
     end
 
@@ -51,5 +52,9 @@ module AhoyCaptain
     def visit
       @visit ||= config.models[:visit].constantize
     end
+
+    def none
+      @none ||= OpenStruct.new(text: "(none)", value: "!none!")
+    end
   end
 end

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

@@ -80,6 +80,8 @@ AhoyCaptain.configure do |config|
   #
   # Set to false to disable custom ranges
   # config.ranges.custom = true
+  #
+  # For an interval to be considered "realtime" it must not have a secondary item in the range
 
   # ==> Filters
   #
@@ -160,4 +162,9 @@ AhoyCaptain.configure do |config|
   #     goal :appointment_created
   #     goal :appointment_paid
   #   end
+  #
+  # => Realtime interval
+  # config.realtime_interval = 30.seconds
+  #
+  # How frequently the page should refresh if the interval is realtime
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_captain
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.10.0
 platform: ruby
 authors:
 - joshmn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -281,20 +281,28 @@ files:
 - 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/combobox_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/item_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/filter_modal_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/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/properties_controller.js
+- app/assets/javascript/ahoy_captain/controllers/property_filter_controller.js
 - app/assets/javascript/ahoy_captain/controllers/realtime_controller.js
-- app/assets/javascript/ahoy_captain/controllers/search_select_controller.js
+- app/assets/javascript/ahoy_captain/controllers/tile_controller.js
 - app/assets/javascript/ahoy_captain/controllers/toggle_controller.js
+- app/assets/javascript/ahoy_captain/helpers/chart_utils.js
+- app/assets/javascript/ahoy_captain/helpers/number_formatters.js
 - app/assets/manifest/ahoy_captain/manifest.js
+- app/components/ahoy_captain/combobox_component.html.erb
+- app/components/ahoy_captain/combobox_component.rb
+- app/components/ahoy_captain/comparison_link_component.rb
 - app/components/ahoy_captain/dropdown_button_component.html.erb
 - app/components/ahoy_captain/dropdown_button_component.rb
 - app/components/ahoy_captain/dropdown_link_component.html.erb
@@ -309,22 +317,24 @@ files:
 - app/components/ahoy_captain/filter/tag_component.rb
 - app/components/ahoy_captain/filter/tag_container_component.html.erb
 - app/components/ahoy_captain/filter/tag_container_component.rb
+- app/components/ahoy_captain/stats/comparable_container_component.html.erb
+- app/components/ahoy_captain/stats/comparable_container_component.rb
 - app/components/ahoy_captain/stats/container_component.html.erb
 - app/components/ahoy_captain/stats/container_component.rb
 - app/components/ahoy_captain/sticky_nav_component.html.erb
 - 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/devices_table_component.rb
+- app/components/ahoy_captain/tables/dynamic_table.rb
+- app/components/ahoy_captain/tables/dynamic_table_component.rb
+- app/components/ahoy_captain/tables/goals_table_component.rb
+- app/components/ahoy_captain/tables/header_component.html.erb
+- app/components/ahoy_captain/tables/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/properties_table_component.rb
+- app/components/ahoy_captain/tables/row_component.html.erb
 - 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
@@ -340,6 +350,7 @@ files:
 - 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/goals_controller.rb
 - app/controllers/ahoy_captain/filters/locations_controller.rb
 - app/controllers/ahoy_captain/filters/operating_systems/names_controller.rb
 - app/controllers/ahoy_captain/filters/operating_systems/versions_controller.rb
@@ -353,6 +364,7 @@ files:
 - app/controllers/ahoy_captain/filters/utms_controller.rb
 - app/controllers/ahoy_captain/funnels_controller.rb
 - app/controllers/ahoy_captain/goals_controller.rb
+- app/controllers/ahoy_captain/properties_controller.rb
 - app/controllers/ahoy_captain/realtimes_controller.rb
 - app/controllers/ahoy_captain/regions_controller.rb
 - app/controllers/ahoy_captain/roots_controller.rb
@@ -378,10 +390,14 @@ 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/comparison_mode.rb
 - app/models/ahoy_captain/export.rb
 - app/models/ahoy_captain/filter_parser.rb
+- app/models/ahoy_captain/range_from_params.rb
 - app/models/ahoy_captain/rangeable.rb
 - app/models/ahoy_captain/widget.rb
+- app/models/concerns/ahoy_captain/compare_mode.rb
+- app/models/concerns/ahoy_captain/limitable.rb
 - app/models/concerns/ahoy_captain/range_options.rb
 - app/presenters/ahoy_captain/dashboard_presenter.rb
 - app/presenters/ahoy_captain/funnel_presenter.rb
@@ -398,6 +414,7 @@ files:
 - 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/base_query.rb
 - app/queries/ahoy_captain/stats/bounce_rates_query.rb
 - app/queries/ahoy_captain/stats/total_pageviews_query.rb
 - app/queries/ahoy_captain/stats/total_visitors_query.rb
@@ -406,6 +423,9 @@ files:
 - 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/queries/concerns/ahoy_captain/comparable_queries.rb
+- app/queries/concerns/ahoy_captain/comparable_query.rb
+- app/queries/concerns/ahoy_captain/lazy_comparable_query.rb
 - app/views/ahoy_captain/campaigns/index.html+details.erb
 - app/views/ahoy_captain/campaigns/index.html.erb
 - app/views/ahoy_captain/cities/index.html+details.erb
@@ -423,6 +443,9 @@ files:
 - app/views/ahoy_captain/funnels/show.html.erb
 - app/views/ahoy_captain/goals/index.html.erb
 - app/views/ahoy_captain/layouts/application.html.erb
+- app/views/ahoy_captain/properties/_form.html.erb
+- app/views/ahoy_captain/properties/index.html.erb
+- app/views/ahoy_captain/properties/show.html.erb
 - app/views/ahoy_captain/realtimes/show.html.erb
 - app/views/ahoy_captain/regions/index.html+details.erb
 - app/views/ahoy_captain/regions/index.html.erb

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

@@ -1,20 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-export default class extends Controller {
-  static targets = ['delete'];
-
-  static values = {
-    columnPredicate: String,
-    category: String,
-  };
-
-  remove(event) {
-    event.preventDefault();
-    this.dispatch('remove', {
-      detail: {
-        paramKey: `q[${this.columnPredicateValue}]`,
-        paramValue: this.categoryValue,
-      },
-    });
-  }
-}

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

@@ -1,65 +0,0 @@
-import {Controller} from "@hotwired/stimulus"
-import SlimSelect from 'slim-select'
-
-export default class extends Controller {
-  static values = {
-    query: String,
-    url: String,
-    selected: Array
-  }
-
-  connect() {
-    this.loadedInitialData = false;
-    this.search = this.search.bind(this)
-    this.select = new SlimSelect({
-      select: this.element,
-      data: [],
-      settings: {
-        contentPosition: 'relative',
-        contentLocation: this.element.closest('fieldset'),
-        searchText: 'Sorry, no results found',
-        searchPlaceholder: 'Type to populate results',
-        placeholderText: `Search`,
-        searchHighlight: true
-      },
-      events: {
-        beforeOpen: async () => {
-          if (!this.loadedInitialData) {
-            const data = await this.search("");
-            this.select.setData(data);
-            this.loadedInitialData = true
-          }
-        },
-        search: this.search
-      }
-    });
-
-    if(this.selectedValue.length) {
-      this.select.setData(this.selectedValue.map(item => ({ "text": item, "value": item })))
-      this.select.setSelected(this.selectedValue)
-    }
-  }
-
-  async search(query) {
-    const searchParams = new URLSearchParams(window.location.search);
-    const formData = new FormData(this.element.form);
-
-    let deleted = [];
-    for (const [key, value] of formData) {
-      if(!deleted.includes(key)) {
-        searchParams.delete(key)
-        deleted.push(key)
-      }
-
-      searchParams.append(key, value)
-    }
-
-    searchParams.delete(this.element.name);
-    searchParams.set(this.queryValue, query);
-
-    const response = await fetch(`${this.urlValue}?${searchParams.toString()}`);
-    const data = await response.json();
-    return data;
-  }
-
-}

data/app/components/ahoy_captain/tables/headers/devices_header_component.html.erb

@@ -1,3 +0,0 @@
-<%= render ::AhoyCaptain::Tables::Headers::HeaderComponent.new(category_name: "Device", unit_name: "Visitors") do %>
-  <span class="w-8 ml-8 text-right">%</span>
-<% end %>

data/app/components/ahoy_captain/tables/headers/devices_header_component.rb

@@ -1,9 +0,0 @@
-module AhoyCaptain
-  module Tables
-    module Headers
-      class DevicesHeaderComponent < ViewComponent::Base
-
-      end
-    end
-  end
-end

data/app/components/ahoy_captain/tables/headers/goals_header_component.html.erb

@@ -1,6 +0,0 @@
-<div class="flex text-sm font-bold  mb-4">
-  <span class="grow">Goal</span>
-  <span class="w-8 ml-8 text-right">Uniques</span>
-  <span class="w-8 ml-8 text-right">Total</span>
-  <span class="w-8 ml-8 text-right">CR</span>
-</div>

data/app/components/ahoy_captain/tables/headers/goals_header_component.rb

@@ -1,9 +0,0 @@
-module AhoyCaptain
-  module Tables
-    module Headers
-      class GoalsHeaderComponent < ViewComponent::Base
-
-      end
-    end
-  end
-end

data/app/components/ahoy_captain/tables/rows/devices_row_component.html.erb

@@ -1,5 +0,0 @@
-<%= progress_bar(@item.count, @item.total_count, @item.display_name) %>
-<%= item do %>
-  <%= tooltip(@item.count) %>
-<% end %>
-<%= item(percent_total(@item)) %>

data/app/components/ahoy_captain/tables/rows/devices_row_component.rb

@@ -1,12 +0,0 @@
-module AhoyCaptain
-  module Tables
-    module Rows
-      class DevicesRowComponent < RowComponent
-
-        def total
-          @item.total_count
-        end
-      end
-    end
-  end
-end

data/app/components/ahoy_captain/tables/rows/goals_row_component.html.erb

@@ -1,11 +0,0 @@
-<%= progress_bar(@item.cr, 100, link_to(@item.name, url, target: :_top)) %>
-<%= item do %>
-  <%= tooltip(@item.unique_visits) %>
-<% end %>
-<%= item do %>
-  <%= tooltip(@item.total_events) %>
-<% end %>
-<%= item do %>
-  <%= tooltip(@item.cr) %>
-<% end %>
-

data/app/components/ahoy_captain/tables/rows/goals_row_component.rb

@@ -1,20 +0,0 @@
-module AhoyCaptain
-  module Tables
-    module Rows
-      class GoalsRowComponent < RowComponent
-        def search_params
-          view_context.search_params
-        end
-
-        def url
-          query = search_params.dup.merge(q: { goal_in: @item.goal_id}).to_query
-          AhoyCaptain::Engine.app.url_helpers.root_path + "?#{query}"
-        end
-
-        def total
-          @item.total_count
-        end
-      end
-    end
-  end
-end