ahoy_captain 0.81 → 0.82

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_captain
 version: !ruby/object:Gem::Version
-  version: '0.81'
+  version: '0.82'
 platform: ruby
 authors:
 - joshmn
@@ -262,20 +262,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pp_sql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A full-featured, mountable analytics dashboard for your Rails app, powered
   by Ahoy.
 email:
@@ -292,18 +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/interval_controller.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/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
@@ -321,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
@@ -340,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
@@ -403,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

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

@@ -1,151 +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);
-            // eslint-disable-next-line max-len
-            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((filter) => {
-      filter.slim.getSelected().forEach((val) => {
-        const filterName = `${filter.name}[]`;
-        if (query.has(filterName)) {
-          if (!query.get(`${filter.name}[]`).includes(val)) {
-            query.append(filterName, val);
-          }
-        } else {
-          query.append(filterName, val);
-        }
-      });
-    });
-    query.set(`q[${target.dataset.filterColumnValue}_i_cont]`, search || '');
-    return query;
-  }
-
-  #beforeChange(target) {
-    return () => {
-      const otherFilters = this.selectTargets.filter((filter) => filter !== target);
-      otherFilters.forEach(async (filter) => {
-        if (this.#hasData(filter)) {
-          const selected = filter.slim.getSelected();
-          filter.slim.setData(selected.map((text) => ({ text })));
-          // setting data triggers a slim render, so need to also set selected again
-          filter.slim.setSelected(selected);
-        }
-      });
-      return true;
-    };
-  }
-
-  #hasData(target) {
-    return target.slim.getData().length !== 0;
-  }
-
-  #hasSelections(target) {
-    return target.slim.getSelected().length !== 0;
-  }
-
-  #filtersForQuery() {
-    // eslint-disable-next-line max-len
-    const predicates = this.predicateTargets.map((el) => ({ name: el.name, column_predicate: el.value }));
-    // eslint-disable-next-line max-len
-    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 };
-      }
-      return undefined;
-    }).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) {
-    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();
-  }
-}