Merge pull request #2153 from samvera/merge-main-into-i35

Merge main into i35

Gemfile

@@ -70,6 +70,7 @@ gem 'puma', '~> 5.6' # Use Puma as the app server
 gem 'rack-test', '0.7.0', group: %i[test] # rack-test >= 0.71 does not work with older Capybara versions (< 2.17). See #214 for more details
 gem 'rails-controller-testing', group: %i[test]
 gem 'rdf', '~> 3.2'
+gem 'redcarpet' # for Markdown constant
 gem 'redis-namespace', '~> 1.10' # Hyrax v5 relies on 1.5; but we'd like to have the #clear method so we need 1.10 or greater.
 gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
 gem 'riiif', '~> 2.0'
@@ -105,6 +106,23 @@ gem 'webmock', group: %i[test]
 
 # This gem does nothing by default, but is instead a tool to ease developer flow
 # and place overrides, themes and deployment code.
-gem 'hyku_knapsack', github: 'samvera-labs/hyku_knapsack', branch: 'upstream_main'
+#
+# When you use a knapsack for Hyku development, which we recommend, you'll want to ensure that your
+# local knapsack repository has a `'required_for_knapsack_instances'` branch (which it should by
+# default).  Due to some tomfoolery, of knapsack, the branch name
+# (e.g. `required_for_knapsack_instances`) must be checked out locally in the knapsack environment
+# that you use to build Docker.
+#
+# Why not use `main`?  We need a stable SHA for building HykuKnapsack prime
+# (e.g. samvera-labs/hyku_knapsack).  Why the stable SHA?  Because when we bundle a knapsack, the
+# Hyku submodule uses the SHA of the locally checked out branch specified in the gem spec.  Which
+# can create a chicken and egg issue; namely I need to update Hyku with a new SHA for Knapsack, but
+# to update Knapsack's submodule reference to Hyku, I need a new SHA for knapsack.  Thus, I can never
+# use a "regular branch".  Instead we need to use a separate more stable for Knapsack.
+#
+# Thus the hopefully descriptive `required_for_knapsack_instances`.
+#
+# tl;dr - Have a local `required_for_knapsack_instances` branch on your knapsack repository
+gem 'hyku_knapsack', github: 'samvera-labs/hyku_knapsack', branch: 'required_for_knapsack_instances'
 
 # rubocop:enable Layout/LineLength

Gemfile.lock

@@ -95,8 +95,8 @@ GIT
 
 GIT
   remote: https://github.com/samvera-labs/hyku_knapsack.git
-  revision: 14f688b61afab9ee886f5f7fa26a76a37bced597
-  branch: upstream_main
+  revision: 5a7c54cace96881a3963ab2fd881ca6ea3f57372
+  branch: required_for_knapsack_instances
   specs:
     hyku_knapsack (0.0.1)
       rails (>= 5.2.0)
@@ -1090,6 +1090,7 @@ GEM
     rdf-xsd (3.3.0)
       rdf (~> 3.3)
       rexml (~> 3.2)
+    redcarpet (3.6.0)
     redic (1.5.3)
       hiredis
     redis (4.8.1)
@@ -1469,6 +1470,7 @@ DEPENDENCIES
   rails (~> 6.0)!
   rails-controller-testing
   rdf (~> 3.2)
+  redcarpet
   redis-namespace (~> 1.10)
   redlock (>= 0.1.2, < 2.0)
   riiif (~> 2.0)

app/assets/javascripts/application.js

@@ -18,6 +18,7 @@
 //= require jquery.fontselect
 //= require jquery.dataTables
 //= require dataTables.bootstrap4
+//= require cropper.min
 //= require stat_slider
 //= require turbolinks
 //= require cocoon

app/assets/stylesheets/application.css

@@ -20,6 +20,7 @@
  *= require single_signon
  *= require blacklight_advanced_search
  *= require blacklight_range_limit
+ *= require cropper.min
  *= require_self
  *= require hyku_knapsack/application
  */

app/assets/stylesheets/hyku.scss

