curation_concerns 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7af44881c5c91d837ca80398c54f3e52fd686b01
-  data.tar.gz: d4186500d7ca262837a72912a0e681b83fac149f
+  metadata.gz: 645a0115a0467d0f30efdb1f3a0ed2cde1805831
+  data.tar.gz: 04a720d015cc23c6537bfc5c603c8db8fba6d80c
 SHA512:
-  metadata.gz: fa316af1763c1a5fd5fe369fd1d88c33b42ff7a5b4f14e8b63191de19862707bc82c3f3f0420c93d0ca9e9c26a9a4406fd400f866559e6201969f1c55dd7a56a
-  data.tar.gz: 243f21c6b7cea9a5fa6b18de63a373a7a40461fda1d3551490b1a4c17051dcc112e550e109ef4d55d802dc48dde368db8b0b2279eb4a1594eec4b0cee4eb671b
+  metadata.gz: 2cd5bad72161b60b7c83e52ccaf80082ffaeb24c912f522a1586273b74ed0cbc40923afd3336f0e991259d7c5076f788b275c0abb3b3594e88158d2eefac006c
+  data.tar.gz: db1f0f7b3de445a107da48e31d6755814437b5c194b683424c37fb2a9d2d65c66547f68d6136621bea2f54a2913d44046c60fac37897cc72850bf448fa35582d

data/.gitignore

@@ -12,3 +12,4 @@ solr_conf/
 .byebug_history
 spec/mock_upload_directory
 fcrepo4-data
+fcrepo4-test-data

data/Gemfile

@@ -7,7 +7,7 @@ gem 'curation_concerns-models', path: './curation_concerns-models'
 
 group :development, :test do
   gem 'rubocop', require: false
-  gem 'rubocop-rspec', require: false
+  gem 'rubocop-rspec', '~> 1.3.1', require: false
   gem 'simplecov', '~> 0.9', require: false
   gem 'coveralls', require: false
   gem 'poltergeist'

data/Rakefile

@@ -5,6 +5,7 @@ require 'engine_cart/rake_task'
 require 'rubocop/rake_task'
 require 'solr_wrapper'
 require 'fcrepo_wrapper'
+require 'active_fedora/rake_support'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
@@ -21,17 +22,8 @@ end
 
 desc 'Spin up Solr & Fedora and run the test suite'
 task ci: ['engine_cart:generate'] do
-  # TODO: set port to nil (random port)
-  solr_params = { port: '8985', verbose: true, managed: true }
-  fcrepo_params = { port: '8986', verbose: true, managed: true }
-  SolrWrapper.wrap(solr_params) do |solr|
-    ENV['SOLR_TEST_PORT'] = solr.port
-    solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), 'solr', 'config')) do
-      FcrepoWrapper.wrap(fcrepo_params) do |fcrepo|
-        ENV['FCREPO_TEST_PORT'] = fcrepo.port
-        Rake::Task['spec'].invoke
-      end
-    end
+  with_test_server do
+    Rake::Task['spec'].invoke
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/app/assets/javascripts/curation_concerns/application.js

@@ -8,5 +8,8 @@
 //= require bootstrap/tooltip
 //= require bootstrap/popover
 //= require bootstrap/tab
+//= require bootstrap/affix
+//
+//= require jquery-ui/sortable
 //
 //= require curation_concerns/curation_concerns

data/app/assets/javascripts/curation_concerns/curation_concerns.js

@@ -2,6 +2,11 @@
 //= require curation_concerns/facet_mine
 //= require curation_concerns/embargoes
 //= require curation_concerns/fileupload
+//= require curation_concerns/file_manager/affix
+//= require curation_concerns/file_manager/list_toggle
+//= require curation_concerns/file_manager/sorting
+//= require curation_concerns/file_manager/save_manager
+//= require curation_concerns/file_manager/member
 
 
 // Initialize plugins and Bootstrap dropdowns on jQuery's ready event as well as

data/app/assets/javascripts/curation_concerns/file_manager/affix.es6

