hyrax 2.3.3 → 2.4.0

data/app/services/hyrax/permission_template_applicator.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # Applies a `PermissionTemplate` to a given model object by adding the
+  # template's manage and view users to the model's permissions.
+  #
+  # @example applying a template
+  #   applicator = PermissionTemplateApplicator.new(template: my_template)
+  #   applicator.apply_to(work)
+  #
+  # @example applying a template with fluent chaining syntax
+  #   PermissionTemplateApplicator.apply(my_template).to work
+  #
+  # @since 2.4.0
+  class PermissionTemplateApplicator
+    ##
+    # @!attribute [rw] template
+    #   @return [Hyrax::PermissionTemplate]
+    attr_accessor :template
+
+    ##
+    # @param template [Hyrax::PermissionTemplate]
+    def initialize(template:)
+      self.template = template
+    end
+
+    ##
+    # @param template [Hyrax::PermissionTemplate]
+    #
+    # @return [PermissionTemplateApplicator]
+    def self.apply(template)
+      new(template: template)
+    end
+
+    ##
+    # @param model [Hydra::PCDM::Object, Hydra::PCDM::Collection]
+    # @return [Boolean] true if the permissions have been successfully applied
+    def apply_to(model:)
+      model.edit_groups += template.agent_ids_for(agent_type: 'group', access: 'manage')
+      model.edit_users  += template.agent_ids_for(agent_type: 'user',  access: 'manage')
+      model.read_groups += template.agent_ids_for(agent_type: 'group', access: 'view')
+      model.read_users  += template.agent_ids_for(agent_type: 'user',  access: 'view')
+
+      true
+    end
+    alias to apply_to
+  end
+end

data/app/views/hyrax/admin/collection_types/_form_settings.html.erb

@@ -29,7 +29,7 @@
             APPLY TO NEW WORKS
           </label>
         </div>
-        <p class="help-block">When new works are created directly in the collection, grant sharing users and groups permissions for the new work according to their collection roles.</p>
+        <p class="help-block"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
       </div>
     </div>
     <p><%= f.input :allow_multiple_membership, as: :boolean, disabled: f.object.all_settings_disabled? %></p>

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -21,7 +21,7 @@
         <%= t('.more_toggle_content_html') %>
       </div>
 
-      <h2>Current Collection Types</h2>
+      <h2><%= t('.header') %></h2>
       <table class="table collection-types-table">
          <thead>
            <tr>

data/app/views/hyrax/base/_form_rendering.html.erb

@@ -4,11 +4,13 @@
       <legend>
         <%= t("hyrax.base.form_rendering.legend_html") %>
       </legend>
-      <p><%= t("hyrax.base.form_rendering.help_html") %></p>
-      <%= f.select :rendering_ids,
-                   f.object.select_files,
-                   { include_blank: true },
-                   { class: 'form-control', multiple: true } %>
+      <div class="form-group">
+        <span class="help-block"><%= t("hyrax.base.form_rendering.help_html") %></span>
+        <%= f.select :rendering_ids,
+                    f.object.select_files,
+                    { include_blank: true },
+                    { class: 'form-control', multiple: true } %>
+      </div>
     </fieldset>
   </div>
 </div>

data/app/views/hyrax/base/_form_representative.html.erb

@@ -4,8 +4,10 @@
         <legend>
           <%= t("hyrax.base.form_representative.legend_html") %>
         </legend>
-        <p><%= t("hyrax.base.form_representative.help_html") %></p>
-        <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
+        <div class="form-group">
+          <span class="help-block"><%= t("hyrax.base.form_representative.help_html") %></span>
+          <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
+        </div>
       </fieldset>
     </div>
   </div>

data/app/views/hyrax/base/_form_thumbnail.html.erb

@@ -4,8 +4,10 @@
         <legend>
           <%= t("hyrax.base.form_thumbnail.legend_html") %>
         </legend>
-        <p><%= t("hyrax.base.form_thumbnail.help_html") %></p>
-        <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
+        <div class="form-group">
+          <span class="help-block"><%= t("hyrax.base.form_thumbnail.help_html") %></span>
+          <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
+        </div>
       </fieldset>
     </div>
   </div>

data/app/views/hyrax/base/_member.html.erb

@@ -2,7 +2,7 @@
   <td class="thumbnail">
     <%= render_thumbnail_tag member %>
   </td>
-  <td class="attribute attribute-filename"><%= link_to(member.link_name, contextual_path(member, @presenter)) %></td>
+  <td class="attribute attribute-filename ensure-wrapped"><%= link_to(member.link_name, contextual_path(member, @presenter)) %></td>
   <td class="attribute attribute-date_uploaded"><%= member.try(:date_uploaded) %></td>
   <td class="attribute attribute-permission"><%= member.permission_badge %></td>
   <td>

