hyrax 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1dfd66c313400a16a149d5bdb7a2495164c18bce86b9bd8f079970b68e328cf
-  data.tar.gz: 66c678a483a9f2822712dea5f8448e55d9019dbdc47605b9a03177d0465ab775
+  metadata.gz: 95d9c34fb76fd8e3ac06d6605962c16bbdad32ffa2c1f5ab24958740fc175507
+  data.tar.gz: 8be6a02dc887f93076d84a5dc47b8e4cc7ecf916415e23fd00df24078f20ebbf
 SHA512:
-  metadata.gz: 8309e7eb25d84767fd2395e04326df0c1f925bef0a2618818b0430327ac623f0f4078abbd45b5a966ccb6ccbc4c6bc233823e7d1b00d08b5e977771c97be4306
-  data.tar.gz: dd759280930d7cbc3448b3fafbfae5bbb631f9eb8fb93a9dca2e9ee73b3226f71d5b453ec29a40ac087dacf076059b752e8e72b2b9e35c5efab1b54743a1e958
+  metadata.gz: b6e519190cda4bdcdb4a68577b682ad6fd138756da25ce69228429755e3ee3a2fb3ac95d9140831d623f75e0aa8a9115d378abafe8f301850c200fb8080b9942
+  data.tar.gz: 90610095bd1b82e79bc7ebaa8de11a2f3c8452803a15d60a4595308b67ab85724b118c7343b2a46fb2bafb3a138365fdb94540e948965cc1a96d4259fd8b07d6

data/.circleci/config.yml

@@ -33,10 +33,9 @@ jobs:
             fi
             [[ -z "$(git branch --all --list master */master)" ]]
 
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: hyrax
 
       # Run rubocop in parallel with caching
       # This should get added to the orb once proven here
@@ -89,10 +88,9 @@ jobs:
           at: ~/
       - samvera/engine_cart_generate:
           cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: hyrax
       - persist_to_workspace:
           root: ~/
           paths:
@@ -128,10 +126,9 @@ jobs:
           solr_config_path: .internal_test_app/solr/conf
           core_name: hyrax-valkyrie-test
       # Rerun bundler in case this is a different ruby version than bundle and build steps
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: hyrax
       - run:
           command: bundle exec rake app:db:migrate
       - samvera/parallel_rspec

data/.dassie/.env

@@ -1,4 +1,3 @@
 MEMCACHED_HOST=memcached
-HYRAX_ANALYTICS=1
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
+SIDEKIQ_REDIS_URL=redis://redis:6379/0

data/.dassie/Gemfile

@@ -52,11 +52,15 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 
-gem 'rsolr', '>= 1.0', '< 3'
 gem 'bootstrap-sass', '~> 3.0'
-gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
-gem 'jquery-rails'
 gem 'devise'
 gem 'devise-guests', '~> 0.6'
+gem 'jquery-rails'
+gem 'pry-byebug'
+gem 'pry-doc'
+gem 'pry-rails'
+gem 'pry-rescue'
 gem 'riiif', '~> 2.1'
+gem 'rsolr', '>= 1.0', '< 3'
 gem 'sidekiq', '~> 6.0'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'

data/.dassie/app/models/user.rb

@@ -5,8 +5,6 @@ class User < ApplicationRecord
   include Hyrax::User
   include Hyrax::UserUsageStats
 
-
-
   if Blacklight::Utils.needs_attr_accessible?
     attr_accessible :email, :password, :password_confirmation
   end

data/.dassie/config/analytics.yml

@@ -1,6 +1,13 @@
 analytics:
-  app_name: My App Name
-  app_version: 0.0.1
-  privkey_path: /tmp/privkey.p12
-  privkey_secret: s00pers3kr1t
-  client_email: oauth@example.org
+  google:
+    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
+    app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
+    app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
+    privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
+    privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
+    client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
+  matomo: 
+    base_url: <%= ENV['MATOMO_BASE_URL'] %>
+    site_id: <%= ENV['MATOMO_SITE_ID'] %>
+    auth_token: <%= ENV['MATOMO_AUTH_TOKEN'] %>
+    

data/.dassie/config/environments/development.rb

@@ -29,6 +29,8 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
+  config.web_console.whitelisted_ips = ['172.18.0.0/16', '172.27.0.0/16', '0.0.0.0/0']
+
   # Store uploaded files on the local file system (see config/storage.yml for options)
   config.active_storage.service = :local
 

data/.dassie/config/initializers/hyrax.rb