@@ -0,0 +1,13 @@
+Blacklight.onLoad(function() {
+  let tools = $("#file-manager-tools")
+  if(tools.length > 0) {
+    tools.affix({
+      offset: {
+        top: $("#file-manager-tools").parent().offset().top,
+        bottom: function() {
+          return $("#file-manager-extra-tools").outerHeight(true) + $("footer").outerHeight(true)
+        }
+      }
+    })
+  }
+})

data/app/assets/javascripts/curation_concerns/file_manager/list_toggle.es6

@@ -0,0 +1,6 @@
+Blacklight.onLoad(function() {
+  $("*[data-action=list-toggle] button").click(function() {
+    $(this).parent().find("button").toggleClass("active")
+    $("#sortable").toggleClass("grid")
+  })
+})

data/app/assets/javascripts/curation_concerns/file_manager/member.es6

@@ -0,0 +1,82 @@
+Blacklight.onLoad(function() {
+  $("li[data-reorder-id]").each(function(index, element) {
+    let manager_member = new FileManagerMember($(element), window.save_manager)
+    $(element).data("file_manager_member", manager_member)
+  })
+})
+class InputTracker {
+  constructor(element, notifier) {
+    this.element = element
+    this.notifier = notifier
+    this.element.data("initial-value", this.element.val())
+    this.element.data("tracker", this)
+    this.element.change(this.value_changed)
+  }
+
+  reset() {
+    this.element.data("initial-value", this.element.val())
+    this.notifier.mark_unchanged(this.element)
+  }
+
+  get value_changed() {
+    return () => {
+      if(this.element.val() == this.element.data("initial-value")) {
+        this.notifier.mark_unchanged(this.element)
+      } else {
+        this.notifier.push_changed(this.element)
+      }
+    }
+  }
+}
+class FileManagerMember {
+  constructor(element, save_manager) {
+    this.element = element
+    this.save_manager = save_manager
+    this.elements = []
+    this.track_label()
+  }
+
+  push_changed(element) {
+    this.elements.push(element)
+    this.elements = $.unique(this.elements)
+    this.save_manager.push_changed(this)
+  }
+
+  mark_unchanged(element) {
+    this.elements = jQuery.grep(this.elements, (value) => {
+      return value != element
+    })
+    if(!this.is_changed) {
+      this.save_manager.mark_unchanged(this)
+    }
+  }
+
+  get is_changed() {
+    return this.elements.length > 0
+  }
+
+  track_label() {
+    new InputTracker(this.element.find("input[type='text']"), this)
+  }
+
+  persist() {
+    if(this.is_changed) {
+      let form = this.element.find("form")
+      let deferred = $.Deferred()
+      form.on("ajax:success", () => {
+        this.elements.forEach((element) => {
+          element.data("tracker").reset()
+        })
+        deferred.resolve()
+      })
+      form.on("ajax:error", () => {
+        deferred.reject()
+      })
+      form.submit()
+      return deferred
+    } else {
+      return $.Deferred().resolve()
+    }
+  }
+}
+

data/app/assets/javascripts/curation_concerns/file_manager/save_manager.es6

@@ -0,0 +1,70 @@
+class SaveManager {
+  constructor() {
+    this.override_save_button()
+    this.elements = []
+  }
+
+  override_save_button() {
+    jQuery(() => {
+      this.save_button.click(this.clicked_save)
+    })
+  }
+
+  push_changed(element) {
+    this.elements.push(element)
+    this.elements = $.unique(this.elements)
+    this.check_button()
+  }
+
+  mark_unchanged(element) {
+    this.elements = jQuery.grep(this.elements, (value) => {
+      return value != element
+    })
+    this.check_button()
+  }
+
+  check_button() {
+    if(this.is_changed && this.save_button.text() == "Save") {
+      this.save_button.removeClass("disabled")
+    } else {
+      this.save_button.addClass("disabled")
+    }
+  }
+
+  persist() {
+    let promises = []
+    this.elements.forEach((element) => {
+      let result = element.persist()
+      promises.push(
+        result.then(() => { return element })
+        .done((element) => { this.mark_unchanged(element) })
+        .fail((element) => { this.push_changed(element) })
+      )
+    })
+    this.save_button.text("Saving...")
+    this.save_button.addClass("disabled")
+    $.when.apply($, promises).always(() => { this.reset_save_button() })
+  }
+  
+  reset_save_button() {
+    this.save_button.text("Save")
+    this.check_button()
+  }
+
+  get is_changed() {
+    return this.elements.length > 0
+  }
+
+  get save_button() {
+    return $("*[data-action='save-actions']")
+  }
+
+  get clicked_save() {
+    return (event) => {
+      event.preventDefault()
+      this.persist()
+    }
+  }
+}
+
+window.save_manager = new SaveManager

