<%= render 'workflow_actions_widget', presenter: presenter %>
+
<%= render 'show_actions', presenter: presenter %>
+
- <%= render 'representative_media', presenter: presenter, viewer: presenter.iiif_viewer? %>
+ <% if display_info_alert?(presenter) %>
+ <%= render('restricted_access_alert', presenter: presenter) %>
+ <% end %>
+
+ <% unless presenter.metadata_only? %>
+ <%= render 'representative_media', presenter: presenter, viewer: presenter.iiif_viewer? %>
+ <% end %>
+
<%#
%>
<%# render 'citations', presenter: presenter %>
<%# render 'social_media' %>
<%#
%>
- <%= render 'export_tools', presenter: presenter %>
+ <%= render('export_tools', presenter: presenter) unless presenter.metadata_only? %>
<%= render 'work_description', presenter: presenter %>
<%= render 'metadata', presenter: presenter %>
<%= render 'items_table', presenter: presenter %>
diff --git a/app/views/hyrax/base/_restricted_access_alert.html.erb b/app/views/hyrax/base/_restricted_access_alert.html.erb
new file mode 100644
index 000000000..39ce36cb6
--- /dev/null
+++ b/app/views/hyrax/base/_restricted_access_alert.html.erb
@@ -0,0 +1,3 @@
+
+ <%= document_access_display_text(presenter).html_safe %>
+
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index d36f7c987..6df187e5c 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -116,7 +116,7 @@
# Should work creation require file upload, or can a work be created first
# and a file added at a later time?
# The default is true.
- # config.work_requires_files = true
+ config.work_requires_files = false
# Enable IIIF image service. This is required to use the
# UniversalViewer-ified show page
diff --git a/config/locales/spot.en.yml b/config/locales/spot.en.yml
index 063a9f6a8..89b15d170 100644
--- a/config/locales/spot.en.yml
+++ b/config/locales/spot.en.yml
@@ -106,6 +106,11 @@ en:
page_title: Terms of Use // %{name}
work:
+ access_message:
+ authenticated: File access restricted to members of the Lafayette College community.
+ embargo: File(s) under embargo until
%{date}
+ lease: File(s) available until
%{date}
+ private: This work's files are unavailable.
export:
additional_options: Additional options
all_files: Download all files
diff --git a/spec/factories/file_set.rb b/spec/factories/file_set.rb
index 16adac265..d3e61ac5b 100644
--- a/spec/factories/file_set.rb
+++ b/spec/factories/file_set.rb
@@ -18,11 +18,18 @@
end
trait :public do
- read_groups { ["public"] }
+ visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+ read_groups { ['public'] }
end
- trait :registered do
- read_groups { ["registered"] }
+ trait :authenticated do
+ visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+ read_groups { ['registered'] }
+ end
+
+ trait :private do
+ visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+ read_groups { ['admin'] }
end
end
end
diff --git a/spec/factories/image.rb b/spec/factories/image.rb
index 43038be64..8af137261 100644
--- a/spec/factories/image.rb
+++ b/spec/factories/image.rb
@@ -57,14 +57,18 @@
factory :image_with_file_set do
after(:create) do |image, evaluator|
- fs_opts = {
- user: evaluator.user,
- title: ['Image FileSet'],
- label: evaluator.label
- }
-
+ fs_opts = { user: evaluator.user, title: ['Image FileSet'], label: evaluator.label }
fs_opts[:content] = evaluator.content if evaluator.content
- fs = create(:file_set, :public, **fs_opts)
+ fs_visibility = case image.visibility
+ when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+ :public
+ when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+ :authenticated
+ else
+ :private
+ end
+
+ fs = create(:file_set, fs_visibility, **fs_opts)
image.ordered_members << fs
image.representative_id = fs.id
diff --git a/spec/factories/publication.rb b/spec/factories/publication.rb
index f7ce32382..007ad5ba1 100644
--- a/spec/factories/publication.rb
+++ b/spec/factories/publication.rb
@@ -56,14 +56,18 @@
factory :publication_with_file_set do
after(:create) do |pub, evaluator|
- fs_opts = {
- user: evaluator.user,
- title: ['Publication FileSet'],
- label: evaluator.label
- }
-
+ fs_opts = { user: evaluator.user, title: ['Image FileSet'], label: evaluator.label }
fs_opts[:content] = evaluator.content if evaluator.content
- fs = create(:file_set, :public, **fs_opts)
+ fs_visibility = case pub.visibility
+ when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+ :public
+ when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+ :authenticated
+ else
+ :private
+ end
+
+ fs = create(:file_set, fs_visibility, **fs_opts)
pub.ordered_members << fs
pub.representative_id = fs.id
diff --git a/spec/support/shared_examples/spot_base_actor.rb b/spec/support/shared_examples/spot_base_actor.rb
index 71759528d..1414c3923 100644
--- a/spec/support/shared_examples/spot_base_actor.rb
+++ b/spec/support/shared_examples/spot_base_actor.rb
@@ -80,4 +80,96 @@
end
end
end
+
+ describe '#update_discover_visibility' do
+ let(:actor) { Hyrax::Actors::InterpretVisibilityActor.new(described_class.new(Hyrax::Actors::Terminator.new)) }
+ let(:attributes) { { visibility: viz } }
+
+ let(:public_viz) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+ let(:private_viz) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+ let(:authenticated_viz) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+ let(:embargoed_viz) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO }
+ let(:leased_viz) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE }
+
+ shared_examples 'it adjusts work#discover_groups based on desired visibility' do
+ # we're gonna use these two a lot in this example, so let's set up shared_examples
+ shared_examples 'it adds "public" to #discover_groups' do
+ subject { work.discover_groups }
+
+ it { is_expected.to be_an(Array) }
+ it { is_expected.to include('public') }
+ end
+
+ shared_examples 'it adds nothing to #discover_groups' do
+ subject { work.discover_groups }
+
+ it { is_expected.to be_an(Array) }
+ it { is_expected.to be_empty }
+ end
+
+ # now the different contexts:
+ context 'when visibility requested is "public"' do
+ let(:viz) { public_viz }
+
+ it_behaves_like 'it adds "public" to #discover_groups'
+ end
+
+ context 'when visibility requested is "private"' do
+ let(:viz) { private_viz }
+
+ it_behaves_like 'it adds nothing to #discover_groups'
+ end
+
+ context 'when embargo is requested' do
+ let(:attributes) do
+ {
+ visibility: embargoed_viz,
+ visibility_during_embargo: viz_during_embargo,
+ visibility_after_embargo: public_viz,
+ embargo_release_date: (Time.zone.today + 1.year).to_s
+ }
+ end
+
+ context '(work is public during embargo)' do
+ let(:viz_during_embargo) { public_viz }
+
+ it_behaves_like 'it adds "public" to #discover_groups'
+ end
+
+ context '(work is authenticated during embargo)' do
+ let(:viz_during_embargo) { authenticated_viz }
+
+ it_behaves_like 'it adds "public" to #discover_groups'
+ end
+
+ context '(work is private during embargo)' do
+ let(:viz_during_embargo) { private_viz }
+
+ it_behaves_like 'it adds nothing to #discover_groups'
+ end
+ end
+ end
+
+ context '#create' do
+ before { actor.create(env) }
+
+ it_behaves_like 'it adjusts work#discover_groups based on desired visibility'
+ end
+
+ context '#update' do
+ let(:work) { create(work_klass.to_s.downcase.to_sym, :public, discover_groups: ['public']) }
+
+ before { actor.update(env) }
+
+ it_behaves_like 'it adjusts work#discover_groups based on desired visibility'
+
+ context 'when a public item becomes private' do
+ let(:attributes) { { visibility: private_viz } }
+
+ it 'removes "public" from work#discover_groups' do
+ expect(work.discover_groups).to be_empty
+ end
+ end
+ end
+ end
end