sufia 7.3.0.rc3 → 7.3.0

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

@@ -1,6 +1,8 @@
 module Sufia
   module Workflow
     class AbstractNotification
+      include ActionView::Helpers::UrlHelper
+
       def self.send_notification(entity:, comment:, user:, recipients:)
         new(entity, comment, user, recipients).call
       end
@@ -13,6 +15,7 @@ module Sufia
         @comment = comment.respond_to?(:comment) ? comment.comment.to_s : ''
         @recipients = recipients
         @user = user
+        @entity = entity
       end
 
       def call
@@ -26,7 +29,17 @@ module Sufia
         end
 
         def message
-          "#{title} (#{work_id}) was advanced in the workflow by #{user.user_key} and is awaiting approval #{comment}"
+          "#{title} (#{link_to work_id, document_path}) was advanced in the workflow by #{user.user_key} and is awaiting approval #{comment}"
+        end
+
+        # @return [ActiveFedora::Base] the document (work) the the Abstract WorkFlow is creating a notification for
+        def document
+          @entity.proxy_for
+        end
+
+        def document_path
+          key = document.model_name.singular_route_key
+          Rails.application.routes.url_helpers.send(key + "_path", document.id)
         end
 
       private

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

@@ -8,13 +8,13 @@ module Sufia
         end
 
         def message
-          "#{title} (#{work_id}) requires additional changes before approval.\n\n '#{comment}'"
+          "#{title} (#{link_to work_id, document_path}) requires additional changes before approval.\n\n '#{comment}'"
         end
 
       private
 
         def users_to_notify
-          user_key = ActiveFedora::Base.find(work_id).depositor
+          user_key = document.depositor
           super << ::User.find_by(email: user_key)
         end
     end

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

@@ -8,7 +8,7 @@ module Sufia
         end
 
         def message
-          "#{title} (#{work_id}) was approved by #{user.user_key}. #{comment}"
+          "#{title} (#{link_to work_id, document_path}) was approved by #{user.user_key}. #{comment}"
         end
 
       private

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

@@ -8,7 +8,7 @@ module Sufia
         end
 
         def message
-          "#{title} (#{work_id}) was deposited by #{user.user_key} and is awaiting approval #{comment}"
+          "#{title} (#{link_to work_id, document_path}) was deposited by #{user.user_key} and is awaiting approval #{comment}"
         end
 
       private

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

@@ -1,16 +1,10 @@
-<%= 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: ''
-      }
- %>
+<%= text_field_tag "find_#{name}",
+                   '',
+                   placeholder: t('.placeholder', default: 'Search for a work'),
+                   autocomplete: 'off',
+                   style: "width: 100%",
+                   data: {
+                     autocomplete: 'work',
+                     'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
+                     'exclude-work': id # exclude this item from the result set.
+                   } %>

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

