sufia 7.0.0 → 7.1.0

data/app/forms/sufia/forms/batch_edit_form.rb

@@ -26,9 +26,9 @@ module Sufia
         def initialize_combined_fields(batch)
           combined_attributes = {}
           permissions = []
-          # For each of the files in the batch, set the attributes to be the concatination of all the attributes
+          # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
           batch.each do |doc_id|
-            work = model_class.load_instance_from_solr(doc_id)
+            work = model_class.find(doc_id)
             terms.each do |key|
               combined_attributes[key] ||= []
               combined_attributes[key] = (combined_attributes[key] + work[key]).uniq

data/app/forms/sufia/forms/work_form.rb

@@ -34,7 +34,19 @@ module Sufia::Forms
          :visibility_after_embargo, :visibility_during_lease,
          :lease_expiration_date, :visibility_after_lease, :visibility,
          :thumbnail_id, :representative_id, :ordered_member_ids,
-         :collection_ids]
+         :collection_ids, :in_works_ids]
+    end
+
+    # The ordered_members which are FileSet types
+    # @return [Array] All of the file sets in the ordered_members
+    def ordered_fileset_members
+      model.ordered_members.to_a.select { |m| m.model_name.singular.to_sym == :file_set }
+    end
+
+    # The ordered_members which are not FileSet types
+    # @return [Array] All of the non file sets in the ordered_members
+    def ordered_work_members
+      model.ordered_members.to_a.select { |m| m.model_name.singular.to_sym != :file_set }
     end
 
     def self.multiple?(term)

data/app/presenters/sufia/work_show_presenter.rb

@@ -17,6 +17,17 @@ module Sufia
       end
     end
 
+    def presenter_types
+      CurationConcerns.config.registered_curation_concern_types.map(&:underscore) + ["collection"]
+    end
+
+    def grouped_presenters(filtered_by: nil, except: nil)
+      grouped = collection_presenters.group_by(&:model_name).transform_keys { |key| key.to_s.underscore }
+      grouped.select! { |obj| obj.downcase == filtered_by } unless filtered_by.nil?
+      grouped.except!(*except) unless except.nil?
+      grouped
+    end
+
     def display_feature_link?
       user_can_feature_works? && solr_document.public? && FeaturedWork.can_create_another? && !featured?
     end

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

@@ -0,0 +1,65 @@
+<%# Form UI behavior code and details;
+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
+  .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)
+%>
+<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' %>
+
+  <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>Child Work</th>
+      <th>Actions</th>
+    </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| %>
+        <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">
+          </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>
+        <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">
+        <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

@@ -8,7 +8,9 @@
         <legend class="legend-save-work">Requirements</legend>
         <ul class="requirements">
           <li class="incomplete" id="required-metadata">Enter required metadata</li>
-          <li class="incomplete" id="required-files">Add files</li>
+          <% if Sufia.config.work_requires_files %>
+            <li class="incomplete" id="required-files">Add files</li>
+          <% end %>
         </ul>
       </fieldset>
     </div>

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

@@ -1,6 +1,15 @@
+<%= render 'form_in_works', f: f %>
 <h2><%= t("sufia.works.#{action_name}.in_collections") %></h2>
 <div id="collection-widget">
   <%= f.input :collection_ids, as: :select,
-      collection: available_collections(nil),
-      input_html: { class: 'form-control', multiple: true } %>
+              collection: available_collections(nil),
+              input_html: { class: 'form-control', multiple: true } %>
 </div>
+
+<% if params[:id] %>
+  <h3><%= t("sufia.works.#{action_name}.in_this_work") %></h3>
+  <%= render 'form_child_work_relationships', f: f %>
+
+  <h3><%= t("sufia.works.#{action_name}.in_other_works") %></h3>
+  <%= render_edit_field_partial(:in_works_ids, f: f) %>
+<% end %>

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

@@ -5,8 +5,8 @@
   </thead>
   <tbody>
     <%= render 'attribute_rows', presenter: presenter %>
-    <%= presenter.attribute_to_html(:embargo_release_date) %>
-    <%= presenter.attribute_to_html(:lease_expiration_date) %>
+    <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date) %>
+    <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date) %>
     <%= presenter.attribute_to_html(:rights, render_as: :rights) %>
   </tbody>
 </table>

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

@@ -1,22 +1,7 @@
-    <h2><%= t('.header') %></h2>
-    <% collection_presenters = presenter.collection_presenters %>
-    <% if collection_presenters.blank? %>
-        <p><%= t('.empty', type: presenter.human_readable_type) %></p>
-    <% else %>
-      <table class="table table-striped relationships">
-        <tbody>
-        <tr>
-          <th><%= t('.collections', type: presenter.human_readable_type) %></th>
-          <td>
-            <% collection_presenters.each do |collection| %>
-              <ul class="tabular">
-                <li class='attribute title'>
-                  <%= link_to collection.to_s, main_app.collection_path(collection) %>
-                </li>
-              </ul>
-            <% end %>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    <% end %>
+<h2><%= t('.header') %></h2>
+<table class="table table-striped relationships">
+  <tbody>
+    <%= render 'relationships_parent_rows', presenter: presenter %>
+    <%= render 'relationships_member_rows', presenter: presenter %>
+  </tbody>
+</table>

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

