sufia 5.0.0 → 6.0.0.beta1

data/app/helpers/generic_file_helper.rb

@@ -64,6 +64,15 @@ module GenericFileHelper
     end
   end
 
+  def more_or_less_button(key, html_class, symbol)
+    # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
+    content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do
+      (symbol + content_tag('span', class: 'sr-only') do
+        "add another #{key.to_s}"
+      end).html_safe
+    end
+  end
+
   def download_image_tag title = nil
     if title.nil?
       image_tag "default.png", { alt: "No preview available", class: "img-responsive" }

data/app/helpers/sufia/records_helper_behavior.rb

@@ -1,5 +1,12 @@
 module Sufia
   module RecordsHelperBehavior
+    def add_field(key)
+      more_or_less_button(key, 'adder', '+')
+    end
+
+    def subtract_field(key)
+     more_or_less_button(key, 'remover', '-')
+    end
 
     def help_icon(key, content = nil, title = nil)
       content = content || metadata_help(key)
@@ -33,6 +40,15 @@ module Sufia
   
     private
 
+    def more_or_less_button(key, html_class, symbol)
+      icon = (symbol == "-") ? "remove" : "plus"
+      content_tag 'span', class: 'input-group-btn field-controls' do
+        content_tag "button", class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}" do
+          sr_hidden(icon) + sr_only(key.to_s)
+        end
+      end
+    end
+
     def sr_hidden icon
       content_tag "span", "aria-hidden" => true do 
         content_tag "i", "", class: "glyphicon glyphicon-#{icon}" 

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -1,9 +1,5 @@
 module Sufia
   module SufiaHelperBehavior
-    def orcid_label(style_class='')
-      "#{image_tag 'orcid.png', { alt: t('sufia.user_profile.orcid.alt'), class: style_class }} #{t('sufia.user_profile.orcid.label')}".html_safe
-    end
-
     def error_messages_for(object)
       if object.try(:errors) and object.errors.full_messages.any?
         content_tag(:div, class: 'alert alert-block alert-error validation-errors') do
@@ -168,13 +164,6 @@ module Sufia
       end
     end
 
-    def user_display_name_and_key(user_key)
-      user = ::User.find_by_user_key(user_key)
-      return user_key if user.nil?
-
-      user.respond_to?(:name) ? "#{user.name} (#{user_key})" : user_key
-    end
-
     private
 
     def search_action_for_dashboard

data/app/jobs/content_depositor_change_event_job.rb

@@ -19,7 +19,7 @@ class ContentDepositorChangeEventJob < EventJob
     # TODO: This should be in its own job, not this event job
     file = ::GenericFile.find(pid)
     file.proxy_depositor = file.depositor
-    file.rightsMetadata.clear_permissions! if reset
+    file.clear_permissions! if reset
     file.apply_depositor_metadata(login)
     file.save!
 

data/app/jobs/ingest_local_file_job.rb

@@ -12,6 +12,7 @@ class IngestLocalFileJob
     self.user_key = user_key
   end
 
+  #TODO this should use Actor#create_content
   def run
     user = User.find_by_user_key(user_key)
     raise "Unable to find user for #{user_key}" unless user
@@ -24,7 +25,7 @@ class IngestLocalFileJob
     generic_file.save!
 
     FileUtils.rm(path)
-    Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, user_key))
+    Sufia.queue.push(ContentDepositEventJob.new(generic_file.id, user_key))
     # add message to user for downloaded file
     message = "The file (#{File.basename(filename)}) was successfully deposited."
     job_user.send_message(user, message, 'Local file ingest')

data/app/models/concerns/sufia/solr_document_behavior.rb

@@ -30,9 +30,9 @@ module Sufia
     # @example
     #   link_to '...', SolrDocument(id: 'bXXXXXX5').new => <a href="/dams_object/bXXXXXX5">...</a>
     def to_model
-      m = ActiveFedora::Base.load_instance_from_solr(id, self)
-      return self if m.class == ActiveFedora::Base
-      m
+      @m ||= ActiveFedora::Base.load_instance_from_solr(id)
+      return self if @m.class == ActiveFedora::Base
+      @m
     end
 
     # Method to return the ActiveFedora model
@@ -41,11 +41,11 @@ module Sufia
     end
 
     def noid
-      self[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)]
+      self[Solrizer.solr_name('noid', Sufia::GenericFile::Indexing.noid_indexer)]
     end
 
     def date_uploaded
-      field = self[Solrizer.solr_name("desc_metadata__date_uploaded", :stored_sortable, type: :date)]
+      field = self[Solrizer.solr_name("date_uploaded", :stored_sortable, type: :date)]
       return unless field.present?
       begin
         Date.parse(field).to_formatted_s(:standard)
