hyrax 2.9.3 → 3.0.0.pre.beta1

data/app/actors/hyrax/actors/attach_members_actor.rb

@@ -30,18 +30,11 @@ module Hyrax
           # checking for existing works to avoid rewriting/loading works that are
           # already attached
           existing_works = env.curation_concern.member_ids
-          boolean_type_caster = ActiveModel::Type::Boolean.new
-
           attributes_collection.each do |attributes|
             next if attributes['id'].blank?
-            if boolean_type_caster.cast(attributes['_destroy'])
-              # Likely someone in the UI sought to add the collection, then
-              # changed their mind and checked the "delete" checkbox and posted
-              # their update.
-              next unless existing_works.include?(attributes['id'])
-              remove(env.curation_concern, attributes['id'])
+            if existing_works.include?(attributes['id'])
+              remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
             else
-              next if existing_works.include?(attributes['id'])
               add(env, attributes['id'])
             end
           end

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

@@ -31,7 +31,7 @@ module Hyrax
         # @param env [Hyrax::Actors::Enviornment]
         # @return [Boolean]
         #
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def assign_nested_attributes_for_collection(env)
           attributes_collection = env.attributes.delete(:member_of_collections_attributes)
@@ -46,24 +46,18 @@ module Hyrax
           attributes_collection = attributes_collection.sort_by { |i, _| i.to_i }.map { |_, attributes| attributes }
           # checking for existing works to avoid rewriting/loading works that are already attached
           existing_collections = env.curation_concern.member_of_collection_ids
-          boolean_type_caster = ActiveModel::Type::Boolean.new
           attributes_collection.each do |attributes|
             next if attributes['id'].blank?
-            if boolean_type_caster.cast(attributes['_destroy'])
-              # Likely someone in the UI sought to add the collection, then
-              # changed their mind and checked the "delete" checkbox and posted
-              # their update.
-              next unless existing_collections.include?(attributes['id'])
-              remove(env.curation_concern, attributes['id'])
+            if existing_collections.include?(attributes['id'])
+              remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
             else
-              next if existing_collections.include?(attributes['id'])
               add(env, attributes['id'])
             end
           end
 
           true
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+        # rubocop:enable Metrics/MethodLength
         # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         ##
@@ -121,6 +115,13 @@ module Hyrax
           curation_concern.member_of_collections.delete(collection)
         end
 
+        # Determines if a hash contains a truthy _destroy key.
+        # rubocop:disable Naming/PredicateName
+        def has_destroy_flag?(hash)
+          ActiveFedora::Type::Boolean.new.cast(hash['_destroy'])
+        end
+        # rubocop:enable Naming/PredicateName
+
         # Extact a singleton collection id from the collection attributes and save it in env.  Later in the actor stack,
         # in apply_permission_template_actor.rb, `env.attributes[:collection_id]` will be used to apply the
         # permissions of the collection to the created work.  With one and only one collection, the work is seen as

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

@@ -64,8 +64,7 @@ module Hyrax
         # 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 = {})
-          import_url = URI.decode_www_form_component(uri.to_s)
-          ::FileSet.new(import_url: import_url, label: file_name) do |fs|
+          ::FileSet.new(import_url: uri.to_s, 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)

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

@@ -129,12 +129,12 @@ module Hyrax
         # @note This is only useful for labeling the file_set, because of the recourse to import_url
         def label_for(file)
           if file.is_a?(Hyrax::UploadedFile) # filename not present for uncached remote file!
-            file.uploader.filename.present? ? file.uploader.filename : File.basename(Addressable::URI.unencode(file.file_url))
+            file.uploader.filename.present? ? file.uploader.filename : File.basename(Addressable::URI.parse(file.file_url).path)
           elsif file.respond_to?(:original_name) # e.g. Hydra::Derivatives::IoDecorator
             file.original_name
           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))
+            File.basename(Addressable::URI.parse(file_set.import_url).path)
           else
             File.basename(file)
           end

data/app/actors/hyrax/actors/transactional_request.rb

@@ -1,24 +1,24 @@
 module Hyrax
   module Actors
-    # Used to wrap the stack in a database transaction.
-    # This would have rolled back any database actions (particularly workflow) if there
+    # Wrap the stack in a database transaction.
+    # This will roll back any database actions (particularly workflow) if there
     # is an error elsewhere in the actor stack.
-    # This was problematic, is removed in v3.0, and is currently a no-op
-    # Backport of https://github.com/samvera/hyrax/pull/3482
     class TransactionalRequest < Actors::AbstractActor
-      # rubocop:disable Rails/Delegate
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
-        next_actor.create(env)
+        ActiveRecord::Base.transaction do
+          next_actor.create(env)
+        end
       end
 
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if update was successful
       def update(env)
-        next_actor.update(env)
+        ActiveRecord::Base.transaction do
+          next_actor.update(env)
+        end
       end
-      # rubocop:enable Rails/Delegate
     end
   end
 end

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/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/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 {