curation_concerns 0.7.0 → 0.8.0

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

@@ -0,0 +1,34 @@
+<h1><%= t("file_manager.link_text") %></h1>
+<ul class="breadcrumb">
+  <li>
+    Back to <%= link_to @presenter.to_s, [main_app, @presenter] %>
+  </li>
+</ul>
+
+<% if !@presenter.file_presenters.empty? %>
+  <div data-action="file-manager">
+    <div class="col-md-3" id="file-manager-tools">
+      <h2>Toolbar</h2>
+      <%= render "file_manager_actions" %>
+    </div>
+    <div class="col-md-3" id="label-tools-spacer" class="fixed"></div>
+    <div class="col-md-9" id="order-grid">
+      <div class="btn-group" role="group" data-action="list-toggle">
+        <button type="button" class="btn btn-default list" aria-label="List">
+          <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
+        </button>
+        <button type="button" class="btn btn-default active grid" aria-label="Grid">
+          <span class="glyphicon glyphicon-th" aria-hidden="true"></span>
+        </button>
+      </div>
+      <ul id="sortable" data-id="<%= @presenter.id %>" data-class-name="<%= @presenter.model_name.plural %>" data-singular-class-name="<%= @presenter.model_name.singular %>" class="list-unstyled grid">
+        <% @presenter.file_presenters.each do |member| %>
+          <%= render "file_manager_member", node: member %>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+<% end %>
+<div id="file-manager-extra-tools">
+  <%= render "file_manager_extra_tools" %>
+</div>

data/app/views/shared/_site_search.html.erb

@@ -1,12 +1,12 @@
 <%= form_tag main_app.search_catalog_path, method: :get, class: "search-form" do %>
   <fieldset>
-    <legend class="accessible-hidden">Search <%= t('curation_concerns.product_name') %></legend>
-    <%= label_tag :catalog_search, t('curation_concerns.search.form.q.label'), class: "accessible-hidden" %>
+    <legend class="sr-only">Search <%= t('curation_concerns.product_name') %></legend>
+    <%= label_tag :catalog_search, t('curation_concerns.search.form.q.label'), class: "sr-only" %>
     <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
     <%= text_field_tag(:q, params[:q], class: "q search-query", id: "catalog_search",
                        placeholder: t('curation_concerns.search.form.q.placeholder'), tabindex: "1", type: "search") %>
                       <button type="submit" class="search-submit btn btn-primary" id="keyword-search-submit" tabindex="2">
-      <i class="glyphicon glyphicon-search"></i><span class="accessible-hidden">Search</span>
+      <i class="glyphicon glyphicon-search"></i><span class="sr-only">Search</span>
     </button>
   </fieldset>
 <% end %>

data/config/locales/curation_concerns.en.yml

@@ -147,6 +147,8 @@ en:
           human_readable_type_tesim: "Resource Type"
           format_tesim: "File Format"
           identifier_tesim: "Identifier"
+  file_manager:
+    link_text: 'File Manager'
   simple_form:
     hints:
       defaults:

data/curation_concerns.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hydra-editor', '~> 1.1'
   spec.add_dependency 'blacklight_advanced_search', '~> 6.0'
   spec.add_dependency 'rails_autolink'
+  spec.add_dependency 'sprockets-es6'
 
   spec.add_development_dependency 'solr_wrapper', '~> 0.4'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
@@ -42,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "database_cleaner", "< 1.1.0"
   spec.add_development_dependency 'mida', '~> 0.3.4'
+  spec.add_development_dependency 'jasmine'
 end

data/lib/curation_concerns/engine.rb

@@ -5,6 +5,7 @@ require 'hydra-collections'
 require 'hydra-editor'
 require 'jquery-ui-rails'
 require 'qa'
+require 'sprockets/es6'
 
 module CurationConcerns
   # Ensures that routes to curation_concerns are prefixed with `curation_concerns_`

data/lib/curation_concerns/rails/routes.rb

@@ -12,6 +12,11 @@ module ActionDispatch::Routing
       namespace :curation_concerns, path: :concern do
         concerns_to_route.each do |curation_concern_name|
           namespaced_resources curation_concern_name, except: [:index], &block
+          namespaced_resources curation_concern_name, only: [] do
+            member do
+              get :file_manager
+            end
+          end
         end
 
         resources :permissions, only: [] do

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.7.0".freeze
+  VERSION = "0.8.0".freeze
 end

data/spec/actors/curation_concerns/work_actor_spec.rb

@@ -247,15 +247,31 @@ describe CurationConcerns::GenericWorkActor do
     context 'with multiple file sets' do
       let(:file_set1) { create(:file_set) }
       let(:file_set2) { create(:file_set) }