@@ -1,4 +1,8 @@
-<%= simple_form_for [main_app, @form], html: { multipart: true } do |f| %>
+<%= simple_form_for [main_app, @form],
+                    html: {
+                      data: { behavior: 'work-form' },
+                      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>

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

@@ -2,21 +2,18 @@
 Code:
   app/assets/javascripts/sufia/relationships
 CSS:
-  table.relationships-ajax-enabled : Used by sufia JS app as selector to wire up the UI functionality
-  tr.new-row : The basic template row for cloning when user clicks "Add"
-  .btn-remove-row : Button to remove its parent TR from the table
-  .btn-add-row : Button to clone its parent TR and inject a new row into the table
-  input.new-form-control : Input field for client client side validation and additional features
+  [data-behavior="remove-relationship"] : Button to remove its parent TR from the table
+  [data-behavior="add-relationship"] : Button to clone its parent TR and inject a new row into the table
   .message.has-warning : Used to display UI errors related to input values and server errors
 HTML Properties:
   table:
-    data-query-url : URL base to append newly added work ID to for querying details (title, href)
+    [data-behavior="child-relationships"] : allows the javascript to be initialized
+    data-param-key : the parameter key value for this model type
 %>
 <div class="form-group multi_value optional managed">
-  <%= link_to "Attach New Work", polymorphic_path([main_app, :new, :curation_concerns, :parent, curation_concern.model_name.singular], parent_id: params[:id]), target: "_blank", class: 'btn btn-primary' %>
+  <%= link_to "Attach New Work", polymorphic_path([main_app, :new, :curation_concerns, :parent, curation_concern.model_name.singular], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
 
-  <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') %>">
+  <table class="table table-striped related-files" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>">
     <thead>
     <tr>
       <th>Child Work</th>
@@ -24,42 +21,35 @@ HTML Properties:
     </tr>
     </thead>
     <tbody>
-    <tr class="hidden">
-      <td>
-        <% f.object.ordered_fileset_members.each do |fileset| %>
-          <input class="related_works_ids work_filesets_ids" name="<%= f.object.model_name.param_key %>[ordered_member_ids][]" type="hidden" value="<%= fileset.id %>">
-        <% end %>
-      </td>
-      <td></td>
-    </tr>
-    <% f.object.ordered_work_members.each do |member| %>
+
+    <%= f.fields_for :work_members do |row| %>
         <tr>
           <td>
-            <%= link_to member.title.first, [main_app, member] %>
-            <input class="string multi_value optional form-control related_works_ids work_child_members_ids form-control multi-text-field hidden" value="<%= member.id %>" id="work_child_members_ids" aria-labelledby="work_child_members_ids_label" name="<%= f.object.model_name.param_key %>[ordered_member_ids][]" type="text">
+            <%= link_to row.object.title.first, [main_app, row.object] %>
           </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>
+            <a class="btn btn-danger" data-behavior="remove-relationship" data-index="<%= row.index %>">Remove</a>
           </td>
         </tr>
     <% end %>
-    <tr class="new-row">
+    <tr>
       <td>
-        <a href="" class="title hidden"></a>
-        <%= 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 %>
+        <%= render "find_work_widget", f: f,
+                                       name: 'child_work',
+                                       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>
+        <a class="btn btn-primary" data-behavior="add-relationship">Add</a>
       </td>
     </tr>
     </tbody>
   </table>
 </div>
+
+<script type="text/x-tmpl" id="tmpl-child-work">
+<tr>
+  <td>{%= o.title %}</td>
+  <td><button class="btn btn-danger" data-behavior="remove-relationship">Remove</button></td>
+</tr>
+</script>

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

@@ -1,7 +1,7 @@
 <% if Flipflop.assign_admin_set? %>
   <%= f.input :admin_set_id, as: :select,
-      collection: Sufia::AdminSetService.new(controller).select_options(:deposit),
-      include_blank: true,
+      include_blank: false,
+      collection: Sufia::AdminSetOptionsPresenter.new(Sufia::AdminSetService.new(controller)).select_options,
       input_html: { class: 'form-control' } %>
 <% end %>
 
@@ -14,10 +14,7 @@
               input_html: { class: 'form-control', multiple: true } %>
 </div>
 
-<% if params[:id] %>
+<% if f.object.persisted? %>
   <h3><%= t("sufia.works.form.in_this_work") %></h3>
-   <%= render 'form_child_work_relationships', f: f, id_name: 'work_child_members_ids', id_type: 'ordered_member_ids' %>
-
-  <h3><%= t("sufia.works.form.in_other_works") %></h3>
-  <%= render 'form_parent_work_relationships', f: f, id_name: 'work_parent_members_ids', id_type: 'in_works_ids' %>
+   <%= render 'form_child_work_relationships', f: f %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% # we will yield to content_for for each tab, e.g. :files_tab %>
-<% tabs ||= %w[metadata files relationships share] # default tab order %>
+<% tabs ||= %w[metadata files relationships] # default tab order %>
 <div class="row">
   <div class="col-xs-12 col-sm-8" role="main">
 
@@ -16,6 +16,12 @@
             </a>
           </li>
       <% end %>
+
+      <li role="presentation" id="tab-share" class="hidden">
+        <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
+          <i class="fa icon-share"></i> <%= t("sufia.works.form.tab.share") %>
+        </a>
+      </li>
     </ul>
 
     <!-- Tab panes -->

data/app/views/sufia/admin/admin_sets/_form_participants.html.erb

@@ -2,7 +2,7 @@
             <div class="panel panel-default labels">
               <div class="panel-body">
                 <h2><%= t('.add_participants') %></h2>
-                <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
+                <% access_options = options_for_select([['Depositor', 'deposit']]) %>
                 <%= simple_form_for @form.permission_template,
                                     url: [sufia, :admin, @form, :permission_template],
                                     html: { id: 'group-participants-form' } do |f| %>
@@ -59,9 +59,9 @@
 
                 <fieldset>
                   <legend><%= t(".current_participants") %></legend>
-                  <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
+                  <%# render 'form_participant_table', access: 'managers', filter: :manage? %>
                   <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
-                  <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
+                  <%# render 'form_participant_table', access: 'viewers', filter: :view? %>
                 </fieldset>
               </div>
             </div>

data/app/views/sufia/admin/admin_sets/show.html.erb

@@ -11,8 +11,16 @@
           <%= link_to sufia.edit_admin_admin_set_path(@presenter), class: 'btn btn-primary' do %>
             <span class="fa fa-edit"></span> <%= t(:'helpers.action.edit') %>
           <% end %>
-          <%= link_to sufia.admin_admin_set_path(@presenter), class: 'btn btn-danger', data: { confirm: t('.confirm_delete'), method: :delete } do %>
-            <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+          <% if @presenter.disable_delete? %>
+            <span title="<%= @presenter.disabled_message %>">
+              <%= link_to sufia.admin_admin_set_path(@presenter), class: 'btn btn-danger disabled' do %>
+                <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+              <% end %>
+            </span>
+          <% else %>
+            <%= link_to sufia.admin_admin_set_path(@presenter), class: 'btn btn-danger', data: { confirm: t('.confirm_delete'), method: :delete } do %>
+              <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+            <% end %>
           <% end %>
         </div>
       </div>

data/config/initializers/monkey_patch_admin_set.rb

@@ -0,0 +1,2 @@
+# Override CC's AdminSet to load Sufia's updated AdminSetBehavior
+AdminSet.include(Sufia::AdminSetBehavior)

data/config/locales/sufia.en.yml

@@ -321,6 +321,8 @@ en:
         new:
           header:         "Create New Administrative Set"
         delete:
+          error_default_set: "Administrative set cannot be deleted as it is the default set"
+          error_not_empty:   "Administrative set cannot be deleted as it is not empty"
           notification:   "Administrative set successfully deleted"
         form:
           tabs:

data/db/migrate/20170317141521_permission_template_change_column_workflow_name.rb

@@ -0,0 +1,5 @@
+class PermissionTemplateChangeColumnWorkflowName < ActiveRecord::Migration
+  def change
+    change_column_null :permission_templates, :workflow_name, false
+  end
+end

data/lib/generators/sufia/templates/workflow.json.erb

@@ -4,6 +4,7 @@
             "name": "one_step_mediated_deposit",
             "label": "One-step mediated deposit workflow",
             "description": "A single-step workflow for mediated deposit in which all deposits must be approved by a reviewer. Reviewer may also send deposits back to the depositor.",
+            "allows_access_grant": false,
             "actions": [
                 {
                     "name": "deposit",

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = '7.3.0.rc3'.freeze
+  VERSION = '7.3.0'.freeze
 end

data/lib/tasks/migrate.rake

@@ -2,7 +2,7 @@ namespace :sufia do
   namespace :migrate do
     task move_all_works_to_admin_set: :environment do
       require 'sufia/move_all_works_to_admin_set'
-      MoveAllWorksToAdminSet.run(AdminSet.find(Sufia::DefaultAdminSetActor::DEFAULT_ID))
+      MoveAllWorksToAdminSet.run(AdminSet.find(AdminSet::DEFAULT_ID))
     end
 
     desc "Migrate workflow data from 7.3.0.rc1"

data/spec/actors/sufia/actors/attach_members_actor_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Actors::AttachMembersActor do
+  let(:create_actor) do
+    double('create actor', create: true,
+                           curation_concern: work,
+                           update: true,
+                           user: depositor)
+  end
+  let(:actor) do
+    CurationConcerns::Actors::ActorStack.new(work, depositor, [described_class])
+  end
+  let(:depositor) { create(:user) }
+  let(:work) { create(:work) }
+  let(:attributes) { { work_members_attributes: { '0' => { id: id } } } }
+
+  describe "#update" do
+    subject { actor.update(attributes) }
+    before do
+      work.ordered_members << existing_child_work
+    end
+    let(:existing_child_work) { create(:work) }
+    let(:id) { existing_child_work.id }
+
+    context "without useful attributes" do
+      let(:attributes) { {} }
+      it { is_expected.to be true }
+    end
+
+    context "when the id already exists in the members" do
+      it "does nothing" do
+        expect { subject }.not_to change { work.ordered_members.to_a }
+      end
+
+      context "and the _destroy flag is set" do
+        let(:attributes) { { work_members_attributes: { '0' => { id: id, _destroy: 'true' } } } }
+
+        it "removes from the member and the ordered members" do
+          expect { subject }.to change { work.ordered_members.to_a }
+          expect(work.ordered_member_ids).not_to include(existing_child_work.id)
+          expect(work.member_ids).not_to include(existing_child_work.id)
+        end
+      end
+    end
+
+    context "when the id does not exist in the members" do
+      let(:another_work) { create(:work) }
+      let(:id) { another_work.id }
+      context "and I can edit that object" do
+        let(:ability) { instance_double(Ability) }
+        before do
+          allow(Ability).to receive(:new).and_return(ability)
+          allow(ability).to receive(:can?).with(:edit, GenericWork).and_return(true)
+        end
+        it "is added to the ordered members" do
+          expect { subject }.to change { work.ordered_members.to_a }
+          expect(work.ordered_member_ids).to include(existing_child_work.id, another_work.id)
+        end
+      end
+
+      context "and I can not edit that object" do
+        it "does nothing" do
+          expect { subject }.not_to change { work.ordered_members.to_a }
+        end
+      end
+    end
+  end
+end

data/spec/actors/sufia/apply_permission_template_actor_spec.rb

@@ -11,7 +11,11 @@ RSpec.describe Sufia::ApplyPermissionTemplateActor do
     CurationConcerns::Actors::ActorStack.new(work, depositor, [described_class])
   end
   let(:depositor) { create(:user) }
-  let(:work) { build(:generic_work) }
+  let(:work) do
+    build(:generic_work,
+          edit_users: ['Kevin'],
+          read_users: ['Taraji'])
+  end
   let(:attributes) { { admin_set_id: admin_set.id } }
   let(:admin_set) { create(:admin_set) }
   let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
@@ -54,9 +58,9 @@ RSpec.describe Sufia::ApplyPermissionTemplateActor do
 
       it "adds the template users to the work" do
         expect(actor.create(attributes)).to be true
-        expect(work.edit_users).to include 'hannah'
+        expect(work.edit_users).to include('hannah', 'Kevin')
         expect(work.edit_groups).to include 'librarians'
-        expect(work.read_users).to include 'gary'
+        expect(work.read_users).to include('gary', 'Taraji')
         expect(work.read_groups).to include 'readers'
       end
     end

data/spec/actors/sufia/default_admin_set_actor_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Sufia::DefaultAdminSetActor do
 
     context "when admin_set_id is blank" do
       let(:attributes) { { admin_set_id: '' } }
-      let(:default_id) { described_class::DEFAULT_ID }
+      let(:default_id) { AdminSet::DEFAULT_ID }
 
       it "creates the default AdminSet with a PermissionTemplate and calls the next actor with the default admin set id" do
         expect(next_actor).to receive(:create).with(admin_set_id: default_id).and_return(true)

data/spec/controllers/sufia/admin/admin_sets_controller_spec.rb

@@ -109,27 +109,30 @@ describe Sufia::Admin::AdminSetsController do
 
     describe "#update" do
       let(:admin_set) { create(:admin_set, edit_users: [user]) }
-      let(:permission_template) { Sufia::PermissionTemplate.find_or_create_by(admin_set_id: admin_set.id) }
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, workflow_name: workflow_name) }
+      let(:workflow_name) { 'one_step_mediated_deposit' }
       it 'updates a record' do
         # Prevent a save which causes Fedora to complain it doesn't know the referenced node.
         expect_any_instance_of(AdminSet).to receive(:save).and_return(true)
         patch :update, params: { id: admin_set,
-                                 admin_set: { title: "Improved title", thumbnail_id: "mw22v559x", workflow_name: "one_step_mediated_deposit" } }
+                                 admin_set: { title: "Improved title", thumbnail_id: "mw22v559x", workflow_name: workflow_name } }
         expect(response).to be_redirect
         expect(assigns[:admin_set].title).to eq ['Improved title']
         expect(assigns[:admin_set].thumbnail_id).to eq 'mw22v559x'
-        expect(permission_template.workflow_name).to eq 'one_step_mediated_deposit'
+        expect(permission_template.workflow_name).to eq workflow_name
       end
     end
 
     describe "#destroy" do
       let(:admin_set) { create(:admin_set, edit_users: [user]) }
+
       context "with empty admin set" do
         it "deletes the admin set" do
           delete :destroy, params: { id: admin_set }
           expect(response).to have_http_status(:found)
           expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.admin_admin_sets_path)
           expect(flash[:notice]).to eq "Administrative set successfully deleted"