data/app/assets/javascripts/curation_concerns/file_manager/sorting.es6

@@ -0,0 +1,82 @@
+{
+  Blacklight.onLoad(function() {
+    window.new_sort_manager = new SortManager
+  })
+
+  class SortManager {
+    constructor() {
+      this.element = $("#sortable")
+      this.sorting_info = {}
+      this.initialize_sort()
+      this.element.data("current-order", this.order)
+      this.save_manager = window.save_manager
+    }
+
+    initialize_sort() {
+      this.element.sortable({handle: ".panel-heading"})
+      this.element.disableSelection()
+      this.element.on("sortstop", this.stopped_sorting)
+      this.element.on("sortstart", this.started_sorting)
+    }
+
+    persist() {
+      let params = {}
+      params[this.singular_class_name] = {
+        "ordered_member_ids": this.order
+      }
+      params["_method"] = "PATCH"
+      let persisting = $.post(
+        `/concern/${this.class_name}/${this.id}`,
+        params
+      ).done(() => {
+        this.element.data("current-order", this.order)
+      })
+      return persisting
+    }
+
+    get_sort_position(item) {
+      return this.element.children().index(item)
+    }
+
+    get stopped_sorting() {
+      return (event, ui) => {
+        this.sorting_info.end = this.get_sort_position($(ui.item))
+        if(this.sorting_info.end == this.sorting_info.start) {
+          return
+        }
+        if(this.order.toString() != this.element.data("current-order").toString()) {
+          this.save_manager.push_changed(this)
+        } else {
+          this.save_manager.mark_unchanged(this)
+        }
+      }
+    }
+
+    get started_sorting() {
+      return (event, ui) => {
+        this.sorting_element = $(ui.item)
+        this.sorting_info.start = this.get_sort_position(ui.item)
+      }
+    }
+
+    get id() {
+      return this.element.data("id")
+    }
+
+    get class_name() {
+      return this.element.data("class-name")
+    }
+
+    get singular_class_name() {
+      return this.element.data("singular-class-name")
+    }
+
+    get order() {
+      return $("*[data-reorder-id]").map(
+        function() {
+          return $(this).data("reorder-id")
+        }
+      ).toArray()
+    }
+  }
+}

data/app/assets/stylesheets/curation_concerns/_modules.scss

@@ -11,4 +11,4 @@
 @import 'modules/pagination';
 @import 'modules/embargoes';
 @import 'modules/icons';
-
+@import 'modules/file_manager';

data/app/assets/stylesheets/curation_concerns/_typography.scss

@@ -89,17 +89,6 @@ legend {
   }
 }
 
