hyrax 3.6.0 → 4.0.0.beta1

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,21 +94,21 @@ 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 {
+    .btn-group.show > .facet-values.show {
       display: table;
     }
 
@@ -179,7 +139,7 @@ body.dashboard {
     padding: 0;
   }
 
-  .user-activity .panel-body {
+  .user-activity .card-body {
     overflow: scroll;
     max-height: 20em;
   }
@@ -206,51 +166,66 @@ 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%;
-      }
-    }
+  .card.labels {
+    border-top: 1px solid $card-border-color;
+    margin-bottom: 0;
   }
 
-  .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%;
-    }
+  .spacer {
+    margin-bottom: 5px;
+  }
+}
 
-    .panel-title {
-      color: $title-text-color;
-      display: block;
-      font-size: 18px;
-      font-weight: 600;
-      line-height: 30px;
+.dropdown-item {
+  display: list-item;
 
-      &.h2 {
-        font-size: 22px;
-      }
+  > .facet-values {
+    display: table;
+    table-layout: fixed;
+
+    > .facet-label {
+      display: table-cell;
+      hyphens: auto;
+      text-indent: -0.938rem;
+    }
+
+    > .facet-count {
+      display: table-cell;
+      text-align: right;
     }
   }
+}
 
-  .panel.panel-default.labels {
-    border-top: 1px solid $panel-default-border;
-    margin-bottom: 0;
+ul#visibility_ssi-dropdown-options {
+  table-layout: fixed;
+
+  > li {
+    display: table-row;
+
+    > .facet-label {
+      display: table-cell;
+      hyphens: auto;
+    }
+
+    > .facet-count {
+      display: table-cell;
+      text-align: right;
+    }
   }
+}
 
-  .spacer {
-    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/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

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] = embargo_history(curation_concern)
-      if curation_concern.work? && work_has_file_set_members?(curation_concern)
+      flash[:notice] = curation_concern.embargo_history.last
+      if curation_concern.work? && curation_concern.file_sets.present?
         redirect_to confirm_permission_path
       else
         redirect_to edit_embargo_path
@@ -60,19 +60,10 @@ 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] = lease_history(curation_concern)&.last
-      if curation_concern.work? && work_has_file_set_members?(curation_concern)
+      flash[:notice] = curation_concern.lease_history.last
+      if curation_concern.work? && curation_concern.file_sets.present?
         redirect_to confirm_permission_path
       else
         redirect_to edit_lease_path
@@ -51,19 +51,10 @@ 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,8 +6,7 @@ module Hyrax
     included do
       attr_accessor :curation_concern
       helper_method :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]
+      load_and_authorize_resource class: ActiveFedora::Base, instance_name: :curation_concern
     end
 
     # This is an override of Hyrax::ApplicationController
@@ -16,16 +15,5 @@ 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
@@ -245,15 +249,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/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? && Hyrax.config.analytics_provider != 'ga4'
+          return unless Hyrax.config.analytics?
 
           @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? && Hyrax.config.analytics_provider != 'ga4'
+          return unless Hyrax.config.analytics?
           @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

@@ -6,7 +6,7 @@ module Hyrax
         include Hyrax::BreadcrumbsForWorksAnalytics
 
         def index
-          return unless Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4'
+          return unless Hyrax.config.analytics?
 
           @accessible_works ||= accessible_works
           @accessible_file_sets ||= accessible_file_sets

data/app/controllers/hyrax/admin/strategies_controller.rb

@@ -7,7 +7,7 @@ module Hyrax
       end
 
       # TODO: we could remove this if we used an isolated engine
-      def features_url(**_kargs)
+      def features_url
         hyrax.admin_features_path
       end
     end

data/app/controllers/hyrax/admin/workflows_controller.rb

@@ -15,8 +15,9 @@ module Hyrax
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.admin.sidebar.tasks'), '#'
       add_breadcrumb t(:'hyrax.admin.sidebar.workflow_review'), request.path
-      assign_action_objects_params
-      @response = WorkflowResponse.new(actionable_objects.to_a, actionable_objects.total_count, current_page, per_page, under_review?)
+
+      @status_list = actionable_objects.reject(&:published?)
+      @published_list = actionable_objects.select(&:published?)
     end
 
     private
@@ -29,51 +30,5 @@ module Hyrax
       @actionable_objects ||=
         Hyrax::Workflow::ActionableObjects.new(user: current_user)
     end
-
-    def current_page
-      @page ||= params.fetch('page', 1).to_i
-    end
-
-    def per_page
-      @per_page ||= params.fetch('per_page', 10).to_i
-    end
-
-    def assign_action_objects_params
-      actionable_objects.page = current_page
-      actionable_objects.per_page = per_page
-      actionable_objects.workflow_state_filter = (under_review? ? '!' : '') + deposited_workflow_state_name
-    end
-
-    def under_review?
-      @under_review = params['state'] != 'published'
-    end
-
-    class WorkflowResponse
-      attr_reader :total_count
-      attr_reader :current_page
-      attr_reader :per_page
-      attr_reader :docs
-      attr_reader :under_review
-
-      def initialize(docs, total_count, page, per_page, under_review)
-        @docs = docs
-        @total_count = total_count
-        @per_page = per_page.to_i
-        @current_page = page.to_i
-        @under_review = under_review
-      end
-
-      def total_pages
-        (total_count.to_f / per_page).ceil
-      end
-
-      def limit_value
-        docs.length
-      end
-
-      def viewing_under_review?
-        under_review
-      end
-    end
   end
 end

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/collections_controller.rb

@@ -220,7 +220,7 @@ module Hyrax
 
         @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.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
+        @collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
         if @collection.update(collection_params.except(:members))
           after_update_response
         else
@@ -422,6 +422,7 @@ 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
 

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

@@ -70,38 +70,6 @@ module Hyrax
 
       private
 
-      ##
-      # @deprecated
-      def build_within_form
-        authorize! :read, form_params[:child_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_within_form
-
-      ##
-      # @deprecated
-      def build_under_form
-        authorize! :read, form_params[:parent_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_under_form
-
-      ##
-      # @deprecated
-      def build_create_collection_form
-        authorize! :deposit, form_params[:parent_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_create_collection_form
-
-      ##
-      # @deprecated
-      def build_remove_form
-        authorize! :edit, form_params[:parent_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_create_collection_form
-
       ##
       # @api public
       # @since 3.2.0