blacklight-spotlight 4.3.0 → 4.3.2

data/app/components/spotlight/analytics/dashboard_component.html.erb

@@ -1,6 +1,22 @@
+<% if note %>
+  <p><%= note %></p>
+<% end %>
+
+<%= form_with url: helpers.analytics_exhibit_dashboard_path(current_exhibit), class: 'mb-3 d-flex', method: :get do |form| %>
+  <div>
+    <%= form.label :start_date, I18n.t("spotlight.dashboards.analytics.start_date_label") %>
+    <%= form.date_field :start_date, value: dates['start_date'], min: min_date, max: max_date %>
+    <%= form.label :end_date, I18n.t("spotlight.dashboards.analytics.end_date_label"), class: 'ml-2 ms-2' %>
+    <%= form.date_field :end_date, value: dates['end_date'], min: min_date, max: max_date %>
+  </div>
+  <div class="ml-auto ms-auto">
+    <%= form.submit I18n.t("spotlight.dashboards.analytics.submit_date_label"), class: 'btn btn-primary' %>
+  </div>
+<% end %>
+
 <% if results? %>
-<%= cache current_exhibit, expires_in: 1.hour do %>
-  <h2><%= I18n.t("spotlight.dashboards.analytics.reporting_period_heading") %></h2>
+  <h2><%= heading %></h2>
+
   <h3 class="h5 mt-4"><%= I18n.t("spotlight.dashboards.analytics.visitor_header") %></h3>
   <%= render Spotlight::Analytics::AggregationComponent.new(data: page_analytics.totals) %>
 
@@ -8,43 +24,42 @@
   <%= render Spotlight::Analytics::AggregationComponent.new(data: search_analytics.totals, exclude_fields: [:eventCount] ) %>
 
   <% unless page_analytics.rows.empty? %>
-  <h3 class="h5 mt-4"><%= I18n.t("spotlight.dashboards.analytics.pages.header") %></h4>
-  <table class="table table-striped popular-pages">
-    <thead>
-      <tr>
-        <th><%= I18n.t("spotlight.dashboards.analytics.pagetitle") %></th>
-        <th class="text-right text-end"><%= I18n.t("spotlight.dashboards.analytics.pageviews") %></th>
-      </tr>
-    </thead>
-    <% page_analytics.rows.each do |p| %>
-      <tr>
-        <td><%= link_to p.pageTitle, p.pagePath %></td>
-        <td class="text-right text-end"><%= p.screenPageViews %></td>
-      </tr>
+    <h3 class="h5 mt-4"><%= I18n.t("spotlight.dashboards.analytics.pages.header") %></h4>
+    <table class="table table-striped popular-pages">
+      <thead>
+        <tr>
+          <th><%= I18n.t("spotlight.dashboards.analytics.pagetitle") %></th>
+          <th class="text-right text-end"><%= I18n.t("spotlight.dashboards.analytics.pageviews") %></th>
+        </tr>
+      </thead>
+      <% page_analytics.rows.each do |p| %>
+        <tr>
+          <td><%= link_to p.pageTitle, p.pagePath %></td>
+          <td class="text-right text-end"><%= p.screenPageViews %></td>
+        </tr>
+      <% end %>
+    </table>
     <% end %>
-  </table>
-  <% end %>
 
-  <% unless search_analytics.rows.empty? %>
-  <h3 class="h5 mt-4"><%= I18n.t("spotlight.dashboards.analytics.searches.header") %></h4>
-  <table class="table table-striped popular-pages">
-    <thead>
-      <tr>
-        <th><%= I18n.t("spotlight.dashboards.analytics.searches.term") %></th>
-        <th class="text-right text-end"><%= I18n.t("spotlight.dashboards.analytics.searches.views") %></th>
-      </tr>
-    </thead>
-    <% search_analytics.rows.each do |p| %>
-      <% if p.searchTerm.present? %>
+    <% unless search_analytics.rows.empty? %>
+    <h3 class="h5 mt-4"><%= I18n.t("spotlight.dashboards.analytics.searches.header") %></h4>
+    <table class="table table-striped popular-pages">
+      <thead>
         <tr>
-          <td><%= p.searchTerm %></td>
-          <td class="text-right text-end"><%= p.eventCount %></td>
+          <th><%= I18n.t("spotlight.dashboards.analytics.searches.term") %></th>
+          <th class="text-right text-end"><%= I18n.t("spotlight.dashboards.analytics.searches.views") %></th>
         </tr>
+      </thead>
+      <% search_analytics.rows.each do |p| %>
+        <% if p.searchTerm.present? %>
+          <tr>
+            <td><%= p.searchTerm %></td>
+            <td class="text-right text-end"><%= p.eventCount %></td>
+          </tr>
+        <% end %>
       <% end %>