@@ -0,0 +1,24 @@
+<% member_presenters = presenter.member_presenters.group_by(&:model_name).transform_keys{|key| key.to_s.singularize.underscore}.select{ |k,v| k.to_sym != :file_set } %>
+<% if member_presenters.blank? %>
+  <tr>
+    <th><%= t(".label", type: presenter.human_readable_type) %></th>
+    <td>
+      <p><%= t('.empty', type: presenter.human_readable_type) %></p>
+    </td>
+  </tr>
+<% else %>
+  <% member_presenters.each_pair do |model_name, members| %>
+    <tr>
+      <th><%= t(".label", type: presenter.human_readable_type) %></th>
+      <td>
+        <ul class="tabular">
+          <% members.each do |member| %>
+            <li class='attribute title'>
+              <%= link_to member.title.first, [main_app, member] %>
+            </li>
+          <% end %>
+        </ul>
+      </td>
+    </tr>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,16 @@
+<tr>
+  <th><%= t(".label", type: type.humanize) %></th>
+  <td>
+    <% if items.blank? %>
+      <p><%= t('.empty', type: type.humanize) %></p>
+    <% else %>
+      <ul class="tabular">
+        <% items.each do |item| %>
+          <li class='attribute title'>
+            <%= link_to item.title.first, [main_app, item] %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,6 @@
+<tr>
+  <th><%= t(".label", type: type.humanize) %></th>
+  <td>
+    <p><%= t(".empty", type: type.humanize) %></p>
+  </td>
+</tr>

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

@@ -0,0 +1,23 @@
+<% presenters = presenter.collection_presenters %>
+<% if presenters.blank? %>
+  <% presenter.presenter_types.each do |type| %>
+    <%= render 'relationships_parent_row_empty', type: type, presenter: presenter %>
+  <% end %>
+<% else %>
+
+  <%# Render presenters which aren't specified in the 'presenter_types' %>
+  <% presenter.grouped_presenters(except: presenter.presenter_types).each_pair do |model_name, items| %>
+    <%= render 'relationships_parent_row', type: model_name, items: items, presenter: presenter %>
+  <% end %>
+
+  <%# Render grouped presenters showing rows or an 'empty' row if there are none for that type %>
+  <% presenter.presenter_types.each do |type| %>
+    <% if presenter.grouped_presenters(filtered_by: type).blank? %>
+      <%= render 'relationships_parent_row_empty', type: type, presenter: presenter %>
+    <% else %>
+      <% presenter.grouped_presenters(filtered_by: type).each_pair do |model_name, items| %>
+        <%= render 'relationships_parent_row', type: type, items: items, presenter: presenter %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/curation_concerns/file_sets/_actions.html.erb

@@ -20,7 +20,7 @@
     </li>
 
     <li role="menuitem" tabindex="-1">
-      <%= link_to t('sufia.single_use_link'), '#',
+      <%= link_to t('sufia.single_use_links.button'), '#',
                   class: "copypaste",
                   title: "Single-Use Link to File",
                   data: { generate_single_use_link_url: curation_concerns.generate_show_single_use_link_url(file_set.id) },

data/app/views/curation_concerns/file_sets/_show_actions.html.erb

@@ -6,17 +6,16 @@
     <%= link_to "Citations", sufia.citations_work_path(@presenter), id: 'citations', class: 'btn btn-default' %>
   <% end %>
   <% if @presenter.editor? %>
-      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default' %>
-      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter], class: 'btn btn-danger', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
-
-      <%= button_tag t('sufia.single_use_link'),
-                  class: "copypaste btn btn-default",
-                  title: "Single-Use Link to File",
-                  data: { generate_single_use_link_url: curation_concerns.generate_show_single_use_link_url(@presenter.id) },
-                  id: "copy_link_#{@presenter.id}" %>
+      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]),
+                  class: 'btn btn-default' %>
+      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter],
+                  class: 'btn btn-danger', data: { confirm: "Delete this #{@presenter.human_readable_type}?" },
+                  method: :delete %>
+      <%= link_to t('sufia.single_use_links.button'),
+                  curation_concerns.generate_download_single_use_link_path(@presenter),
+                  class: 'btn btn-default generate-single-use-link' %>
   <% end %>
 
-
   <%= render 'social_media' %>
 </div>
 

data/app/views/curation_concerns/file_sets/_single_use_link_rows.html.erb