@@ -60,11 +60,11 @@ module Sufia
     end
 
     def title
-      Array(self[Solrizer.solr_name('desc_metadata__title')]).first
+      Array(self[Solrizer.solr_name('title')]).first
     end
 
     def description
-      Array(self[Solrizer.solr_name('desc_metadata__description')]).first
+      Array(self[Solrizer.solr_name('description')]).first
     end
 
     def label
@@ -76,15 +76,15 @@ module Sufia
     end
 
     def creator
-      Array(self[Solrizer.solr_name("desc_metadata__creator")]).first
+      Array(self[Solrizer.solr_name("creator")]).first
     end
 
     def tags
-      Array(self[Solrizer.solr_name("desc_metadata__tag")])
+      Array(self[Solrizer.solr_name("tag")])
     end
 
     def resource_type
-      Array(self[Solrizer.solr_name("desc_metadata__resource_type")])
+      Array(self[Solrizer.solr_name("resource_type")])
     end
 
     def mime_type

data/app/models/featured_work_list.rb

@@ -11,8 +11,6 @@ class FeaturedWorkList
     end
   end
 
-  delegate :query, :construct_query_for_pids, to: ActiveFedora::SolrService
-
   def featured_works
     return @works if @works
     @works = FeaturedWork.all
@@ -26,20 +24,20 @@ class FeaturedWorkList
   private
     def add_solr_document_to_works
       solr_docs.each do |doc|
-        work_with_pid(doc['id']).generic_file_solr_document = SolrDocument.new(doc)
+        work_with_id(doc['id']).generic_file_solr_document = SolrDocument.new(doc)
       end
     end
 
-    def pids
-      @works.pluck(:generic_file_id).map { |noid| Sufia::Noid.namespaceize(noid) }
+    def ids
+      @works.pluck(:generic_file_id)
     end
 
     def solr_docs
-      query(construct_query_for_pids(pids))
+      ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids))
     end
 
-    def work_with_pid(pid)
-      @works.find { |w| Sufia::Noid.namespaceize(w.generic_file_id) == pid}
+    def work_with_id(id)
+      @works.find { |w| w.generic_file_id == id}
     end
-  
+
 end

data/app/presenters/sufia/version_list_presenter.rb

@@ -0,0 +1,15 @@
+module Sufia
+  class VersionListPresenter
+    def initialize(version_list)
+      @raw_list = version_list
+    end
+
+    delegate :each, to: :wrapped_list
+
+    private
+
+      def wrapped_list
+        @wrapped_list ||= @raw_list.map { |v| Sufia::VersionPresenter.new(v) }.sort(&:date).tap { |l| l.first.try(:current!) }
+      end
+  end
+end

data/app/presenters/sufia/version_presenter.rb

@@ -0,0 +1,30 @@
+module Sufia
+  class VersionPresenter
+    attr_reader :version
+
+    def initialize(version)
+      @version = version
+      @current = false
+    end
+
+    delegate :label, :uri, to: :version
+
+    def current!
+      @current = true
+    end
+
+    def current?
+      @current
+    end
+
+    def created
+      @created ||= version.created.to_time.to_formatted_s(:long_ordinal)
+      @created
+    end
+
+    def committer
+      vc = VersionCommitter.where(version_id: @version.uri)
+      return vc.empty? ? nil : vc.first.committer_login
+    end
+  end
+end

data/app/views/batch/_metadata.html.erb

@@ -9,7 +9,7 @@
           <%= f.label :title, "<span class='required-field'>*</span> Title #{index + 1}".html_safe, class: "control-label" %>
           <%= help_icon(:title) %>
           <div id="additional_title_clone">
-            <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, required: true %>
+            <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, class: 'form-control', required: true %>
           </div>
         </div>
       <% end %>
@@ -22,41 +22,63 @@
 </div>
 
 <%= hidden_field_tag(:extra_description_count, "1") %>
-<div  id="descriptions_display">
+<div id="descriptions_display">
   <h2>Bulk Descriptions</h2>
   <div class="well">
-    <h3>Applies to all files just uploaded</h3>
-    <div class="batch-group" id="resources">
-      <%# See if this works: render_edit_field_partial(:type, f:f) %>
-      <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
-      <%= help_icon(:resource_type) %>
-      <%= content_tag :p, t('sufia.batch.help.resource_type'), class: "help-block" %>
-      <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, size: 7, "aria-label" => "Rights combo box" } %>
-    </div>
+    <div class="row">
+      <div class="col-sm-6">
+      <h3>Applies to all files just uploaded</h3>
+      <div class="batch-group" id="resources">
+        <%# See if this works: render_edit_field_partial(:type, f:f) %>
+        <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
+        <%= help_icon(:resource_type) %>
+        <%= content_tag :p, t('sufia.batch.help.resource_type'), class: "help-block" %>
+        <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, class: 'form-control', size: 7, "aria-label" => "Rights combo box" } %>
+      </div>
 