+          expect(AdminSet.exists?(admin_set.id)).to be false
         end
       end
       context "with a non-empty admin set" do
@@ -138,14 +141,26 @@ describe Sufia::Admin::AdminSetsController do
           admin_set.members << work
           admin_set.reload
         end
-        it "detaches the works and deletes the admin set" do
+        it "doesn't delete the admin set (or work)" do
           delete :destroy, params: { id: admin_set }
           expect(response).to have_http_status(:found)
-          expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.admin_admin_sets_path)
-          expect(flash[:notice]).to eq "Administrative set successfully deleted"
+          expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.admin_admin_set_path(admin_set))
+          expect(flash[:alert]).to eq "Administrative set cannot be deleted as it is not empty"
+          expect(AdminSet.exists?(admin_set.id)).to be true
           expect(GenericWork.exists?(work.id)).to be true
         end
       end
+
+      context "with the default admin set" do
+        let(:admin_set) { create(:admin_set, edit_users: [user], id: AdminSet::DEFAULT_ID) }
+        it "doesn't delete the admin set" do
+          delete :destroy, params: { id: admin_set }
+          expect(response).to have_http_status(:found)
+          expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.admin_admin_set_path(admin_set))
+          expect(flash[:alert]).to eq "Administrative set cannot be deleted as it is the default set"
+          expect(AdminSet.exists?(admin_set.id)).to be true
+        end
+      end
     end
   end
 end