hyrax 5.0.1 → 5.0.3

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

@@ -4,39 +4,53 @@ class TrackingTags {
   }
 
   analytics() {
-    if(this.provider === "matomo") {
+    switch(this.provider) {
+    case "matomo":
       return _paq;
-    }
-    else {
+    case "ga4":
+      return dataLayer;
+    default:
       return _gaq;
     }
   }
 
   pageView() {
-    if(this.provider === "matomo") {
-      return 'trackPageView'
-    } else {
-      return '_trackPageview'
+    switch(this.provider) {
+    case "matomo":
+      return 'trackPageView';
+    case "ga4":
+      return 'event';
+    default:
+      return '_trackPageview';
     }
   }
 
   trackEvent() {
-    if(this.provider === "matomo") {
-      return 'trackEvent'
-    } else {
-      return '_trackEvent'
+    switch(this.provider) {
+    case "matomo":
+      return 'trackEvent';
+    case "ga4":
+      return 'event';
+    default:
+      return '_trackEvent';
     }
   }
 }
 
-function trackPageView() {
-  window.trackingTags.analytics().push([window.trackingTags.pageView()]);
+function trackPageView(provider) {
+  if(provider !== 'ga4'){
+    window.trackingTags.analytics().push([window.trackingTags.pageView()]);
+  }
 }
 
-function trackAnalyticsEvents() {
+function trackAnalyticsEvents(provider) {
   $('span.analytics-event').each(function(){
     var eventSpan = $(this)
-    window.trackingTags.analytics().push([window.trackingTags.trackEvent(), eventSpan.data('category'), eventSpan.data('action'), eventSpan.data('name')]);
+    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')})
+    }
   })
 }
 
@@ -46,8 +60,8 @@ function setupTracking() {
       return;
     }
     window.trackingTags = new TrackingTags(provider)
-    trackPageView()
-    trackAnalyticsEvents()
+    trackPageView(provider)
+    trackAnalyticsEvents(provider)
 }
 
 if (typeof Turbolinks !== 'undefined') {
@@ -55,7 +69,7 @@ if (typeof Turbolinks !== 'undefined') {
     setupTracking()
   })
 } else {
-  $(document).on('ready', function() {
+  $(document).ready(function() {
     setupTracking()
   })
 }
@@ -66,10 +80,20 @@ $(document).on('click', '#file_download', function(e) {
     return;
   }
   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]);
-  });
+
+  if(provider !== 'ga4') {
+    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]);
+    });
+  } else {
+    gtag('event', 'file-set-download', { 'content_type': 'file-set', 'content_id': $(this).data('label')})
+    gtag('event', 'file-set-in-work-download', { 'content_type': 'file-set-in-work', 'content_id': $(this).data('work-id')})
+    $(this).data('collection-ids').forEach(function (collection) {
+      gtag('event', 'file-set-in-collection-download', { 'content_type': 'file-set-in-collection', 'content_id': collection })
+      gtag('event', 'work-in-collection-download', { 'content_type': 'work-in-collection', 'content_id': collection })
+    });
+  }
 });

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

@@ -40,10 +40,10 @@ function getStatusActivity(){
     }
     else if(isCollapsed){
         resultDiv.classList.remove("in");
-        resultDiv.setAttribute("aria-expanded", "false");
+        // resultDiv.setAttribute("aria-expanded", "false");
     }else{
         resultDiv.classList.add("in");
-        resultDiv.setAttribute("aria-expanded", "true");
+        // resultDiv.setAttribute("aria-expanded", "true");
     }
 }
 
@@ -55,10 +55,10 @@ function getStatusSettings(){
     }
     else if(isCollapsed){
         resultDiv.classList.remove("in");
-        resultDiv.setAttribute("aria-expanded", "false");
+        // resultDiv.setAttribute("aria-expanded", "false");
     }else{
         resultDiv.classList.add("in");
-        resultDiv.setAttribute("aria-expanded", "true");
+        // resultDiv.setAttribute("aria-expanded", "true");
     }
 }
 

data/app/assets/javascripts/hyrax/file_manager/save_manager.es6

