hyrax 5.2.0 → 5.3.0

data/.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'
+    - '.dassie/db/**/*'
     - 'script/**/*'
     - 'spec/test_app_templates/**/*'
     - 'vendor/**/*'

data/CONTAINERS.md

@@ -73,6 +73,8 @@ Let's break down the above command:
 
 _**Note:**_ The `bundle exec rspec` portion of the command runs the whole test suite. See the [rspec command documentation](https://github.com/rspec/rspec-core#the-rspec-command) for how to refine your test runs.
 
+**If you get "You have already activated rspec-support X, but your Gemfile requires rspec-support Y"** when running specs, you are not using the engine's bundle. Always use `bundle exec rspec` (never plain `rspec`). If you shell into the container and run from `/app/samvera/hyrax-engine`, force the engine's Gemfile: `BUNDLE_GEMFILE=Gemfile bundle exec rspec ./spec/path/to/spec.rb`.
+
 #### The Docker Container Named "web"
 
 As a developer, you may need to run commands against the Hyrax-based application and/or the Hyrax engine.  Examples

data/Dockerfile

@@ -1,4 +1,4 @@
-ARG DEBIAN_VERSION=bookworm
+ARG DEBIAN_VERSION=trixie
 ARG RUBY_VERSION=3.3
 
 FROM ruby:$RUBY_VERSION-$DEBIAN_VERSION AS hyrax-base
@@ -8,11 +8,14 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     acl \
     build-essential \
+    clamav-daemon \
+    clamdscan \
     curl \
     exiftool \
     ffmpeg \
     ghostscript \
     git \
+    imagemagick \
     less \
     libgsf-1-dev \
     libimagequant-dev \
@@ -53,29 +56,9 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     ln -s /usr/lib/*-linux-gnu/libjemalloc.so.2 /usr/lib/libjemalloc.so.2 && \
+    mkdir -p /var/run/clamav && chown clamav:clamav /var/run/clamav && \
     echo "******** Packages Installed *********"
 
-RUN bash -x -c "\
-    if [ $(dpkg --print-architecture) = 'amd64' ]; then \
-      wget https://github.com/ImageMagick/ImageMagick/releases/download/7.1.1-47/ImageMagick-82572af-gcc-x86_64.AppImage -O magick \
-        && chmod a+x magick \
-        && ./magick --appimage-extract \
-        && mv squashfs-root/usr/etc/ImageMagick*  /etc \
-        && rm -rf squashfs-root/usr/share/doc \
-        && cp -rv squashfs-root/usr/*  /usr/local \
-        && rm -rf magick squashfs-root ; \
-    else \
-      wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-47.tar.gz \
-        && tar xf 7.1.1-47.tar.gz \
-        && cd ImageMagick* \
-        && ./configure \
-        && make install \
-        && ldconfig /usr/local/lib \
-        && cd $OLDPWD \
-        && rm -rf 7.1.1-47.tar.gz ImageMagick* ; \
-    fi \
-    && identify -version"
-
 RUN setfacl -d -m o::rwx /usr/local/bundle && \
     gem update --silent --system
 
@@ -147,6 +130,10 @@ ENV BUILD_GITSHA=$BUILD_GITSHA \
 
 FROM hyrax-worker-base AS hyrax-engine-dev
 
+# Reduce memory requirements
+RUN echo "ConcurrentDatabaseReload no" >> /etc/clamav/clamd.conf && \
+    sed -i 's/\(TestDatabases\).*/\1 no/' /etc/clamav/freshclam.conf
+
 USER app
 ARG BUNDLE_WITHOUT=
 ENV HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine

data/Gemfile

@@ -21,5 +21,4 @@ group :development, :test do
   gem 'ruby-prof', require: false
   gem 'semaphore_test_boosters'
   gem 'simplecov', require: false
-  gem 'timecop'
 end

data/Gemfile.allinson

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

data/README.md

@@ -3,8 +3,7 @@
 ![Samvera's Hyrax Logo](https://raw.githubusercontent.com/samvera/hyrax/gh-pages/assets/images/hyrax_logo_horizontal_white_background.png)
 
 Code: [![Version](https://badge.fury.io/rb/hyrax.png)](http://badge.fury.io/rb/hyrax)
-[![CircleCI](https://circleci.com/gh/samvera/hyrax.svg?style=svg)](https://circleci.com/gh/samvera/hyrax)
-[![Code Climate](https://codeclimate.com/github/samvera/hyrax/badges/gpa.svg)](https://codeclimate.com/github/samvera/hyrax)
+[![Lint Build Test](https://github.com/samvera/hyrax/actions/workflows/lint-build-test.yml/badge.svg)](https://github.com/samvera/hyrax/actions/workflows/lint-build-test.yml)
 
 Docs: [![Documentation Status](https://inch-ci.org/github/samvera/hyrax.svg?branch=master)](https://inch-ci.org/github/samvera/hyrax)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/hyrax)

data/app/actors/hyrax/actors/file_actor.rb

@@ -23,6 +23,8 @@ module Hyrax
       # @see IngestJob
       # @todo create a job to monitor the temp directory (or in a multi-worker system, directories!) to prune old files that have made it into the repo
       def ingest_file(io)
+        io.use_valkyrie = false # we are in the actors, we need af objects
+
         Hydra::Works::AddFileToFileSet.call(file_set,
                                             io,
                                             relation,

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

@@ -123,7 +123,7 @@ module Hyrax
 
       # uses create! because object must be persisted to serialize for jobs
       def wrapper!(file:, relation:)
-        JobIoWrapper.create_with_varied_file_handling!(user: user, file: file, relation: relation, file_set: file_set)
+        JobIoWrapper.create_with_varied_file_handling!(user: user, file: file, relation: relation, file_set: file_set, use_valkyrie: false)
       end
 
       # For the label, use the original_filename or original_name if it's there.

data/app/assets/javascripts/hyrax/app.js.erb

@@ -22,24 +22,25 @@ Hyrax = {
         this.sidebar();
         this.batchSelect();
         this.internationalizationHelper();
+        this.fileSetEditor();
     },
 
     // The AdminSet edit page
     adminSetEditor: function() {
       var AdminSetControls = require('hyrax/admin/admin_set_controls');
-      var controls = new AdminSetControls($('#admin-set-controls'));
+      new AdminSetControls($('#admin-set-controls'));
     },
 
     // The collectionType edit page
     collectionTypeEditor: function() {
       var CollectionTypeControls = require('hyrax/admin/collection_type_controls');
-      var controls = new CollectionTypeControls($('#collection-types-controls'));
+      new CollectionTypeControls($('#collection-types-controls'));
     },
 
     // The Collection edit page
     collectionEditor: function() {
       var CollectionControls = require('hyrax/collections/editor');
-      var controls = new CollectionControls($('#collection-edit-controls'));
+      new CollectionControls($('#collection-edit-controls'));
     },
 
     // Collections v2 - collections related js should (over time) be moved here
@@ -52,7 +53,7 @@ Hyrax = {
     // Collection types
     collectionTypes: function() {
       var CollectionTypes = require('hyrax/collection_types');
-      var collection_types = new CollectionTypes($('.collection-types-wrapper'))
+      new CollectionTypes($('.collection-types-wrapper'));
     },
 
     collectionUtilities: function() {
@@ -82,13 +83,22 @@ Hyrax = {
 
     // The work edit page
     workEditor: function () {
-        var element = $("[data-behavior='work-form']")
+        var element = $("[data-behavior='work-form']");
         if (element.length > 0) {
           var Editor = require('hyrax/editor');
           new Editor(element).init();
         }
     },
 
+    // The file set edit page
+    fileSetEditor: function () {
+        var element = $("[data-behavior='file-set-form']");
+        if (element.length > 0) {
+            var Editor = require('hyrax/editor');
+            new Editor(element).init();
+        }
+    },
+
     // Popover help modals. Used on the user profile page.
     popovers: function () {
         $("a[data-toggle=popover]").popover({html: true})
@@ -119,8 +129,8 @@ Hyrax = {
         <% if Hyrax.config.realtime_notifications? %>
         var consumer = ActionCable.createConsumer("<%= Hyrax::Engine.routes.url_helpers.notifications_endpoint_path %>");
         consumer.subscriptions.create("Hyrax::NotificationsChannel", {
-            connected: function(data) {
-                this.perform("update_locale", { locale: $('html').attr('lang') });
+            connected: function() {
+                 this.perform("update_locale", { locale: $('html').attr('lang') });
             },
 
             received: function(data) {
@@ -154,9 +164,132 @@ Hyrax = {
 
     // Minimize/maximize the dashboard sidebar
     sidebar: function () {
-        $('.sidebar-toggle').on('click', function() {
-            $('.sidebar, .main-content').toggleClass('maximized')
-        })
+        // Cache jQuery selectors
+        var $sidebar = $('.sidebar');
+        var $toggle = $('.sidebar-toggle');
+        var $mainContent = $('.main-content');
+        var $sidebarElements = $('.sidebar, .main-content');
+
+        var isMobileView = function() {
+            return $(window).width() < 992;
+        };
+
+        var closeSidebar = function() {
+            $sidebarElements.removeClass('maximized');
+            $toggle.attr('aria-expanded', 'false');
+            manageFocusTrap();
+            $toggle.focus();
+        };
+
+        var updateSidebarState = function() {
+            var isMobile = isMobileView();
+            var isMaximized = $sidebar.hasClass('maximized');
+
+            if (isMobile) {
+                // On mobile, ensure sidebar is collapsed
+                if (isMaximized) {
+                    $sidebarElements.removeClass('maximized');
+                    $toggle.attr('aria-expanded', 'false');
+                }
+            } else {
+                // On desktop, ensure sidebar is maximized
+                if (!isMaximized) {
+                    $sidebarElements.addClass('maximized');
+                    $toggle.attr('aria-expanded', 'true');
+                }
+            }
+        };
+
+        // Prevent keyboard focus from reaching greyed-out content
+        var manageFocusTrap = function() {
+            var isMobile = isMobileView();
+            var isMaximized = $mainContent.hasClass('maximized');
+
+            if (isMobile && isMaximized) {
+                // Set tabindex on all focusable elements in greyed-out content
+                $mainContent.find('a, button, input, select, textarea, [tabindex]:not([tabindex="-1"])').each(function() {
+                    if (!$(this).attr('data-original-tabindex')) {
+                        $(this).attr('data-original-tabindex', $(this).attr('tabindex') || '0');
+                        $(this).attr('tabindex', '-1');
+                    }
+                });
+            } else {
+                $mainContent.find('[data-original-tabindex]').each(function() {
+                    var originalTabindex = $(this).attr('data-original-tabindex');
+                    $(this).attr('tabindex', originalTabindex === '0' ? null : originalTabindex);
+                    $(this).removeAttr('data-original-tabindex');
+                });
+            }
+        };
+
+        var toggleSidebar = function() {
+            var isMobile = isMobileView();
+            var isMaximized = $sidebar.hasClass('maximized');
+
+            $sidebarElements.toggleClass('maximized');
+            $toggle.attr('aria-expanded', !isMaximized);
+
+            // Manage sidebar state changes
+            manageFocusTrap();
+
+            // Focus management for accessibility
+            if (isMobile) {
+                if (!isMaximized) {
+                    // Sidebar focus to first element in sidebar
+                    var $firstFocusable = $sidebar.find('a, button, [tabindex]:not([tabindex="-1"])').first();
+                    if ($firstFocusable.length) {
+                        setTimeout(function() {
+                            $firstFocusable.focus();
+                        }, 100);
+                    }
+                } else {
+                    // Return focus to toggle button
+                    $toggle.focus();
+                }
+            }
+        };
+
+        // Set initial state
+        updateSidebarState();
+        manageFocusTrap();
+
+        // Add initialized class to prevent the flash of open sidebar on mobile page load
+        $sidebarElements.addClass('js-initialized');
+
+        // Update state when window is resized
+        $(window).on('resize', function() {
+            updateSidebarState();
+            manageFocusTrap();
+        });
+
+        // Toggle sidebar on click
+        $toggle.on('click', function() {
+            toggleSidebar();
+        });
+
+        // Toggle sidebar on keyboard press
+        $toggle.on('keydown', function(e) {
+            if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                toggleSidebar();
+            }
+        });
+
+        // Close sidebar when clicking backdrop on mobile
+        $('.sidebar-backdrop').on('click', function() {
+            if (isMobileView()) {
+                closeSidebar();
+            }
+        });
+
+        // Close sidebar on Escape key when open on mobile
+        $(document).on('keydown', function(e) {
+            if (e.key === 'Escape' && isMobileView()) {
+                if ($sidebar.hasClass('maximized')) {
+                    closeSidebar();
+                }
+            }
+        });
     },
 
     // Add and reorder files attached to works

data/app/assets/javascripts/hyrax/collection_select.js

@@ -0,0 +1,68 @@
+// Initialize collection-select2 dropdowns in a targeted way
+// This runs after document ready to avoid interfering with other Select2 initializations
+
+$(document).on('turbolinks:load', function() {
+  // Use a longer delay to ensure controlled vocabulary Select2s are initialized first
+  setTimeout(initializeCollectionSelect2, 500);
+});
+
+// Also handle regular page loads (non-turbolinks)
+$(document).ready(function() {
+  if (typeof Turbolinks === 'undefined') {
+    setTimeout(initializeCollectionSelect2, 500);
+  }
+});
+
+// Initialize on modal show events
+$(document).on('shown.bs.modal', '.modal', function() {
+  initializeCollectionSelect2();
+});
+
+function initializeCollectionSelect2() {
+  // Only initialize collection-select2 elements that:
+  // 1. Are not already initialized
+  // 2. Are visible
+  // 3. Are specifically for collection selection (not location fields)
+  $('.collection-select2:visible:not(.select2-hidden-accessible)').each(function() {
+    var $select = $(this);
+
+    // Skip if this is inside a controlled vocabulary field (location search)
+    if ($select.closest('.controlled_vocabulary').length > 0) {
+      return;
+    }
+
+    var dropdownParent = $select.closest('.modal-body');
+    var options = {
+      placeholder: $select.data('placeholder') || 'Select',
+      allowClear: true
+    };
+
+    if (dropdownParent.length > 0) {
+      options.dropdownParent = dropdownParent;
+    }
+
+    $select.select2(options);
+  });
+
+  // Also initialize member_of_collection_ids selects that don't have collection-select2 class
+  $('select[name="member_of_collection_ids"]:visible:not(.select2-hidden-accessible)').each(function() {
+    var $select = $(this);
+
+    // Skip if already has select2 or is inside controlled vocabulary
+    if ($select.data('select2') || $select.closest('.controlled_vocabulary').length > 0) {
+      return;
+    }
+
+    var dropdownParent = $select.closest('.modal-body');
+    var options = {
+      placeholder: $select.data('placeholder') || 'Select',
+      allowClear: true
+    };
+
+    if (dropdownParent.length > 0) {
+      options.dropdownParent = dropdownParent;
+    }
+
+    $select.select2(options);
+  });
+}

data/app/assets/javascripts/hyrax/copy_permalink_button.js

@@ -0,0 +1,28 @@
+// Wires the "Copy permalink" button (on work and collection show pages) to
+// ClipboardJS. The button ships with the button label as its `title` so a
+// pre-init hover shows something sensible; we initialize a manual-trigger
+// Bootstrap tooltip so the browser's native title-attribute tooltip stops
+// appearing on hover. On a successful copy we swap the tooltip text to the
+// "Copied!" message, show it briefly, then restore the original label.
+Blacklight.onLoad(function () {
+  var $buttons = $('.copy-permalink-button');
+  if (!$buttons.length) { return; }
+
+  $buttons.tooltip({ trigger: 'manual' });
+
+  var clipboard = new Clipboard('.copy-permalink-button');
+
+  clipboard.on('success', function (e) {
+    var $btn = $(e.trigger);
+    var originalLabel = $btn.attr('data-original-title');
+    var successText = $btn.attr('data-success-text');
+
+    $btn.attr('data-original-title', successText).tooltip('show');
+
+    setTimeout(function () {
+      $btn.tooltip('hide').attr('data-original-title', originalLabel);
+    }, 1500);
+
+    e.clearSelection();
+  });
+});

data/app/assets/javascripts/hyrax/redirects.js

@@ -0,0 +1,45 @@
+// Behavior for the Aliases form (see app/views/hyrax/base/_form_redirects.html.erb).
+// Event-delegated handlers on document so dynamically-added rows work
+// without rebinding. A sentinel on document guards against the IIFE
+// running twice (Turbolinks evaluates module scripts again on some
+// navigation paths in development), which would otherwise stack
+// duplicate listeners and fire each handler N times per click.
+(function() {
+    if (document.hyraxRedirectsBound) return;
+    document.hyraxRedirectsBound = true;
+
+    document.addEventListener('input', function(event) {
+        var pathInput = event.target.closest('[data-redirects-path-input]');
+        if (!pathInput) return;
+        var radioId = pathInput.getAttribute('data-redirects-display-radio');
+        var radio = document.getElementById(radioId);
+        if (radio) radio.disabled = (pathInput.value.trim() === '');
+    });
+
+    document.addEventListener('click', function(event) {
+        var removeButton = event.target.closest('[data-redirects-remove-row]');
+        if (removeButton) {
+            var row = removeButton.closest('tr');
+            if (row) row.parentNode.removeChild(row);
+            return;
+        }
+
+        var addButton = event.target.closest('[data-redirects-add-row]');
+        if (!addButton) return;
+        var template = document.querySelector('[data-redirects-row-template]');
+        var table = document.querySelector('[data-redirects-table]');
+        if (!template || !table) return;
+        var tbody = table.querySelector('tbody');
+        if (!tbody) return;
+        // Monotonic counter on the table; never recycle an index after a
+        // row is removed. Fallback to row count when the attribute is
+        // missing.
+        var nextIndex = parseInt(table.dataset.nextIndex, 10);
+        if (isNaN(nextIndex)) {
+            nextIndex = tbody.querySelectorAll('[data-redirects-row]').length;
+        }
+        var html = template.innerHTML.replace(/__INDEX__/g, nextIndex);
+        tbody.insertAdjacentHTML('beforeend', html);
+        table.dataset.nextIndex = String(nextIndex + 1);
+    });
+})();

data/app/assets/javascripts/hyrax/relationships/control.es6

@@ -18,17 +18,37 @@ export default class RelationshipsControl {
     this.element = $(element)
     this.members = this.element.data('members')
     this.registry = new Registry(this.element.find('tbody'), paramKey, property, templateId)
-    this.input = this.element.find(`[data-autocomplete]`)
+    this.input = this.element.find(`[data-autocomplete], .collection-select2`)
     this.warning = this.element.find(".message.has-warning")
     this.addButton = this.element.find("[data-behavior='add-relationship']")
     this.errors = null
   }
 
   init() {
+    this.ensureSelect2();
     this.bindAddButton();
     this.displayMembers();
   }
 
+  ensureSelect2() {
+    // Ensure select2 is initialized on collection-select2 dropdowns
+    // The global initialization should handle this, but we'll check just in case
+    let collectionSelect = this.input.filter('.collection-select2, select[name="member_of_collection_ids"]');
+    if (collectionSelect.length > 0 && !collectionSelect.hasClass('select2-hidden-accessible')) {
+      let dropdownParent = collectionSelect.closest('.modal-body');
+      let options = {
+        placeholder: collectionSelect.data('placeholder') || 'Select',
+        allowClear: true
+      };
+
+      if (dropdownParent.length > 0) {
+        options.dropdownParent = dropdownParent;
+      }
+
+      collectionSelect.select2(options);
+    }
+  }
+
   validate() {
     if (this.input.val() === "") {
       this.errors = ['ID cannot be empty.']

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

@@ -39,8 +39,13 @@ export default class SelectWorkType {
   // for a single work.  So, given the value of 'this.type', return the appropriate
   // path.
   destination() {
-      let admin_set_id = this.form.find('select').val()
       let url = this.form.find('input[type="radio"]:checked').data(this.type)
-      return url + "&admin_set_id=" + admin_set_id
+      const select = this.form.find('select')
+
+      // Only append admin_set_id if the select exists and has a value
+      if (select.length && select.val()) {
+          url = url + "&admin_set_id=" + select.val()
+      }
+      return url
   }
 }

data/app/assets/javascripts/hyrax.js

@@ -1,6 +1,5 @@
 //= require jquery-ui
 
-
 //= require select2
 //= require fixedsticky
 
@@ -45,6 +44,8 @@
 //= require hyrax/proxy_rights
 //= require hyrax/sorting
 //= require hyrax/single_use_links_manager
+//= require hyrax/copy_permalink_button
+//= require hyrax/redirects
 //= require hyrax/dashboard_actions
 //= require hyrax/batch
 //= require hyrax/flot_stats
@@ -73,6 +74,7 @@
 //= require hyrax/collections_v2
 //= require hyrax/collection_types
 //= require hyrax/collections_utils
+//= require hyrax/collection_select
 //= require hyrax/select_collection_type
 //= require hydra-editor/hydra-editor
 //= require nestable

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

@@ -3,6 +3,7 @@
   padding-top: 1em;
   dt {
     color: $file-show-term-color;
+    break-inside: avoid;
   }
   dd {
     padding-bottom: .35em;

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

@@ -11,9 +11,17 @@
   left: 0;
 }
 
+// Universal Viewer:
 // Show various footer, header, left and right panels on larger screens only
 @media only screen and (min-width: 640px) {
   .viewer-wrapper {
     height: 640px;
   }
+}
+
+// Clover IIIF Viewer:
+// Increase the height so that thumbnails below the player are visible
+// (for works with multiple audio/video files)
+.viewer-wrapper.clover-viewer-wrapper {
+  height: 775px;
 }

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

@@ -66,6 +66,8 @@ body.dashboard {
       font-size: $h2-font-size;
       margin-left: $table-cell-padding-sm;
       margin-top: $input-btn-padding-y;
+      flex: 1 1 auto;
+      min-width: 0; // Prevents overflow
 
       .fa {
         color: $gray;
@@ -75,6 +77,25 @@ body.dashboard {
 
     .btn {
       margin-bottom: $input-btn-padding-y;
+      flex-shrink: 0; // Prevents button from shrinking
+      white-space: nowrap; // Prevents button text from wrapping
+    }
+
+    // Ensure flexbox container works on different screen sizes
+    .d-flex {
+      width: 100%;
+    } 
+
+    @media screen and (max-width: 767px) {
+      h1 {
+        margin-left: 0;
+        width: 100%;
+      }
+
+      .btn {
+        width: 100%;
+        margin-top: 0.5rem;
+      }
     }
   }
 
@@ -121,7 +142,7 @@ body.dashboard {
   }
 
   .user-activity .card-body {
-    overflow: scroll;
+    overflow: auto;
     max-height: 20em;
   }