sufia 7.2.0 → 7.3.0.rc1

data/app/services/sufia/collection_thumbnail_path_service.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Sufia
+  class CollectionThumbnailPathService < CurationConcerns::ThumbnailPathService
+    class << self
+      def default_image
+        ActionController::Base.helpers.image_path 'collection.png'
+      end
+    end
+  end
+end

data/app/services/sufia/workflow/abstract_notification.rb

@@ -0,0 +1,39 @@
+module Sufia
+  module Workflow
+    class AbstractNotification
+      def self.send_notification(entity:, comment:, user:, recipients:)
+        new(entity, comment, user, recipients).call
+      end
+
+      attr_reader :work_id, :title, :comment, :user, :recipients
+
+      def initialize(entity, comment, user, recipients)
+        @work_id = entity.proxy_for_global_id.sub(/.*\//, '')
+        @title = entity.proxy_for.title.first
+        @comment = comment.respond_to?(:comment) ? comment.comment.to_s : ''
+        @recipients = recipients
+        @user = user
+      end
+
+      def call
+        user.send_message(users_to_notify.uniq, message, subject)
+      end
+
+      protected
+
+        def subject
+          raise NotImplementedError, "Implement #subject in a child class"
+        end
+
+        def message
+          "#{title} (#{work_id}) was advanced in the workflow by #{user.user_key} and is awaiting approval #{comment}"
+        end
+
+      private
+
+        def users_to_notify
+          recipients.fetch('to', []) + recipients.fetch('cc', [])
+        end
+    end
+  end
+end

data/app/services/sufia/workflow/changes_required_notification.rb

@@ -0,0 +1,22 @@
+module Sufia
+  module Workflow
+    class ChangesRequiredNotification < AbstractNotification
+      protected
+
+        def subject
+          'Your deposit requires changes'
+        end
+
+        def message
+          "#{title} (#{work_id}) requires additional changes before approval.\n\n '#{comment}'"
+        end
+
+      private
+
+        def users_to_notify
+          user_key = ActiveFedora::Base.find(work_id).depositor
+          super << ::User.find_by(email: user_key)
+        end
+    end
+  end
+end

data/app/services/sufia/workflow/complete_notification.rb

@@ -0,0 +1,22 @@
+module Sufia
+  module Workflow
+    class CompleteNotification < AbstractNotification
+      protected
+
+        def subject
+          'Deposit has been approved'
+        end
+
+        def message
+          "#{title} (#{work_id}) was approved by #{user.user_key}. #{comment}"
+        end
+
+      private
+
+        def users_to_notify
+          user_key = ActiveFedora::Base.find(work_id).depositor
+          super << ::User.find_by(email: user_key)
+        end
+    end
+  end
+end

data/app/services/sufia/workflow/pending_review_notification.rb

@@ -0,0 +1,21 @@
+module Sufia
+  module Workflow
+    class PendingReviewNotification < AbstractNotification
+      protected
+
+        def subject
+          'Deposit needs review'
+        end
+
+        def message
+          "#{title} (#{work_id}) was deposited by #{user.user_key} and is awaiting approval #{comment}"
+        end
+
+      private
+
+        def users_to_notify
+          super << user
+        end
+    end
+  end
+end

data/app/services/sufia/workflow/workflow_by_admin_set_strategy.rb

@@ -0,0 +1,15 @@
+module Sufia
+  module Workflow
+    class WorkflowByAdminSetStrategy
+      def initialize(_work, attributes)
+        @admin_set_id = attributes[:admin_set_id] if attributes[:admin_set_id].present?
+      end
+
+      # @return [String] The name of the workflow by admin_set to use
+      def workflow_name
+        return 'default' unless @admin_set_id
+        Sufia::PermissionTemplate.find_by!(admin_set_id: @admin_set_id).workflow_name
+      end
+    end
+  end
+end

data/app/views/_masthead.html.erb

@@ -1,3 +1,4 @@
+<%= render '/shared/select_work_type_modal' if create_work_presenter.many? %>
 <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
@@ -8,14 +9,13 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <%= render partial: '/logo' %>
+      <%= render '/logo' %>
     </div>
 
     <div class="collapse navbar-collapse" id="top-navbar-collapse">
-      <%= render partial: '/toolbar' %>
+      <%= render '/toolbar' %>
 
-      <%= render partial: '/user_util_links' %>
+      <%= render '/user_util_links' %>
     </div>
   </div>
 </nav>
-

data/app/views/_toolbar.html.erb

@@ -22,18 +22,40 @@
         <% end %>
         <ul class="dropdown-menu">
           <li><%= link_to t("sufia.toolbar.works.my"), sufia.dashboard_works_path %></li>
-
-          <% classification = CurationConcerns::QuickClassificationQuery.new(current_user) %>
-          <% classification.each do |concern| %>
-            <li><%= link_to(
-                  "#{t("sufia.toolbar.works.new")} #{concern.human_readable_type}",
-                  new_polymorphic_path([main_app, concern]),
-                  class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
+          <% if create_work_presenter.many? %>
+            <% # launch the type selector modal %>
+            <li>
+              <%= link_to(
+                    t("sufia.toolbar.works.new"),
+                    '#',
+                    data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single' },
+                    class: "item-option contextual-quick-classify",
+                    role: 'menuitem'
+                  ) %>
+            </li>
+            <li>
+              <%= link_to(
+                    t("sufia.toolbar.works.batch"),
+                    '#',
+                    data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'batch' },
+                    class: "item-option contextual-quick-classify",
+                    role: 'menuitem'
+                  ) %>
+            </li>
+          <% else %>
+            <% # simple link to the first work type %>
+            <li>
+            <%= link_to(
+                  t("sufia.toolbar.works.new"),
+                  new_polymorphic_path([main_app, create_work_presenter.first_model]),
+                  class: "item-option contextual-quick-classify",
                   role: 'menuitem'
                 ) %>
             </li>
+            <li><%= link_to t("sufia.toolbar.works.batch"),
+                            sufia.new_batch_upload_path(payload_concern: create_work_presenter.first_model) %>
+            </li>
           <% end %>
-          <li><%= link_to t("sufia.toolbar.works.batch"), sufia.new_batch_upload_path %></li>
         </ul>
       </li>
     <% end %>
@@ -41,7 +63,7 @@
     <% if can?(:create, Collection) %>
       <li class="dropdown">
         <%= link_to sufia.dashboard_collections_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
-          <span class="fa fa-cubes"></span> <%= t("sufia.toolbar.collections.menu") %> <span class="caret"></span>
+          <span class="<%= Sufia::ModelIcon.css_class_for(Collection) %>"></span> <%= t("sufia.toolbar.collections.menu") %> <span class="caret"></span>
         <% end %>
         <ul class="dropdown-menu">
           <li><%= link_to t("sufia.toolbar.collections.my"), sufia.dashboard_collections_path %></li>

data/app/views/_user_util_links.html.erb

@@ -2,29 +2,29 @@
   <% if user_signed_in? %>
     <li>
       <%= link_to sufia.notifications_path do %>
-        Notifications
+        <%= t("sufia.toolbar.notifications") %>
         <%= render partial: 'users/notify_number' %>
       <% end %>
     </li>
     <li class="dropdown">
       <%= link_to sufia.profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>
-        <span class="sr-only">View</span>
+        <span class="sr-only"><%= t("sufia.toolbar.profile.sr_action") %></span>
         <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
-        <span class="sr-only"> profile</span>
+        <span class="sr-only"> <%= t("sufia.toolbar.profile.sr_target") %></span>
         <span class="fa fa-user"></span>
         <span class="caret" ></span>
       <% end %>
       <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to 'View Profile', sufia.profile_path(current_user) %></li>
-        <li><%= link_to 'Edit Profile', sufia.edit_profile_path(current_user) %></li>
+        <li><%= link_to t("sufia.toolbar.profile.view"), sufia.profile_path(current_user) %></li>
+        <li><%= link_to t("sufia.toolbar.profile.edit"), sufia.edit_profile_path(current_user) %></li>
         <li class="divider"></li>
-        <li><%= link_to 'Logout', main_app.destroy_user_session_path %></li>
+        <li><%= link_to t("sufia.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
       </ul>
     </li><!-- /.btn-group -->
   <% else %>
     <li>
       <%= link_to main_app.new_user_session_path do %>
-        <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> Login
+        <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span > <%= t("sufia.toolbar.profile.login") %>
       <% end %>
     </li>
   <% end %>

data/app/views/batch_edits/edit.html.erb

@@ -34,8 +34,11 @@
                   <%= hidden_field_tag('key', term.to_s) %>
                   <%# TODO we don't need to show required %>
                   <%= render_edit_field_partial(term, f: f) %>
+                  <% @form.batch_document_ids.each do |batch_id| %>
+                    <%= hidden_field_tag "batch_document_ids[]", batch_id %>
+                  <% end %>
                   <div>
-                    <%= f.submit "Save changes", class: 'btn btn-primary field-save updates-batches' , id: "#{term.to_s}_save" %>
+                    <%= f.submit "Save changes", class: 'btn btn-primary field-save', id: "#{term.to_s}_save" %>
                     <a class="btn btn-default" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
                     <div class="status fleft"></div>
                   </div>
@@ -45,18 +48,27 @@
         <% end %>
       </div><!-- #descriptions_display -->
 
-      <div id="permissions_display" class="tab-pane">
-        <%= simple_form_for @form.model, url: batch_edits_path, method: :put, remote: true, html: { id: "form_permissions", class: "ajax-form"} do |f| %>
-           <%= hidden_field_tag('update_type', 'update') %>
-           <%= hidden_field_tag('key', 'permissions') %>
-           <%= render "curation_concerns/file_sets/permission_form", f: f %>
-         <div class="row">
-            <%= f.submit "Save changes", class: 'btn btn-primary updates-batches', id: 'permissions_save' %>
+    <div id="permissions_display" class="tab-pane">
+      <%= simple_form_for @form.model,
+                          url: batch_edits_path,
+                          method: :put,
+                          remote: true,
+                          html: { id: "form_permissions", class: "ajax-form"},
+                          data: { 'param-key' => @form.model_name.param_key } do |f| %>
+        <%= hidden_field_tag('update_type', 'update') %>
+        <%= hidden_field_tag('key', 'permissions') %>
+        <%= render "curation_concerns/base/form_permission", f: f %>
+        <%= render "curation_concerns/base/form_share", f: f %>
+        <% @form.batch_document_ids.each do |batch_id| %>
+          <%= hidden_field_tag "batch_document_ids[]", batch_id %>
+        <% end %>
+        <div class="row">
+            <%= f.submit "Save changes", class: 'btn btn-primary', id: 'permissions_save' %>
             <div id="status_permissions" class="status fleft"></div>
-         </div>
-       <% end %>
-     </div>
-   </div> <!-- .tab-content -->
+        </div>
+      <% end %>
+    </div>
+  </div> <!-- .tab-content -->
 
 <!-- Ajax call to clear the batch before page uload. -->
 <%= button_to "Clear Batch", { controller: :batch_edits, action: :clear }, form_class: 'hidden', remote: true, id: 'clear_batch' %>

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,4 +1,4 @@
     <div class="col-sm-3">
-      <span class="fa fa-cubes collection-icon-search"></span>
+      <span class="<%= Sufia::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>
     </div>
 

data/app/views/collections/_form.html.erb

@@ -1,12 +1,12 @@
 <%= simple_form_for @form, html: { class: 'editor' } do |f| %>
   <div id="descriptions_display">
-    <h2 class="non lower"><%= t('sufia.collection.edit.description') %></h2>
+    <h2 class="non lower"><%= t('sufia.collection.form.description') %></h2>
     <div id="base-terms">
       <% f.object.primary_terms.each do |term| %>
         <%= render_edit_field_partial(term, f: f) %>
       <% end %>
     </div>
-    <%= link_to t('sufia.collection.edit.additional_fields'),
+    <%= link_to t('sufia.collection.form.additional_fields'),
             '#extended-terms',
             class: 'btn btn-default additional-fields',
             data: { toggle: 'collapse' },

data/app/views/collections/_media_display.html.erb

@@ -1 +1 @@
-<span class="fa fa-cubes collection-icon-search"></span>
+<span class="<%= Sufia::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>

data/app/views/curation_concerns/base/_find_work_widget.html.erb

@@ -0,0 +1,16 @@
+<%= f.input id_type,
+      label: false,
+      type: :text,
+      input_html:{
+        id: id_name,
+        name: f.object.model_name.param_key + '[' + id_type + '][]',
+        :'data-autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
+        :'data-autocomplete' => 'work',
+        :'data-user' => current_user.email,
+        :'data-id' => id,
+        autocomplete: 'off',
+        :'aria-labelledby' => id_name + '_label',
+        :class => 'new-form-control string multi_value optional related_works_ids form-control multi-text-field ui-autocomplete-input',
+        value: ''
+      }
+ %>

data/app/views/curation_concerns/base/_form.html.erb

@@ -1,4 +1,10 @@
 <%= simple_form_for [main_app, @form], html: { multipart: true } do |f| %>
+  <% if f.object.errors.include?(:base) %>
+    <div class="alert alert-danger alert-dismissable" role="alert">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+      <%= f.object.errors.full_messages_for(:base).send(SimpleForm.error_method) %>
+    </div>
+  <% end %>
   <% unless f.object.persisted? %>
     <% content_for :metadata_tab do %>
       <p class="switch-upload-type">To create a separate work for each of the files, go to <%= link_to "Batch upload", sufia.new_batch_upload_path %></p>

data/app/views/curation_concerns/base/_form_child_work_relationships.html.erb

@@ -49,7 +49,7 @@ HTML Properties:
     <tr class="new-row">
       <td>
         <a href="" class="title hidden"></a>
-        <input class="new-form-control string multi_value optional related_works_ids work_child_members_ids form-control multi-text-field" value="" id="work_child_members_ids" aria-labelledby="work_child_members_ids_label" name="<%= f.object.model_name.param_key %>[ordered_member_ids][]" type="text">
+        <%= render "find_work_widget", f: f, id_name: 'work_child_members_ids', id_type: 'ordered_member_ids', user_email: current_user.email, id: f.object.model.id %>
         <div class="message has-warning hidden"></div>
       </td>
       <td>

data/app/views/curation_concerns/base/_form_metadata.html.erb

@@ -7,7 +7,7 @@
             <%= render_edit_field_partial(term, f: f) %>
           <% end %>
         </div>
-        <%= link_to t('sufia.works.edit.additional_fields'),
+        <%= link_to t('sufia.works.form.additional_fields'),
                     '#extended-terms',
                     class: 'btn btn-default additional-fields',
                     data: { toggle: 'collapse' },

data/app/views/curation_concerns/base/_form_parent_work_relationships.html.erb

@@ -0,0 +1,43 @@
+<div class="form-group multi_value optional managed">
+
+  <table class="table table-striped related-files relationships-ajax-enabled"
+         data-query-url="<%= polymorphic_path([main_app, :curation_concerns, curation_concern.model_name.singular], id: '$id') %>">
+    <thead>
+    <tr>
+      <th>Parent Work</th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+    <tbody>
+
+    <% f.object.in_work_members.each do |member| %>
+        <tr>
+          <td>
+            <%= link_to member.title.first, [main_app, member] %>
+            <input class="string multi_value optional form-control related_works_ids form-control multi-text-field hidden" value="<%= member.id %>" id="work_in_works_ids" aria-labelledby="work_in_works_ids_label" name="<%= f.object.model_name.param_key %>[in_works_ids][]" type="text">
+          </td>
+          <td>
+            <div class="child-actions">
+              <%= link_to "Edit", [main_app, :edit, member], target: "_blank", class: 'btn btn-default' %>
+              <a class="btn btn-danger btn-remove-row">Remove</a>
+            </div>
+          </td>
+        </tr>
+    <% end %>
+    <tr class="new-row">
+      <td>
+        <a href="" class="title hidden"></a>
+        <%= render "find_work_widget", f: f, id_name: 'work_parent_members_ids', id_type: 'in_works_ids', user_email: current_user.email, id: f.object.model.id %>
+        <div class="message has-warning hidden"></div>
+      </td>
+      <td>
+        <div class="child-actions">
+          <a href="" class="edit hidden btn btn-default" target="_blank">Edit</a>
+          <a class="btn btn-danger btn-remove-row hidden">Remove</a>
+          <a class="btn btn-primary btn-add-row">Add</a>
+        </div>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div>

data/app/views/curation_concerns/base/_form_progress.html.erb

@@ -5,11 +5,11 @@
   <div class="list-group">
     <div class="list-group-item">
       <fieldset>
-        <legend class="legend-save-work">Requirements</legend>
+        <legend class="legend-save-work"><%= t('.requirements') %></legend>
         <ul class="requirements">
-          <li class="incomplete" id="required-metadata">Enter required metadata</li>
+          <li class="incomplete" id="required-metadata"><%= t('.required_descriptions') %></li>
           <% if Sufia.config.work_requires_files %>
-            <li class="incomplete" id="required-files">Add files</li>
+            <li class="incomplete" id="required-files"><%= t('.required_files') %></li>
           <% end %>
         </ul>
       </fieldset>
@@ -43,6 +43,9 @@
     <%= link_to t(:'helpers.action.cancel'),
                 sufia.dashboard_index_path,
                 class: 'btn btn-default' %>
-    <%= f.submit 'Save', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "with_files_submit", name: "save_with_files" %>
+    <%# TODO: If we start using ActionCable, we could listen for object updates and
+              alert the user that the object has changed by someone else %>
+    <%= f.input CurationConcerns::OptimisticLockValidator.version_field, as: :hidden unless f.object.new_record? %>
+    <%= f.submit class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "with_files_submit", name: "save_with_files" %>
   </div>
 </aside>