Skip to content

Commit

Permalink
Create local models so we can avoid cocina edits
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Mar 24, 2022
1 parent a0dead4 commit afa1dd1
Show file tree
Hide file tree
Showing 135 changed files with 1,217 additions and 1,106 deletions.
4 changes: 2 additions & 2 deletions app/components/contents/file_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<%= filename %>
<% end %>
</td>
<td><%= hasMimeType %></td>
<td><%= mime_type %></td>
<td><%= number_to_human_size(size) %></td>
<td><%= role %></td>
<td class="ps-4"><%= tag :span, class: 'bi-check' if publish %></td>
<td class="ps-4"><%= tag :span, class: 'bi-check' if shelve %></td>
<td class="ps-4"><%= tag :span, class: 'bi-check' if sdrPreserve %></td>
<td class="ps-4"><%= tag :span, class: 'bi-check' if preserve %></td>
<td><%= view_access %></td>
<td><%= download_access %></td>
</tr>
7 changes: 3 additions & 4 deletions app/components/contents/file_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ def viewable?
@viewable
end

delegate :access, :administrative, :filename, :hasMimeType, :size, :externalIdentifier, :use, to: :file
delegate :publish, :shelve, :sdrPreserve, to: :administrative
delegate :filename, :mime_type, :size, :use, :publish, :shelve, :preserve, to: :file

def view_access
access.view.capitalize
file.view_access.capitalize
end

def download_access
access.download.capitalize
file.download_access.capitalize
end

def role
Expand Down
7 changes: 2 additions & 5 deletions app/components/contents/resource_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

module Contents
class ResourceComponent < ViewComponent::Base
# @param [FileSet] resource
def initialize(resource:, resource_counter:, object_id:, viewable:)
@resource = resource
@resource_counter = resource_counter
Expand All @@ -19,10 +20,6 @@ def type
resource.type.delete_prefix('https://cocina.sul.stanford.edu/models/resources/')
end

delegate :label, to: :resource

def files
resource.structural.contains
end
delegate :label, :files, to: :resource
end
end
4 changes: 2 additions & 2 deletions app/components/contents/structural_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="resource-list">
<%= render Contents::ResourceComponent.with_collection(structural&.contains, object_id: object_id, viewable: viewable?) %>
<%= render Contents::ExternalFileComponent.with_collection(structural&.hasMemberOrders&.first&.members) %>
<%= render Contents::ResourceComponent.with_collection(item.file_sets, object_id: object_id, viewable: viewable?) %>
<%= render Contents::ExternalFileComponent.with_collection(item.members) %>
</ul>
8 changes: 4 additions & 4 deletions app/components/contents/structural_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

module Contents
class StructuralComponent < ViewComponent::Base
def initialize(structural:, object_id:, viewable:)
@structural = structural
def initialize(item:, viewable:)
@item = item
@viewable = viewable
@object_id = object_id
@object_id = item.id
end

attr_reader :structural, :object_id
attr_reader :item, :object_id

def viewable?
@viewable
Expand Down
4 changes: 2 additions & 2 deletions app/components/contents_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="document-contents-heading">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#document-contents-section" aria-expanded="true" aria-controls="document-contents-section">
Content (<%= pluralize Array(@cocina.structural&.contains).size, 'Resource' %>)
Content (<%= pluralize @item.file_sets.size, 'Resource' %>)
</button>
</h2>
<div id="document-contents-section" class="accordion-collapse collapse show" aria-labelledby="document-contents-heading">
Expand All @@ -28,7 +28,7 @@
<% end %>
</div>

<%= render Contents::StructuralComponent.new(structural: @cocina.structural, object_id: @cocina.externalIdentifier, viewable: can?(:view_content, @cocina)) %>
<%= render Contents::StructuralComponent.new(item: @item, viewable: can?(:view_content, @item)) %>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions app/components/contents_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

class ContentsComponent < ApplicationComponent
def initialize(presenter:)
@item = presenter.item
@document = presenter.document
@cocina = presenter.cocina
@state_service = presenter.state_service
end

def render?
@cocina.respond_to?(:structural)
@item.is_a? Item
end

delegate :allows_modification?, to: :@state_service
Expand Down
2 changes: 1 addition & 1 deletion app/components/document_title_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<header class="document-header row mb-5 pb-3">
<%= render OpenCloseComponent.new(id: @document.id) if helpers.can?(:manage_item, @presenter.cocina) %>
<%= render OpenCloseComponent.new(id: @document.id) if helpers.can?(:manage_item, @presenter.item) %>
<%= content_tag @as, class: @classes do %>
<%= title -%>
Expand Down
2 changes: 1 addition & 1 deletion app/components/show/admin_policy_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row">
<div class="col">
<%= render Show::ExternalLinksComponent.new(document: document) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, cocina)) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, item)) %>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/components/show/admin_policy_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ def initialize(presenter:)