@@ -26,8 +26,10 @@ export default class SaveManager {
   check_button() {
     if (this.is_changed) {
       this.save_button.removeClass("disabled")
+      this.save_button.attr("aria-disabled", "false")
     } else {
       this.save_button.addClass("disabled")
+      this.save_button.attr("aria-disabled", "true")
     }
   }
 

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

@@ -4,6 +4,7 @@
 
     this.init = function() {
       this.$label = this.$element.find('[data-search-element="label"]');
+      this.$visibleLabel = this.$element.find('.dropdown-toggle').find('span[aria-hidden="true"]');
       this.$items = this.$element.find('[data-search-option]');
       this.setDefault();
     }
@@ -12,7 +13,6 @@
     this.attachEvents();
   }
 
-
   Hyrax.Search.prototype = {
     attachEvents: function() {
 
@@ -43,6 +43,7 @@
 
     setLabel: function(label) {
       this.$label.html(label);
+      this.$visibleLabel.html(label);
     }
 
   }
@@ -58,8 +59,6 @@
 
 })(jQuery);
 
-
 Blacklight.onLoad(function() {
   $('#search-form-header').search();
 });
-

data/app/assets/javascripts/hyrax/select_work_type.es6

@@ -39,6 +39,8 @@ export default class SelectWorkType {
   // for a single work.  So, given the value of 'this.type', return the appropriate
   // path.
   destination() {
-      return this.form.find('input[type="radio"]:checked').data(this.type)
+      let admin_set_id = this.form.find('select').val()
+      let url = this.form.find('input[type="radio"]:checked').data(this.type)
+      return url + "&admin_set_id=" + admin_set_id
   }
 }

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

@@ -10,7 +10,6 @@
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
  *
  * Licensed under the MIT license:
  * http://www.opensource.org/licenses/MIT
@@ -21,45 +20,48 @@
 
   $.fn.extend({
     hyraxUploader: function( options ) {
-      // Initialize our jQuery File Upload widget.
       this.fileupload($.extend({
-        // xhrFields: {withCredentials: true},              // to send cross-domain cookies
-        // acceptFileTypes: /(\.|\/)(png|mov|jpe?g|pdf)$/i, // not a strong check, just a regex on the filename
-        // limitMultiFileUploadSize: 500000000, // bytes
+        maxChunkSize: 10000000,  // 10 MB chunk size
         autoUpload: true,
         url: '/uploads/',
         type: 'POST',
-        dropZone: $(this).find('.dropzone')
+        dropZone: $(this).find('.dropzone'),
+        add: function (e, data) {
+          var that = this;
+          $.post('/uploads/', { files: [data.files[0].name] }, function (result) {
+            data.formData = {id: result.files[0].id};
+            $.blueimp.fileupload.prototype.options.add.call(that, e, data);
+          });
+        }
       }, Hyrax.config.uploader, options))
       .on('fileuploadadded', function (e, data) {
         $(e.currentTarget).find('button.cancel').removeAttr("hidden");
       });
-
       $(document).on('dragover', function(e) {
         var dropZone = $('.dropzone'),
             timeout = window.dropZoneTimeout;
         if (!timeout) {
-            dropZone.addClass('in');
+          dropZone.addClass('in');
         } else {
-            clearTimeout(timeout);
+          clearTimeout(timeout);
         }
         var found = false,
             node = e.target;
         do {
-            if (node === dropZone[0]) {
-                found = true;
-                break;
-            }
-            node = node.parentNode;
+          if (node === dropZone[0]) {
+            found = true;
+            break;
+          }
+          node = node.parentNode;
         } while (node !== null);
         if (found) {
-            dropZone.addClass('hover');
+          dropZone.addClass('hover');
         } else {
-            dropZone.removeClass('hover');
+          dropZone.removeClass('hover');
         }
         window.dropZoneTimeout = setTimeout(function () {
-            window.dropZoneTimeout = null;
-            dropZone.removeClass('in hover');
+          window.dropZoneTimeout = null;
+          dropZone.removeClass('in hover');
         }, 100);
       });
     }

data/app/assets/javascripts/hyrax.js

@@ -90,6 +90,7 @@
 //= require hyrax/collapse
 //= require hyrax/skip_to_content
 //= require hyrax/reports-buttons
+//= require hydra-editor/field_manager
 
 // this needs to be after batch_select so that the form ids get setup correctly
 //= require hyrax/batch_edit

data/app/assets/stylesheets/_bootstrap-default-overrides.scss

@@ -18,6 +18,10 @@ $warning: #565653 !default;
 // * Darkens the text for disabled pagination buttons on every page.
 $breadcrumb-active-color: #4c4c4c;
 $pagination-disabled-color: #4c4c4c;
+$blue: #0056B3 !default;
+// Adjusts link text to show as underlined and then not underlined on hover
+$link-decoration: underline !default;
+$link-hover-decoration: none !default;
 
 // Date picker on safari placeholder text was misaligned
 @media screen {

data/app/assets/stylesheets/hyrax/_card.scss

@@ -2,6 +2,10 @@
   margin-bottom: 20px;
 }
 
+#featured_works .card {
+  margin-bottom: 5px;
+}
+
 .card-title {
   margin-top: 0;
   margin-bottom: 0;

data/app/assets/stylesheets/hyrax/_catalog.scss

@@ -23,6 +23,16 @@
     }
   }
 