-    <div class="batch-group">
-      <%= f.label :tag, "<span class='required-field'>*</span> Keyword".html_safe, class: "control-label" %>
-      <%= help_icon(:tag) %>
-      <%= f.input :tag, label: false, as: :multi_value  %>
-    </div>
+      <div class="batch-group">
+        <%= f.label :tag, "<span class='required-field'>*</span> Keyword".html_safe, class: "control-label" %>
+        <%= help_icon(:tag) %>
+        <div id="additional_tag_clone" class="input-group">
+          <%= f.text_field :tag, name: "generic_file[tag][]", value: "", class: 'form-control', required: true  %>
+          <span class="input-group-btn field-controls">
+            <button class="adder btn" name="additional_tag" id="additional_tag_submit">
+              <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
+              <span class="sr-only"><%= t('sufia.batch.metadata.add_another_keyword') %></span>
+            </button>
+          </span>
+        </div>
+        <div id="additional_tag_elements"></div>
+      </div>
 
-    <div class="batch-group">
-      <%= f.label :creator, "<span class='required-field'>*</span> Creator".html_safe, class: "control-label" %>
-      <%= help_icon(:creator) %>
-      <%= f.input :creator, label: false, as: :multi_value  %>
-    </div>
+      <div class="batch-group">
+        <%= f.label :creator, "<span class='required-field'>*</span> Creator".html_safe, class: "control-label" %>
+        <%= help_icon(:creator) %>
+        <div id="additional_creator_clone" class="input-group">
+          <%= f.text_field :creator, name: "generic_file[creator][]", value: "", class: 'form-control', required: true %>
+          <span class="input-group-btn field-controls">
+            <button class="adder btn" name="additional_creator" id="additional_creator_submit"><span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span><span class="sr-only"><%= t('sufia.batch.metadata.add_another_creator') %></span></button>
+          </span>
+        </div>
+        <div id="additional_creator_elements"></div>
+      </div>
 
-    <div class="batch-group">
-      <%= f.label :rights, '<span class="required-field">*</span> Rights'.html_safe, class: "control-label" %>
-      <%= help_icon_modal('rightsModal') %>
-      <%= f.input :rights, label: false, as: :multi_value, collection: Sufia.config.cc_licenses, include_blank: true, input_html: { type: 'select', class: 'select optional form-control' } %>
-      <%= render partial: "generic_files/rights_modal" %>
-    </div>
+      <div class="batch-group">
+        <%= f.label :rights, '<span class="required-field">*</span> Rights'.html_safe, class: "control-label" %>
+        <%= help_icon_modal('rightsModal') %>
+        <% f.object[:rights].each_with_index do |v, index| %>
+          <%= render_edit_field_partial(:rights, record: f.object, f: f, v: v, index: index, render_req: true) %>
+        <% end %>
+        <%= render "generic_files/rights_modal" %>
+        <div id="additional_rights_elements"></div>
+      </div>
 
-    <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
-    <!-- hidden on initial load -->
+      <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
+      <!-- hidden on initial load -->
 
-    <%= render partial: 'more_metadata', locals: {f:f} %>
+      <%= render 'more_metadata', f: f %>
 
+      </div> <!-- /col-sm-8 -->
+    </div> <!-- /row -->
   </div><!-- /well -->
 </div> <!-- /row -->

data/app/views/batch/_more_metadata.html.erb