attr_reader :presenter

delegate :document, :cocina, to: :presenter
delegate :document, :item, to: :presenter
end
end
2 changes: 1 addition & 1 deletion app/components/show/agreement_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row">
<div class="col">
<%= render Show::ExternalLinksComponent.new(document: document) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, presenter.cocina)) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, presenter.item)) %>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions app/components/show/apo/default_object_rights_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class DefaultObjectRightsComponent < ApplicationComponent
# @param [ArgoShowPresenter] presenter
def initialize(presenter:)
@presenter = presenter
@default_access = @presenter.cocina.administrative.accessTemplate
@default_access = @presenter.item.access_template
end

def access_rights
Expand All @@ -22,7 +22,7 @@ def license
end

def use_and_reproduction
@default_access.useAndReproductionStatement || 'None'
@default_access.use_statement || 'None'
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions app/components/show/apo/overview_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ class OverviewComponent < ApplicationComponent
def initialize(presenter:)
@presenter = presenter
@solr_document = presenter.document
@registration_workflow = presenter.cocina.administrative.registrationWorkflow
@registration_workflows = presenter.item.registration_workflows
end

def registration_workflow
@registration_workflow.present? ? @registration_workflow.join(', ') : 'None'
@registration_workflows.present? ? @registration_workflows.join(', ') : 'None'
end

delegate :id, :status, to: :@solr_document
Expand Down
6 changes: 3 additions & 3 deletions app/components/show/apo/roles_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ def permissions
private

def model
@presenter.cocina
@presenter.item
end

def manage_permissions
manage_role = model.administrative.roles&.find { |role| role.name == 'dor-apo-manager' }
manage_role = model.roles&.find { |role| role.name == 'dor-apo-manager' }
managers = manage_role ? manage_role.members.map { |member| "#{member.type}:#{member.identifier}" } : []
build_permissions(managers, 'manage')
end

def view_permissions
view_role = model.administrative.roles&.find { |role| role.name == 'dor-apo-viewer' }
view_role = model.roles&.find { |role| role.name == 'dor-apo-viewer' }
viewers = view_role ? view_role.members.map { |member| "#{member.type}:#{member.identifier}" } : []
build_permissions(viewers, 'view')
end
Expand Down
2 changes: 1 addition & 1 deletion app/components/show/collection_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row">
<div class="col">
<%= render Show::ExternalLinksComponent.new(document: document) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, cocina)) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, item)) %>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/components/show/collection_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ def initialize(presenter:)

attr_reader :presenter

delegate :document, :cocina, to: :presenter
delegate :document, :item, to: :presenter
end
end
2 changes: 1 addition & 1 deletion app/components/show/item/details_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def initialize(presenter:)
end

def render?
!@presenter.cocina.is_a? NilModel
@presenter.item
end

delegate :object_type, :created_date, :preservation_size, to: :@solr_document
Expand Down
2 changes: 1 addition & 1 deletion app/components/show/item/overview_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def initialize(presenter:)
end

def render?
!@presenter.cocina.is_a? NilModel
@presenter.item
end

delegate :id, :status, to: :@solr_document
Expand Down
2 changes: 1 addition & 1 deletion app/components/show/item_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
<div class="col-md-9">
<%= render Show::ExternalLinksComponent.new(document: document) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, presenter.cocina)) %>
<%= render Show::ControlsComponent.new(solr_document: document, manager: helpers.can?(:manage_item, presenter.item)) %>
</div>
</div>

Expand Down
10 changes: 5 additions & 5 deletions app/components/workflow_process_row.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
class WorkflowProcessRow < ApplicationComponent
# @param [Dor::Workflow::Response::Process] process_status the model for the WorkflowProcess
# @param [Integer] index the row index
# @param [Cocina::Models::DRO,Cocina::Models::Collection] cocina_object the repository object that the workflow is about
def initialize(process:, index:, cocina_object:)
# @param [Item,Collection] item the repository object that the workflow is about
def initialize(process:, index:, item:)
@process = process
@index = index
@cocina_object = cocina_object
@item = item
end

delegate :druid, :workflow_name, :repository, :name, :status, :datetime,
Expand All @@ -25,8 +25,8 @@ def error?
end

