hyrax 3.4.2 → 4.0.0.beta2

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

@@ -1,5 +1,5 @@
-@import 'morris.js/0.5.1/morris';
-@import 'bootstrap/variables';
+@import "morris";
+@import "bootstrap/variables";
 $tab-margin: 44px !default;
 $title-text-color: #4e4a42 !default;
 $body-background-color: #f0f0f0 !default;
@@ -9,7 +9,7 @@ $admin-sidebar-profile-background-color: #505050 !default;
 $admin-sidebar-section-heading-color: #dedede !default;
 $admin-sidebar-link-color: #ffffff !default;
 $admin-sidebar-link-hover-color: #000000 !default;
-$admin-sidebar-link-background-color: #505050 !default;
+$admin-sidebar-link-background-color: #eeeeee !default;
 $admin-content-background-color: #f0f0f0 !default;
 $admin-vertical-padding: 0 !default;
 $admin-panel-border-color: #dedede !default;
@@ -37,11 +37,7 @@ $admin-panel-border-color: #dedede !default;
 
 body.dashboard {
   background-color: $body-background-color;
-  padding-top: $navbar-height;
-
-  @media only screen and (max-width : 767px) {
-    padding-top: 0;
-  }
+  padding-top: 3.5rem;
 }
 
 .dashboard {
@@ -49,42 +45,6 @@ body.dashboard {
     font-size: 1.1em;
   }
 
-  .tabs {
-    margin-top: $tab-margin;
-    position: relative;
-  }
-
-  .nav-tabs {
-    border-bottom: 0;
-    margin-bottom: 0;
-    margin-top: -$tab-margin;
-    padding: 0 5px;
-  }
-
-  .nav-tabs > li > a {
-    border-top: 2px solid transparent;
-  }
-
-  .nav-tabs > li.active > a,
-  .nav-tabs > li.active > a:hover {
-    border-top: 2px solid $tab-active-accent-color;
-  }
-
-  /* The #masthead selector below could (and ideally, should) be removed if we can
-   * replace the "navbar-static-top" class with "navbar-fixed-top" for the Admin UI only
-   */
-  #masthead {
-    border: 0;
-    left: 0;
-    position: fixed;
-    right: 0;
-    top: 0;
-
-    @media only screen and (max-width : 767px) {
-      position: initial;
-    }
-  }
-
   /* This is needed in Chrome for the admin/admin_sets edit view AND the collection
    * sharing edit view to render the participants tab
    * Without this the contents of that tab flow off the right-hand side of the screen
@@ -103,30 +63,30 @@ body.dashboard {
     margin-top: 0;
 
     h1 {
-      font-size: $font-size-h2;
-      margin-left: $padding-xs-horizontal;
-      margin-top: $padding-base-vertical;
+      font-size: $h2-font-size;
+      margin-left: $table-cell-padding-sm;
+      margin-top: $input-btn-padding-y;
 
       .fa {
         color: $gray;
-        margin-right: $padding-xs-horizontal;
+        margin-right: $table-cell-padding-sm;
       }
     }
 
-
     .btn {
-      margin-bottom: $padding-base-vertical;
+      margin-bottom: $input-btn-padding-y;
     }
   }
 
   // the span selector is required because Blacklight is using it.
-  .list-filters-label, span.constraints-label {
+  .list-filters-label,
+  span.constraints-label {
     font-weight: bold;
     margin-right: 2em;
   }
 
   .constraints-container {
-    padding: $panel-heading-padding;
+    padding: $card-spacer-y $card-spacer-x;
 
     .start-over {
       padding: 4px 6px;
@@ -134,44 +94,25 @@ body.dashboard {
   }
 
   .table {
-     .date,
-     .action {
+    .date,
+    .action {
       width: 13ch;
     }
   }
 
   .list-filters {
-    background-color: $panel-default-heading-bg;
+    background-color: $card-cap-bg;
     margin-bottom: 20px;
-    padding: $panel-heading-padding;
+    padding: $card-spacer-y $card-spacer-x;
 
-    .btn-group > .facet-values {
-      display: none;
-    }
-    .btn-group.open > .facet-values {
-      display: table;
-    }
-
-    .facet-values {
-      width: 20em; // TODO: make this responsive.
+    .dropdown-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
     }
 
     .facet-label {
-      padding: 3px 20px;
-      font-weight: 400;
-      line-height: 1.42857143;
-      color: #333;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .facet-count {
-      padding: 3px 20px;
-      font-weight: 400;
-      line-height: 1.42857143;
-      color: #333;
-      white-space: nowrap;
+      padding-right: 20px;
     }
   }
 
@@ -179,7 +120,7 @@ body.dashboard {
     padding: 0;
   }
 
-  .user-activity .panel-body {
+  .user-activity .card-body {
     overflow: scroll;
     max-height: 20em;
   }
@@ -206,47 +147,8 @@ body.dashboard {
     margin-bottom: 0;
   }
 
-  // The select collection modal for batch operations
-  .collection-list-modal {
-    .modal-content {
-      float: left;
-      .modal-header,
-      .modal-footer,
-      .modal-body {
-        float: left;
-        width: 100%;
-      }
-    }
-  }
-
-  .panel {
-    border: 1px solid $admin-panel-border-color;
-    float: left;
-    width: 100%;
-
-    .panel-heading,
-    .panel-footer,
-    .panel-body,
-    .list-group-item {
-      float: left;
-      width: 100%;
-    }
-
-    .panel-title {
-      color: $title-text-color;
-      display: block;
-      font-size: 18px;
-      font-weight: 600;
-      line-height: 30px;
-
-      &.h2 {
-        font-size: 22px;
-      }
-    }
-  }
-
-  .panel.panel-default.labels {
-    border-top: 1px solid $panel-default-border;
+  .card.labels {
+    border-top: 1px solid $card-border-color;
     margin-bottom: 0;
   }
 
@@ -254,3 +156,19 @@ body.dashboard {
     margin-bottom: 5px;
   }
 }
+
+.card.tabs {
+  background-color: transparent;
+
+  > .card-body {
+    background-color: white;
+  }
+}
+
+#form_workflows .card-body .radio label span input {
+  margin-right: 0.5rem;
+}
+
+div.main-content.maximized.admin-stats {
+  background-color: white;
+}

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

@@ -18,28 +18,34 @@ $gutter-width: $grid-gutter-width/2;
 // .sidebar is a class on the div
 .sidebar {
   background-color: $admin-sidebar-background-color;
-  padding-top: $admin-vertical-padding;
+  min-height: 100vh;
+  padding-bottom: 2rem;
   position: absolute;
-  transition: width .1s;
+  transition: width 0.1s;
   width: $drawer-small;
   z-index: 1000;
-  min-height: 600px;
-  min-height: 100vh;
 
   &.maximized {
-    .h5, .sidebar-action-text, .profile, .collapse-toggle::after {
+    width: $drawer-large;
+
+    .h5,
+    .sidebar-action-text,
+    .profile,
+    .collapse-toggle::after {
       opacity: 1;
     }
-    width: $drawer-large;
 
     .sidebar-toggle {
       transform: rotate(-180deg);
     }
 
     .nav-pills > li {
+      width: 100%;
+
       a {
         padding-left: 24px;
       }
+
       ul > li a {
         padding-left: 52px;
       }
@@ -61,6 +67,7 @@ $gutter-width: $grid-gutter-width/2;
     width: 18px;
     z-index: 1001;
   }
+
   a {
     color: $admin-sidebar-link-color;
   }
@@ -72,6 +79,7 @@ $gutter-width: $grid-gutter-width/2;
   .sidebar-action-text {
     opacity: 0;
   }
+
   .h5 {
     color: $admin-sidebar-section-heading-color;
     opacity: 0;
@@ -102,29 +110,41 @@ $gutter-width: $grid-gutter-width/2;
   .nav {
     margin-left: 0;
     margin-right: 0;
+
     li {
-      overflow: hidden;
       white-space: nowrap;
+
+      > a:hover, > a:focus {
+        text-decoration: none;
+        background-color: $admin-sidebar-link-background-color;
+      }
     }
+    
     li .fa {
-      margin-right: $padding-base-horizontal;
+      margin-right: $input-btn-padding-x;
     }
   }
 
-  .nav-pills > li > a {
-    border-radius: 0;
-    padding: 12px 10px 12px 12px;
+  .nav-pills > li {
+    > a {
+      border-radius: 0;
+    }
 
-    &:focus {
-      background-color: transparent;
-      color: $admin-sidebar-link-color;
+    > a.collapse-toggle.nav-link {
+      background-color: unset;
+
+      &:hover {
+        background-color: $admin-sidebar-link-background-color;
+      }
     }
-  }
 
-  .nav-pills > li.active > a,
-  .nav-pills > li.active > a:focus,
-  .nav-pills > li.active > a:hover {
-    background-color: $admin-sidebar-link-background-color;
+    &.active > a,
+    &.active > a:focus,
+    &.active > a:hover {
+      text-decoration: none;
+      background-color: $admin-sidebar-link-background-color;
+      color: $admin-sidebar-link-hover-color;
+    }
   }
 
   // submenu items

data/app/components/hyrax/dropdown_facet_field_component.html.erb

@@ -0,0 +1,21 @@
+<fieldset class="btn-group">
+  <legend class="sr-only"><%= @facet_field.label %></legend>
+  <button class="btn btn-secondary dropdown-toggle" type="button" id="<%= @facet_field.key.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-controls="<%= @facet_field.key.parameterize + '-dropdown-options' %>">
+    <%= @facet_field.label %>
+  </button>
+  <ul class="dropdown-menu" id="<%= @facet_field.key.parameterize + '-dropdown-options' %>">
+    <% facet_item_presenters.each do |item| -%>
+      <li class="dropdown-item">
+        <%= render Blacklight::FacetItemComponent.new(facet_item: item, wrapping_element: nil) %>
+      </li>
+    <% end %>
+
+    <% if @facet_field.modal_path %>
+      <li class="dropdown-item more_facets">
+        <%= link_to t("more_#{@facet_field.key}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: @facet_field.label),
+          @facet_field.modal_path,
+          data: { blacklight_modal: 'trigger' } %>
+      </li>
+    <% end %>
+  </ul>
+</fieldset>

data/app/components/hyrax/dropdown_facet_field_component.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  class DropdownFacetFieldComponent < Blacklight::FacetFieldListComponent
+    def facet_item_presenters
+      return to_enum(:facet_item_presenters) unless block_given?
+
+      @facet_field.paginator.items.each do |item|
+        skipped = facet_config.skip_item&.call(item)
+
+        yield facet_item_presenter(item) unless skipped
+
+        item.items&.each do |subitem|
+          yield facet_item_presenter(subitem.dup.tap { |i| i.fq = nil if skipped })
+        end
+      end
+    end
+
+    def facet_item_presenter(facet_item)
+      config = facet_config(facet_item.field)
+
+      (config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, config, helpers, facet_item.field)
+    end
+
+    def facet_config(key = nil)
+      return @facet_field.facet_field if key.nil?
+
+      helpers.blacklight_config.facet_fields[key]
+    end
+  end
+end

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

@@ -12,6 +12,10 @@ module Hyrax
       # This is needed as of BL 3.7
       copy_blacklight_config_from(::CatalogController)
 
+      before_action do
+        blacklight_config.track_search_session = false
+      end
+
       class_attribute :presenter_class,
                       :form_class,
                       :single_item_search_builder_class,
@@ -32,6 +36,11 @@ module Hyrax
       @curation_concern = @collection # we must populate curation_concern
       presenter
       query_collection_members
+
+      respond_to do |format|
+        format.html
+        format.json { render json: @curation_concern }
+      end
     end
 
     def collection
@@ -57,13 +66,6 @@ module Hyrax
       Hyrax::SearchService.new(config: blacklight_config, user_params: params.except(:q, :page), scope: self, search_builder_class: single_item_search_builder_class)
     end
 
-    # Instantiates the search builder that builds a query for a single item
-    # this is useful in the show view.
-    def single_item_search_builder
-      search_service.search_builder
-    end
-    deprecation_deprecate :single_item_search_builder
-
     def collection_params
       form_class.model_attributes(params[:collection])
     end
@@ -74,11 +76,15 @@ module Hyrax
       @_prefixes ||= super + ['catalog', 'hyrax/base']
     end
 
+    # rubocop:disable Style/GuardClause
     def query_collection_members
       load_member_works
-      load_member_subcollections if collection.collection_type.nestable?
-      load_parent_collections if collection.collection_type.nestable? && action_name == 'show'
+      if Hyrax::CollectionType.for(collection: collection).nestable?
+        load_member_subcollections
+        load_parent_collections if action_name == 'show'
+      end
     end
+    # rubocop:enable Style/GuardClause
 
     # Instantiate the membership query service
     def collection_member_service

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

@@ -15,8 +15,8 @@ module Hyrax
     # Removes a single embargo
     def destroy
       Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
-      flash[:notice] = curation_concern.embargo_history.last
-      if curation_concern.work? && curation_concern.file_sets.present?
+      flash[:notice] = embargo_history(curation_concern)
+      if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else
         redirect_to edit_embargo_path
@@ -60,10 +60,19 @@ module Hyrax
     end
 
     def edit
+      @curation_concern = Hyrax::Forms::WorkEmbargoForm.new(curation_concern).prepopulate! if
+        Hyrax.config.use_valkyrie?
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.embargoes.index.manage_embargoes'), hyrax.embargoes_path
       add_breadcrumb t(:'hyrax.embargoes.edit.embargo_update'), '#'
     end
+
+    private
+
+    def embargo_history(concern)
+      concern.try(:embargo_history) ||
+        concern.try(:embargo)&.embargo_history
+    end
   end
 end

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

@@ -15,8 +15,8 @@ module Hyrax
     # Removes a single lease
     def destroy
       Hyrax::Actors::LeaseActor.new(curation_concern).destroy
-      flash[:notice] = curation_concern.lease_history.last
-      if curation_concern.work? && curation_concern.file_sets.present?
+      flash[:notice] = lease_history(curation_concern)&.last
+      if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else
         redirect_to edit_lease_path
@@ -51,10 +51,19 @@ module Hyrax
     end
 
     def edit
+      @curation_concern = Hyrax::Forms::WorkLeaseForm.new(curation_concern).prepopulate! if
+        Hyrax.config.use_valkyrie?
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.leases.index.manage_leases'), hyrax.leases_path
       add_breadcrumb t(:'hyrax.leases.edit.lease_update'), '#'
     end
+
+    private
+
+    def lease_history(concern)
+      concern.try(:lease_history) ||
+        concern.try(:lease)&.lease_history
+    end
   end
 end

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

@@ -6,7 +6,8 @@ module Hyrax
     included do
       attr_accessor :curation_concern
       helper_method :curation_concern
-      load_and_authorize_resource class: ActiveFedora::Base, instance_name: :curation_concern
+      base_class = Hyrax.config.use_valkyrie? ? Hyrax::Resource : ActiveFedora::Base
+      load_and_authorize_resource class: base_class, instance_name: :curation_concern, except: [:index]
     end
 
     # This is an override of Hyrax::ApplicationController
@@ -15,5 +16,16 @@ module Hyrax
     end
 
     def edit; end
+
+    private
+
+    def work_has_file_set_members?(work)
+      case work
+      when Valkyrie::Resource
+        Hyrax.custom_queries.find_child_file_set_ids(resource: work).any?
+      else
+        work.file_sets.present?
+      end
+    end
   end
 end

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

@@ -11,6 +11,10 @@ module Hyrax
       with_themed_layout :decide_layout
       copy_blacklight_config_from(::CatalogController)
 
+      before_action do
+        blacklight_config.track_search_session = false
+      end
+
       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
@@ -185,7 +189,8 @@ module Hyrax
           'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
           'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
           'change_set.set_user_as_depositor' => { user: current_user },
-          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
+          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
+          'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] }
         )
         .call(form)
       @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
@@ -198,7 +203,8 @@ module Hyrax
       result =
         transactions['change_set.update_work']
         .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
+                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes },
+                        'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] })
         .call(form)
       @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
       after_update_response
@@ -245,15 +251,6 @@ module Hyrax
       ::Hyrax::ContextualPath.new(presenter, parent_presenter).show
     end
 
-    # @deprecated
-    def curation_concern_from_search_results
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                       "Instead, use '#search_result_document'.")
-      search_params = params.deep_dup
-      search_params.delete :page
-      search_result_document(search_params)
-    end
-
     ##
     # Only returns unsuppressed documents the user has read access to
     #

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -54,7 +54,7 @@ module Hyrax
       obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
       obj.date_modified = Time.current.ctime
 
-      InheritPermissionsJob.perform_now(obj, use_valkyrie: false)
+      InheritPermissionsJob.perform_now(obj)
       VisibilityCopyJob.perform_now(obj)
 
       obj.save

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

@@ -30,7 +30,6 @@ module Hyrax
         after_update_error(err_msg) if err_msg.present?
         return if err_msg.present?
 
-        @collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
         begin
           Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: collection_id,
                                                                          new_member_ids: batch_ids,

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

@@ -165,7 +165,7 @@ module Hyrax
           end
         end
       rescue StandardError => err
-        Rails.logger.error(err)
+        Hyrax.logger.error(err)
         after_destroy_error(params[:id])
       end
 
@@ -190,7 +190,7 @@ module Hyrax
         @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.to_global_id
         @collection.attributes = collection_params.except(:members, :parent_id, :collection_type_gid)
         @collection.apply_depositor_metadata(current_user.user_key)
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless Hyrax::CollectionType.for(collection: @collection).discoverable?
         if @collection.save
           after_create_response
         else
@@ -218,9 +218,7 @@ module Hyrax
         process_member_changes
         process_branding
 
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
-        # we don't have to reindex the full graph when updating collection
-        @collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless Hyrax::CollectionType.for(collection: @collection).discoverable?
         if @collection.update(collection_params.except(:members))
           after_update_response
         else
@@ -422,7 +420,6 @@ module Hyrax
           params.permit(collection: {})[:collection]
                 .merge(params.permit(:collection_type_gid)
                              .with_defaults(collection_type_gid: default_collection_type_gid))
-                .merge(member_of_collection_ids: Array(params[:parent_id]))
         end
       end
 
@@ -485,7 +482,7 @@ module Hyrax
           params[:destination_collection_id]
         flash[:notice] = "Successfully moved #{batch.count} files to #{destination_title} Collection."
       rescue StandardError => err
-        Rails.logger.error(err)
+        Hyrax.logger.error(err)
         destination_title =
           Hyrax.query_service.find_by(id: params[:destination_collection_id]).title.first ||
           destination_id