data/app/views/hyrax/base/_representative_media.html.erb

@@ -1,9 +1,6 @@
 <% if presenter.representative_id.present? && presenter.representative_presenter.present? %>
   <% if defined?(viewer) && viewer %>
-    <%= PulUvRails::UniversalViewer.script_tag %>
-    <div class="viewer-wrapper">
-      <div class="uv viewer" data-uri="<%= main_app.polymorphic_path [main_app, :manifest, presenter], { locale: nil } %>"></div>
-    </div>
+    <%= iiif_viewer_display presenter %>
   <% else %>
     <%= media_display presenter.representative_presenter %>
   <% end %>

data/app/views/hyrax/base/_show_actions.html.erb

@@ -20,12 +20,14 @@
               <% end %>
             </ul>
         </div>
-        <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
-        <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
-            class: 'btn btn-default submits-batches submits-batches-add',
-            data: { toggle: "modal", target: "#collection-list-container" } %>
       <% end %>
   <% end %>
+  <% if presenter.show_deposit_for?(collections: @user_collections) %>
+      <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
+      <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
+                     class: 'btn btn-default submits-batches submits-batches-add',
+                     data: { toggle: "modal", target: "#collection-list-container" } %>
+  <% end %>
   <% if presenter.work_featurable? %>
       <%= link_to "Feature", hyrax.featured_work_path(presenter, format: :json),
           data: { behavior: 'feature' },

data/app/views/hyrax/base/iiif_viewers/_universal_viewer.html.erb

@@ -0,0 +1,4 @@
+<%= PulUvRails::UniversalViewer.script_tag %>
+<div class="viewer-wrapper">
+  <div class="uv viewer" data-uri="<%= main_app.polymorphic_url [main_app, :manifest, presenter], { locale: nil } %>"></div>
+</div>

data/app/views/hyrax/base/show.html.erb

@@ -15,13 +15,13 @@
       <div class="panel-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.universal_viewer? %>
+          <% if @presenter.iiif_viewer? %>
             <div class="col-sm-12">
               <%= render 'representative_media', presenter: @presenter, viewer: true %>
             </div>
           <% end %>
           <div class="col-sm-3 text-center">
-            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.universal_viewer? %>
+            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? %>
             <%= render 'citations', presenter: @presenter %>
             <%= render 'social_media' %>
           </div>

data/app/views/hyrax/dashboard/works/_default_group.html.erb

@@ -1,4 +1,4 @@
-<table class="table table-striped works-list datatable">
+<table class="table table-striped works-list">
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
   <thead>
     <tr>

data/app/views/hyrax/file_sets/_file_set_title.erb

@@ -1,9 +1,9 @@
 <% presenter.title.each_with_index do |title, index| %>
     <% if index == 0 %>
-        <h1>
+        <h1 class="ensure-wrapped">
             <%= title %> <%= presenter.permission_badge %>
         </h1>
     <% else %>
-        <h1><%= title %></h1>
+        <h1 class="ensure-wrapped"><%= title %></h1>
     <% end %>
 <% end %>

data/app/views/hyrax/homepage/_featured.html.erb

@@ -1,9 +1,6 @@
 <% presenter = featured.presenter %>
 <li class="featured-item" data-id="<%= presenter.id %>">
   <div class="row">
-    <div class="col-sm-2">
-      <%= render_thumbnail_tag presenter %>
-    </div>
     <div class="col-sm-10">
       <%= render 'hyrax/homepage/featured_fields', featured: presenter %>
     </div>

data/app/views/hyrax/my/_collection_action_menu.html.erb

@@ -42,6 +42,7 @@
         <%= t("hyrax.dashboard.my.action.delete_collection") %>
       <% end %>
     </li>
+
     <% if Hyrax::CollectionType.any_nestable? %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
       <li role="menuitem" tabindex="-1">

data/app/views/hyrax/my/collections/_default_group.html.erb

@@ -2,15 +2,7 @@
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
   <thead>
   <tr>
-    <th class="check-all text-left">
-      <label for="check_all" class="sr-only">
-        <%= t("hyrax.dashboard.my.sr.check_all_label") %>
-      </label>
-      <label class="centerizer">
-        <input type="checkbox" class="check-all-checkbox" name="check_all" id="check_all" value="yes" />
-        <%= t("hyrax.dashboard.my.action.select") %>
-      </label>
-    </th>
+    <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
     <th><%= t("hyrax.dashboard.my.heading.type") %></th>
     <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>