+  .search-results-title-row {
+    .badge {
+      margin-bottom: 6px;
+    }
+
+    .search-result-title {
+      margin-right: 16px;
+    }
+  }
+
   .collection-icon-search {
     padding-bottom: 20px;
   }
@@ -91,3 +101,14 @@
     display: inline-block;
   }
 }
+
+@media (max-width: 1199px) {
+  .sort-pagination {
+    display: block !important;
+  }
+}
+
+#search-results .search-result-wrapper .metadata a,
+#documents .document-metadata a {
+  word-break: break-all;
+}

data/app/assets/stylesheets/hyrax/_collections.scss

@@ -684,7 +684,7 @@ button.branding-banner-remove:hover {
 
   .pagination {
 
-    display: block;
+    display: flex;
     margin: 0;
     padding: 0;
 

data/app/assets/stylesheets/hyrax/_facets.scss

@@ -1,9 +1,21 @@
 #facet-panel-collapse {
-    display: inline-block !important; 
+    display: inline-block !important;
     width: 100%;
 }
 
-.navbar-toggler-icon {
+.facet-field-heading button.collapsed::after {
+    transition: transform 0.25s ease;
+}
+
+.facet-field-heading button::after {
+    transition: transform 0.25s ease;
+}
+
+.collapsing {
+    transition: height 0.25s ease;
+}
+
+.facets-header > .navbar-toggler {
     display: none;
 }
 
@@ -43,4 +55,4 @@ ul.facet-values.list-unstyled {
     content: "\f105";
     font-family: "FontAwesome";
     padding-left: 0.5rem;
-}
+}

data/app/assets/stylesheets/hyrax/_featured.scss

@@ -44,3 +44,7 @@ ol#featured_works {
   padding: 1em 0;
   border-bottom: 1px dotted $gray-lighter;
 }
+
+.dd-handle.dd3-handle {
+  z-index: 1;
+}

data/app/assets/stylesheets/hyrax/_form.scss

@@ -1,5 +1,9 @@
 .form-tab-content {
   margin: 15px 10px;
+
+  label {
+    font-weight: bold;
+  }
 }
 
 // For the admin page //

data/app/assets/stylesheets/hyrax/_forms.scss

@@ -1,6 +1,6 @@
 legend small {
   margin-left: 0.5em;
-  color: #999999;
+  color: #595959;
   font-size: 15px;
 }
 