-    <% end %>
-  </table>
+    </table>
   <% end %>
-<% end %>
 <% else %>
-  <%= I18n.t("spotlight.dashboards.analytics.no_results", pageurl: page_url) %>
+  <p><%= I18n.t("spotlight.dashboards.analytics.no_results", pageurl: page_url) %></p>
 <% end %>

data/app/components/spotlight/analytics/dashboard_component.rb

@@ -9,7 +9,37 @@ module Spotlight
       def initialize(current_exhibit:)
         super
         @current_exhibit = current_exhibit
-        @dates = { 'start_date' => '365daysAgo', 'end_date' => 'today' }
+        @default_start_date = [min_date, 1.year.ago].max
+        @default_end_date = [max_date, Time.zone.today].min
+      end
+
+      def before_render
+        flash[:error] = nil
+        @dates = { 'start_date' => @default_start_date.to_date.to_s,
+                   'end_date' => @default_end_date.to_date.to_s }
+
+        validate_dates if params[:start_date] || params[:end_date]
+      end
+
+      def min_date
+        Spotlight::Engine.config.ga_date_range['start_date'] || Date.new(2015, 8, 14) # This is the minimum date supported by GA
+      end
+
+      def max_date
+        Spotlight::Engine.config.ga_date_range['end_date'] || Time.zone.today
+      end
+
+      def note
+        I18n.t('spotlight.dashboards.analytics.note', default: nil)
+      end
+
+      def heading
+        if params[:start_date] || params[:end_date]
+          I18n.t('spotlight.dashboards.analytics.reporting_period_heading_dynamic', start_date: formatted_date(dates['start_date']),
+                                                                                    end_date: formatted_date(dates['end_date']))
+        else
+          I18n.t('spotlight.dashboards.analytics.reporting_period_heading')
+        end
       end
 
       def results?
@@ -21,11 +51,49 @@ module Spotlight
       end
 
       def page_analytics
-        @page_analytics ||= current_exhibit.page_analytics(dates, page_url)
+        Rails.cache.fetch([current_exhibit, dates['start_date'], dates['end_date'], 'page_analytics'], expires_in: 1.hour) do
+          current_exhibit.page_analytics(dates, page_url)
+        end
       end
 
       def search_analytics
-        @search_analytics ||= current_exhibit.analytics(dates, page_url)
+        Rails.cache.fetch([current_exhibit, dates['start_date'], dates['end_date'], 'search_analytics'], expires_in: 1.hour) do
+          current_exhibit.analytics(dates, page_url)
+        end
+      end
+
+      private
+
+      def validate_dates
+        @start_date = parse_date(params[:start_date], min_date)
+        @end_date = parse_date(params[:end_date], max_date)
+        if @start_date > @end_date
+          flash[:error] = I18n.t('spotlight.dashboards.analytics.error_heading', date: "#{@start_date} to #{@end_date}")
+        elsif @start_date < min_date
+          flash[:error] = I18n.t('spotlight.dashboards.analytics.error_heading', date: @start_date)
+        elsif @end_date > max_date
+          flash[:error] = I18n.t('spotlight.dashboards.analytics.error_heading', date: @end_date)
+        else
+          update_dates
+        end
+      end
+
+      def update_dates
+        @dates['start_date'] = @start_date.to_date.to_s if parse_date(params[:start_date], nil)
+        @dates['end_date'] = @end_date.to_date.to_s if parse_date(params[:end_date], nil)
+      end
+
+      def parse_date(date, backup_date)
+        return backup_date unless date
+
+        Date.parse(date)
+      rescue Date::Error
+        flash[:error] = I18n.t('spotlight.dashboards.analytics.error_heading', date:)
+        backup_date
+      end
+
+      def formatted_date(date_string)
+        Date.parse(date_string).strftime('%m/%d/%Y')
       end
     end
   end

data/app/models/concerns/spotlight/exhibit_analytics.rb

@@ -7,17 +7,13 @@ module Spotlight
     def analytics(dates = { start_date: '365daysAgo', end_date: 'today' }, path = nil)
       return OpenStruct.new unless analytics_provider&.enabled?
 
-      @analytics ||= {}
-      start_date = dates['start_date'] || 1.month.ago
-      @analytics[start_date] ||= analytics_provider.exhibit_data(path || self, dates)
+      analytics_provider.exhibit_data(path || self, dates)
     end
 
     def page_analytics(dates = { start_date: '365daysAgo', end_date: 'today' }, path = nil)
       return [] unless analytics_provider&.enabled?
 