@@ -5,6 +5,8 @@ Hyrax.config do |config|
   # Defaults to false.  See README for more info
   config.arkivo_api = true
 
+  config.analytics = ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS', 'false'))
+  config.analytics_provider = ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'google')
   # Injected via `rails g hyrax:work GenericWork`
   config.register_curation_concern :generic_work
   # Injected via `rails g hyrax:work NamespacedWorks::NestedWork`

data/.dassie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20160111215816)
+class EnableUuidExtension < ActiveRecord::Migration[5.0]
+  def change
+    enable_extension 'uuid-ossp'
+  end
+end

data/.dassie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20161007101725)
+class CreateOrmResources < ActiveRecord::Migration[5.0]
+  def options
+    if ENV["VALKYRIE_ID_TYPE"] == "string"
+      { id: :text, default: -> { '(uuid_generate_v4())::text' } }
+    else
+      { id: :uuid }
+    end
+  end
+
+  def change
+    create_table :orm_resources, **options do |t|
+      t.jsonb :metadata, null: false, default: {}
+      t.timestamps
+    end
+    add_index :orm_resources, :metadata, using: :gin
+  end
+end

data/.dassie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20170124135846)
+class AddModelTypeToOrmResources < ActiveRecord::Migration[5.0]
+  def change
+    add_column :orm_resources, :resource_type, :string
+  end
+end

data/.dassie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20170531004548)
+class ChangeModelTypeToInternalModel < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :orm_resources, :resource_type, :internal_resource
+  end
+end

data/.dassie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20171011224121)
+class CreatePathGinIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :orm_resources, 'metadata jsonb_path_ops', using: :gin
+  end
+end

data/.dassie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20171204224121)
+class CreateInternalResourceIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :orm_resources, :internal_resource
+  end
+end

data/.dassie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20180212092225)
+class CreateUpdatedAtIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :orm_resources, :updated_at
+  end
+end

data/.dassie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20180802220739)
+class AddOptimisticLockingToOrmResources < ActiveRecord::Migration[5.1]
+  def change
+    add_column :orm_resources, :lock_version, :integer
+  end
+end

data/.dassie/db/migrate/20211130181150_create_default_administrative_set.rb

@@ -0,0 +1,8 @@
+class CreateDefaultAdministrativeSet < ActiveRecord::Migration[5.2]
+  def change
+    create_table :hyrax_default_administrative_set do |t|
+      t.string :default_admin_set_id, null: false
+      t.timestamps null: false
+    end
+  end
+end

data/.dassie/db/schema.rb

@@ -10,10 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_08_21_212903) do
+ActiveRecord::Schema.define(version: 2021_11_30_181150) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
+  enable_extension "uuid-ossp"
 
   create_table "bookmarks", id: :serial, force: :cascade do |t|
     t.integer "user_id", null: false
@@ -139,6 +140,12 @@ ActiveRecord::Schema.define(version: 2020_08_21_212903) do
     t.index ["machine_id"], name: "index_hyrax_collection_types_on_machine_id", unique: true
   end
 
+  create_table "hyrax_default_administrative_set", force: :cascade do |t|
+    t.string "default_admin_set_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "hyrax_features", force: :cascade do |t|
     t.string "key", null: false
     t.boolean "enabled", default: false, null: false
@@ -225,6 +232,18 @@ ActiveRecord::Schema.define(version: 2020_08_21_212903) do
     t.index ["namespace"], name: "index_minter_states_on_namespace", unique: true
   end
 
+  create_table "orm_resources", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+    t.jsonb "metadata", default: {}, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "internal_resource"
+    t.integer "lock_version"
+    t.index ["internal_resource"], name: "index_orm_resources_on_internal_resource"
+    t.index ["metadata"], name: "index_orm_resources_on_metadata", using: :gin
+    t.index ["metadata"], name: "index_orm_resources_on_metadata_jsonb_path_ops", opclass: :jsonb_path_ops, using: :gin
+    t.index ["updated_at"], name: "index_orm_resources_on_updated_at"
+  end
+
   create_table "permission_template_accesses", force: :cascade do |t|
     t.bigint "permission_template_id"
     t.string "agent_type"

data/.env

@@ -1,14 +1,17 @@
+ANALYTICS_START_DATE=2021-08-21
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
 DATABASE_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax?pool=5
-DB_PORT=5432
 DB_HOST=postgres
-FCREPO_PORT=8080
+DB_PORT=5432
 FCREPO_HOST=fcrepo
+FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
 FCREPO_TEST_BASE_PATH=/test
 HUB_URL=http://chrome:4444/wd/hub
+HYRAX_ANALYTICS=false
+HYRAX_ANALYTICS_PROVIDER=google
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
@@ -17,9 +20,9 @@ RACK_ENV=development
 RAILS_ENV=development
 RAILS_ROOT=.dassie
 REDIS_HOST=redis
-SOLR_PORT=8983
 SOLR_HOST=solr
+SOLR_PORT=8983
 SOLR_TEST_URL=http://solr:8983/solr/hyrax_test
 SOLR_URL=http://solr:8983/solr/hyrax
-VALKYRIE_SOLR_PORT=8983
 VALKYRIE_SOLR_HOST=solr
+VALKYRIE_SOLR_PORT=8983

data/.github/workflows/main.yml

@@ -0,0 +1,17 @@
+name: Trigger Nurax build
+on:
+  workflow_dispatch:
+  push:
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: peter-evans/repository-dispatch@v1
+      with:
+         token: ${{ secrets.NURAX_ACCESS_TOKEN }}
+         event-type: push
+         repository: curationexperts/nurax
+         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+
+

data/.github/workflows/release.yml

@@ -0,0 +1,17 @@
+name: Trigger Nurax build
+on:
+  workflow_dispatch:
+  release:
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: peter-evans/repository-dispatch@v1
+      with:
+         token: ${{ secrets.NURAX_ACCESS_TOKEN }}
+         event-type: release
+         repository: curationexperts/nurax
+         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+
+

data/.gitignore

@@ -82,3 +82,4 @@ lib/bundler/man
 spec/reports
 /spec/examples.txt
 node_modules
+.env.*

data/.regen

@@ -1 +1 @@
-36
+40

data/CONTAINERS.md

@@ -1,15 +1,12 @@
 Hyrax-in-a-Container
 ====================
 
-Our goal is to provide a practical, reusable "reference environment for applications.  The first step is providing
-on on-ramp for Hyrax engine development.  Then providing help with Hyrax-based application development.  Finally,
-providing better guidance around deployment.
-
-Where are we at?  It's complicated.  What we have below is experimental support, but one that we want to push
-towards.  We need your help to keep pushing in this direction.  So dig in and prepare to get your hands dirty.
+Our goal is to provide a practical, reusable reference environment for applications.  The first step is providing an on-ramp for Hyrax engine development. Then providing help with Hyrax-based application development. Finally, providing better guidance around deployment.
 
 The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).
 
