Edit project tag from the show page

jcoyne · jcoyne · commit 429087a45d61 · 2022-02-24T07:39:30.000-06:00
diff --git a/app/components/show/agreement/details_component.html.erb b/app/components/show/agreement/details_component.html.erb
@@ -18,7 +18,7 @@
       <tr>
         <th class="col-3" scope="row">Project</th>
         <td>
-          <%= render Show::ProjectTagComponent.new(document: @presenter.document) %>
+          <%= render Show::ProjectTagComponent.new(change_set: @presenter.change_set) %>
         </td>
       </tr>
 
diff --git a/app/components/show/collection/details_component.html.erb b/app/components/show/collection/details_component.html.erb
@@ -11,7 +11,7 @@
       <tr>
         <th class="col-3" scope="row">Project</th>
         <td>
-          <%= render Show::ProjectTagComponent.new(document: @presenter.document) %>
+          <%= render Show::ProjectTagComponent.new(change_set: @presenter.change_set) %>
         </td>
       </tr>
 
diff --git a/app/components/show/item/details_component.html.erb b/app/components/show/item/details_component.html.erb
@@ -18,7 +18,7 @@
       <tr>
         <th class="col-3" scope="row">Project</th>
         <td>
-          <%= render Show::ProjectTagComponent.new(document: @presenter.document) %>
+          <%= render Show::ProjectTagComponent.new(change_set: @presenter.change_set) %>
         </td>
       </tr>
 
diff --git a/app/components/show/project_tag_component.html.erb b/app/components/show/project_tag_component.html.erb
@@ -0,0 +1,6 @@
+<turbo-frame id="project">
+  <%= project %>
+  <%= link_to edit_project_item_path(id: id), aria: { label: 'Edit project' } do %>
+    <span class="bi-pencil"></span>
+  <% end %>
+</turbo-frame>
diff --git a/app/components/show/project_tag_component.rb b/app/components/show/project_tag_component.rb
@@ -2,25 +2,10 @@
 
 module Show
   class ProjectTagComponent < ApplicationComponent
-    def initialize(document:)
-      @document = document
+    def initialize(change_set:)
+      @change_set = change_set
     end
 
-    def call
-      render_field 'project_tag_ssim'
-    end
-
-    private
-
-    delegate :blacklight_config, :search_state, :search_action_path, to: :helpers
-
-    def render_field(field_name)
-      field_config = fields.fetch(field_name)
-      Blacklight::FieldPresenter.new(self, @document, field_config).render
-    end
-
-    def fields
-      @fields ||= blacklight_config.show_fields_for(:show)
-    end
+    delegate :id, :project, to: :@change_set
   end
 end
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
@@ -44,10 +44,13 @@ def create
   def update
     @cocina = maybe_load_cocina(params[:id])
     authorize! :manage_item, @cocina
-    return unless enforce_versioning
+
+    attributes = params.require(:collection).permit(:copyright, :use_statement, :license, :project)
+
+    # Editing project does not require versioning.
+    return if attributes.except(:project).present? && !enforce_versioning
 
     change_set = CollectionChangeSet.new(@cocina)
-    attributes = params.require(:collection).permit(:copyright, :use_statement, :license)
     change_set.validate(**attributes)
     change_set.save
     Argo::Indexer.reindex_pid_remotely(@cocina.externalIdentifier)
diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb
@@ -7,7 +7,7 @@ class ItemsController < ApplicationController
     add_collection set_collection remove_collection
     mods
     purge_object
-    show_barcode show_copyright show_license show_use_statement
+    show_barcode show_copyright show_license show_use_statement show_project
     source_id
     tags_bulk
     update
@@ -20,7 +20,6 @@ class ItemsController < ApplicationController
     refresh_metadata
     set_rights
     set_governing_apo
-    update
   ]
 
   rescue_from Dor::Services::Client::UnexpectedResponse do |exception|
@@ -279,10 +278,24 @@ def show_license
     render Show::LicenseComponent.new(change_set: change_set, state_service: state_service)
   end
 
+  # Draw form for setting project
+  def edit_project
+    @change_set = build_change_set
+  end
+
+  def show_project
+    change_set = ItemChangeSet.new(@cocina)
+    render Show::ProjectTagComponent.new(change_set: change_set)
+  end
+
   # save the form
   def update
     change_set = ItemChangeSet.new(@cocina)
-    attributes = params.require(:item).permit(:barcode, :copyright, :use_statement, :license)
+    attributes = params.require(:item).permit(:barcode, :copyright, :use_statement, :license, :project)
+
+    # Editing project does not require versioning.
+    return if attributes.except(:project).present? && !enforce_versioning
+
     if change_set.validate(**attributes)
       change_set.save # may raise Dor::Services::Client::BadRequestError
       reindex
diff --git a/app/models/collection_change_set.rb b/app/models/collection_change_set.rb
@@ -7,6 +7,7 @@ class CollectionChangeSet < ApplicationChangeSet
   property :copyright, virtual: true
   property :license, virtual: true
   property :use_statement, virtual: true