-.accessible-hidden {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
 .centered {
   text-align:center;
 }

data/app/assets/stylesheets/curation_concerns/modules/file_manager.scss

@@ -0,0 +1,115 @@
+*[data-action=file-manager] {
+  .actions {
+    padding: 10px;
+    .form-group div {
+      padding-left: 0;
+    }
+  }
+
+  .ui-selectable {
+    padding-left: 0px;
+    padding-right: 0px;
+    margin-top: 61px;
+  }
+
+  .btn-group {
+    margin-bottom: 10px;
+    padding-left: 15px;
+  }
+
+  ul {
+    list-style-type: none;
+    &.grid li {
+      @extend .col-xs-4;
+      .thumbnail {
+        height: 150px;
+        @extend .col-xs-12;
+        img {
+          max-height: 140px;
+        }
+      }
+
+      .spacer {
+        @extend .col-xs-12;
+      }
+      .attributes {
+        @extend .col-xs-12;
+      }
+      .order-title {
+        width: 85%;
+      }
+      .order-filename {
+        width: 100%;
+      }
+      .file-set-link {
+        padding-right: 15px;
+      }
+    }
+    li {
+      @extend .col-xs-12;
+      .text {
+        display: inline-block;
+      }
+      .thumbnail {
+        @extend .col-xs-3;
+      }
+      .spacer {
+        @extend .col-xs-3;
+      }
+      .attributes {
+        @extend .col-xs-6;
+      }
+      .order-title {
+        width: 49%;
+        display: inline-block;
+      }
+      .order-filename {
+        width: 46%;
+        display: inline-block;
+      }
+      .file-set-link {
+        display: inline-block;
+        width: 3%;
+        a {
+          font-size: 20px;
+          color: #999;
+        }
+        span {
+          top: 5px;
+        }
+      }
+      .ui-selecting .panel-body {
+        background: #FECA40;
+      }
+      .ui-selected .panel-body {
+        background: #F39814;
+      }
+      .panel-heading {
+        cursor: grab;
+        cursor: -webkit-grab;
+        cursor: -moz-grab;
+      }
+      input[type=radio] {
+        width: 20px;
+      }
+    }
+  }
+  #file-manager-tools {
+    @media (max-width: $screen-md-min) {
+      &.affix {
+        position: inherit;
+      }
+    }
+    @media (min-width: $screen-md-min) {
+      &.affix {
+        top: 0;
+        width: 235px;
+      }
+    }
+    @media (min-width: $screen-lg-min) {
+      &.affix {
+        width: 285px;
+      }
+    }
+  }
+}

data/app/controllers/concerns/curation_concerns/collections_controller_behavior.rb

@@ -60,7 +60,7 @@ module CurationConcerns
       end
 
       def collection_search_builder
-        collection_search_builder_class.new(self).with(params).tap do |builder|
+        collection_search_builder_class.new(self).with(params.except(:q)).tap do |builder|
           builder.current_ability = current_ability
         end
       end

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -16,7 +16,7 @@ module CurationConcerns::CurationConcernController
 
   module ClassMethods
     def set_curation_concern_type(curation_concern_type)
-      load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: :show
+      load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager]
       self.curation_concern_type = curation_concern_type
     end
 
@@ -85,6 +85,10 @@ module CurationConcerns::CurationConcernController
     after_destroy_response(title)
   end
 
+  def file_manager
+    presenter
+  end
+
   attr_writer :actor
 
   protected

data/app/forms/curation_concerns/forms/work_form.rb

@@ -14,7 +14,7 @@ module CurationConcerns
                     :representative_id, :thumbnail_id, :files,
                     :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo,
                     :visibility_during_lease, :lease_expiration_date, :visibility_after_lease,
-                    :visibility]
+                    :visibility, :ordered_member_ids]
 
       # @param [ActiveFedora::Base,#member_ids] model
       # @param [Ability] current_ability
@@ -43,6 +43,8 @@ module CurationConcerns
           case term.to_s
           when 'rights'
             false
+          when 'ordered_member_ids'
+            true
           else
             super
           end

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

@@ -1,4 +1,4 @@
-<h3 id="document-list-heading" class="accessible-hidden">List of files deposited in <%= t('curation_concerns.product_name') %> that match your search criteria</h3>
+<h3 id="document-list-heading" class="sr-only">List of items deposited in <%= t('curation_concerns.product_name') %> that match your search criteria</h3>
 <ol id="documents" class="container-fluid search-results-list" start="<%= document_counter_with_offset(0) %>" aria-labeled-by="document-list-heading">
   <%= render documents, as: :document %>
 </ol>

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

@@ -1,7 +1,7 @@
 <div style="float: right;" >
   <%= form_for([collections, @collection], url: collections.edit_collection_path , method: :get, class: "well form-search") do |f| %>
 