+See the [Troubleshooting](#troubleshooting) section if you encounter any issues.
+
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
 ## Hyrax Engine Development
 
@@ -42,8 +39,6 @@ To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kb
 
 _**Note:** Starting and stopping Docker in this way will preserve your data between restarts._
 
-_**Note:** I (Jeremy) encountered a problem using `docker-compose build`. I ran `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That appeared to clear up the problem of a failure to build a gem._
-
 ### Code Changes and Testing
 
 With `docker-compose up` running, any changes you make to your cloned Hyrax code-base should show up in `http://localhost:3000`; There may be cases where you need to restart your test application (e.g. stop the containers and start them up again).
@@ -99,7 +94,7 @@ In the two examples, note the difference in the `-w` switch. In the first case,
 
 ### Debugging
 
-I (Jeremy) find myself wanting to debug the application.  This requires a somewhat different approach than running Hyrax bare-metal.  You need to use `docker attach` to debug the running docker instance.
+If you are interested in running Hyrax in debug mode, this requires a somewhat different approach than running Hyrax bare-metal.  You need to use `docker attach` to debug the running docker instance.
 
 1. With `docker-compose up` running open a new Terminal session.
 2. In that new Terminal session, using `docker container ls` find the "CONTAINER ID" for the `hyrax-engine-dev`.
@@ -127,6 +122,14 @@ cp: cannot create directory '/var/solr/data/hyrax_test': Permission denied
 
 The solution that appears to work is to `docker-compose down --volumes`; This will tear down the docker instance, and remove the volumes.  You can then run `docker-compose up` to get back to work.  _**Note:** the `--volumes` switch will remove all custom data._
 
+#### Errors building the Docker image
+
+If you encounter errors running `docker-compose build`, try running `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That can help clear up the problem of a failure to build a particular gem.
+
+#### Containers do not all start
+
+If any of the services fail to start on `docker-compose up`, try clearing out any `Gemfile.lock` files that might exist in `./hyrax` or `./hyrax/.dassie` and run `docker-compose build` again, then `docker-compose up` again.
+
 <!-- NOTE: This title is referenced in the top-level documentation/developing-your-hyrax-based-app.md. Keep that in mind if you change it. -->
 ## Docker Image for Hyrax-based Applications
 
@@ -177,4 +180,4 @@ helm dependency update chart/hyrax
 helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
-[dockerhub-samveralabs]: https://hub.docker.com/r/samveralabs
+[dockerhub-samveralabs]: https://hub.docker.com/r/samveralabs

data/README.md

@@ -77,6 +77,43 @@ This is where you work on the code-base that will be used by yours and other Hyr
     <p>By moving to Docker, we are encoding the documentation steps for standing up a Hyrax-engine development environment.</p>
 </aside>
 
+### Installing Analytics
+
+Hyrax supports your choice of either Google Analytics or Matomo.  To enable analytics tracking and reporting features, follow the directions below.
+
+Enable Analytics Features
+
+Analytics can be enabled and configured using environment variables. Set HYRAX_ANALYTICS to true, set either 'google' or 'matomo' for  HYRAX_ANALYTICS_PROVIDER, and set the date you would like reporting to start (ANALYTICS_START_DATE).
+
+```
+HYRAX_ANALYTICS=true
+HYRAX_ANALYTICS_PROVIDER=google
+ANALYTICS_START_DATE=2021-08-21
+```
+
+If using google, you'll also need the following ENV variables:
+
+```
+GOOGLE_ANALYTICS_ID=UA-111111-1  # Universal ID (Currently Hyrax Analytics only works with Univeral (UA) accounts)
+GOOGLE_OAUTH_APP_NAME=
+GOOGLE_OAUTHAPP_VERSION=
+GOOGLE_OAUTH_PRIVATE_KEY_PATH= # store the .p12 file in the root of your application
+GOOGLE_OAUTH_PRIVATE_KEY_SECRET=
+GOOGLE_OAUTH_CLIENT_EMAIL=
+```
+
+Add these ENV variables if using Matomo:
+
+```
+MATOMO_SITE_ID=
+MATOMO_BASE_URL=
+MATOMO_AUTH_TOKEN=
+```
+
+#### Analytics Features
+
+Once analytics is enabled, Hyrax will automatically install the JS tracking code.  Page views and downloads of a file set are recorded and sent to the selected analytics provider.  Admin users will have access to an expanded dashboard with details about how many vistors viewed a page, and how many visitors downloaded a file.  Easily find the top works by views, and most popular file downloads!
+
 #### Contributing
 
 We'd love to accept your contributions.  Please see our guide to [contributing to Hyrax](./.github/CONTRIBUTING.md).

data/app/assets/javascripts/hyrax/admin/graphs.es6

@@ -1,46 +1,44 @@
 export default class {
-
     constructor(data) {
         this.userSelector = 'user-activity'
         this.growthSelector = 'dashboard-growth'
         this.statusSelector = 'dashboard-repository-objects'
-
         if (this.hasSelector(this.userSelector))
             this.userActivity(data.userActivity);
         if (this.hasSelector(this.growthSelector))
             this.repositoryGrowth(data.repositoryGrowth);
         if (this.hasSelector(this.statusSelector))
             this.objectStatus(data.repositoryObjects);
-
     }
-
     // Don't attempt to initialize Morris if the selector is not on the page
     // otherwise it raises a "Graph container element not found" error
     hasSelector(selector) {
-      return $(`#${selector}`).length > 0;
+        return $(`#${selector}`).length > 0;
     }
-
     // Draws a bar chart of new user signups
     userActivity(data) {
-        if (typeof data === "undefined")
-            return
+        if (typeof data === 'undefined') return
         Morris.Bar({
-             element: this.userSelector,
-             data: data,
-             xkey: 'y',
-             // TODO: when we add returning users:
-             // ykeys: ['a', 'b'],
-             // labels: ['New Users', 'Returning'],
-             ykeys: ['a'],
-             labels: ['New Users', 'Returning'],
-             barColors: ['#33414E', '#3FBAE4'],
-             gridTextSize: '10px',
-             hideHover: true,
-             resize: true,
-             gridLineColor: '#E5E5E5'
-         });
+            element: this.userSelector,
+            data: data,
+            xkey: 'y',
+            ykeys: ['new_users', 'new_visitors', 'returning_visitors', 'total_visitors'],
+            labels: ['New Users', 'New Visitors', 'Returning Visitors', 'Total Visitors'],
+            // TODO: use the ykeys and labels below when the returning_users method in
+            // user_activity_presenter.rb returns data
+            // ykeys: ['new_users', 'returning_users', 'new_visitors', 'returning_visitors', 'total_visitors'],
+            // labels: ['New Users', 'Returning Users', 'New Visitors', 'Returning Visitors', 'Total Visitors'],
+            barColors: [
+                '#001219','#005f73','#0a9396','#94d2bd','#e9d8a6',
+                '#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'
+            ],
+            gridTextSize: '12px',
+            hideHover: true,
+            resize: true,
+            gridLineColor: '#E5E5E5',
+            stacked: true
+        });
     }
-
     // Draws a donut chart of active/inactive objects
     objectStatus(data) {
         if (typeof data === "undefined")
@@ -48,28 +46,27 @@ export default class {
         Morris.Donut({
             element: this.statusSelector,
             data: data,
-            colors: ['#33414E', '#3FBAE4', '#FEA223'],
-            gridTextSize: '9px',
+            colors: ['#001219','#005f73','#0a9396','#94d2bd','#e9d8a6','#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'],
+            gridTextSize: '12px',
             resize: true
         });
     }
-
     // Creates a line graph of collections and object in the last 90 days
     repositoryGrowth(data) {
         if (typeof data === "undefined")
             return
         Morris.Line({
-           element: this.growthSelector,
-           data: data,
-           xkey: 'y',
-           ykeys: ['a','b'],
-           labels: ['Objects','Collections'],
-           resize: true,
-           hideHover: true,
-           xLabels: 'day',
-           gridTextSize: '10px',
-           lineColors: ['#3FBAE4','#33414E'],
-           gridLineColor: '#E5E5E5'
+            element: this.growthSelector,
+            data: data,
+            xkey: 'y',
+            ykeys: ['works','collections'],
+            labels: ['Works','Collections'],
+            resize: true,
+            hideHover: true,
+            xLabels: 'day',
+            gridTextSize: '12px',
+            lineColors: ['#001219','#005f73','#0a9396','#94d2bd','#e9d8a6','#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'],
+            gridLineColor: '#E5E5E5'
         });
     }
 }

data/app/assets/javascripts/hyrax/analytics_events.js

@@ -0,0 +1,69 @@
+class TrackingTags {
+  constructor(provider) {
+    this.provider = provider
+  }
+
+  analytics() {
+    if(this.provider === "matomo") {
+      return _paq;
+    }
+    else {
+      return _gaq
+    }
+  }
+
+  pageView() {
+    if(this.provider === "matomo") {
+      return 'trackPageView'
+    } else {
+      return '_trackPageview'
+    }
+  }
+
+  trackEvent() {
+    if(this.provider === "matomo") {
+      return 'trackEvent'
+    } else {
+      return '_trackEvent'
+    }
+  }
+}
+
+function trackPageView() {
+  window.trackingTags.analytics().push([window.trackingTags.pageView()]);
+}
+
+function trackAnalyticsEvents() {
+  $('span.analytics-event').each(function(){
+    var eventSpan = $(this)
+    window.trackingTags.analytics().push([window.trackingTags.trackEvent(), eventSpan.data('category'), eventSpan.data('action'), eventSpan.data('name')]);
+  })
+}
+
+function setupTracking() {
+    var provider = $('meta[name="analytics-provider"]').prop('content')
+    window.trackingTags = new TrackingTags(provider)
+    trackPageView()
+    trackAnalyticsEvents()
+}
+
+if (typeof Turbolinks !== 'undefined') {
+  $(document).on('turbolinks:load', function() {
+    setupTracking()
+  })
+} else {
+  $(document).on('ready', function() {
+    setupTracking()
+  })
+}
+
+$(document).on('click', '#file_download', function(e) {
+  var provider = $('meta[name="analytics-provider"]').prop('content')
+  window.trackingTags = new TrackingTags(provider)
+  window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set', 'file-set-download', $(this).data('label')]);
+  window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set-in-work', 'file-set-in-work-download', $(this).data('work-id')]);
+  $(this).data('collection-ids').forEach(function (collection) {
+    window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set-in-collection', 'file-set-in-collection-download', collection]);
+    window.trackingTags.analytics().push([trackingTags.trackEvent(), 'work-in-collection', 'work-in-collection-download', collection]);
+  });
+});