ahoy_captain 0.83 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +25 -13
- data/Rakefile +23 -2
- data/app/assets/javascript/ahoy_captain/controllers/application_controller.js +20 -0
- data/app/assets/javascript/ahoy_captain/controllers/combobox_controller.js +371 -0
- data/app/assets/javascript/ahoy_captain/controllers/filter/item_controller.js +12 -0
- data/app/assets/javascript/ahoy_captain/controllers/filter_modal_controller.js +45 -0
- data/app/assets/javascript/ahoy_captain/controllers/frame_link_controller.js +20 -0
- data/app/assets/javascript/ahoy_captain/controllers/funnel_chart_controller.js +58 -16
- data/app/assets/javascript/ahoy_captain/controllers/interval_controller.js +5 -0
- data/app/assets/javascript/ahoy_captain/controllers/line_chart_controller.js +236 -22
- data/app/assets/javascript/ahoy_captain/controllers/map_controller.js +47 -0
- data/app/assets/javascript/ahoy_captain/controllers/predicate_select_controller.js +1 -1
- data/app/assets/javascript/ahoy_captain/controllers/properties_controller.js +8 -0
- data/app/assets/javascript/ahoy_captain/controllers/property_filter_controller.js +45 -0
- data/app/assets/javascript/ahoy_captain/controllers/realtime_controller.js +4 -2
- data/app/assets/javascript/ahoy_captain/controllers/tile_controller.js +33 -0
- data/app/assets/javascript/ahoy_captain/controllers/toggle_controller.js +17 -0
- data/app/assets/javascript/ahoy_captain/helpers/chart_utils.js +156 -0
- data/app/assets/javascript/ahoy_captain/helpers/countries.js +2261 -0
- data/app/assets/javascript/ahoy_captain/helpers/number_formatters.js +55 -0
- data/app/components/ahoy_captain/combobox_component.html.erb +33 -0
- data/app/components/ahoy_captain/combobox_component.rb +13 -0
- data/app/components/ahoy_captain/comparison_link_component.html.erb +17 -0
- data/app/components/ahoy_captain/comparison_link_component.rb +44 -0
- data/app/components/ahoy_captain/dropdown_button_component.html.erb +5 -5
- data/app/components/ahoy_captain/dropdown_link_component.html.erb +5 -7
- data/app/components/ahoy_captain/dropdown_link_component.rb +4 -0
- data/app/components/ahoy_captain/filter/dropdown_component.html.erb +50 -0
- data/app/components/ahoy_captain/filter/dropdown_component.rb +51 -0
- data/app/components/ahoy_captain/filter/modal_component.html.erb +7 -5
- data/app/components/ahoy_captain/filter/select_component.html.erb +23 -21
- data/app/components/ahoy_captain/filter/select_component.rb +24 -9
- data/app/components/ahoy_captain/filter/tag_component.html.erb +8 -4
- data/app/components/ahoy_captain/filter/tag_component.rb +6 -30
- data/app/components/ahoy_captain/filter/tag_container_component.html.erb +2 -3
- data/app/components/ahoy_captain/filter/tag_container_component.rb +1 -8
- data/app/components/ahoy_captain/previous_next_component.html.erb +8 -0
- data/app/components/ahoy_captain/previous_next_component.rb +11 -0
- data/app/components/ahoy_captain/stats/comparable_container_component.html.erb +25 -0
- data/app/components/ahoy_captain/stats/comparable_container_component.rb +86 -0
- data/app/components/ahoy_captain/stats/container_component.html.erb +15 -0
- data/app/components/ahoy_captain/stats/container_component.rb +26 -0
- data/app/components/ahoy_captain/sticky_nav_component.html.erb +28 -33
- data/app/components/ahoy_captain/sticky_nav_component.rb +19 -0
- data/app/components/ahoy_captain/table_component.html.erb +2 -2
- data/app/components/ahoy_captain/table_component.rb +15 -3
- data/app/components/ahoy_captain/tables/devices_table_component.rb +11 -0
- data/app/components/ahoy_captain/tables/dynamic_table.rb +13 -0
- data/app/components/ahoy_captain/tables/dynamic_table_component.rb +204 -0
- data/app/components/ahoy_captain/tables/goals_table_component.rb +17 -0
- data/app/components/ahoy_captain/tables/header_component.html.erb +5 -0
- data/app/components/ahoy_captain/tables/header_component.rb +18 -0
- data/app/components/ahoy_captain/tables/headers/header_component.html.erb +1 -1
- data/app/components/ahoy_captain/tables/headers/header_component.rb +4 -0
- data/app/components/ahoy_captain/tables/properties_table_component.rb +27 -0
- data/app/components/ahoy_captain/tables/row_component.html.erb +4 -0
- data/app/components/ahoy_captain/tables/rows/row_component.rb +2 -3
- data/app/components/ahoy_captain/tile_component.html.erb +21 -10
- data/app/components/ahoy_captain/tile_component.rb +10 -2
- data/app/components/ahoy_captain/tooltip_component.html.erb +2 -2
- data/app/controllers/ahoy_captain/application_controller.rb +7 -16
- data/app/controllers/ahoy_captain/exports_controller.rb +1 -2
- data/app/controllers/ahoy_captain/filters/base_controller.rb +1 -3
- data/app/controllers/ahoy_captain/filters/goals_controller.rb +9 -0
- data/app/controllers/ahoy_captain/filters/pages/actions_controller.rb +1 -1
- data/app/controllers/ahoy_captain/filters/pages/entry_pages_controller.rb +1 -1
- data/app/controllers/ahoy_captain/filters/pages/exit_pages_controller.rb +1 -1
- data/app/controllers/ahoy_captain/filters/properties/values_controller.rb +4 -4
- data/app/controllers/ahoy_captain/filters/sources_controller.rb +1 -1
- data/app/controllers/ahoy_captain/filters/utms_controller.rb +1 -1
- data/app/controllers/ahoy_captain/locations/cities_controller.rb +22 -0
- data/app/controllers/ahoy_captain/locations/countries_controller.rb +22 -0
- data/app/controllers/ahoy_captain/locations/maps_controller.rb +24 -0
- data/app/controllers/ahoy_captain/locations/regions_controller.rb +22 -0
- data/app/controllers/ahoy_captain/properties_controller.rb +41 -0
- data/app/controllers/ahoy_captain/stats/base_controller.rb +86 -5
- data/app/controllers/ahoy_captain/stats/bounce_rates_controller.rb +1 -1
- data/app/controllers/ahoy_captain/stats/total_pageviews_controller.rb +1 -1
- data/app/controllers/ahoy_captain/stats/total_visits_controller.rb +1 -1
- data/app/controllers/ahoy_captain/stats/unique_visitors_controller.rb +2 -1
- data/app/controllers/ahoy_captain/stats/views_per_visits_controller.rb +1 -10
- data/app/controllers/ahoy_captain/stats/visit_durations_controller.rb +1 -1
- data/app/helpers/ahoy_captain/application_helper.rb +60 -3
- data/app/models/ahoy_captain/comparison_mode.rb +72 -0
- data/app/models/ahoy_captain/filter_parser.rb +82 -0
- data/app/models/ahoy_captain/range_from_params.rb +78 -0
- data/app/models/ahoy_captain/rangeable.rb +0 -3
- data/app/models/concerns/ahoy_captain/compare_mode.rb +19 -0
- data/app/models/concerns/ahoy_captain/limitable.rb +17 -0
- data/app/models/concerns/ahoy_captain/range_options.rb +1 -14
- data/app/presenters/ahoy_captain/dashboard_presenter.rb +18 -54
- data/app/presenters/ahoy_captain/goals_presenter.rb +3 -2
- data/app/queries/ahoy_captain/application_query.rb +74 -10
- data/app/queries/ahoy_captain/event_query.rb +7 -2
- data/app/queries/ahoy_captain/stats/average_views_per_visit_query.rb +11 -4
- data/app/queries/ahoy_captain/stats/average_visit_duration_query.rb +14 -2
- data/app/queries/ahoy_captain/stats/base_query.rb +18 -0
- data/app/queries/ahoy_captain/stats/bounce_rates_query.rb +15 -1
- data/app/queries/ahoy_captain/stats/total_pageviews_query.rb +2 -2
- data/app/queries/ahoy_captain/stats/total_visitors_query.rb +1 -1
- data/app/queries/ahoy_captain/stats/unique_visitors_query.rb +1 -1
- data/app/queries/ahoy_captain/stats/views_per_visit_query.rb +1 -1
- data/app/queries/ahoy_captain/stats/visit_duration_query.rb +3 -3
- data/app/queries/ahoy_captain/visit_query.rb +1 -2
- data/app/queries/concerns/ahoy_captain/comparable_queries.rb +25 -0
- data/app/queries/concerns/ahoy_captain/comparable_query.rb +138 -0
- data/app/queries/concerns/ahoy_captain/lazy_comparable_query.rb +42 -0
- data/app/views/ahoy_captain/devices/_table.html.erb +1 -4
- data/app/views/ahoy_captain/funnels/show.html.erb +5 -2
- data/app/views/ahoy_captain/goals/index.html.erb +1 -4
- data/app/views/ahoy_captain/layouts/application.html.erb +3 -4
- data/app/views/ahoy_captain/layouts/shared/_tile_loader.html.erb +12 -0
- data/app/views/ahoy_captain/locations/maps/show.html.erb +3 -0
- data/app/views/ahoy_captain/properties/_form.html.erb +6 -0
- data/app/views/ahoy_captain/properties/index.html.erb +3 -0
- data/app/views/ahoy_captain/properties/show.html.erb +6 -0
- data/app/views/ahoy_captain/realtimes/show.html.erb +1 -1
- data/app/views/ahoy_captain/roots/_filters.html.erb +80 -0
- data/app/views/ahoy_captain/roots/show.html.erb +113 -122
- data/app/views/ahoy_captain/stats/base/index.html.erb +37 -8
- data/app/views/ahoy_captain/stats/show.html.erb +14 -56
- data/config/routes.rb +9 -3
- data/lib/ahoy_captain/ahoy/event_methods.rb +21 -14
- data/lib/ahoy_captain/ahoy/visit_methods.rb +1 -1
- data/lib/ahoy_captain/configuration.rb +18 -7
- data/lib/ahoy_captain/engine.rb +21 -0
- data/lib/ahoy_captain/filter_configuration/filter.rb +16 -0
- data/lib/ahoy_captain/filter_configuration/filter_collection.rb +48 -0
- data/lib/ahoy_captain/filters_configuration.rb +77 -0
- data/lib/ahoy_captain/goals.rb +1 -1
- data/lib/ahoy_captain/predicate_label.rb +7 -0
- data/lib/ahoy_captain/version.rb +1 -1
- data/lib/ahoy_captain.rb +8 -1
- data/lib/generators/ahoy_captain/templates/config.rb.tt +32 -0
- metadata +149 -22
- data/app/assets/javascript/ahoy_captain/controllers/active_links_controller.js +0 -15
- data/app/assets/javascript/ahoy_captain/controllers/filter_tag_controller.js +0 -20
- data/app/assets/javascript/ahoy_captain/controllers/search_select_controller.js +0 -65
- data/app/components/ahoy_captain/tables/headers/devices_header_component.html.erb +0 -3
- data/app/components/ahoy_captain/tables/headers/devices_header_component.rb +0 -9
- data/app/components/ahoy_captain/tables/headers/goals_header_component.html.erb +0 -6
- data/app/components/ahoy_captain/tables/headers/goals_header_component.rb +0 -9
- data/app/components/ahoy_captain/tables/rows/devices_row_component.html.erb +0 -5
- data/app/components/ahoy_captain/tables/rows/devices_row_component.rb +0 -12
- data/app/components/ahoy_captain/tables/rows/goals_row_component.html.erb +0 -11
- data/app/components/ahoy_captain/tables/rows/goals_row_component.rb +0 -12
- data/app/controllers/ahoy_captain/cities_controller.rb +0 -20
- data/app/controllers/ahoy_captain/countries_controller.rb +0 -20
- data/app/controllers/ahoy_captain/regions_controller.rb +0 -20
- /data/app/views/ahoy_captain/{cities → locations/cities}/index.html+details.erb +0 -0
- /data/app/views/ahoy_captain/{cities → locations/cities}/index.html.erb +0 -0
- /data/app/views/ahoy_captain/{countries → locations/countries}/index.html+details.erb +0 -0
- /data/app/views/ahoy_captain/{countries → locations/countries}/index.html.erb +0 -0
- /data/app/views/ahoy_captain/{regions → locations/regions}/index.html+details.erb +0 -0
- /data/app/views/ahoy_captain/{regions → locations/regions}/index.html.erb +0 -0
@@ -0,0 +1,55 @@
|
|
1
|
+
const THOUSAND = 1000
|
2
|
+
const HUNDRED_THOUSAND = 100000
|
3
|
+
const MILLION = 1000000
|
4
|
+
const HUNDRED_MILLION = 100000000
|
5
|
+
const BILLION = 1000000000
|
6
|
+
const HUNDRED_BILLION = 100000000000
|
7
|
+
const TRILLION = 1000000000000
|
8
|
+
|
9
|
+
export function numberFormatter(num) {
|
10
|
+
if (num >= THOUSAND && num < MILLION) {
|
11
|
+
const thousands = num / THOUSAND
|
12
|
+
if (thousands === Math.floor(thousands) || num >= HUNDRED_THOUSAND) {
|
13
|
+
return Math.floor(thousands) + 'k'
|
14
|
+
} else {
|
15
|
+
return (Math.floor(thousands * 10) / 10) + 'k'
|
16
|
+
}
|
17
|
+
} else if (num >= MILLION && num < BILLION) {
|
18
|
+
const millions = num / MILLION
|
19
|
+
if (millions === Math.floor(millions) || num >= HUNDRED_MILLION) {
|
20
|
+
return Math.floor(millions) + 'M'
|
21
|
+
} else {
|
22
|
+
return (Math.floor(millions * 10) / 10) + 'M'
|
23
|
+
}
|
24
|
+
} else if (num >= BILLION && num < TRILLION) {
|
25
|
+
const billions = num / BILLION
|
26
|
+
if (billions === Math.floor(billions) || num >= HUNDRED_BILLION) {
|
27
|
+
return Math.floor(billions) + 'B'
|
28
|
+
} else {
|
29
|
+
return (Math.floor(billions * 10) / 10) + 'B'
|
30
|
+
}
|
31
|
+
} else {
|
32
|
+
return num
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
function pad(num, size) {
|
37
|
+
return ('000' + num).slice(size * -1);
|
38
|
+
}
|
39
|
+
|
40
|
+
export function durationFormatter(duration) {
|
41
|
+
const hours = Math.floor(duration / 60 / 60)
|
42
|
+
const minutes = Math.floor(duration / 60) % 60
|
43
|
+
const seconds = Math.floor(duration - (minutes * 60) - (hours * 60 * 60))
|
44
|
+
if (hours > 0) {
|
45
|
+
return `${hours}h ${minutes}m ${seconds}s`
|
46
|
+
} else if (minutes > 0) {
|
47
|
+
return `${minutes}m ${pad(seconds, 2)}s`
|
48
|
+
} else {
|
49
|
+
return `${seconds}s`
|
50
|
+
}
|
51
|
+
}
|
52
|
+
|
53
|
+
export function percentageFormatter(float) {
|
54
|
+
return Number(float/100).toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
|
55
|
+
}
|
@@ -0,0 +1,33 @@
|
|
1
|
+
<div data-controller="combobox"
|
2
|
+
data-combobox-single-option-value="<%= !@multiple %>"
|
3
|
+
data-combobox-placeholder-value="Select an option..."
|
4
|
+
data-combobox-is-disabled-value="false"
|
5
|
+
data-combobox-url-value="<%= @url %>"
|
6
|
+
data-combobox-disabled-value="<%= @disabled %>"
|
7
|
+
data-combobox-query-value="q[<%= @column %>_i_cont]"
|
8
|
+
data-combobox-selected-value="<%= @value.map { |value| { text: value, value: value } }.to_json %>"
|
9
|
+
class=" w-full "
|
10
|
+
>
|
11
|
+
<div data-action="click->combobox#toggleOpen" data-combobox-target="box"
|
12
|
+
class="
|
13
|
+
bg-gray-900 ring-0 focus-within:ring-0 focus-within:ring-0 focus:ring-0 focus:outline-none w-full rounded-md py-2 text-sm
|
14
|
+
w-full"
|
15
|
+
data-combobox-box-open-class="border-secondary-500 ring-1 ring-secondary-500">
|
16
|
+
<select data-combobox-target="select" style="display:none;"
|
17
|
+
data-predicate-select-target="select"
|
18
|
+
name="<%= @name %>"
|
19
|
+
id="<%= @select_html[:id] || "filter_#{@name}" %>"
|
20
|
+
<% @select_html.each do |k,v| %><%=k %>="<%=v %>"<% end %>
|
21
|
+
><% @value.each do |value| %><option value="<%= value %>" selected><%= value %></option><% end %></select>
|
22
|
+
<div data-combobox-target="selected" class="px-2" style="display:none;"></div>
|
23
|
+
<input data-combobox-target="input"
|
24
|
+
data-action="input->combobox#onInput"
|
25
|
+
class="input input-sm input-ghost w-full inline-block rounded-md focus:outline-none focus:ring-0 focus:bg-gray-900"
|
26
|
+
type="text"
|
27
|
+
placeholder="Select an option...">
|
28
|
+
</div>
|
29
|
+
<ul data-combobox-target="list"
|
30
|
+
class="z-50 absolute mt-1 max-h-60 w-full overflow-auto rounded-md py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm bg-gray-800 text-gray-350"
|
31
|
+
style="display: none;">
|
32
|
+
</ul>
|
33
|
+
</div>
|
@@ -0,0 +1,13 @@
|
|
1
|
+
module AhoyCaptain
|
2
|
+
class ComboboxComponent < ViewComponent::Base
|
3
|
+
def initialize(name:, multiple: false, disabled: false, column:, url:, value: [], select_html: {})
|
4
|
+
@name = name
|
5
|
+
@multiple = multiple
|
6
|
+
@column = column
|
7
|
+
@url = url
|
8
|
+
@value = Array(value)
|
9
|
+
@select_html = select_html
|
10
|
+
@disabled = disabled
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
<div class="dropdown dropdown-end" data-controller='dropdown-label'>
|
2
|
+
<label
|
3
|
+
tabindex="0"
|
4
|
+
class="cursor-pointer flex <%= classes %>"
|
5
|
+
data-action='click->dropdown-label#removeHidden'
|
6
|
+
>
|
7
|
+
<span data-dropdown-label-target="label"><%= title %></span>
|
8
|
+
|
9
|
+
</label>
|
10
|
+
<ul class="dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box w-52" data-dropdown-label-target="close">
|
11
|
+
<% links.each do |link| %>
|
12
|
+
<li data-action="click->dropdown-label#setLabel">
|
13
|
+
<%= link %>
|
14
|
+
<li>
|
15
|
+
<% end %>
|
16
|
+
</ul>
|
17
|
+
</div>
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class AhoyCaptain::ComparisonLinkComponent < ViewComponent::Base
|
4
|
+
include ::AhoyCaptain::CompareMode
|
5
|
+
include ::AhoyCaptain::RangeOptions
|
6
|
+
include ::AhoyCaptain::Rangeable
|
7
|
+
|
8
|
+
renders_many :links
|
9
|
+
renders_one :header
|
10
|
+
|
11
|
+
attr_reader :title, :classes
|
12
|
+
def initialize(title: "", classes: "btn btn-sm btn-base-100 no-underline hover:bg-base-100")
|
13
|
+
@classes = classes
|
14
|
+
end
|
15
|
+
|
16
|
+
# cheating
|
17
|
+
def title
|
18
|
+
self.with_link_content(options_for_option)
|
19
|
+
|
20
|
+
comparison_mode.label
|
21
|
+
end
|
22
|
+
|
23
|
+
def render?
|
24
|
+
comparison_mode.enabled?
|
25
|
+
end
|
26
|
+
|
27
|
+
def options_for_option
|
28
|
+
[
|
29
|
+
(link_to "Custom period", "javascript:customComparisonModal.showModal()", class: selected(:custom)),
|
30
|
+
(link_to "Year-over-year", AhoyCaptain::Engine.routes.url_helpers.root_path(**helpers.search_params.merge(comparison: :year)), class: selected(:year)),
|
31
|
+
(link_to "Previous period", AhoyCaptain::Engine.routes.url_helpers.root_path(**helpers.search_params.merge(comparison: :previous)), class: selected(:previous, :true)),
|
32
|
+
(link_to "Disable Comparison", AhoyCaptain::Engine.routes.url_helpers.root_path(**helpers.search_params.merge(comparison: false))),
|
33
|
+
|
34
|
+
].reverse.join.html_safe
|
35
|
+
end
|
36
|
+
|
37
|
+
private
|
38
|
+
|
39
|
+
def selected(*types)
|
40
|
+
return "font-bold" if comparison_mode.type.in?(types)
|
41
|
+
|
42
|
+
nil
|
43
|
+
end
|
44
|
+
end
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<div class="dropdown dropdown-end">
|
2
|
-
<label
|
3
|
-
tabindex="0"
|
4
|
-
class="btn btn-ghost dark:hover:bg-neutral flex"
|
2
|
+
<label
|
3
|
+
tabindex="0"
|
4
|
+
class="btn btn-ghost dark:hover:bg-neutral flex"
|
5
5
|
>
|
6
6
|
<%= header_icon %>
|
7
7
|
<span><%= title %></span>
|
8
8
|
</label>
|
9
|
-
<ul class="dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box
|
9
|
+
<ul class="dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box">
|
10
10
|
<% options.each do |option| %>
|
11
11
|
<li>
|
12
12
|
<%= option %>
|
13
13
|
<li>
|
14
14
|
<% end %>
|
15
15
|
</ul>
|
16
|
-
</div>
|
16
|
+
</div>
|
@@ -1,13 +1,11 @@
|
|
1
1
|
<div class="dropdown dropdown-end" data-controller='dropdown-label'>
|
2
|
-
<label
|
3
|
-
tabindex="0"
|
4
|
-
class="cursor-pointer flex <%= classes %>"
|
2
|
+
<label
|
3
|
+
tabindex="0"
|
4
|
+
class="cursor-pointer flex <%= classes %>"
|
5
5
|
data-action='click->dropdown-label#removeHidden'
|
6
6
|
>
|
7
7
|
<span data-dropdown-label-target="label"><%= title %></span>
|
8
|
-
|
9
|
-
<path fill="currentColor" d="M16.53 8.97a.75.75 0 0 1 0 1.06l-4 4a.75.75 0 0 1-1.06 0l-4-4a.75.75 0 1 1 1.06-1.06L12 12.44l3.47-3.47a.75.75 0 0 1 1.06 0Z" clip-rule="evenodd" />
|
10
|
-
</svg>
|
8
|
+
|
11
9
|
</label>
|
12
10
|
<ul class="dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box w-52" data-dropdown-label-target="close">
|
13
11
|
<% options.each do |option| %>
|
@@ -16,4 +14,4 @@
|
|
16
14
|
<li>
|
17
15
|
<% end %>
|
18
16
|
</ul>
|
19
|
-
</div>
|
17
|
+
</div>
|
@@ -0,0 +1,50 @@
|
|
1
|
+
<div class="dropdown dropdown-end">
|
2
|
+
<label
|
3
|
+
tabindex="0"
|
4
|
+
class="btn btn-sm btn-ghost dark:hover:bg-neutral flex"
|
5
|
+
>
|
6
|
+
<%= header_icon %>
|
7
|
+
<span><%= title %></span>
|
8
|
+
</label>
|
9
|
+
|
10
|
+
<ul class="w-72 dropdown-content z-[1] p-2 shadow bg-base-100 rounded-box" data-controller='toggle' data-toggle-enable-value="<%= advanced_filter_menu? %>">
|
11
|
+
<% if advanced_filter_menu? %>
|
12
|
+
<div id="advanced-filters" class="w-full text-sm leading-tight" >
|
13
|
+
<button class='w-full cursor-pointer block pl-4 pt-1 text-left hover:text-primary' data-action="click->toggle#trigger">+ Add filter</button>
|
14
|
+
<div class="divider my-1"></div>
|
15
|
+
<% filters.each do |_, filter| %>
|
16
|
+
<li class='flex flex-inline px-4 items-center' data-toggle-target='toggleable'>
|
17
|
+
<button title="Edit filter: <%= filter.title %>"
|
18
|
+
class="flex w-full justify-between link no-underline items-center group <% if filter.modal %>cursor-pointer<% else %>cursor-text<% end %> text-left"
|
19
|
+
onclick="<% if filter.modal %><%= filter.modal %>.showModal() <% end %>">
|
20
|
+
<span class="truncate w-48 ">
|
21
|
+
<%= filter.column.titleize %> <%= filter.predicate.titleize %>
|
22
|
+
<%= filter.values.to_sentence %>
|
23
|
+
</span>
|
24
|
+
<% if filter.modal %>
|
25
|
+
<span class="group-hover:text-primary hover:text-primary ">
|
26
|
+
<%= edit_icon %>
|
27
|
+
</span>
|
28
|
+
<% end %>
|
29
|
+
</button>
|
30
|
+
<a title="Remove filter: <%= filter.title %>"
|
31
|
+
class="hover:text-primary link no-underline pl-2" href="<%= filter.url %>">
|
32
|
+
<%= remove_icon %>
|
33
|
+
</a>
|
34
|
+
</li>
|
35
|
+
<div class="divider my-1" data-toggle-target='toggleable'></div>
|
36
|
+
<% end %>
|
37
|
+
<li data-toggle-target='toggleable'>
|
38
|
+
<a class="block mx-auto pl-4 pb-1 " href="<%= AhoyCaptain::Engine.app.url_helpers.root_path %>">Clear all filters</a>
|
39
|
+
</li>
|
40
|
+
</div>
|
41
|
+
<% end %>
|
42
|
+
|
43
|
+
<ul id="core-filters" class="menu <%= 'hidden' if advanced_filter_menu? %> pt-0" data-toggle-target='toggleable'>
|
44
|
+
<% AhoyCaptain.config.filters.each do |label, filter_group| %>
|
45
|
+
<li><button onClick="<%= filter_group.modal_name %>.showModal()" class='link no-underline' data-action="click->toggle#trigger"><%= label %></button></li>
|
46
|
+
<% end %>
|
47
|
+
<li><button onClick="customPropertyFilterModal.showModal()" class='link no-underline' data-action="click->toggle#trigger">Property</button></li>
|
48
|
+
</ul>
|
49
|
+
</ul>
|
50
|
+
</div>
|
@@ -0,0 +1,51 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class AhoyCaptain::Filter::DropdownComponent < ViewComponent::Base
|
4
|
+
def initialize(filters:)
|
5
|
+
@filters = filters
|
6
|
+
end
|
7
|
+
|
8
|
+
private
|
9
|
+
|
10
|
+
attr_reader :filters
|
11
|
+
|
12
|
+
def header_icon
|
13
|
+
advanced_filter_menu? ? filters_icon : magnifier_icon
|
14
|
+
end
|
15
|
+
|
16
|
+
def title
|
17
|
+
advanced_filter_menu? ? "#{filters.size} Filters" : 'Filter'
|
18
|
+
end
|
19
|
+
|
20
|
+
def advanced_filter_menu?
|
21
|
+
filter_categories.count >= ::AhoyCaptain::FilterParser::FILTER_MENU_MAX_SIZE
|
22
|
+
end
|
23
|
+
|
24
|
+
def filter_categories
|
25
|
+
filters.values.map(&:values).flatten
|
26
|
+
end
|
27
|
+
|
28
|
+
def magnifier_icon
|
29
|
+
%Q(
|
30
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="-ml-1 mr-1 h-4 w-4 md:h-4 md:w-4"><path fill-rule="evenodd" d="M9 3.5a5.5 5.5 0 100 11 5.5 5.5 0 000-11zM2 9a7 7 0 1112.452 4.391l3.328 3.329a.75.75 0 11-1.06 1.06l-3.329-3.328A7 7 0 012 9z" clip-rule="evenodd"></path></svg>
|
31
|
+
).html_safe
|
32
|
+
end
|
33
|
+
|
34
|
+
def filters_icon
|
35
|
+
%Q(
|
36
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="-ml-1 mr-1 h-4 w-4"><path d="M17 2.75a.75.75 0 00-1.5 0v5.5a.75.75 0 001.5 0v-5.5zM17 15.75a.75.75 0 00-1.5 0v1.5a.75.75 0 001.5 0v-1.5zM3.75 15a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5a.75.75 0 01.75-.75zM4.5 2.75a.75.75 0 00-1.5 0v5.5a.75.75 0 001.5 0v-5.5zM10 11a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5A.75.75 0 0110 11zM10.75 2.75a.75.75 0 00-1.5 0v1.5a.75.75 0 001.5 0v-1.5zM10 6a2 2 0 100 4 2 2 0 000-4zM3.75 10a2 2 0 100 4 2 2 0 000-4zM16.25 10a2 2 0 100 4 2 2 0 000-4z"></path></svg>
|
37
|
+
).html_safe
|
38
|
+
end
|
39
|
+
|
40
|
+
def edit_icon
|
41
|
+
%Q(
|
42
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-4 h-4 ml-1 cursor-pointer"><path d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z"></path><path d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z"></path></svg>
|
43
|
+
).html_safe
|
44
|
+
end
|
45
|
+
|
46
|
+
def remove_icon
|
47
|
+
%Q(
|
48
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-4 h-4"><path d="M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z"></path></svg>
|
49
|
+
).html_safe
|
50
|
+
end
|
51
|
+
end
|
@@ -1,11 +1,13 @@
|
|
1
|
-
<dialog id="<%= id %>" class="modal">
|
2
|
-
<div class="modal-box
|
1
|
+
<dialog id="<%= id %>" class="modal" data-controller="filter-modal">
|
2
|
+
<div class="modal-box h-5/6 max-w-5xl">
|
3
|
+
<h1 class="text-xl mb-4"><%= title %></h1>
|
3
4
|
<fieldset>
|
4
|
-
<h5><%= title %></h5>
|
5
5
|
<%= modal_display %>
|
6
|
-
<button class="btn btn-primary mt-4" type="submit">Apply</button>
|
7
|
-
<button class="btn btn-primary mt-4" type="reset">Reset</button>
|
8
6
|
</fieldset>
|
7
|
+
<div class="mt-10">
|
8
|
+
<button class="btn btn-active btn-primary" type="submit">Apply</button>
|
9
|
+
<button class="btn btn-active btn-primary" type="reset">Reset</button>
|
10
|
+
</div>
|
9
11
|
</div>
|
10
12
|
<label class="modal-backdrop">
|
11
13
|
<button onclick="event.preventDefault(); <%=id %>.close();">Close</button>
|
@@ -1,23 +1,25 @@
|
|
1
|
-
<
|
2
|
-
|
3
|
-
|
4
|
-
<
|
5
|
-
|
6
|
-
<
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
1
|
+
<div class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1"><%= label %></div>
|
2
|
+
<fieldset class="grid grid-cols-11 mb-3" data-controller="predicate-select">
|
3
|
+
<div class="col-span-3 mr-2">
|
4
|
+
<div class="w-full">
|
5
|
+
<div class="relative inline-block text-left w-full">
|
6
|
+
<div class="w-full">
|
7
|
+
<% if @predicates.any? %>
|
8
|
+
<select id="<%= column %>_predicate" class='select border-0 select-primary bg-gray-900 ring-0 focus-within:ring-0 focus-within:ring-0 focus:ring-0 focus:outline-none inline-flex justify-between items-center w-full rounded-md ' data-action='change->predicate-select#handleChange'>
|
9
|
+
<% @predicates.each do |predicate| %>
|
10
|
+
<option value="<%= option_value(predicate) %>" <%= 'selected' if selected_predicate?(predicate) %>>
|
11
|
+
<%= predicate_label(predicate) %>
|
12
|
+
</option>
|
13
|
+
<% end %>
|
14
|
+
</select>
|
15
|
+
<% end %>
|
16
|
+
</div>
|
17
|
+
</div>
|
18
|
+
</div>
|
19
|
+
</div>
|
20
|
+
<div class="col-span-8">
|
21
|
+
<div class="relative w-full">
|
22
|
+
<%= render ::AhoyCaptain::ComboboxComponent.new(name: column_name_with_predicate, multiple: multiple, column: column, url: url, value: values) %>
|
23
|
+
</div>
|
11
24
|
</div>
|
12
|
-
|
13
|
-
<select
|
14
|
-
data-predicate-select-target="select"
|
15
|
-
data-controller="search-select"
|
16
|
-
class='w-[50%] border-base-content border-opacity-20 rounded-lg min-h-[3rem]'
|
17
|
-
name="<%= column_name_with_predicate %>"
|
18
|
-
<% if multiple %>multiple<% end %>
|
19
|
-
data-search-select-query-value="q[<%= column %>_i_cont]"
|
20
|
-
data-search-select-url-value="<%= url %>"
|
21
|
-
data-search-select-selected-value="<%= values %>"
|
22
|
-
></select>
|
23
25
|
</fieldset>
|
@@ -1,38 +1,53 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class AhoyCaptain::Filter::SelectComponent < ViewComponent::Base
|
4
|
-
def initialize(label:, column:, url:, predicates:, form:, multiple: true)
|
4
|
+
def initialize(label:, column:, url:, predicates:, form:, multiple: true, input_html: {})
|
5
5
|
@label = label
|
6
6
|
@column = column
|
7
7
|
@url = url
|
8
8
|
@predicates = predicates
|
9
9
|
@form = form
|
10
10
|
@multiple = multiple
|
11
|
+
@input_html_options = input_html
|
11
12
|
end
|
12
13
|
|
13
14
|
private
|
14
15
|
|
15
|
-
def selected_predicate
|
16
|
-
|
16
|
+
def selected_predicate?(predicate)
|
17
|
+
params.dig(:q, predicate_name(predicate)).present?
|
17
18
|
end
|
18
19
|
|
19
20
|
def option_value(predicate)
|
20
|
-
name = "q[#{predicate}]"
|
21
|
+
name = "q[#{predicate_name(predicate)}]"
|
21
22
|
name += "[]" if multiple
|
22
23
|
name
|
23
24
|
end
|
24
25
|
|
26
|
+
def predicate_name(predicate)
|
27
|
+
"#{@column}_#{predicate}"
|
28
|
+
end
|
29
|
+
|
30
|
+
def selected_predicate
|
31
|
+
@predicates.each do |predicate|
|
32
|
+
if params.dig(:q, predicate_name(predicate))
|
33
|
+
return predicate
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
nil
|
38
|
+
end
|
39
|
+
|
25
40
|
def column_name_with_predicate
|
26
41
|
if selected_predicate
|
27
42
|
option_value(selected_predicate)
|
28
43
|
else
|
29
|
-
option_value(
|
44
|
+
option_value(@predicates.first)
|
30
45
|
end
|
31
46
|
end
|
32
47
|
|
33
48
|
def values
|
34
|
-
|
35
|
-
option = params.dig(:q, predicate)
|
49
|
+
@predicates.each do |predicate|
|
50
|
+
option = params.dig(:q, predicate_name(predicate))
|
36
51
|
if option
|
37
52
|
return option
|
38
53
|
end
|
@@ -41,8 +56,8 @@ class AhoyCaptain::Filter::SelectComponent < ViewComponent::Base
|
|
41
56
|
[]
|
42
57
|
end
|
43
58
|
|
44
|
-
def
|
45
|
-
|
59
|
+
def predicate_label(predicate)
|
60
|
+
AhoyCaptain::PredicateLabel[predicate]
|
46
61
|
end
|
47
62
|
|
48
63
|
attr_reader :label, :column, :url, :predicates, :form, :multiple
|
@@ -1,7 +1,11 @@
|
|
1
|
-
<div class="bg-base-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
<div class="bg-base-200 py-2 px-4 mx-2 flex items-center text-base-content" data-controller="filter--item" data-filter--item-modal-value="<%= tag_item.modal %>">
|
2
|
+
<span data-action='click->filter--item#openModal'>
|
3
|
+
<%= tag_item.column.titleize %> <%= tag_item.predicate.titleize %>
|
4
|
+
<span class="font-bold">
|
5
|
+
<%= tag_item.label %>
|
6
|
+
</span>
|
7
|
+
</span>
|
8
|
+
<a class="hover:text-primary" href="<%= tag_item.url %>">
|
5
9
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-4 h-4">
|
6
10
|
<path d="M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z"></path>
|
7
11
|
</svg>
|
@@ -1,38 +1,14 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class AhoyCaptain::Filter::TagComponent < ViewComponent::Base
|
4
|
-
|
5
|
-
|
6
|
-
not_eq: 'not equals',
|
7
|
-
cont: 'contains',
|
8
|
-
in: 'in',
|
9
|
-
not_in: 'not in',
|
10
|
-
}
|
11
|
-
def initialize(column_predicate:, category:)
|
12
|
-
@column_predicate = column_predicate
|
13
|
-
@category = category
|
4
|
+
def initialize(tag_item:)
|
5
|
+
@tag_item = tag_item
|
14
6
|
end
|
15
7
|
|
16
|
-
|
17
|
-
|
18
|
-
if search_params["q"][@column_predicate].is_a?(Array)
|
19
|
-
search_params["q"][@column_predicate] = search_params["q"][@column_predicate] - [@category]
|
20
|
-
else
|
21
|
-
search_params["q"].delete(@column_predicate)
|
22
|
-
end
|
8
|
+
private
|
9
|
+
attr_reader :tag_item
|
23
10
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
private
|
28
|
-
attr_reader :column_predicate, :category
|
29
|
-
|
30
|
-
def column_with_predicate
|
31
|
-
PREDICATES.keys.map(&:to_s).each do |predicate|
|
32
|
-
if column_predicate.include?(predicate)
|
33
|
-
before, match, after = column_predicate.partition(predicate)
|
34
|
-
return [before.gsub('_',' '), PREDICATES[match.to_sym]].join(' ').humanize
|
35
|
-
end
|
36
|
-
end
|
11
|
+
def modal
|
12
|
+
tag_item.modal
|
37
13
|
end
|
38
14
|
end
|
@@ -1,5 +1,4 @@
|
|
1
|
-
<%
|
2
|
-
|
3
|
-
<%= render AhoyCaptain::Filter::TagComponent.new(column_predicate: column_predicate, category: category) %>
|
1
|
+
<% ::AhoyCaptain::FilterParser.parse(request).each do |_, filter| %>
|
2
|
+
<%= render AhoyCaptain::Filter::TagComponent.new(tag_item: filter) %>
|
4
3
|
<% end %>
|
5
4
|
|
@@ -1,13 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class AhoyCaptain::Filter::TagContainerComponent < ViewComponent::Base
|
4
|
-
def initialize
|
5
|
-
@filters = filters.to_unsafe_h.to_a.map do |key, values|
|
6
|
-
Array(values).map { |value| [key, value] }
|
7
|
-
end.flatten(1).reject { |k,v| v.blank? }
|
8
|
-
|
4
|
+
def initialize
|
9
5
|
end
|
10
|
-
|
11
|
-
private
|
12
|
-
attr_reader :filters
|
13
6
|
end
|
@@ -0,0 +1,8 @@
|
|
1
|
+
<div class="rounded shadow bg-white cursor-pointer dark:bg-gray-800 flex h-8">
|
2
|
+
<button class="flex items-center px-1 sm:px-2 border-r border-gray-300 rounded-l dark:border-gray-500 dark:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-900" type="button">
|
3
|
+
<svg class="feather h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"></polyline></svg>
|
4
|
+
</button>
|
5
|
+
<button class="flex items-center px-1 sm:px-2 rounded-r dark:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-900" type="button">
|
6
|
+
<svg class="feather h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"></polyline></svg>
|
7
|
+
</button>
|
8
|
+
</div>
|
@@ -0,0 +1,25 @@
|
|
1
|
+
<a href="<%= @url %>" class="relative px-4 md:px-6 w-1/2 my-4 w-auto group cursor-pointer" data-controller="frame-link" data-turbo-frame="chart">
|
2
|
+
<div>
|
3
|
+
<h5 class="text-sm font-bold uppercase whitespace-nowrap flex w-content border-transparent tooltip tooltip-bottom "
|
4
|
+
data-active-links-target="link" data-tip="<%= tooltip %>">
|
5
|
+
<%= @label %>
|
6
|
+
<div class="<%= klass %> ms-2"><%= arrow %></div>
|
7
|
+
</h5>
|
8
|
+
<div class="md:block flex gap-4">
|
9
|
+
<div>
|
10
|
+
<span class="flex items-center justify-between whitespace-nowrap">
|
11
|
+
<p class="font-bold text-xl"><%= formatted(value.current) %></p>
|
12
|
+
</span>
|
13
|
+
<% if compare_mode? %>
|
14
|
+
<p class="text-xs"><%= range_string %></p>
|
15
|
+
<% end %>
|
16
|
+
</div>
|
17
|
+
<% if compare_mode? %>
|
18
|
+
<div>
|
19
|
+
<p class="font-bold text-xl text-gray-500"><%= formatted(value.compared_to) %></p>
|
20
|
+
<p class="text-xs text-gray-500"><%= compare_range_string %></p>
|
21
|
+
</div>
|
22
|
+
<% end %>
|
23
|
+
</div>
|
24
|
+
</div>
|
25
|
+
</a>
|