-      <label class="accessible-hidden">Search Collection <%= @collection.title %></label>
+      <label class="sr-only">Search Collection <%= @collection.title %></label>
       <%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
       <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>

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

@@ -1,7 +1,7 @@
 <div style="float: right;" >
   <%= form_for [collections, @presenter], method: :get, class: "well form-search" do |f| %>
 
-      <label class="accessible-hidden">Search Collection <%= @presenter.title %></label>
+      <label class="sr-only">Search Collection <%= @presenter.title %></label>
       <%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
       <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>

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

@@ -1,24 +1,31 @@
-<% @page_title = "#{@presenter.title} - #{application_name}" %>
+<% provide :page_title, "#{@presenter.title} - #{application_name}" %>
 
-<h1 class="lower"><%= @presenter.title %></h1>
+<% provide :sidebar do %>
+  <%= render 'search_sidebar' %>
+<% end %>
 
-<%= render 'curation_concerns/base/representative_media', work: @presenter %>
+<div id="content">
+  <h1 class="lower"><%= @presenter.title %></h1>
 
-<h3><%= @presenter.description %> </h3>
+  <%= render 'curation_concerns/base/representative_media', work: @presenter %>
 
-<% unless has_collection_search_parameters? %>
-  <%= render partial: 'collections/show_actions' %>
-  <%= render 'attributes', curation_concern: @presenter %>
-<% end %>
+  <h3><%= @presenter.description %> </h3>
 
-<%= render 'search_form' %>
-<%= render 'sort_and_per_page', collection: @presenter %>
+  <% unless has_collection_search_parameters? %>
+    <%= render partial: 'collections/show_actions' %>
+    <%= render 'attributes', curation_concern: @presenter %>
+  <% end %>
 
-<% if has_collection_search_parameters? %>
-  <h2>Search Results within this Collection</h2>
-<% else %>
-  <h2>Items in this Collection</h2>
-<% end %>
-<%= render_document_index @member_docs %>
+  <%= render 'search_form' %>
+  <%= render 'sort_and_per_page', collection: @presenter %>
+
+  <% if has_collection_search_parameters? %>
+    <h2>Search Results within this Collection</h2>
+  <% else %>
+    <h2>Items in this Collection</h2>
+  <% end %>
+  <%= render_document_index @member_docs %>
+
+  <%= render partial: 'paginate' %>
+</div>
 
-<%= render partial: 'paginate' %>

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

@@ -0,0 +1,3 @@
+  <div class="actions form-horizontal panel panel-default">
+    <%= button_tag "Save", class: "btn btn-primary disabled", data: { action: "save-actions" }%>
+  </div>

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

@@ -0,0 +1,31 @@
+<li data-reorder-id='<%= node.id %>'>
+  <%= simple_form_for [main_app, node], remote: true do |f| %>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class="order-title">
+          <%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title" }, value: node.to_s, label: false %>
+        </div>
+        <div class="file-set-link pull-right">
+          <%= link_to polymorphic_path([main_app, node]), title: "Edit file" do %>
+            <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
+          <% end %>
+        </div>
+        <% if node.respond_to?(:page_title) %>
+          <div class="order-filename">
+            <em title="<%= node.page_title %>">(<%= truncate(node.page_title, length: 29) %>)</em>
+          </div>
+        <% end %>
+      </div>
+      <div class="panel-body">
+        <div class="text-center thumbnail">
+          <%= render "file_manager_thumbnail", node: node %>
+        </div>
+        <div class="attributes">
+          <%= render "file_manager_attributes", node: node, f: f%>
+        </div>
+        <div class="spacer">
+        </div>
+      </div>
+    </div>
+  <% end %>
+</li>

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

@@ -0,0 +1 @@
+<%= render_thumbnail_tag node, class: 'thumbnail-inner' %>

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

@@ -3,6 +3,7 @@
     <% if editor %>
       <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default' %>
       <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
+      <%= link_to t("file_manager.link_text"), polymorphic_path([main_app, :file_manager, @presenter]), class: 'btn btn-default' %>
       <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
     <% end %>
     <% if collector %>