@@ -31,6 +31,8 @@
   // allows full width if tabs are turned off with feature flipper
   .home-content {
     display: flex;
+    justify-content: normal;
+    padding: 0 20px;
   }
   .home-tabs-left {
     min-width: 50%;
@@ -418,12 +420,23 @@ a.btn.btn-default.restore-default-color.with-color-hint {
 nav.navbar.navbar-default.navbar-static-top .container-fluid .row {
   margin-left: 0;
   margin-right: 0;
-
   nav.navbar-nav.col-sm-5 {
     padding-right: 0;
   }
 }
 
+//these styles modify the theming for the citations section
+div#collapse-citations {
+  text-align: left;
+  word-wrap: break-word;
+}
+
+@media (min-width: 576px) {
+  .citations-button .download-pdf-button {
+    max-width: 300px;
+  }
+}
+
 body.public-facing {
   .btn {
     &.btn-primary,
@@ -502,3 +515,119 @@ body.public-facing {
   vertical-align: middle;
   width: 1.5em;
 }
+
+// make sure constraints are on only one line, even with markdown
+span.constraint-value p, .facet-values p {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+// make the facet counts appear at the end of the facet panel
+.facet-content .panel-body .facet-values p {
+  display: flex;
+  justify-content: space-between;
+}
+
+// button to remove a filter should be red instead of white
+.remove.dropdown-toggle .glyphicon.glyphicon-remove {
+  color: #c4302b;
+}
+
+// style the analytics button to match citations button
+#stats {
+  margin-top: 10px;
+
+  @media (min-width: 576px) {
+    max-width: 300px;
+  }
+}
+
+#download-pdf-button {
+  margin: 10px 0 10px 0;
+}
+
+.catalog_startOverLink {
+  font-size: 1.15em;
+  font-weight: bold;
+}
+
+// collection show page styles
+
+.space-between {
+  align-items: center;
+  justify-content: space-between;
+}
+
+.hyc-banner {
+  padding: 15px;
+  .hyc-bugs .hyc-created-by,
+  .hyc-bugs .hyc-last-updated,
+  .hyc-title {
+    padding: 0;
+  }
+
+  .hyc-item-count {
+    background: rgba(255, 255, 255, 0.75);
+    border-radius: 0.5em;
+    color: #333;
+    margin: 0;
+    padding: 10px;
+  }
+
+  .hyc-bugs div,
+  div {
+    position: relative;
+  }
+}
+
+// these margin classes can be removed when Hyku is eventually updated to Bootstrap 4 upon upgrading to Hyrax 4.
+// These correspond directly to bootstrap 4 classes.
+
+.mb-0 {
+  margin-bottom: 0;
+}
+
+.mt-5 {
+  margin-top: 3em;
+}
+
+.mt-2 {
+  margin-top: 0.5em;
+}
+
+.mb-2 {
+  margin-bottom: 0.5em;
+}
+
+.mb-5 {
+  margin-bottom: 3em;
+}
+
+.mx-3 {
+  margin-right: 1em;
+  margin-left: 1em;
+}
+
+.ml-auto {
+  margin-left: auto;
+}
+
+.py-0 {
+  padding-bottom: 0;
+  padding-top: 0;
+}
+
+.py-4 {
+  padding-bottom: 2em;
+  padding-top: 2em;
+}
+
+.d-block {
+  display: block;
+}
+
+// hide iiif-print feature flipper
+
+tr[data-feature="use-iiif-print"] {
+  display: none;
+}

app/assets/stylesheets/hyrax.scss

@@ -19,3 +19,9 @@
 @import "viewer";
 
 @import "themes/*";
+
+// for catalog search result snippets
+.highlight {
+    background: #ffff00;
+  font-weight: 700;
+}

app/assets/stylesheets/viewer.scss

@@ -5,9 +5,6 @@
 .viewer {
   height: 100%;
   padding: 10px;
-  iframe {
-    // position: absolute;
-  }
 }
 
 #viewer-modal {
@@ -21,3 +18,8 @@
     margin-bottom: 10px;
   }
 }
+
+.video-embed-viewer {
+  aspect-ratio: 16 / 9;
+  width: 100%;
+}