-      let(:curation_concern) { FactoryGirl.create(:generic_work, user: user, members: [file_set1, file_set2]) }
+      let(:curation_concern) { FactoryGirl.create(:generic_work, user: user, ordered_members: [file_set1, file_set2]) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work, members: [file_set2, file_set1])
+        FactoryGirl.attributes_for(:generic_work, ordered_member_ids: [file_set2.id, file_set1.id])
       end
-      xit 'updates the order of file sets' do
-        expect(curation_concern.ordered_members).to eq [file_set1, file_set2]
+      it 'updates the order of file sets' do
+        expect(curation_concern.ordered_members.to_a).to eq [file_set1, file_set2]
+
         expect(subject.update).to be true
+
         curation_concern.reload
-        expect(curation_concern.ordered_members).to eq [file_set2, file_set1]
+        expect(curation_concern.ordered_members.to_a).to eq [file_set2, file_set1]
+      end
+      ## Is this something we want to support?
+      context "when told to stop ordering a file set" do
+        let(:attributes) do
+          FactoryGirl.attributes_for(:generic_work, ordered_member_ids: [file_set2.id])
+        end
+        it "works" do
+          expect(curation_concern.ordered_members.to_a).to eq [file_set1, file_set2]
+
+          expect(subject.update).to be true
+
+          curation_concern.reload
+          expect(curation_concern.ordered_members.to_a).to eq [file_set2]
+        end
       end
     end
   end

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -163,6 +163,15 @@ describe CollectionsController do
         expect(assigns[:presenter].title).to eq collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
       end
+
+      context 'when the q parameter is passed' do
+        it 'loads the collection (paying no attention to the q param)' do
+          get :show, id: collection, q: 'no matches'
+          expect(response).to be_successful
+          expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
+          expect(assigns[:presenter].title).to eq collection.title
+        end
+      end
     end
 
     context 'not signed in' do

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -122,7 +122,7 @@ describe CurationConcerns::GenericWorksController do
   describe '#update' do
     let(:a_work) { create(:private_generic_work, user: user) }
     before do
-      allow(controller).to receive(:actor).and_return(actor)
+      allow(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor)
     end
     let(:actor) { double(update: true, visibility_changed?: false) }
 
@@ -131,6 +131,13 @@ describe CurationConcerns::GenericWorksController do
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(a_work)
     end
 
+    it "can update file membership" do
+      file = create(:file_set, user: user)
+
+      patch :update, id: a_work, generic_work: { ordered_member_ids: [file.id] }
+      expect(CurationConcerns::CurationConcern).to have_received(:actor).with(anything, anything, ordered_member_ids: [file.id])
+    end
+
     describe 'changing rights' do
       let(:actor) { double(update: true, visibility_changed?: true) }
 
@@ -138,14 +145,14 @@ describe CurationConcerns::GenericWorksController do
         let(:a_work) { create(:work_with_one_file, user: user) }
 
         it 'prompts to change the files access' do
-          patch :update, id: a_work
+          patch :update, id: a_work, generic_work: {}
           expect(response).to redirect_to main_app.confirm_curation_concerns_permission_path(controller.curation_concern)
         end
       end
 
       context 'without children' do
         it "doesn't prompt to change the files access" do
-          patch :update, id: a_work
+          patch :update, id: a_work, generic_work: {}
           expect(response).to redirect_to main_app.curation_concerns_generic_work_path(a_work)
         end
       end
@@ -155,7 +162,7 @@ describe CurationConcerns::GenericWorksController do
       let(:actor) { double(update: false, visibility_changed?: false) }
 
       it 'renders the form' do
-        patch :update, id: a_work
+        patch :update, id: a_work, generic_work: {}
         expect(assigns[:form]).to be_kind_of CurationConcerns::GenericWorkForm
         expect(response).to render_template('edit')
       end
@@ -207,4 +214,17 @@ describe CurationConcerns::GenericWorksController do
       end
     end
   end
+
+  describe '#file_manager' do
+    let(:work) { create(:private_generic_work, user: user) }
+    before do
+      sign_in user
+    end
+    it "is successful" do
+      get :file_manager, id: work.id
+
+      expect(response).to be_success
+      expect(assigns(:presenter)).not_to be_blank
+    end
+  end
 end

data/spec/javascripts/file_manager_member_spec.coffee