@@ -1,6 +1,6 @@
 <div id="more_descriptions">
   <button id="hide_addl_descriptions" class="btn btn-default" aria-label="hide additional metadata description fields">Hide Additional Fields</button>
   <% (@generic_file.terms_for_editing - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
-    <%= render partial: "generic_files/field_form", locals: { generic_file: @generic_file, f: f, render_req: false, key: term } %>
+    <%= render "generic_files/field_form", f: f, render_req: false, key: term %>
   <% end %>
 </div> <!-- /more_descriptions -->

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

@@ -5,20 +5,22 @@
 <h1>Apply Metadata</h1>
 <p>
   The information you provide for Title will be applied to the corresponding file only; however all other
-  information you provide will be applied <em>to the entire batch of files</em> you have just 
-  deposited into <%= t('sufia.product_name') %>. You may edit individual files from 
+  information you provide will be applied <em>to the entire batch of files</em> you have just
+  deposited into <%= t('sufia.product_name') %>. You may edit individual files from
   <%= link_to "<i class='glyphicon glyphicon-dashboard'></i> #{t('sufia.bread_crumb.file_list')}".html_safe, sufia.dashboard_files_path %>
   once this step is finished. <span class="required-field">*</span> indicates required fields.
 </p>
-<%= simple_form_for([@batch, @generic_file], url: sufia.batch_generic_files_path, html: { multipart: true, class: 'form-horizontal' }) do |f| %>
+<%= form_for([sufia, @batch, @generic_file], html: { multipart: true }) do |f| %>
 
-  <%= render partial: 'metadata', formats: [:html], locals: {f: f} %>
+  <%= render 'metadata', f: f %>
 
-  <%= render partial: 'generic_files/permission_form', formats: [:html], locals: { gf: @generic_file, batch: @batch } %>
+  <%= render 'generic_files/permission_form', f: f, batch: @batch %>
 
-  <div class="action-button" id="permissions_submit">
-    <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary',
-        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
+  <div class="row" id="permissions_submit">
+    <%= button_tag type: 'submit', class: 'btn btn-primary btn-lg',
+        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
+      <i class="glyphicon glyphicon-floppy-disk"></i> Save
+    <% end %>
   </div>
 
 <% end %>

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

@@ -15,25 +15,28 @@
     <div class="tab-content">
       <div class="well tab-pane active" id="descriptions_display">
         <% @terms.each do |term| %>
-          <% vals = @show_file.send(term) %>
+          <% vals = @generic_file.send(term) %>
           <div class="row">
             <!-- look into dashboard_actions.js -->
             <div class="col-sm-2 col-sm-offset-1">
-              <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
-                <%= get_label(term) %> <span class="chevron"></span>
+              <a class="accordion-toggle grey glyphicon-chevron-right-helper" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#" id="expand_link_<%=term.to_s%>">
+                <%= get_label(term) %>
               </a>
+              <a href="#collapse_<%=term.to_s%>" class="small" id="chevron_link_<%=term.to_s%>"><span id="expand_<%=term.to_s%>" class="glyphicon glyphicon-chevron-right"></span></a>
             </div>
-            <div id="collapse_<%= term.to_s %>" class="collapse scrolly col-sm-6">
-                <%= simple_form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
+            <div id="detail_<%= term.to_s %>" class="col-sm-6">
+              <div class="accordion-body collapse expanded-details scrolly">
+                <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
                   <%= hidden_field_tag('update_type', 'update') %>
                   <%= hidden_field_tag('key', term.to_s) %>
-                  <%= render partial: "generic_files/field_form", locals: { generic_file: @show_file, f: f, render_req: false, key: term } %>
+                  <%= render "generic_files/field_form", f: f, render_req: false, key: term %>
                   <div>
                     <%= f.submit "Save changes", class: 'btn btn-primary field-save updates-batches' , 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>
+                    <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
                     <div id="status_<%= term.to_s %>" class="status fleft"></div>
                   </div>
                 <% end %>
+              </div>
             </div>
           </div>
         <% end %>
@@ -43,9 +46,10 @@
         <%= form_for @generic_file, 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 partial: "generic_files/permission_form", locals: { gf: @show_file } %>
+           <%= render "generic_files/permission_form", f: f %>
          <div class="row">
             <%= f.submit "Save changes", class: 'btn btn-primary updates-batches', id: 'permissions_save' %>
+            <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_permissions" href="#collapse_permissions">Cancel </a>
             <div id="status_permissions" class="status fleft"></div>
          </div>
        <% end %>
@@ -55,4 +59,4 @@
 <!-- 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' %>
 
-</div><!-- descriptions_display -->
+</div><!-- descriptions_display -->

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

@@ -1,6 +1,6 @@
 <%# This mimics the generic_files/descriptions partial & re-uses some of its sub-partials %>
 <div id="descriptions_display" class="tab-pane active">
-  <%= simple_form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
+  <%= form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
       <div class="well">

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

@@ -1,4 +1,4 @@
-<%= simple_form_for [collections, @collection], html: {class: 'form-horizontal editor'} do |f| %>
+<%= form_for [collections, @collection], html: {class: 'form-horizontal editor'} do |f| %>
   <div id="descriptions_display">
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
     <div class="well">
@@ -13,12 +13,12 @@
       <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>"/>
     <% end %>
   <% end %>
-  
+
   <div class="primary-actions">
     <% if params[:action] == "new" %>
-      <%= f.button_button 'Create Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
+      <%= f.button 'Create Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
     <% else %>
-      <%= f.button_button 'Update Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
+      <%= f.button 'Update Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
     <% end %>
     <%= link_to t(:'helpers.action.cancel'), main_app.root_path, class: 'btn btn-link' %>
   </div>