def show_reset_button?
error? && can?(:manage_item, cocina_object)
error? && can?(:manage_item, item)
end

attr_reader :process, :index, :cocina_object
attr_reader :process, :index, :item
end
4 changes: 2 additions & 2 deletions app/controllers/apo_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ def edit
end

def new
authorize! :create, Cocina::Models::AdminPolicy
authorize! :create, AdminPolicy
@form = ApoForm.new(nil, search_service: search_service)

render layout: 'one_column'
end

def create
authorize! :create, Cocina::Models::AdminPolicy
authorize! :create, AdminPolicy

change_set = AdminPolicyChangeSet.new
unless change_set.validate(params[:apo_form].merge(registered_by: current_user.login))
Expand Down
19 changes: 4 additions & 15 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,7 @@ class ApplicationController < ActionController::Base

layout :determine_layout

# Currently we know that not all objects are Cocina compliant, this ensures that we can at least
# receive some object and so, at least administrators can be authorized to operate on it.
# See: https://argo.stanford.edu/catalog?f[data_quality_ssim][]=Cocina+conversion+failed
# @return [Cocina::Models::DRO,NilModel]
def maybe_load_cocina(druid)
object_client = Dor::Services::Client.object(druid)
object_client.find
rescue Dor::Services::Client::UnexpectedResponse
NilModel.new(druid)
end
delegate :maybe_load_cocina, to: :Repository

def current_user
super.tap do |cur_user|
Expand All @@ -42,15 +33,13 @@ def default_html_head

protected

def enforce_versioning
return redirect_to solr_document_path(@cocina.externalIdentifier), flash: { error: 'Unable to retrieve the cocina model' } if @cocina.is_a? NilModel

state_service = StateService.new(@cocina.externalIdentifier, version: @cocina.version)
def enforce_versioning(item = @item)
state_service = StateService.new(item.id, version: item.version)

# if this object has been submitted and doesn't have an open version, they cannot change it.
return true if state_service.allows_modification?

redirect_to solr_document_path(@cocina.externalIdentifier), flash: { error: 'Object cannot be modified in its current state.' }
redirect_to solr_document_path(item.id), flash: { error: 'Object cannot be modified in its current state.' }
false
end
end
10 changes: 7 additions & 3 deletions app/controllers/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,14 @@ def show
params[:id] = 'druid:' + params[:id] unless params[:id].include? 'druid'
_deprecated_response, @document = search_service.fetch(params[:id])

@cocina = maybe_load_cocina(params[:id])
flash[:alert] = 'Warning: this object cannot currently be represented in the Cocina model.' if @cocina.instance_of?(NilModel)

authorize! :view_metadata, @cocina
begin
@item = Repository.find(params[:id])
rescue Repository::NotCocina
flash[:alert] = 'Warning: this object cannot currently be represented in the Cocina model.'
end

authorize! :view_metadata, @item

object_client = Dor::Services::Client.object(params[:id])
@events = object_client.events.list
Expand Down
20 changes: 10 additions & 10 deletions app/controllers/catkeys_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class CatkeysController < ApplicationController
end

def edit
@change_set = change_set_class.new(@cocina)
@change_set = change_set_class.new(@item)
respond_to do |format|
format.html { render layout: !request.xhr? }
end
Expand All @@ -20,29 +20,29 @@ def edit
def update
return unless enforce_versioning

change_set = change_set_class.new(@cocina)
change_set = change_set_class.new(@item)
change_set.validate(catkey: update_params[:catkey].strip)
change_set.save
Argo::Indexer.reindex_druid_remotely(@cocina.externalIdentifier)
Argo::Indexer.reindex_druid_remotely(@item.id)

msg = "Catkey for #{@cocina.externalIdentifier} has been updated!"
redirect_to solr_document_path(@cocina.externalIdentifier), notice: msg
msg = "Catkey for #{@item.id} has been updated!"
redirect_to solr_document_path(@item.id), notice: msg
end

private

def change_set_class
case @cocina
when Cocina::Models::DRO
case @item
when Item
ItemChangeSet
when Cocina::Models::Collection
when Collection
CollectionChangeSet
end
end

def load_and_authorize_resource
@cocina = maybe_load_cocina(params[:item_id])
authorize! :manage_item, @cocina
@item = Repository.find(params[:item_id])
authorize! :manage_item, @item
end

def update_params
Expand Down
Loading

0 comments on commit afa1dd1

Please sign in to comment.