@@ -0,0 +1,87 @@
+describe "FileManagerMember", ->
+  file_manager_member = null
+  save_manager = null
+  beforeEach () ->
+    loadFixtures('file_manager_member.html')
+    save_manager = {
+      push_changed: () -> {},
+      mark_unchanged: () -> {}
+    }
+    file_manager_member = new FileManagerMember($("li"), save_manager)
+  describe "#is_changed", ->
+    it "is true when the form's label input is changed", ->
+      $("#file_set_title").val("testing")
+      $("#file_set_title").change()
+
+      expect(file_manager_member.is_changed).toEqual(true)
+    it "is false when the form's label input isn't changed", ->
+      $("#file_set_title").change()
+
+      expect(file_manager_member.is_changed).toEqual(false)
+    it "is false when the form's label input returns", ->
+      initial_val = $("#file_set_title").val()
+      $("#file_set_title").val("testing")
+      $("#file_set_title").change()
+      $("#file_set_title").val(initial_val)
+      $("#file_set_title").change()
+
+      expect(file_manager_member.is_changed).toEqual(false)
+    it "triggers save_manager's push_changed when changed", ->
+      spyOn(save_manager, "push_changed")
+      $("#file_set_title").val("testing")
+      $("#file_set_title").change()
+
+      expect(save_manager.push_changed).toHaveBeenCalledWith(file_manager_member)
+    it "triggers save_manager's mark_unchanged when no longer changed", ->
+      spyOn(save_manager, "mark_unchanged")
+      initial_val = $("#file_set_title").val()
+      $("#file_set_title").val("testing")
+      $("#file_set_title").change()
+      $("#file_set_title").val(initial_val)
+      $("#file_set_title").change()
+
+      expect(save_manager.mark_unchanged).toHaveBeenCalledWith(file_manager_member)
+    it "doesn't trigger save_manager's mark_unchanged when there are still changed elements", ->
+      spyOn(save_manager, "mark_unchanged")
+      file_manager_member.elements.push {}
+      initial_val = $("#file_set_title").val()
+      $("#file_set_title").val("testing")
+      $("#file_set_title").change()
+      $("#file_set_title").val(initial_val)
+      $("#file_set_title").change()
+
+      expect(save_manager.mark_unchanged).not.toHaveBeenCalled()
+  describe "#persist", ->
+    describe "when nothing has changed", ->
+      it "returns a resolved deferred object", ->
+        expect(file_manager_member.persist().state()).toEqual("resolved")
+    describe "when updates need to be sent", ->
+      request = null
+      beforeEach () ->
+        jasmine.Ajax.install()
+      afterEach () ->
+        jasmine.Ajax.uninstall()
+      it "returns a deferred object which is resolved with the ajax request", ->
+        $("#file_set_title").val("testing")
+        $("#file_set_title").change()
+        result = file_manager_member.persist()
+        request = jasmine.Ajax.requests.mostRecent()
+
+        expect(result.state()).toEqual("pending")
+
+        request.respondWith(TestResponses.file_manager_member.success)
+
+        expect(result.state()).toEqual("resolved")
+        expect(file_manager_member.is_changed).toEqual(false)
+      it "rejects the deferred object when the ajax request fails", ->
+        $("#file_set_title").val("testing")
+        $("#file_set_title").change()
+        result = file_manager_member.persist()
+        request = jasmine.Ajax.requests.mostRecent()
+
+        expect(result.state()).toEqual("pending")
+
+        request.respondWith(TestResponses.file_manager_member.failure)
+
+        expect(result.state()).toEqual("rejected")
+        expect(file_manager_member.is_changed).toEqual(true)

data/spec/javascripts/fixtures/file_manager_member.html

@@ -0,0 +1,40 @@
+<li data-reorder-id="j38606956">
+  <form accept-charset="UTF-8" action="/concern/file_sets/j38606956" class=
+  "simple_form edit_file_set" data-remote="true" id="edit_file_set_j38606956"
+  method="post" name="edit_file_set_j38606956">
+    <input name="utf8" type="hidden" value="✓"><input name="_method" type=
+    "hidden" value="patch">
+    <div class="panel panel-default">
+      <div class="panel-heading ui-sortable-handle">
+        <div class="order-title">
+          <div class="form-group string required file_set_title">
+            <div>
+              <input aria-required="true" class=
+              "string required title form-control" id="file_set_title" name=
+              "file_set[title][]" required="required" type="text" value=
+              "01.tif">
+            </div>
+          </div>
+        </div>
+        <div class="file-set-link pull-right">
+          <a href="/concern/file_sets/j38606956" title=
+          "Edit file"><span aria-hidden="true" class=
+          "glyphicon glyphicon-edit"></span></a>
+        </div>
+        <div class="order-filename">
+          <em title="01.tif">(01.tif)</em>
+        </div>
+      </div>
+      <div class="panel-body">
+        <div class="text-center thumbnail">
+          <a data-context-href="/catalog/j38606956/track?search_id=1" href=
+          "/concern/file_sets/j38606956"><img alt="J38606956?file=thumbnail"
+          class="thumbnail-inner" src=
+          "/downloads/j38606956?file=thumbnail"></a>
+        </div>
+        <div class="attributes"></div>
+        <div class="spacer"></div>
+      </div>
+    </div>
+  </form>
+</li>

data/spec/javascripts/fixtures/save_button.html

@@ -0,0 +1,3 @@
+<div class="actions form-horizontal panel panel-default">
+    <button name="button" type="submit" class="btn btn-primary disabled" data-action="save-actions">Save</button>
+  </div>