+  property :project, virtual: true
 
   def self.model_name
     ::ActiveModel::Name.new(nil, nil, 'Collection')
@@ -22,6 +23,7 @@ def setup_properties!(_options)
     self.copyright = model.access.copyright
     self.use_statement = model.access.useAndReproductionStatement
     self.license = model.access.license
+    self.project = model.administrative&.partOfProject
   end
 
   def save_model
diff --git a/app/models/item_change_set.rb b/app/models/item_change_set.rb
@@ -12,6 +12,7 @@ class ItemChangeSet < ApplicationChangeSet
   property :source_id, virtual: true
   property :use_statement, virtual: true
   property :barcode, virtual: true
+  property :project, virtual: true
 
   validates :embargo_access, inclusion: {
     in: Constants::REGISTRATION_RIGHTS_OPTIONS.map(&:second),
@@ -36,6 +37,7 @@ def setup_properties!(_options)
     self.copyright = model.access.copyright
     self.use_statement = model.access.useAndReproductionStatement
     self.license = model.access.license
+    self.project = model.administrative.partOfProject
 
     setup_embargo_properties! if model.access.embargo
   end
diff --git a/app/services/collection_change_set_persister.rb b/app/services/collection_change_set_persister.rb
@@ -18,20 +18,24 @@ def update
     updated = model
     updated = update_identification(updated) if changed?(:source_id) || changed?(:catkey)
     updated = updated_access(updated) if access_changed?
-    updated = updated_administrative(updated) if changed?(:admin_policy_id)
+    updated = updated_administrative(updated) if administrative_changed?
     object_client.update(params: updated)
   end
 
   private
 
   attr_reader :model, :change_set
 
-  delegate :admin_policy_id, :license, :copyright, :use_statement, :catkey, :changed?, to: :change_set
+  delegate :admin_policy_id, :project, :license, :copyright, :use_statement, :catkey, :changed?, to: :change_set
 
   def access_changed?
     changed?(:copyright) || changed?(:license) || changed?(:use_statement)
   end
 
+  def administrative_changed?
+    changed?(:admin_policy_id) || changed?(:project)
+  end
+
   def updated_access(updated)
     access_properties = {
       copyright: changed?(:copyright) ? copyright : updated.access.copyright,
@@ -49,7 +53,11 @@ def update_identification(updated)
   end
 
   def updated_administrative(updated)
-    updated_administrative = updated.administrative.new(hasAdminPolicy: admin_policy_id)
+    properties = {}
+    properties[:hasAdminPolicy] = admin_policy_id if changed?(:admin_policy_id)
+    properties[:partOfProject] = project if changed?(:project)
+
+    updated_administrative = updated.administrative.new(properties)
     updated.new(administrative: updated_administrative)
   end
 
diff --git a/app/services/item_change_set_persister.rb b/app/services/item_change_set_persister.rb
@@ -19,7 +19,7 @@ def update
     updated = model
     updated = update_structural(updated) if changed?(:collection_ids)
     updated = update_identification(updated) if changed?(:source_id) || changed?(:catkey) || changed?(:barcode)
-    updated = updated_administrative(updated) if changed?(:admin_policy_id)
+    updated = updated_administrative(updated) if administrative_changed?
     updated = updated_access(updated) if access_changed?
     object_client.update(params: updated)
   end
@@ -28,7 +28,7 @@ def update
 
   attr_reader :model, :change_set
 
-  delegate :admin_policy_id, :barcode, :catkey, :collection_ids,
+  delegate :admin_policy_id, :project, :barcode, :catkey, :collection_ids,
            :copyright, :embargo_release_date, :embargo_access, :license, :source_id,
            :use_statement, :changed?, to: :change_set
 
@@ -37,7 +37,11 @@ def object_client
   end
 
   def updated_administrative(updated)
-    updated_administrative = updated.administrative.new(hasAdminPolicy: admin_policy_id)
+    properties = {}
+    properties[:hasAdminPolicy] = admin_policy_id if changed?(:admin_policy_id)
+    properties[:partOfProject] = project if changed?(:project)
+
+    updated_administrative = updated.administrative.new(properties)
     updated.new(administrative: updated_administrative)
   end
 
@@ -58,6 +62,10 @@ def access_changed?
       changed?(:embargo_access)
   end
 
+  def administrative_changed?
+    changed?(:admin_policy_id) || changed?(:project)
+  end
+
   def updated_access(updated)
     access_properties = {}
     access_properties[:copyright] = copyright.presence if changed?(:copyright)
diff --git a/app/views/items/edit_project.html.erb b/app/views/items/edit_project.html.erb
@@ -0,0 +1,12 @@
+<%= turbo_frame_tag 'project' do %>
+  <%= form_with model: @change_set do |f| %>
+    <div class="mb-3">
+      <%= f.label :project, class: 'visually-hidden' %>
+      <%= f.text_field :project, class: 'form-control' %>
+    </div>
+    <div class="float-end">
+      <%= link_to 'Cancel', show_project_item_path(params[:id]) %>
+      <%= f.submit 'Save', class: 'btn btn-primary' %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -153,6 +153,8 @@
       get 'show_use_statement'
       get 'edit_license'
       get 'show_license'
+      get 'edit_project'
+      get 'show_project'
       get 'collection/delete',   action: :remove_collection, as: 'remove_collection'
       post 'collection/add',     action: :add_collection,    as: 'add_collection'
       post 'collection/set',     action: :set_collection,    as: 'set_collection'
diff --git a/spec/components/show/collection/details_component_spec.rb b/spec/components/show/collection/details_component_spec.rb
@@ -7,7 +7,7 @@
   let(:presenter) { instance_double(ArgoShowPresenter, document: doc, change_set: change_set, cocina: cocina, state_service: state_service) }
   let(:cocina) { instance_double(Cocina::Models::Collection) }
 
-  let(:change_set) { instance_double(ItemChangeSet, barcode: nil, id: doc.id, catkey: '') }
+  let(:change_set) { instance_double(CollectionChangeSet, id: doc.id, catkey: '', project: 'phoenix') }
   let(:rendered) { render_inline(component) }
   let(:allows_modification) { true }
   let(:state_service) { instance_double(StateService, allows_modification?: allows_modification) }
diff --git a/spec/components/show/item/details_component_spec.rb b/spec/components/show/item/details_component_spec.rb
@@ -7,7 +7,7 @@
   let(:presenter) { instance_double(ArgoShowPresenter, document: doc, change_set: change_set, cocina: cocina, state_service: state_service) }
   let(:cocina) { instance_double(Cocina::Models::DRO) }
 
-  let(:change_set) { instance_double(ItemChangeSet, barcode: nil, id: doc.id, catkey: '') }
+  let(:change_set) { instance_double(ItemChangeSet, barcode: nil, id: doc.id, catkey: '', project: 'phoenix') }
   let(:rendered) { render_inline(component) }
   let(:allows_modification) { true }
   let(:state_service) { instance_double(StateService, allows_modification?: allows_modification) }
diff --git a/spec/requests/collection_update_spec.rb b/spec/requests/collection_update_spec.rb
@@ -29,23 +29,47 @@
                            })
     end
 