@@ -40,6 +40,7 @@ legend small {
 
 .select2-container .select2-choice > .select2-chosen {
   max-width: 26em;
+  overflow: auto;
 }
 
 form {

data/app/assets/stylesheets/hyrax/_nestable.scss

@@ -47,12 +47,12 @@ tr.dd-item {
 
 .dd-placeholder,
 .dd-empty { margin: 5px 0; padding: 0; min-height: 30px; border: 1px dashed #b6bcbf; box-sizing: border-box; -moz-box-sizing: border-box; }
-.dd-empty { border: 1px dashed #bbb; min-height: 100px; 
-    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+.dd-empty { border: 1px dashed #bbb; min-height: 100px;
+    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
                       -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image:    -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+    background-image:    -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
                          -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image:         linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+    background-image:         linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
                               linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
     background-size: 60px 60px;
     background-position: 0 0, 30px 30px;
@@ -82,7 +82,7 @@ tr.dd-item {
     background: #fafafa;
     background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%);
     background:    -moz-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background:         linear-gradient(top, #fafafa 0%, #eee 100%);
+    background:         linear-gradient(to bottom, #fafafa 0%, #eee 100%);
     -webkit-border-radius: 3px;
             border-radius: 3px;
     box-sizing: border-box; -moz-box-sizing: border-box;
@@ -95,15 +95,16 @@ tr.dd-item {
 
 .dd3-item > button { margin-left: 30px; }
 
-.dd3-handle { 
+.dd3-handle {
     position: absolute; margin: 0; left: 0; top: 0; cursor: pointer; width: 30px;
     text-indent: 100px;
     white-space: nowrap; overflow: hidden;
     border: 1px solid #aaa;
     background: #ddd;
     background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background:    -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background:         linear-gradient(top, #ddd 0%, #bbb 100%);
+    background: -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
+    background: -o-linear-gradient(to bottom, #ddd 0%, #bbb 100%);
+    background: linear-gradient(to bottom, #ddd 0%, #bbb 100%);
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }

data/app/assets/stylesheets/hyrax/_select_work_type.scss

@@ -54,3 +54,15 @@
     }
   }
 }
+
+.select-work-admin-set {
+  margin: 20px;
+  select {
+    width: 100%;
+  }
+
+  .admin-set-title {
+    font-size: $h4-font-size;
+    margin-top: 0;
+  }
+}

data/app/assets/stylesheets/hyrax/_styles.scss

@@ -72,3 +72,7 @@ label.disabled {
     margin-bottom: 1rem;
   }
 }
+
+#content_block_page {
+  display: block;
+}

data/app/assets/stylesheets/hyrax/_work-show.scss

@@ -10,6 +10,9 @@
       margin-left: auto;
     }
   }
+  .dropdown-item {
+    font-size: 125%;
+  }
 }
 
 .no-preview,

data/app/controllers/concerns/hyrax/singular_subresource_controller.rb

@@ -6,12 +6,17 @@ module Hyrax
 
     included do
       before_action :find_work, only: :work
+      before_action :find_file_set, only: :file
       load_and_authorize_resource :work, only: :work
-      load_and_authorize_resource :file, class: 'FileSet', only: :file, id_param: :id
+      load_and_authorize_resource :file, only: :file
     end
 
     def find_work
-      @work = Hyrax::WorkRelation.new.find(params[:id])
+      @work = Hyrax.query_service.find_by(id: params[:id])
+    end
+
+    def find_file_set
+      @file = Hyrax.query_service.find_by(id: params[:id])
     end
   end
 end

data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb

@@ -11,10 +11,19 @@ module Hyrax
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def send_file_contents_valkyrie(file_set)
-      response.headers["Accept-Ranges"] = "bytes"
-      self.status = 200
+      # TODO: Refactor for goddess adapter usage
+      # This determines if we're dealing with active fedora or not. If we are,
+      # fallback to the original implementation.
       mime_type = params[:mime_type]
       file_metadata = find_file_metadata(file_set: file_set, use: use, mime_type: mime_type)
+      begin
+        ::Valkyrie::StorageAdapter.adapter_for(id: file_metadata.file_identifier)
+      rescue Valkyrie::StorageAdapter::AdapterNotFoundError
+        return show_active_fedora
+      end
+
+      response.headers["Accept-Ranges"] = "bytes"
+      self.status = 200
       return unless stale?(last_modified: file_metadata.updated_at, template: false)
 
       file = Valkyrie::StorageAdapter.find_by(id: file_metadata.file_identifier)

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -58,7 +58,7 @@ module Hyrax
       @admin_set_options = available_admin_sets
       # TODO: move these lines to the work form builder in Hyrax
       curation_concern.depositor = current_user.user_key
-      curation_concern.admin_set_id = admin_set_id_for_new
+      curation_concern.admin_set_id = params[:admin_set_id] || admin_set_id_for_new
       build_form
     end
 
@@ -263,6 +263,8 @@ module Hyrax
 
     def contextual_path(presenter, parent_presenter)
       ::Hyrax::ContextualPath.new(presenter, parent_presenter).show
+    rescue NoMethodError
+      ''
     end
 
     ##
@@ -385,7 +387,12 @@ module Hyrax
 
     def format_error_messages(errors)
       # the error may already be a string
-      errors.respond_to?(:messages) ? errors.messages.values.flatten.join("\n") : errors
+      return errors unless errors.respond_to?(:messages)
+
+      errors.messages.map do |field, messages|
+        field_name = field.to_s.humanize
+        messages.map { |message| "#{field_name} #{message.sub(/^./, &:downcase)}" }
+      end.flatten.join("\n")
     end
 
     def after_create_error(errors, original_input_params_for_form = nil)

data/app/controllers/hyrax/admin/analytics/collection_reports_controller.rb

@@ -5,7 +5,7 @@ module Hyrax
       class CollectionReportsController < AnalyticsController
         include Hyrax::BreadcrumbsForCollectionAnalytics
         def index
-          return unless Hyrax.config.analytics?
+          return unless Hyrax.config.analytics_reporting?
 
           @pageviews = Hyrax::Analytics.daily_events('collection-page-view')
           @work_page_views = Hyrax::Analytics.daily_events('work-in-collection-view')
@@ -21,7 +21,7 @@ module Hyrax
         end
 
         def show
-          return unless Hyrax.config.analytics?
+          return unless Hyrax.config.analytics_reporting?
           @document = ::SolrDocument.find(params[:id])
           @pageviews = Hyrax::Analytics.daily_events_for_id(@document.id, 'collection-page-view')
           @work_page_views = Hyrax::Analytics.daily_events_for_id(@document.id, 'work-in-collection-view')

data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb

@@ -4,9 +4,10 @@ module Hyrax
     module Analytics
       class WorkReportsController < AnalyticsController
         include Hyrax::BreadcrumbsForWorksAnalytics
+        before_action :authenticate_user!
 
         def index
-          return unless Hyrax.config.analytics?
+          return unless Hyrax.config.analytics_reporting?
 
           @accessible_works ||= accessible_works
           @accessible_file_sets ||= accessible_file_sets
@@ -14,10 +15,7 @@ module Hyrax
           @top_works = paginate(top_works_list, rows: 10)
           @top_file_set_downloads = paginate(top_files_list, rows: 10)
 
-          if current_user.ability.admin?
-            @pageviews = Hyrax::Analytics.daily_events('work-view')
-            @downloads = Hyrax::Analytics.daily_events('file-set-download')
-          end
+          @pageviews = Hyrax::Analytics.daily_events('work-view'), @downloads = Hyrax::Analytics.daily_events('file-set-download') if current_user.ability.admin?
 
           respond_to do |format|
             format.html
@@ -39,7 +37,7 @@ module Hyrax
   private
 
         def accessible_works
-          models = Hyrax.config.curation_concerns.map { |m| "\"#{m}\"" }
+          models = Hyrax::ModelRegistry.work_rdf_representations.map { |m| "\"#{m}\"" }
           if current_user.ability.admin?
             Hyrax::SolrService.query("has_model_ssim:(#{models.join(' OR ')})",
               fl: 'title_tesim, id, member_of_collections',
@@ -54,15 +52,16 @@ module Hyrax
         end
 
         def accessible_file_sets
+          file_set_model_clause = "has_model_ssim:\"#{Hyrax::ModelRegistry.file_set_rdf_representations.join('" OR "')}\""
           if current_user.ability.admin?
             Hyrax::SolrService.query(
-              "has_model_ssim:FileSet",
+              file_set_model_clause,
               fl: 'title_tesim, id',
               rows: 50_000
             )
           else
             Hyrax::SolrService.query(
-              "edit_access_person_ssim:#{current_user} AND has_model_ssim:FileSet",
+              "edit_access_person_ssim:#{current_user} AND #{file_set_model_clause}",
               fl: 'title_tesim, id',
               rows: 50_000
             )

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -231,7 +231,8 @@ module Hyrax
                                                                             banner_unchanged_indicator: params["banner_unchanged"] },
                           'collection_resource.save_collection_logo' => { update_logo_file_ids: params["logo_files"],
                                                                           alttext_values: params["alttext"],
-                                                                          linkurl_values: params["linkurl"] }
+                                                                          linkurl_values: params["linkurl"],
+                                                                          logo_unchanged_indicator: false }
                         )
                  .call(form)
         @collection = result.value_or { return after_update_errors(result.failure.first) }