app/controllers/admin/roles_service_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Admin
+  class RolesServiceController < ApplicationController
+    layout 'hyrax/dashboard'
+
+    def index
+      authorize! :update, RolesService
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.admin.sidebar.roles_service_jobs'), main_app.admin_roles_service_jobs_path
+    end
+
+    # post "admin/roles_service/:job_name_key
+    def update_roles
+      authorize! :update, RolesService
+      job = RolesService.valid_jobs.fetch(params[:job_name_key])
+
+      job.perform_later
+
+      respond_to do |wants|
+        wants.html { redirect_to main_app.admin_roles_service_jobs_path, notice: "#{job} has been submitted." }
+        wants.json { render json: { notice: "#{job} has been submitted." }, status: :ok }
+      end
+    end
+  end
+end

app/controllers/admin/users_controller.rb

@@ -2,6 +2,7 @@
 
 module Admin
   class UsersController < AdminController
+    before_action :ensure_admin!, except: [:remove_role]
     before_action :load_user, only: [:destroy]
 
     # NOTE: User creation/invitations handled by devise_invitable
@@ -26,6 +27,22 @@ def activate
       end
     end
 
+    def remove_role
+      authorize! :edit, User
+
+      user = User.find(params[:id])
+      role = Role.find(params[:role_id])
+
+      if user && role && user.roles.include?(role)
+        user.remove_role(role.name)
+        flash[:notice] = "Role '#{role.name}' was successfully removed from user #{user.email}."
+      else
+        flash[:alert] = "Failed to remove role from user #{user.email}."
+      end
+
+      redirect_back(fallback_location: root_path)
+    end
+
     private
 
     def load_user

app/controllers/application_controller.rb

@@ -29,35 +29,25 @@ class ApplicationController < ActionController::Base
 
   protected
 
-  # rubocop:disable Naming/PredicateName
-  def is_hidden
-    # rubocop:enable Naming/PredicateName
+  def hidden?
     current_account.persisted? && !current_account.is_public?
   end
 
-  # rubocop:disable Naming/PredicateName
-  def is_api_or_pdf
-    # rubocop:enable Naming/PredicateName
+  def api_or_pdf?
     request.format.to_s.match('json') ||
       params[:print] ||
       request.path.include?('api') ||
       request.path.include?('pdf')
   end
 
-  # rubocop:disable Naming/PredicateName
-  def is_staging
-    # rubocop:enable Naming/PredicateName
-    ['staging'].include?(Rails.env)
+  def staging?
+    Rails.env.staging? # rubocop:disable Rails/UnknownEnv
   end
 
-  ##
-  # Extra authentication for palni-palci during development phase
   def authenticate_if_needed
     # Disable this extra authentication in test mode
     return true if Rails.env.test?
-    # rubocop:disable Naming/PredicateName
-    return unless (is_hidden || is_staging) && !is_api_or_pdf
-    # rubocop:enable Naming/PredicateName
+    return unless (hidden? || staging?) && !api_or_pdf?
     authenticate_or_request_with_http_basic do |username, password|
       username == "samvera" && password == "hyku"
     end

app/controllers/catalog_controller.rb

@@ -89,8 +89,10 @@ def self.uploaded_field
     config.default_solr_params = {
       qt: "search",
       rows: 10,
-      qf: IiifPrint.config.metadata_fields.keys.map { |attribute| "#{attribute}_tesim" }
-                   .join(' ') << " title_tesim description_tesim all_text_timv file_set_text_tsimv", # the first space character is necessary!
+      qf: (
+        IiifPrint.config.metadata_fields.keys.map { |attribute| "#{attribute}_tesim" } +
+        ["title_tesim", "description_tesim", "all_text_timv", "file_set_text_tsimv"]
+      ).uniq.join(' '),
       "hl": true,
       "hl.simple.pre": "<span class='highlight'>",
       "hl.simple.post": "</span>",

app/controllers/flipflop/strategies_controller_decorator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# OVERRIDE Flipflop v2.7.1 to allow for custom `Action` labels
+
+module Flipflop
+  module StrategiesControllerDecorator
+    def enable?
+      values = StrategiesController::ENABLE_VALUES | ADDITIONAL_ENABLE_VALUES
+      values.include?(params[:commit])
+    end
+
+    ADDITIONAL_ENABLE_VALUES = FeaturesHelper::FEATURE_ACTION_LABELS.map { |_, v| v[:on] }.to_set.freeze
+  end
+end
+
+Flipflop::StrategiesController.prepend(Flipflop::StrategiesControllerDecorator)