@@ -0,0 +1,19 @@
+<% single_use_links.each do |presenter| %>
+  <tr>
+    <td>
+      <%= t('sufia.single_use_links.expiration_message', link: presenter.short_key, 
+                                                         time: presenter.human_readable_expiration) %>
+    </td>
+    <td>
+      <button class="btn btn-xs btn-default copy-single-use-link"
+              data-clipboard-text="<%= curation_concerns.send(presenter.url_helper, presenter.downloadKey) %>"
+              data-toggle="tooltip" data-placement="bottom"
+              title="<%= t('curation_concerns.single_use_links.copy.tooltip') %>">
+        <%= t('curation_concerns.single_use_links.copy.button') %>
+      </button>
+      <%= link_to t('curation_concerns.single_use_links.delete'),
+                  curation_concerns.delete_single_use_link_path(params[:id], presenter),
+                  class: 'btn btn-xs btn-danger delete-single-use-link' %>
+    </td>
+  </tr>
+<% end %>

data/app/views/curation_concerns/file_sets/_single_use_links.html.erb

@@ -0,0 +1,10 @@
+<h3><%= t('curation_concerns.single_use_links.title') %></h3>
+<table class="table table-striped table-condensed <%= dom_class(presenter) %> single-use-links">
+  <tbody data-url="<%= curation_concerns.generated_single_use_links_path(presenter) %>">
+    <% if presenter.single_use_links.empty? %>
+      <tr><td><%= t('curation_concerns.single_use_links.table.no_links') %></td></tr>
+    <% else %>
+      <%= render 'single_use_link_rows', single_use_links: presenter.single_use_links %>
+    <% end %>
+  </tbody>
+</table>

data/app/views/curation_concerns/file_sets/show.html.erb

@@ -5,6 +5,7 @@
     <div class="col-xs-12 col-sm-4">
       <%= media_display @presenter %>
       <%= render 'show_actions', presenter: @presenter %>
+      <%= render 'single_use_links', presenter: @presenter if @presenter.editor? %>
     </div>
     <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
       <header>

data/app/views/records/edit_fields/_in_works_ids.html.erb

@@ -0,0 +1,59 @@
+<%# Form UI behavior code and details;
+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
+  .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)
+%>
+<% if f.object.class.multiple? key %>
+  <div class="form-group multi_value optional work_in_works_ids 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>
+        <% curation_concern.in_works.each do |parent| %>
+          <tr>
+            <td>
+              <%= link_to "#{parent.title.first}", polymorphic_path([main_app, :curation_concerns, curation_concern.model_name.singular], id: parent.id) %>
+              <input class="string multi_value optional form-control related_works_ids form-control multi-text-field hidden" name="<%= curation_concern.model_name.param_key %>[in_works_ids][]" value="<%= parent.id %>" id="work_in_works_ids" aria-labelledby="work_in_works_ids_label" type="text">
+            </td>
+            <td>
+              <div class="child-actions">
+                <%= link_to "Edit", edit_polymorphic_path([main_app, :curation_concerns, curation_concern.model_name.singular], id: parent.id), 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>
+            <input class="new-form-control string multi_value optional related_works_ids form-control multi-text-field" name="<%= curation_concern.model_name.param_key %>[in_works_ids][]" value="" aria-labelledby="work_in_works_ids_label" type="text">
+            <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>
+<% else %>
+  <%= f.input key, required: f.object.required?(key) %>
+<% end %>

data/config/locales/sufia.en.yml

@@ -14,7 +14,9 @@ en:
     share_button:       "Share Your Work"
     view_profile:       "View Profile"
     edit_profile:       "Edit Profile"
-    single_use_link:    "Single-Use Link to File"
+    single_use_links:
+      button:  "Single-Use Link to File"
+      expiration_message: "Link %{link} expires %{time}"
     directory:
       suffix:           "@example.org"
     search:
@@ -210,10 +212,14 @@ en:
       new:
         header: Add New Work
         in_collections: This Work in Collections
+        in_this_work: Other Works in this Work
+        in_other_works: This Work in Other Works
         after_create_html: "Your files are being processed by %{application_name} in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
       edit:
         header: Edit Work
         in_collections: This Work in Collections
+        in_this_work: Other Works in this Work
+        in_other_works: This Work in Other Works
         additional_fields: "Additional fields"
         tab:
           metadata:      "Descriptions"
@@ -228,6 +234,8 @@ en:
       new:
         header: Batch Create New Works
         in_collections: These Works in Collections
+        in_this_work: Other Works in this Work
+        in_other_works: This Work in Other Works
       progress:
         header: Save Works
       files:
@@ -340,8 +348,15 @@ en:
     base:
       relationships:
         header: Relationships
-        empty:       "This %{type} is not currently in any collections."
-        collections: "In collections:"
+        empty: "This %{type} is not currently in any collections."
+      relationships_parent_row:
+        label: "In %{type}:"
+      relationships_parent_row_empty:
+        label: "In %{type}:"
+        empty: "There are no %{type} relationships."
+      relationships_member_rows:
+        label: "Has related %{type}:"
+        empty: "This %{type} does not have any related works."
       metadata:
         header: Descriptions
         attribute_name_label: Attribute Name
@@ -362,12 +377,16 @@ en:
         label_html: Lease
       private:
         label_html: Private
+    single_use_links:
+      copy: 
+        button: Copy
   blacklight:
     search:
       fields:
         show:
           keyword: Keyword
 
+
   helpers:
     action:
       cancel: "Cancel"