fix ga4 stats not being able to retrieve events properly, add work sh…

…ow to user vitals (#6886)
samvera · Aug 13, 2024 · fa67bc9 · fa67bc9
1 parent 9d8d5f8
commit fa67bc9
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 30 deletions.
diff --git a/app/assets/javascripts/hyrax/analytics_events.js b/app/assets/javascripts/hyrax/analytics_events.js
@@ -49,7 +49,7 @@ function trackAnalyticsEvents(provider) {
     if(provider !== 'ga4') {
       window.trackingTags.analytics().push([window.trackingTags.trackEvent(), eventSpan.data('category'), eventSpan.data('action'), eventSpan.data('name')]);
     } else {
-      gtag('event', eventspan.data('action'), { 'content_type': eventspan.data('category'), 'content_id': eventspan.data('name')})
+      gtag('event', eventSpan.data('action'), { 'content_type': eventSpan.data('category'), 'content_id': eventSpan.data('name')})
     }
   })
 }

diff --git a/app/services/hyrax/analytics/ga4.rb b/app/services/hyrax/analytics/ga4.rb
@@ -15,14 +15,6 @@ module Ga4
       extend ActiveSupport::Concern
       # rubocop:disable Metrics/BlockLength
       class_methods do
-        def client
-          @client
-        end
-
-        def client=(value)
-          @client = value
-        end
-
         # Loads configuration options from config/analytics.yml. You only need PRIVATE_KEY_PATH or
         # PRIVATE_KEY_VALUE. VALUE takes precedence.
         # Expected structure:
@@ -87,7 +79,7 @@ def account_info
         end
 
         def client
-          self.class.client ||= ::Google::Analytics::Data::V1beta::AnalyticsData::Client.new do |conf|
+          @client ||= ::Google::Analytics::Data::V1beta::AnalyticsData::Client.new do |conf|
             conf.credentials = config.account_info
           end
         end

diff --git a/app/services/hyrax/analytics/ga4/base.rb b/app/services/hyrax/analytics/ga4/base.rb
@@ -5,6 +5,16 @@ module Ga4
       class Base
         attr_reader :start_date, :end_date, :dimensions, :metrics
 
+        def initialize(start_date:,
+                       end_date:,
+                       dimensions: [],
+                       metrics: [])
+          @start_date = start_date.to_date
+          @end_date = end_date.to_date
+          @dimensions = dimensions
+          @metrics = metrics
+        end
+
         def filters
           @filters ||= {}
         end

diff --git a/app/services/hyrax/analytics/ga4/events.rb b/app/services/hyrax/analytics/ga4/events.rb
@@ -8,10 +8,6 @@ def initialize(start_date:,
                        dimensions: [{ name: 'eventName' }, { name: 'contentType' }, { name: 'contentId' }],
                        metrics: [{ name: 'eventCount' }])
           super
-          @start_date = start_date.to_date
-          @end_date = end_date.to_date
-          @dimensions = dimensions
-          @metrics = metrics
         end
 
         def self.list(start_date, end_date, action)

diff --git a/app/services/hyrax/analytics/ga4/events_daily.rb b/app/services/hyrax/analytics/ga4/events_daily.rb
@@ -8,10 +8,6 @@ def initialize(start_date:,
                        dimensions: [{ name: 'date' }, { name: 'eventName' }, { name: 'contentType' }, { name: 'contentId' }],
                        metrics: [{ name: 'eventCount' }])
           super
-          @start_date = start_date.to_date
-          @end_date = end_date.to_date
-          @dimensions = dimensions
-          @metrics = metrics
         end
 
         # returns a daily number of events for a specific action

diff --git a/app/services/hyrax/analytics/ga4/visits.rb b/app/services/hyrax/analytics/ga4/visits.rb
@@ -5,10 +5,6 @@ module Ga4
       class Visits < Hyrax::Analytics::Ga4::Base
         def initialize(start_date:, end_date:, dimensions: [{ name: 'newVsReturning' }], metrics: [{ name: 'sessions' }])
           super
-          @start_date = start_date.to_date
-          @end_date = end_date.to_date
-          @dimensions = dimensions
-          @metrics = metrics
         end
 
         def new_visits

diff --git a/app/services/hyrax/analytics/ga4/visits_daily.rb b/app/services/hyrax/analytics/ga4/visits_daily.rb
@@ -5,10 +5,6 @@ module Ga4
       class VisitsDaily < Hyrax::Analytics::Ga4::Base
         def initialize(start_date:, end_date:, dimensions: [{ name: 'date' }, { name: 'newVsReturning' }], metrics: [{ name: 'sessions' }])
           super
-          @start_date = start_date.to_date
-          @end_date = end_date.to_date
-          @dimensions = dimensions
-          @metrics = metrics
         end
 
         def new_visits

diff --git a/app/views/hyrax/users/_vitals.html.erb b/app/views/hyrax/users/_vitals.html.erb
@@ -12,7 +12,8 @@
   <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_works(user) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
-      <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
-      <li><span class="badge badge-optional dark-text"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
+    <li><span class="badge badge-optional dark-text"><%= user.total_work_views %></span> <%= t("hyrax.dashboard.stats.work_views").pluralize(user.total_work_views) %></li>
+    <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
+    <li><span class="badge badge-optional dark-text"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
   </ul>
 </div>
diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml
@@ -1141,8 +1141,9 @@ en:
         graph_reports: Customized Graph Reports
       stats:
         collections: Collections created
-        file_downloads: Download
-        file_views: View
+        work_views: Metadata View
+        file_downloads: File Download
+        file_views: File View
         files: Files deposited
         heading: Your Statistics
         joined_on: Joined on