-    let(:updated_model) do
-      cocina_model.new(
-        {
-          'access' => {
-            'copyright' => 'in public domain'
+    context 'when copyright is passed' do
+      let(:updated_model) do
+        cocina_model.new(
+          {
+            'access' => {
+              'copyright' => 'in public domain'
+            }
           }
-        }
-      )
+        )
+      end
+
+      it 'sets the new copyright' do
+        patch "/collections/#{pid}", params: { collection: { copyright: 'in public domain' } }
+
+        expect(object_client).to have_received(:update)
+          .with(params: updated_model)
+        expect(Argo::Indexer).to have_received(:reindex_pid_remotely)
+        expect(response.code).to eq('303')
+      end
     end
 
-    it 'sets the new copyright' do
-      patch "/collections/#{pid}", params: { collection: { copyright: 'in public domain' } }
+    context 'when project is passed' do
+      let(:updated_model) do
+        cocina_model.new(
+          {
+            administrative: {
+              partOfProject: 'pegasus',
+              hasAdminPolicy: 'druid:cg532dg5405'
+            }
+          }
+        )
+      end
+
+      it 'sets the new project' do
+        patch "/collections/#{pid}", params: { collection: { project: 'pegasus' } }
 
-      expect(object_client).to have_received(:update)
-        .with(params: updated_model)
-      expect(Argo::Indexer).to have_received(:reindex_pid_remotely)
-      expect(response.code).to eq('303')
+        expect(object_client).to have_received(:update)
+          .with(params: updated_model)
+        expect(Argo::Indexer).to have_received(:reindex_pid_remotely)
+        expect(response.code).to eq('303')
+      end
     end
   end
 end
diff --git a/spec/requests/item_update_spec.rb b/spec/requests/item_update_spec.rb
@@ -114,6 +114,28 @@
       end
     end
 
+    context 'when project is passed' do
+      let(:updated_model) do
+        cocina_model.new(
+          {
+            administrative: {
+              partOfProject: 'pegasus',
+              hasAdminPolicy: 'druid:cg532dg5405'
+            }
+          }
+        )
+      end
+
+      it 'sets the new project' do
+        patch "/items/#{pid}", params: { item: { project: 'pegasus' } }
+
+        expect(object_client).to have_received(:update)
+          .with(params: updated_model)
+        expect(Argo::Indexer).to have_received(:reindex_pid_remotely)
+        expect(response.code).to eq('303')
+      end
+    end
+
     context 'when there is an error' do
       it 'draws the error' do
         allow(object_client).to receive(:update).and_raise(Dor::Services::Client::BadRequestError, '({"errors":[{"detail":"broken"}]})')
