hyrax 2.9.6 → 3.0.0.pre.beta1

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

@@ -10,34 +10,6 @@ export default class Autocomplete {
    * @param {string} url - The url for the autocompete search endpoint
    */
   setup (element, fieldName, url) {
-    if(element.data('autocomplete-type') && element.data('autocomplete-type').length > 0) {
-      this.byDataAttribute(element, url)
-    } else {
-      this.byFieldName(element, fieldName, url)
-    }
-  }
-
-  byDataAttribute(element, url) {
-    let type = element.data('autocomplete-type')
-    let exlude = element.data('exclude-work')
-    if(type === 'resource' && exclude.length > 0) {
-      new Resource(
-        element,
-        url,
-        { excluding: exclude }
-      )
-    } else if(type === 'resource' ) {
-      new Resource(
-        element,
-        url)
-    } else if(type === 'linked') {
-      new LinkedData(element, url)
-    } else {
-      new Default(element, url)
-    }
-  }
-
-  byFieldName(element, fieldName, url) {
     switch (fieldName) {
       case 'work':
         new Resource(
@@ -58,5 +30,4 @@ export default class Autocomplete {
         break
     }
   }
-
 }

data/app/assets/javascripts/hyrax/collections/editor.es6

@@ -4,24 +4,14 @@ import tabifyForm from 'hyrax/tabbed_form'
 
 // Controls the behavior of the Collections edit form
 // Add search for thumbnail to the edit descriptions
-// this method used to simply replace the string edit
-// but now replaces the last url part if and only if
-// that part is edit
 export default class {
   constructor(elem) {
+    let url =  window.location.pathname.replace('edit', 'files')
     let field = elem.find('#collection_thumbnail_id')
-    this.thumbnailSelect = new ThumbnailSelect(this.url(), field)
+    this.thumbnailSelect = new ThumbnailSelect(url, field)
     tabifyForm(elem.find('form.editor'))
 
     let participants = new Participants(elem.find('#participants'))
     participants.setup()
   }
-
-  url() {
-    let urlParts = window.location.pathname.split("/")
-    if(urlParts[urlParts.length - 1] === "edit") {
-      urlParts[urlParts.length - 1] = "files"
-    }
-    return urlParts.join("/") 
-  }
 }

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

@@ -53,16 +53,17 @@ export default class {
       $('[data-autocomplete]').each((function() {
         var elem = $(this)
         autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
-        elem.parents('.multi_value.form-group').manage_fields({
-          add: function(e, element) {
-            var elem = $(element)
-            // Don't mark an added element as readonly even if previous element was
-            // Enable before initializing, as otherwise LinkedData fields remain disabled
-            elem.attr('readonly', false)
-            autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
-          }
-        })
       }))
+
+      $('.multi_value.form-group').manage_fields({
+        add: function(e, element) {
+          var elem = $(element)
+          // Don't mark an added element as readonly even if previous element was
+          // Enable before initializing, as otherwise LinkedData fields remain disabled
+          elem.attr('readonly', false)
+          autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
+        }
+      })
   }
 
   // initialize any controlled vocabulary widgets

data/app/assets/javascripts/hyrax.js

@@ -104,7 +104,6 @@
 //= require hyrax/tabbed_form
 //= require hyrax/turbolinks_events
 //= require hyrax/i18n_helper
-//= require hyrax/skip_to_content
 
 // this needs to be after batch_select so that the form ids get setup correctly
 //= require hyrax/batch_edit

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

@@ -401,22 +401,8 @@ button.branding-banner-remove:hover {
   .section-add-sharing {
     padding-bottom: 40px;
 
-    .form-inline {
-      label {
-        padding-right: 5px;
-        text-align: right;
-        width: 100px;
-      }
-
-      input,
-      select,
-      .select2-container {
-        width: 200px;
-      }
-
-      .btn {
-        width: 75px;
-      }
+    .sharing-row-form {
+      margin-bottom: $padding-large-vertical;
     }
   }
 

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

@@ -11,6 +11,10 @@ ol#featured_works {
   min-height: 100px;
   padding: 8px;
 
+  &:first-of-type {
+    border-top: 0;
+  }
+
   h3 {
     font-size: 1.1em;
     margin-top: 0;

data/app/assets/stylesheets/hyrax/_file-listing.scss

@@ -97,8 +97,7 @@ h4 .small {
   text-decoration: none;
 }
 
-input.batch_document_selector,
-input.disabled {
+input.batch_document_selector {
   margin: 10px 10px 2px 10px;
   padding: 0px;
 }

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

@@ -29,8 +29,6 @@ legend small {
   padding-left:1.2em;
 }
 
-.form-group { margin-bottom: 2em; }
-
 .form-group.has-error input,
 .form-group.has-error option,
 .form-group.has-error textarea {

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

@@ -26,7 +26,7 @@ header > .navbar {
 }
 
 .dropdown-toggle:focus {
-  outline: 2px auto  Highlight; // FireFox
+  outline: 2px auto Highlight; // FireFox
   outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari
   outline: -2px;
 }

data/app/assets/stylesheets/hyrax/_home-page.scss

@@ -69,7 +69,14 @@
 
 .home-content {
   .nav {
-    margin-bottom: 20px;
+    margin-bottom: $padding-large-vertical * 2;
+  }
+
+  // Give some separation between the Works and Collections columns, which stack up vertically on mobile
+  @media screen and (max-width: 640px) {
+    > div {
+      margin-bottom: $padding-large-vertical * 3;
+    }
   }
 }
 
@@ -84,12 +91,12 @@
   }
 }
 
-.home_share_work {
-  margin-bottom: $padding-large-vertical * 2.5;
+.home-share-work {
+  margin-bottom: $padding-large-vertical * 4;
+  margin-top: $padding-large-vertical * 2;
 
-  p {
-    margin: 0.25em auto;
-    width: 40%;
+  .terms-of-use {
+    margin-top: $padding-large-vertical;
   }
 }
 

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

@@ -1,15 +1,15 @@
 @import 'hydra-editor/multi_value_fields';
 @import 'hyrax/variables', 'hyrax/file_sets', 'hyrax/settings', 'hyrax/header',
-        'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
-        'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types', 'hyrax/batch-edit',
-        'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats', 'hyrax/catalog',
-        'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights', 'hyrax/file-show',
-        'hyrax/work-show', 'hyrax/modal', 'hyrax/forms', 'hyrax/form',
-        'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
-        'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
-        'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
-        'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
-        'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
+  'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
+  'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types',
+  'hyrax/batch-edit', 'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats',
+  'hyrax/catalog', 'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights',
+  'hyrax/file-show', 'hyrax/work-show', 'hyrax/modal', 'hyrax/forms',
+  'hyrax/form', 'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
+  'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
+  'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
+  'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
+  'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
 @import 'typeahead';
 @import 'sharing_buttons';
 

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

@@ -0,0 +1,20 @@
+// Login / Sign up styles needed because Devise gem controls the markup
+form.new_user {
+  margin-bottom: 1rem;
+
+  .field {
+    @extend .form-group;
+
+    input[type='email'],
+    input[type='input'],
+    input[type='password'] {
+      @extend .form-control;
+      width: 300px;
+    }
+  }
+
+  input[type='submit'] {
+    @extend .btn;
+    @extend .btn-primary;
+  }
+}

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

@@ -36,11 +36,6 @@ ul.tabular {
   list-style: none;
 }
 
-.show-actions {
-  padding: $panel-body-padding;
-  // text-align: center;
-}
-
 .work-show {
   dt,
   dd {
@@ -53,6 +48,10 @@ ul.tabular {
 
 .work-type-tag {
   color: #808080;
+  font-size: 24px;
+  font-weight: 500;
+  margin-bottom: $padding-large-vertical;
+  margin-top: $padding-large-vertical * 2;
 }
 
 .work-type {
@@ -65,6 +64,44 @@ ul.tabular {
       word-break: break-word;
     }
   }
+
+  // Button row which sits below the title, and above panel content for a page
+  .button-row-top-two-column {
+    margin-bottom: $padding-large-vertical;
+    margin-top: $padding-large-vertical;
+
+    @media screen and (max-width: 767px) {
+      > div {
+        text-align: center;
+
+        &:first-child {
+          padding-bottom: $padding-small-vertical;
+        }
+      }
+    }
+  }
+}
+
+.work-title-wrapper {
+  margin-bottom: $padding-large-vertical * 2;
+
+  .title-with-badges {
+    align-items: center;
+    display: flex;
+
+    h1,
+    h2 {
+      margin: 0;
+    }
+
+    .label {
+      margin-left: 5px;
+
+      &:first-of-type {
+        margin-left: 10px;
+      }
+    }
+  }
 }
 
 .panel-workflow {

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

@@ -15,20 +15,6 @@ module Hyrax::Controller
     hyrax.dashboard_path
   end
 
-  ##
-  # @deprecated this helper is no longer used by Hyrax; if you need access to
-  #   this presenter on every page, you may need to readd it manually.
-  #
-  # A presenter for selecting a work type to create this is needed here because
-  # the selector is in the header on every page.
-  def create_work_presenter
-    Deprecation.warn(self, "The `create_work_presenter` helper is deprecated " \
-                           "for removal in Hyrax 3.0. The work selector has " \
-                           "been removed the masthead in Hyrax 2.1.")
-
-    Hyrax::SelectTypeListPresenter.new(current_user)
-  end
-
   # Ensure that the locale choice is persistent across requests
   def default_url_options
     super.merge(locale: I18n.locale)

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

@@ -29,7 +29,6 @@ module Hyrax
       end
 
       def send_local_file_contents
-        return unless stale?(last_modified: local_file_last_modified, template: false)
         self.status = 200
         prepare_local_file_headers
         # For derivatives stored on the local file system
@@ -66,7 +65,7 @@ module Hyrax
         response.headers['Content-Type'] = local_file_mime_type
         response.headers['Content-Length'] ||= local_file_size.to_s
         # Prevent Rack::ETag from calculating a digest over body
-        response.headers['Last-Modified'] ||= local_file_last_modified.httpdate
+        response.headers['Last-Modified'] = local_file_last_modified.utc.strftime("%a, %d %b %Y %T GMT")
         self.content_type = local_file_mime_type
       end
 

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

@@ -11,11 +11,9 @@ module Hyrax
       copy_blacklight_config_from(::CatalogController)
 
       class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
-      class_attribute :iiif_manifest_builder, instance_accessor: false
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
-      self.iiif_manifest_builder = nil
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
 
@@ -129,29 +127,14 @@ module Hyrax
 
     def manifest
       headers['Access-Control-Allow-Origin'] = '*'
-
-      json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
-
       respond_to do |wants|
-        wants.json { render json: json }
-        wants.html { render json: json }
+        wants.json { render json: manifest_builder.to_h }
+        wants.html { render json: manifest_builder.to_h }
       end
     end
 
     private
 
-      def iiif_manifest_builder
-        self.class.iiif_manifest_builder ||
-          (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
-      end
-
-      def iiif_manifest_presenter
-        IiifManifestPresenter.new(curation_concern_from_search_results).tap do |p|
-          p.hostname = request.base_url
-          p.ability = current_ability
-        end
-      end
-
       def user_collections
         collections_service.search_results(:deposit)
       end
@@ -174,6 +157,10 @@ module Hyrax
         @form = work_form_service.build(curation_concern, current_ability, self)
       end
 
+      def manifest_builder
+        ::IIIFManifest::ManifestFactory.new(presenter)
+      end
+
       def actor
         @actor ||= Hyrax::CurationConcern.actor
       end

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -50,13 +50,6 @@ module Hyrax
       obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
       obj.date_modified = Time.current.ctime
 
-      if params[:visibility]
-        Deprecation.warn(self, "visibility is not submitted by the Hyrax UI and is deprecated " \
-                               "for removal in Hyrax 3.0. Please use " \
-                               "#{form_class.model_name.param_key}[visibility] instead.")
-        obj.visibility = params[:visibility]
-      end
-
       InheritPermissionsJob.perform_now(obj)
       VisibilityCopyJob.perform_now(obj)
 

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

@@ -279,10 +279,10 @@ module Hyrax
           public_files = []
           uploaded_file_ids.each_with_index do |ufi, i|
             if ufi.include?('public')
-              update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
+              update_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
               public_files << ufi
             else # brand new one, insert in the database
-              logo_info = create_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
+              logo_info = create_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
               public_files << logo_info.local_path
             end
           end
@@ -458,17 +458,6 @@ module Hyrax
         def params_for_query
           params.merge(q: params[:cq])
         end
-
-        # Only accept HTTP|HTTPS urls;
-        # @return <String> the url
-        def verify_linkurl(linkurl)
-          url = Loofah.scrub_fragment(linkurl, :prune).to_s
-          url if valid_url?(url)
-        end
-
-        def valid_url?(url)
-          (url =~ URI.regexp(['http', 'https']))
-        end
     end
   end
 end

data/app/controllers/hyrax/depositors_controller.rb

@@ -45,10 +45,12 @@ module Hyrax
       end
 
       def send_proxy_depositor_added_messages(grantor, grantee)
-        message_to_grantee = "#{grantor.name} has assigned you as a proxy depositor"
-        message_to_grantor = "You have assigned #{grantee.name} as a proxy depositor"
-        Hyrax::MessengerService.deliver(::User.batch_user, grantor, message_to_grantor, "Proxy Depositor Added")
-        Hyrax::MessengerService.deliver(::User.batch_user, grantee, message_to_grantee, "Proxy Depositor Added")
+        message_to_grantee = I18n.t('hyrax.notifications.proxy_depositor_added.grantee_message', grantor: grantor.name)
+        message_to_grantor = I18n.t('hyrax.notifications.proxy_depositor_added.grantor_message', grantee: grantee.name)
+        Hyrax::MessengerService.deliver(::User.batch_user, grantor, message_to_grantor,
+                                        I18n.t('hyrax.notifications.proxy_depositor_added.subject'))
+        Hyrax::MessengerService.deliver(::User.batch_user, grantee, message_to_grantee,
+                                        I18n.t('hyrax.notifications.proxy_depositor_added.subject'))
       end
 
       def decide_layout

data/app/controllers/hyrax/downloads_controller.rb

@@ -43,16 +43,7 @@ module Hyrax
         authorize! :download, params[asset_param_key]
       rescue CanCan::AccessDenied
         unauthorized_image = Rails.root.join("app", "assets", "images", "unauthorized.png")
-        if File.exist? unauthorized_image
-          send_file unauthorized_image, status: :unauthorized
-        else
-          Deprecation.warn(self, "redirect_to default_image is deprecated and will be removed from Hyrax 3.0 (copy unauthorized.png image to directory assets/images instead)")
-          redirect_to default_image
-        end
-      end
-
-      def default_image
-        ActionController::Base.helpers.image_path 'default.png'
+        send_file unauthorized_image, status: :unauthorized
       end
 
       # Overrides Hydra::Controller::DownloadBehavior#load_file, which is hard-coded to assume files are in BasicContainer.

data/app/controllers/hyrax/file_sets_controller.rb

@@ -85,18 +85,13 @@ module Hyrax
           actor.revert_content(params[:revision])
         elsif params.key?(:file_set)
           if params[:file_set].key?(:files)
-            actor.update_content(uploaded_file_from_path)
+            actor.update_content(params[:file_set][:files].first)
           else
             update_metadata
           end
         end
       end
 
-      def uploaded_file_from_path
-        uploaded_file = CarrierWave::SanitizedFile.new(params[:file_set][:files].first)
-        Hyrax::UploadedFile.create(user_id: current_user.id, file: uploaded_file)
-      end
-
       def after_update_response
         respond_to do |wants|
           wants.html do

data/app/controllers/hyrax/single_use_links_controller.rb

@@ -18,22 +18,22 @@ module Hyrax
     end
 
     def create_download
-      @su = SingleUseLink.create itemId: params[:id], path: hyrax.download_path(id: params[:id])
-      render plain: hyrax.download_single_use_link_url(@su.downloadKey)
+      @su = SingleUseLink.create item_id: params[:id], path: hyrax.download_path(id: params[:id])
+      render plain: hyrax.download_single_use_link_url(@su.download_key)
     end
 
     def create_show
-      @su = SingleUseLink.create(itemId: params[:id], path: asset_show_path)
-      render plain: hyrax.show_single_use_link_url(@su.downloadKey)
+      @su = SingleUseLink.create(item_id: params[:id], path: asset_show_path)
+      render plain: hyrax.show_single_use_link_url(@su.download_key)
     end
 
     def index
-      links = SingleUseLink.where(itemId: params[:id]).map { |link| show_presenter.new(link) }
+      links = SingleUseLink.where(item_id: params[:id]).map { |link| show_presenter.new(link) }
       render partial: 'hyrax/file_sets/single_use_link_rows', locals: { single_use_links: links }
     end
 
     def destroy
-      SingleUseLink.find_by_downloadKey(params[:link_id]).destroy
+      SingleUseLink.find_by_download_key(params[:link_id]).destroy
       head :ok
     end
 

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -18,7 +18,7 @@ module Hyrax
     end
 
     def show
-      _, document_list = search_results(id: single_use_link.itemId)
+      _, document_list = search_results(id: single_use_link.item_id)
       curation_concern = document_list.first
 
       # Authorize using SingleUseLinksViewerController::Ability
@@ -30,7 +30,7 @@ module Hyrax
 
       # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
       @su = single_use_link.create_for_path hyrax.download_path(curation_concern.id)
-      @download_link = hyrax.download_single_use_link_path(@su.downloadKey)
+      @download_link = hyrax.download_single_use_link_path(@su.download_key)
     end
 
     private
@@ -51,7 +51,7 @@ module Hyrax
       end
 
       def single_use_link
-        @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
+        @single_use_link ||= SingleUseLink.find_by_download_key!(params[:id])
       end
 
       def not_found_exception
@@ -59,7 +59,7 @@ module Hyrax
       end
 
       def asset
-        @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
+        @asset ||= ActiveFedora::Base.find(single_use_link.item_id)
       end
 
       def current_ability
@@ -88,7 +88,7 @@ module Hyrax
 
           @single_use_link = single_use_link
           can :read, [ActiveFedora::Base, ::SolrDocument] do |obj|
-            single_use_link.valid? && single_use_link.itemId == obj.id && single_use_link.destroy!
+            single_use_link.valid? && single_use_link.item_id == obj.id && single_use_link.destroy!
           end
         end
       end

data/app/controllers/hyrax/users_controller.rb

@@ -41,7 +41,7 @@ module Hyrax
 
       def find_user
         @user = ::User.from_url_component(params[:id])
-        redirect_to root_path, alert: "User does not exist" unless @user
+        redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
       end
 
       def sort_value

data/app/forms/hyrax/forms/workflow_responsibility_form.rb

@@ -12,9 +12,9 @@ module Hyrax
         @model ||= Sipity::WorkflowResponsibility.new
       end
 
-      # def to_model
-      #   model_instance
-      # end
+      def to_model
+        model_instance
+      end
 
       delegate :model_name, :to_key, :workflow_role_id, :persisted?, :save!, to: :model_instance
 

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -12,7 +12,6 @@ module Hyrax
     include Hyrax::ChartsHelper
     include Hyrax::DashboardHelperBehavior
     include Hyrax::IiifHelper
-    include Hyrax::WorkFormHelper
 
     # Which translations are available for the user to select
     # @return [Hash<String,String>] locale abbreviations as keys and flags as values

data/app/indexers/hyrax/collection_indexer.rb

@@ -11,7 +11,9 @@ module Hyrax
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Collections show under the "Collections" tab
-        solr_doc['generic_type_sim'] = ["Collection"]
+        Solrizer.set_field(solr_doc, 'generic_type', 'Collection', :facetable)
+        # Index the size of the collection in bytes
+        solr_doc[Solrizer.solr_name(:bytes, STORED_LONG)] = object.bytes
         solr_doc['visibility_ssi'] = object.visibility
 
         object.in_collections.each do |col|