-      @page_analytics ||= {}
-      start_date = dates['start_date'] || 1.month.ago
-      @page_analytics[start_date] ||= analytics_provider.page_data(path || self, dates)
+      analytics_provider.page_data(path || self, dates)
     end
 
     def analytics_provider

data/app/models/spotlight/search.rb

@@ -79,13 +79,16 @@ module Spotlight
     end
 
     def search_params
-      search_service.search_builder.with((query_params || {}).with_indifferent_access).merge(facet: false)
+      search_service.search_builder.with(base_search_state).merge(facet: false)
     end
 
     def merge_params_for_search(params, blacklight_config)
-      base_query = Blacklight::SearchState.new((query_params || {}), blacklight_config)
-      user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
-      base_query.params_for_search(user_query).merge(user_query.slice(:page))
+      user_query = Blacklight::SearchState.new(params, blacklight_config, nil).to_h
+      base_search_state.params_for_search(user_query).merge(user_query.slice(:page))
+    end
+
+    def base_search_state
+      Blacklight::SearchState.new((query_params || {}).with_indifferent_access, blacklight_config, nil)
     end
 
     private

data/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb

@@ -1,6 +1,6 @@
 <div class="box" data-id="<%= document.id %>">
   <% view_config = blacklight_config.view_config(:embed) %>
-  <%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new((Blacklight.version > '8.0' ? :document : :presenter) => document_presenter(document), counter: nil) do |component| %>
+  <%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new((Blacklight.version > '8.0' ? :document : :presenter) => document_presenter(document), counter: nil, block: local_assigns[:block]) do |component| %>
     <% component.with_partial do %>
       <%= render_document_partials document, view_config.partials, component: component, document_counter: nil, view_config: view_config, block: local_assigns[:block], **(view_config.locals) %>
     <% end if view_config&.partials&.any? %>

data/config/locales/spotlight.en.yml

@@ -482,14 +482,18 @@ en:
     dashboards:
       analytics:
         activeUsers: unique visits
+        end_date_label: End date
         engagementRate: engagement rate
+        error_heading: "%{date} does not constitute a valid date range. Please enter a valid date range."
         header: Analytics
         no_results: There are no analytics for the path "%{pageurl}"
+        note:
         pages:
           header: Most popular pages
         pagetitle: Page title
         pageviews: Page views
         reporting_period_heading: User activity over the past year
+        reporting_period_heading_dynamic: User activity from %{start_date} to %{end_date}
         screenPageViews: page views
         screenPageViewsPerSession: pages per session
         searches:
@@ -498,6 +502,8 @@ en:
           views: Searches
         session_header: Sessions
         sessions: sessions
+        start_date_label: Start date
+        submit_date_label: Submit
         totalUsers: visitors
         users: unique visits
         visitor_header: Visitors

data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb

@@ -70,6 +70,8 @@
 # (https://console.cloud.google.com/iam-admin/iam -> Service accounts -> click on service account -> keys)
 # c) set ga_property_id below to your site's property id (located in admin -> Property -> Property details upper right hand corner)
 # d) Set the ga_web_property_id. (located in admin -> Data collection and modification -> Web stream details and begins with G-)
+# e) (optional) set ga_date_range. This allows you throttle the dates the user can filter by.
+# ga_date_range values should use a Date object i.e. (Date.new(YYYY, MM, DD)).
 # ga_property_id is used for fetching analytics data from google's api, ga_web_property_id is used for sending events to GA analtyics
 # ga_web_property_id will probably change in V5 to ga_measurement_id for clarity
 # Rails.application.config.to_prepare do
@@ -77,6 +79,7 @@
 #   Spotlight::Engine.config.ga_json_key_path = nil
 #   Spotlight::Engine.config.ga_web_property_id = 'G-XXXXXXXXXX'
 #   Spotlight::Engine.config.ga_property_id = '12345678'
+#   Spotlight::Engine.config.ga_date_range = { 'start_date' => nil, 'end_date' => nil }
 #   Spotlight::Engine.config.ga_analytics_options = {}
 #   Spotlight::Engine.config.ga_page_analytics_options = Spotlight::Engine.config.ga_analytics_options.merge(limit: 5)
 #   Spotlight::Engine.config.ga_search_analytics_options = Spotlight::Engine.config.ga_analytics_options.merge(limit: 11)

data/lib/spotlight/engine.rb

@@ -201,6 +201,7 @@ module Spotlight
     config.ga_property_id = nil
     config.ga_analytics_options = {}
     config.ga_page_analytics_options = config.ga_analytics_options.merge(limit: 5)
+    config.ga_date_range = { 'start_date' => nil, 'end_date' => nil }
     config.ga_debug_mode = false
 
     config.max_pages = 1000

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '4.3.0'
+  VERSION = '4.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -1586,7 +1586,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections