hyrax 3.0.1 → 3.3.0

data/Dockerfile

@@ -1,6 +1,5 @@
-ARG RUBY_VERSION=2.7.2
-# lock at alpine3.12 because 3.13 has dns resolver problems
-FROM ruby:$RUBY_VERSION-alpine3.12 as hyrax-base
+ARG RUBY_VERSION=2.7.4
+FROM ruby:$RUBY_VERSION-alpine3.14 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
@@ -44,7 +43,7 @@ ONBUILD RUN bundle install --jobs "$(nproc)"
 ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 
-FROM hyrax-base as hyrax-worker
+FROM hyrax-base as hyrax-worker-base
 
 ENV MALLOC_ARENA_MAX=2
 
@@ -64,13 +63,17 @@ RUN mkdir -p /app/fits && \
     chmod a+x /app/fits/fits.sh
 ENV PATH="${PATH}:/app/fits"
 
+CMD bundle exec sidekiq
+
+
+FROM hyrax-worker-base as hyrax-worker
+
 ARG APP_PATH=.
 ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-
-CMD bundle exec sidekiq
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 
 FROM hyrax-base as hyrax-engine-dev
@@ -83,11 +86,13 @@ ENV HYRAX_ENGINE_PATH /app/samvera/hyrax-engine
 COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 COPY --chown=1001:101 . /app/samvera/hyrax-engine
 
-RUN cd /app/samvera/hyrax-engine && bundle install --jobs "$(nproc)"
+RUN gem update bundler && gem cleanup bundler && bundle -v && \
+  bundle install --jobs "$(nproc)" && \
+  cd $HYRAX_ENGINE_PATH && bundle install --jobs "$(nproc)"
 RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 
-FROM hyrax-worker as hyrax-engine-dev-worker
+FROM hyrax-worker-base as hyrax-engine-dev-worker
 
 ARG APP_PATH=.dassie
 ARG BUNDLE_WITHOUT=
@@ -97,4 +102,4 @@ ENV HYRAX_ENGINE_PATH /app/samvera/hyrax-engine
 COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 COPY --chown=1001:101 . /app/samvera/hyrax-engine
 
-RUN cd /app/samvera/hyrax-engine && bundle install --jobs "$(nproc)"
+RUN bundle install --jobs "$(nproc)"

data/Gemfile

@@ -1,44 +1,38 @@
 # frozen_string_literal: true
-source 'https://rubygems.org' do
-  # Please see hyrax.gemspec for dependency information.
-  gemspec
+source 'https://rubygems.org'
+# Please see hyrax.gemspec for dependency information.
+gemspec
 
-  group :development, :test do
-    gem 'benchmark-ips'
-    gem 'easy_translate'
-    gem 'i18n-tasks'
-    gem 'okcomputer'
-    gem 'pry' unless ENV['CI']
-    gem 'pry-byebug' unless ENV['CI']
-    gem 'ruby-prof', require: false
-    gem "simplecov", require: false
-  end
+group :development, :test do
+  gem 'benchmark-ips'
+  gem 'easy_translate'
+  gem 'i18n-tasks'
+  gem 'okcomputer'
+  gem 'pry' unless ENV['CI']
+  gem 'pry-byebug' unless ENV['CI']
+  gem 'ruby-prof', require: false
+  gem "simplecov", require: false
 end
 
 test_app_path = ENV['RAILS_ROOT'] ||
                 ENV.fetch('ENGINE_CART_DESTINATION', File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 test_app_gemfile = File.expand_path('Gemfile', test_app_path)
 
+# rubocop:disable Bundler/DuplicatedGem
 if File.exist?(test_app_gemfile)
   begin
+    Bundler.ui.info "[Hyrax] Including test application dependencies from #{test_app_gemfile}"
     eval_gemfile test_app_gemfile
   rescue Bundler::GemfileError => e
     Bundler.ui.warn '[Hyrax] Skipping Rails application dependencies:'
     Bundler.ui.warn e.message
   end
+elsif ENV['RAILS_VERSION'] == 'edge'
+  gem 'rails', github: 'rails/rails', source: 'https://rubygems.org'
+  ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+elsif ENV['RAILS_VERSION']
+  gem 'rails', ENV['RAILS_VERSION'], source: 'https://rubygems.org'
 else
-  Bundler.ui.warn "[Hyrax] Unable to find test application dependencies in #{test_app_gemfile}, using placeholder dependencies"
-
-  # rubocop:disable Bundler/DuplicatedGem
-  if ENV['RAILS_VERSION']
-    if ENV['RAILS_VERSION'] == 'edge'
-      gem 'rails', github: 'rails/rails', source: 'https://rubygems.org'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
-    else
-      gem 'rails', ENV['RAILS_VERSION'], source: 'https://rubygems.org'
-    end
-  end
-  # rubocop:enable Bundler/DuplicatedGem
-
-  eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__))
+  Bundler.ui.warn '[Hyrax] Skipping all Rails dependency injection'
 end
+# rubocop:enable Bundler/DuplicatedGem

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/actors/hyrax/actors/base_actor.rb

@@ -37,7 +37,7 @@ module Hyrax
       # @return [Boolean] true if destroy was successful
       def destroy(env)
         env.curation_concern.in_collection_ids.each do |id|
-          destination_collection = ::Collection.find(id)
+          destination_collection = Hyrax.config.collection_class.find(id)
           destination_collection.members.delete(env.curation_concern)
           destination_collection.update_index
         end
@@ -95,7 +95,7 @@ module Hyrax
       def clean_attributes(attributes)
         attributes[:license] = Array(attributes[:license]) if attributes.key? :license
         attributes[:rights_statement] = Array(attributes[:rights_statement]) if attributes.key? :rights_statement
-        remove_blank_attributes!(attributes)
+        remove_blank_attributes!(attributes).except('file_set')
       end
 
       # If any attributes are blank remove them

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -69,7 +69,7 @@ module Hyrax
       # Adds the item to the ordered members so that it displays in the items
       # along side the FileSets on the show page
       def add(env, id)
-        collection = ::Collection.find(id)
+        collection = Hyrax.config.collection_class.find(id)
         collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
 
         return unless env.current_ability.can?(:deposit, collection)
@@ -78,7 +78,7 @@ module Hyrax
 
       # Remove the object from the members set and the ordered members list
       def remove(curation_concern, id)
-        collection = ::Collection.find(id)
+        collection = Hyrax.config.collection_class.find(id)
         curation_concern.member_of_collections.delete(collection)
       end
 
@@ -107,7 +107,7 @@ module Hyrax
         collection_id = attributes_collection.first.second['id']
 
         # Do not apply permissions to work if collection type is configured not to
-        collection = ::Collection.find(collection_id)
+        collection = Hyrax.config.collection_class.find(collection_id)
         return unless collection.share_applies_to_new_works?
 
         # Save the collection id in env for use in apply_permission_template_actor

data/app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -26,90 +26,112 @@ module Hyrax
 
       private
 
-      def registered_ingest_dirs
-        Hyrax.config.registered_ingest_dirs
+      def attach_files(env, remote_files)
+        ingest_remote_files_service_class.new(user: env.user,
+                                              curation_concern: env.curation_concern,
+                                              remote_files: remote_files,
+                                              file_set_actor_class: file_set_actor_class).attach!
       end
 
-      # @param uri [URI] the uri fo the resource to import
-      def validate_remote_url(uri)
-        if uri.scheme == 'file'
-          path = File.absolute_path(CGI.unescape(uri.path))
-          registered_ingest_dirs.any? do |dir|
-            path.start_with?(dir) && path.length > dir.length
+      class IngestRemoteFilesService
+        ##
+        # @parm user [User]
+        # @parm curation_concern [Hyrax::Work]
+        # @param remote_files [HashWithIndifferentAccess]
+        # @param file_set_actor_class
+        # @param ordered_members [Array]
+        # @param ordered [Boolean]
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(user:, curation_concern:, remote_files:, file_set_actor_class:, ordered_members: [], ordered: false)
+          @remote_files = remote_files
+          @user = user
+          @curation_concern = curation_concern
+          @file_set_actor_class = file_set_actor_class
+          @ordered_members = ordered_members
+          @ordered = ordered
+        end
+        # rubocop:enable Metrics/ParameterLists
+        attr_reader :remote_files, :user, :curation_concern, :ordered_members, :ordered, :file_set_actor_class
+
+        ##
+        # @return true
+        def attach!
+          return true unless remote_files
+          remote_files.each do |file_info|
+            next if file_info.blank? || file_info[:url].blank?
+            # Escape any space characters, so that this is a legal URI
+            uri = URI.parse(Addressable::URI.escape(file_info[:url]))
+            unless self.class.validate_remote_url(uri)
+              Rails.logger.error "User #{user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
+              return false
+            end
+            auth_header = file_info.fetch(:auth_header, {})
+            create_file_from_url(uri, file_info[:file_name], auth_header)
           end
-        else
-          Rails.logger.debug "Assuming #{uri.scheme} uri is valid without a serious attempt to validate: #{uri}"
+          add_ordered_members! if ordered
           true
         end
-      end
 
-      # @param [HashWithIndifferentAccess] remote_files
-      # @return [TrueClass]
-      def attach_files(env, remote_files)
-        return true unless remote_files
-        remote_files.each do |file_info|
-          next if file_info.blank? || file_info[:url].blank?
-          # Escape any space characters, so that this is a legal URI
-          uri = URI.parse(Addressable::URI.escape(file_info[:url]))
-          unless validate_remote_url(uri)
-            Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
-            return false
+        def self.registered_ingest_dirs
+          Hyrax.config.registered_ingest_dirs
+        end
+
+        # @param uri [URI] the uri fo the resource to import
+        def self.validate_remote_url(uri)
+          if uri.scheme == 'file'
+            path = File.absolute_path(CGI.unescape(uri.path))
+            registered_ingest_dirs.any? do |dir|
+              path.start_with?(dir) && path.length > dir.length
+            end
+          else
+            Rails.logger.debug "Assuming #{uri.scheme} uri is valid without a serious attempt to validate: #{uri}"
+            true
           end
-          auth_header = file_info.fetch(:auth_header, {})
-          create_file_from_url(env, uri, file_info[:file_name], auth_header)
         end
-        true
-      end
 
-      def create_file_from_url(env, uri, file_name, auth_header)
-        case env.curation_concern
-        when Valkyrie::Resource
-          create_file_from_url_through_valkyrie(env, uri, file_name, auth_header)
-        else
-          create_file_from_url_through_active_fedora(env, uri, file_name, auth_header)
+        private
+
+        def create_file_from_url(uri, file_name, auth_header)
+          import_url = URI.decode_www_form_component(uri.to_s)
+          use_valkyrie = false
+          case curation_concern
+          when Valkyrie::Resource
+            file_set = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
+            use_valkyrie = true
+          else
+            file_set = ::FileSet.new(import_url: import_url, label: file_name)
+          end
+          __create_file_from_url(file_set: file_set, uri: uri, auth_header: auth_header, use_valkyrie: use_valkyrie)
         end
-      end
 
-      # Generic utility for creating FileSet from a URL
-      # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url_through_active_fedora(env, uri, file_name, auth_header)
-        import_url = URI.decode_www_form_component(uri.to_s)
-        ::FileSet.new(import_url: import_url, label: file_name) do |fs|
-          actor = Hyrax::Actors::FileSetActor.new(fs, env.user)
-          actor.create_metadata(visibility: env.curation_concern.visibility)
-          actor.attach_to_work(env.curation_concern)
-          fs.save!
+        def __create_file_from_url(file_set:, uri:, auth_header:, use_valkyrie: Hyrax.config.use_valkyrie?)
+          actor = file_set_actor_class.new(file_set, user, use_valkyrie: use_valkyrie)
+          actor.create_metadata(visibility: curation_concern.visibility)
+          actor.attach_to_work(curation_concern)
+          file_set.save! if file_set.respond_to?(:save!)
+          # We'll remember the order, but if it's not `@ordered` we won't do anything.
+          ordered_members << file_set
           if uri.scheme == 'file'
             # Turn any %20 into spaces.
             file_path = CGI.unescape(uri.path)
-            IngestLocalFileJob.perform_later(fs, file_path, env.user)
+            IngestLocalFileJob.perform_later(file_set, file_path, user)
           else
-            ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
+            ImportUrlJob.perform_later(file_set, operation_for(user: user), auth_header)
           end
         end
-      end
 
-      # Generic utility for creating Hyrax::FileSet from a URL
-      # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url_through_valkyrie(env, uri, file_name, auth_header)
-        import_url = URI.decode_www_form_component(uri.to_s)
-        fs = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
-        actor = Hyrax::Actors::FileSetActor.new(fs, env.user, use_valkyrie: true)
-        actor.create_metadata(visibility: env.curation_concern.visibility)
-        actor.attach_to_work(env.curation_concern)
-        if uri.scheme == 'file'
-          # Turn any %20 into spaces.
-          file_path = CGI.unescape(uri.path)
-          IngestLocalFileJob.perform_later(fs, file_path, env.user)
-        else
-          ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
+        def operation_for(user:)
+          Hyrax::Operation.create!(user: user,
+                                   operation_type: "Attach Remote File")
         end
-      end
 
-      def operation_for(user:)
-        Hyrax::Operation.create!(user: user,
-                                 operation_type: "Attach Remote File")
+        def add_ordered_members!
+          actor = Hyrax::Actors::OrderedMembersActor.new(ordered_members, user)
+          actor.attach_ordered_members_to_work(curation_concern)
+        end
       end
+      class_attribute :file_set_actor_class, default: ::Hyrax::Actors::FileSetActor
+      class_attribute :ingest_remote_files_service_class, default: ::Hyrax::Actors::CreateWithRemoteFilesActor::IngestRemoteFilesService
     end
   end
 end

data/app/actors/hyrax/actors/create_with_remote_files_ordered_members_actor.rb

@@ -39,54 +39,19 @@ module Hyrax
     # url property, it may have spaces, and not be a valid URI.
     class CreateWithRemoteFilesOrderedMembersActor < CreateWithRemoteFilesActor
       attr_reader :ordered_members
+      self.file_set_actor_class = Hyrax::Actors::FileSetOrderedMembersActor
 
       # @param [HashWithIndifferentAccess] remote_files
       # @return [TrueClass]
       def attach_files(env, remote_files)
-        return true unless remote_files
         @ordered_members = env.curation_concern.ordered_members.to_a
-        remote_files.each do |file_info|
-          next if file_info.blank? || file_info[:url].blank?
-          # Escape any space characters, so that this is a legal URI
-          uri = URI.parse(Addressable::URI.escape(file_info[:url]))
-          unless validate_remote_url(uri)
-            Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
-            return false
-          end
-          auth_header = file_info.fetch(:auth_header, {})
-          create_file_from_url(env, uri, file_info[:file_name], auth_header)
-        end
-        add_ordered_members(env.user, env.curation_concern)
-        true
-      end
-
-      # Generic utility for creating FileSet from a URL
-      # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url(env, uri, file_name, auth_header = {})
-        ::FileSet.new(import_url: uri.to_s, label: file_name) do |fs|
-          actor = file_set_actor_class.new(fs, env.user)
-          actor.create_metadata(visibility: env.curation_concern.visibility)
-          actor.attach_to_work(env.curation_concern)
-          fs.save!
-          ordered_members << fs
-          if uri.scheme == 'file'
-            # Turn any %20 into spaces.
-            file_path = CGI.unescape(uri.path)
-            IngestLocalFileJob.perform_later(fs, file_path, env.user)
-          else
-            ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
-          end
-        end
+        ingest_remote_files_service_class.new(user: env.user,
+                                              curation_concern: env.curation_concern,
+                                              remote_files: remote_files,
+                                              ordered_members: @ordered_members,
+                                              ordered: true,
+                                              file_set_actor_class: file_set_actor_class).attach!
       end
-
-      # Add all file_sets as ordered_members in a single action
-      def add_ordered_members(user, work)
-        actor = Hyrax::Actors::OrderedMembersActor.new(ordered_members, user)
-        actor.attach_ordered_members_to_work(work)
-      end
-
-      class_attribute :file_set_actor_class
-      self.file_set_actor_class = Hyrax::Actors::FileSetOrderedMembersActor
     end
   end
 end

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -31,10 +31,9 @@ module Hyrax
           # hand. Do this because we don't have the underlying UploadedFile instance
           file_actor = build_file_actor(relation)
           file_actor.ingest_file(wrapper!(file: file, relation: relation))
-          # Copy visibility and permissions from parent (work) to
-          # FileSets even if they come in from BrowseEverything
-          VisibilityCopyJob.perform_later(file_set.parent)
-          InheritPermissionsJob.perform_later(file_set.parent)
+          parent = parent_for(file_set: file_set)
+          VisibilityCopyJob.perform_later(parent)
+          InheritPermissionsJob.perform_later(parent)
         else
           IngestJob.perform_later(wrapper!(file: file, relation: relation))
         end
@@ -138,6 +137,12 @@ module Hyrax
         @ability ||= ::Ability.new(user)
       end
 
+      # @param file_set [FileSet]
+      # @return [ActiveFedora::Base]
+      def parent_for(file_set:)
+        file_set.parent
+      end
+
       def build_file_actor(relation)
         fs = use_valkyrie ? file_set.valkyrie_resource : file_set
         file_actor_class.new(fs, relation, user, use_valkyrie: use_valkyrie)
@@ -160,6 +165,8 @@ module Hyrax
         elsif file_set.import_url.present?
           # This path is taken when file is a Tempfile (e.g. from ImportUrlJob)
           File.basename(Addressable::URI.unencode(file.file_url))
+        elsif file.respond_to?(:original_filename) # e.g. Rack::Test::UploadedFile
+          file.original_filename
         else
           File.basename(file)
         end
@@ -179,7 +186,7 @@ module Hyrax
       # Although ActiveFedora clears the children nodes it leaves those fields in Solr populated.
       # rubocop:disable Metrics/CyclomaticComplexity
       def unlink_from_work
-        work = file_set.parent
+        work = parent_for(file_set: file_set)
         return unless work && (work.thumbnail_id == file_set.id || work.representative_id == file_set.id || work.rendering_ids.include?(file_set.id))
         work.thumbnail = nil if work.thumbnail_id == file_set.id
         work.representative = nil if work.representative_id == file_set.id

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'
         });
     }
 }