data/app/views/hyrax/my/collections/_list_collections.html.erb

@@ -1,6 +1,6 @@
 <% # used by Your Collections tab %>
 <% id = collection_presenter.id %>
-<%# Data attributes referenced by the javascript for row actions %>
+<%# Data attributes referenced by the javascript for submitting nested forms. %>
 <tr id="document_<%= id %>"
   data-source="my"
   data-id="<%= id %>"

data/app/views/hyrax/users/_activity_log.html.erb

@@ -9,7 +9,7 @@
   <% events.each do |event| %>
     <% next if event[:action].blank? or event[:timestamp].blank? %>
     <tr>
-      <td><%= sanitize event[:action] %></td>
+      <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
       <% time = Time.zone.at(event[:timestamp].to_i) %>
       <td data-sort="<%= time.getutc.iso8601(5) %>">
         <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">

data/config/locales/hyrax.de.yml

@@ -826,6 +826,8 @@ de:
         type: Art von Arbeit
         viz_after: Sichtbarkeit wird geändert
         viz_current: Aktuelle Sichtbarkeit
+      update:
+        embargo_deactivated: Deaktivierung erfolgreich!
     featured_researchers: Ausgewählte Forscher
     file_manager:
       link_text: Dateimanager

data/config/locales/hyrax.en.yml

@@ -825,6 +825,8 @@ en:
         type: Type of Item
         viz_after: Visibility will Change to
         viz_current: Current Visibility
+      update:
+        embargo_deactivated: Deactivation succeeded!
     featured_researchers: Featured Researchers
     file_manager:
       link_text: File Manager

data/config/locales/hyrax.es.yml

@@ -824,6 +824,8 @@ es:
         type: Tipo de trabajo
         viz_after: La visibilidad cambiará a
         viz_current: Visibilidad actual
+      update:
+        embargo_deactivated: Desactivación exitosa!
     featured_researchers: Investigadores Destacados
     file_manager:
       link_text: Administrador de archivos

data/config/locales/hyrax.fr.yml

@@ -825,6 +825,8 @@ fr:
         type: Type de travail
         viz_after: La visibilité changera en
         viz_current: Visibilité actuelle
+      update:
+        embargo_deactivated: Désactivation réussie!
     featured_researchers: Les chercheurs en vedette
     file_manager:
       link_text: Gestionnaire de fichiers

data/config/locales/hyrax.it.yml

@@ -824,6 +824,8 @@ it:
         type: Tipo di lavoro
         viz_after: La visibilità cambierà
         viz_current: Visibilità attuale
+      update:
+        embargo_deactivated: Disattivazione riuscita!
     featured_researchers: Ricercatori in primo piano
     file_manager:
       link_text: File Manager

data/config/locales/hyrax.pt-BR.yml

@@ -819,6 +819,8 @@ pt-BR:
         type: Tipo de obra
         viz_after: O acesso mudará para
         viz_current: Acesso atual
+      update:
+        embargo_deactivated: Desativação bem sucedida!
     featured_researchers: Pesquisadores em destaque
     file_manager:
       link_text: Gerenciador de arquivos

data/config/locales/hyrax.zh.yml

@@ -822,6 +822,8 @@ zh:
         type: 什么样的工作
         viz_after: 公开度将更改为
         viz_current: 当前公开度
+      update:
+        embargo_deactivated: 停用限制成功!
     featured_researchers: 特色研究者
     file_manager:
       link_text: 文件管理员

data/hyrax.gemspec

@@ -43,6 +43,7 @@ SUMMARY
   spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
   spec.add_dependency 'dry-struct', '~> 0.1'
+  spec.add_dependency 'dry-transaction', '~> 0.11'
   spec.add_dependency 'dry-validation', '~> 0.9'
   spec.add_dependency 'flipflop', '~> 2.3'
   # Pin more tightly because 0.x gems are potentially unstable

data/lib/generators/hyrax/templates/config/initializers/hyrax.rb

@@ -121,7 +121,7 @@ Hyrax.config do |config|
   # config.show_work_item_rows = 10
 
   # Enable IIIF image service. This is required to use the
-  # UniversalViewer-ified show page
+  # IIIF viewer enabled show page
   #
   # If you have run the riiif generator, an embedded riiif service
   # will be used to deliver images via IIIF. If you have not, you will

data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml

@@ -50,7 +50,7 @@ de:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2017 Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
+      copyright_html: "<strong>Copyright © 2018 Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
       service_html: Ein Dienst von <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Name des Instituts

data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml

@@ -50,7 +50,7 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2017 Samvera</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> Licensed under the Apache License, Version 2.0"
       service_html: A service of <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: Institution
     institution_name_full: The Institution Name

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -50,7 +50,7 @@ es:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2017 Samvera</strong> bajo licencia de Apache, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> bajo licencia de Apache, Version 2.0"
       service_html: Un servicio de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera/a>.
     institution_name: institución
     institution_name_full: El nombre de la institución

data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml

@@ -50,7 +50,7 @@ fr:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2017 Samvera</strong> Licence sous Licence Apache, Version 2.0"
+      copyright_html: "<strong>Copyright © 2018 Samvera</strong> Licence sous Licence Apache, Version 2.0"
       service_html: Un service de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Nom de l'établissement

data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml

@@ -50,7 +50,7 @@ it:
     directory:
       suffix: "@ example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2017 Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
+      copyright_html: "<strong>Copyright © 2018 Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
       service_html: Un servizio di <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Istituzione
     institution_name_full: Nome dell'Istituzione

data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml

@@ -50,7 +50,7 @@ zh:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>版权所有 &copy; 2017 Samvera</strong> 根据Apache许可证2.0版许可"
+      copyright_html: "<strong>版权所有 &copy; 2018 Samvera</strong> 根据Apache许可证2.0版许可"
       service_html: 的服务<a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: 机构
     institution_name_full: 机构名称

data/lib/hyrax/configuration.rb

@@ -367,7 +367,7 @@ module Hyrax
     end
 
     # Enable IIIF image service. This is required to use the
-    # UniversalViewer-enabled show page
+    # IIIF viewer enabled show page
     #
     # If you have run the hyrax:riiif generator, an embedded riiif service
     # will be used to deliver images via IIIF. If you have not, you will

data/lib/hyrax/transactions.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'hyrax/transactions/container'
+
+module Hyrax
+  ##
+  # This is a parent module for DRY Transaction classes handling Hyrax
+  # processes. Especially: transactions and steps for creating, updating, and
+  # destroying PCDM Objects are located here. Loading this module provides an
+  # easy way to load the full suite of transactions included for these purposes.
+  #
+  # @note These uses of `dry-transaction` are currently experimental
+  #   replacements for actor stack behavior. They are not loaded during normal
+  #   execution in a stock Hyrax application.
+  #
+  # @since 2.4.0
+  #
+  # @example
+  #   require 'hyrax/transactions'
+  #
+  # @see https://dry-rb.org/gems/dry-transaction/
+  module Transactions
+  end
+end

data/lib/hyrax/transactions/container.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+require "dry/transaction"
+require "dry/transaction/operation"
+
+module Hyrax
+  module Transactions
+    ##
+    # Provides a container for transaction steps related to creating, updating,
+    # and destroying PCDM Objects in Hyrax.
+    #
+    # In advanced use, the container could provide runtime dependency injection
+    # for particular step code. For the basic case, users can consider it as
+    # providing namespaceing and resolution for steps (as used in
+    # `Hyrax::Transaction::CreateWork`; e.g.
+    # `step :save_work, with: 'work.save_work'`).
+    #
+    # @since 2.4.0
+    #
+    # @see https://dry-rb.org/gems/dry-container/
+    class Container
+      require 'hyrax/transactions/create_work'
+      require 'hyrax/transactions/steps/apply_permission_template'
+      require 'hyrax/transactions/steps/ensure_admin_set'
+      require 'hyrax/transactions/steps/ensure_permission_template'
+      require 'hyrax/transactions/steps/save_work'
+      require 'hyrax/transactions/steps/set_default_admin_set'
+      require 'hyrax/transactions/steps/set_modified_date'
+      require 'hyrax/transactions/steps/set_uploaded_date'
+
+      extend Dry::Container::Mixin
+
+      namespace 'work' do |ops|
+        ops.register 'apply_permission_template' do
+          Steps::ApplyPermissionTemplate.new
+        end
+
+        ops.register 'ensure_admin_set' do
+          Steps::EnsureAdminSet.new
+        end
+
+        ops.register 'ensure_permission_template' do
+          Steps::EnsurePermissionTemplate.new
+        end
+
+        ops.register 'save_work' do
+          Steps::SaveWork.new
+        end
+
+        ops.register 'set_default_admin_set' do
+          Steps::SetDefaultAdminSet.new
+        end
+
+        ops.register 'set_modified_date' do
+          Steps::SetModifiedDate.new
+        end
+
+        ops.register 'set_uploaded_date' do
+          Steps::SetUploadedDate.new
+        end
+      end
+    end
+  end
+end