Add restricted note info to complex object view

.rubocop.yml

@@ -36,3 +36,12 @@ Metrics/AbcSize:
 
 Metrics/LineLength:
   Max: 150
+
+Rails/OutputSafety:
+  Exclude:
+    - 'app/helpers/dams_objects_helper.rb'
+
+Style/SafeNavigation:
+  Exclude:
+    - 'app/helpers/dams_objects_helper.rb'
+    - 'lib/dams/controller_helper.rb'

app/assets/javascripts/views-object.js

@@ -299,6 +299,12 @@ $(document).ready(function()
         $(".simple-object, .first-component, .dams-sidebar").hide();
     }
 
+    // Hide content if "restricted view notice" present
+    if($(".restricted-notice-complex").length)
+    {
+        $(".simple-object").hide();
+    }
+
     // Show hidden "restricted notice" objects
     $("#view-masked-object").click(function() {        
         $('.restricted-notice').hide();

app/assets/stylesheets/custom-object-viewer.css.scss

@@ -103,7 +103,7 @@ $complexFile: #AC6F2B !default;
 .file-thumbnail img{margin-bottom: 20px;}
 
 // Masked Objects (Restricted, Sensitive, etc.)
-.restricted-notice
+.restricted-notice, .restricted-notice-complex
 {
   background:#b1b1b1 url(https://library.ucsd.edu/assets/dams/site/restricted.png) no-repeat center center;
   background-size:150%,150%;

app/controllers/dams_resource_controller.rb

@@ -56,6 +56,8 @@ def show
             end
         end
         @related_collections = related_collections_map facet_collection_names
+    else
+      @metadata_only = metadata_display?(@document['otherRights_tesim'])
     end
 
     @rdfxml = @document['rdfxml_ssi']

app/helpers/dams_objects_helper.rb

@@ -688,6 +688,39 @@ def grabRestrictedText(data)
 
   end
 
+  #---
+  # Check to see if an object has a "metadataDisplay or localDisplay otherRights"
+  #
+  # @return An HTML string if an object has a "metadataDisplay or localDisplay otherRights", nil otherwise
+  #---
+
+  def grab_access_text(document)
+    result = nil
+    access_group = document['read_access_group_ssim'] # "public" > "local" > "dams-curator" == "dams-rci" == default
+    data = document['otherRights_tesim']
+    unless data.nil? && access_group.nil?
+      if access_group.include?('local')
+        data.each do |datum|
+          if datum.include?('localDisplay') || datum.include?('metadataDisplay')
+            result = "<h3>Restricted View</h3><p>#{get_attribution_note(document['otherNote_json_tesim'])}</p>".html_safe
+          end
+        end
+      end
+    end
+    result
+  end
+
+  def get_attribution_note(data)
+    result = 'Content not available. Access may granted for research purposes at the discretion of the UC San Diego Library. '
+    result += 'For more information please contact the '
+    unless data.nil?
+      data.each do |datum|
+        note = JSON.parse(datum)
+        result += note['value'] if note['type'].start_with?('local attribution')
+      end
+    end
+    result
+  end
   #---
   # Normalized rdf view from DAMS4 REST API
   #---

app/views/dams_objects/_audio_viewer_complex.html.erb

@@ -7,10 +7,12 @@
 
    dataForDynamicLoad = "{\"file_type\":\"audio\",\"display_file_path\":\"\",\"service_file_path\":\"#{wowzaURL}\"}"
 %>
+<%= render :partial => 'restricted_access', :locals => {:access_notice => access_notice } %>
 
-<% if wowzaURL != nil %>
+<% if access_notice.nil? && wowzaURL != nil %>
 
   <div id="dams-audio-<%=componentIndex%>" data='<%=dataForDynamicLoad%>'>Loading the player...</div>
 
 <% end %>
-<%= render :partial => 'admin_download', :locals => {:downloadFilePath => downloadFilePath, :downloadDerivativePath => downloadDerivativePath  } %>
+
+<%= render :partial => 'admin_download', :locals => {:downloadFilePath => downloadFilePath, :downloadDerivativePath => downloadDerivativePath  } if access_notice.nil?%>

app/views/dams_objects/_complex_object_viewer.html.erb

@@ -15,6 +15,7 @@
     </div>
   </div>
 <% end %>
+<% access_text = grab_access_text(@document) %>
 
 <section id="le-component">
 
@@ -54,48 +55,48 @@
 
             isFirstComponent = (i == 1) ? true : false
         %>
-
 		<div id="component-<%= i %>" class="component <%= firstComponent if isFirstComponent %>" <%= loadFirstComponent if isFirstComponent %>>
 
 			<%= render :partial => 'shared/fields/title', :locals => {:componentIndex => i} %>
-
 			<% if fileType == 'image' %>
-
+			  <%= render :partial => 'restricted_access', :locals => {:access_notice => access_text} %>				        
+              <% if access_text.nil? %>
 				<% zoom_file_path = zoom_path(ark, "#{i}") %>
 				<% dataForDynamicLoad = "{\"file_type\":\"image\",\"display_file_path\":\"#{display_file_path}\",\"service_file_path\":\"#{zoom_file_path}\",\"download_file_path\":\"#{download_file_path}\"}" %>
 
 				<div data='<%=dataForDynamicLoad%>'></div>
+			  <% end %>
 		    <%= render :partial => 'metadata_component', :locals => {:componentIndex => i} %>
-		    <%= render :partial => 'admin_download', :locals => {:downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path  } %>
+		    <%= render :partial => 'admin_download', :locals => {:downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path  } if access_text.nil?%>
 
 		  <% elsif fileType == 'audio' %>
 
-		    <%= render :partial => 'audio_viewer_complex', :locals => {:componentIndex => i, :downloadFilePath => download_file_path, :downloadDerivativePath => nil  } %>
+		    <%= render :partial => 'audio_viewer_complex', :locals => {:access_notice => access_text, :componentIndex => i, :downloadFilePath => download_file_path, :downloadDerivativePath => nil  } %>
 		    <%= render :partial => 'metadata_component', :locals => {:componentIndex => i} %>
 
 		  <% elsif fileType == 'video' %>
 
-		    <%= render :partial => 'video_viewer_complex', :locals => {:componentIndex => i, :downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path  } %>
+		    <%= render :partial => 'video_viewer_complex', :locals => {:access_notice => access_text, :componentIndex => i, :downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path  } %>
 		    <%= render :partial => 'metadata_component', :locals => {:componentIndex => i} %>
 
 		  <% elsif fileType == 'document' %>
 
-		    <%= render :partial => 'document_viewer', :locals => {:filePath => service_file_path, :displayFilePath => display_file_path, :downloadDerivativePath => service_file_path  } %>
+		    <%= render :partial => 'document_viewer', :locals => {:access_notice => access_text, :filePath => service_file_path, :displayFilePath => display_file_path, :downloadDerivativePath => service_file_path  } %>
 		    <%= render :partial => 'metadata_component', :locals => {:componentIndex => i, :fileMetadata => true, :fileName => service_file} %>
-		    <%= render :partial => 'data_viewer', :locals => {:objectType => 'complex', :filePath => service_file_path, :downloadDerivativePath => service_file_path, :sourcefilePath => source_file_path  } %>
+		    <%= render :partial => 'data_viewer', :locals => {:objectType => 'complex', :filePath => service_file_path, :downloadDerivativePath => service_file_path, :sourcefilePath => source_file_path  } if access_text.nil?%>
 
 			<% elsif fileType == 'data' %>
-
+			  <%= render :partial => 'restricted_access', :locals => {:access_notice => access_text} %>				        
 		    <%= render :partial => 'metadata_component', :locals => {:componentIndex => i, :fileMetadata => true, :fileName => service_file} %>
-				<%= render :partial => 'data_viewer', :locals => {:objectType => 'complex', :filePath => service_file_path, :downloadDerivativePath => service_file_path, :sourcefilePath => source_file_path  } %>
+				<%= render :partial => 'data_viewer', :locals => {:objectType => 'complex', :filePath => service_file_path, :downloadDerivativePath => service_file_path, :sourcefilePath => source_file_path  } if access_text.nil?%>
 	        <% elsif fileType == 'text' %>
+			  <%= render :partial => 'restricted_access', :locals => {:access_notice => access_text} %>				        
 		      <%= render :partial => 'metadata_component', :locals => {:componentIndex => i, :fileMetadata => true, :fileName => service_file} %>
-			  <%= render :partial => 'text_viewer', :locals => {:objectType => 'complex', :downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path  } %>
+			  <%= render :partial => 'text_viewer', :locals => {:objectType => 'complex', :downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path  } if access_text.nil?%>
 			<% else %>
-
+			    <%= render :partial => 'restricted_access', :locals => {:access_notice => access_text} %>			
 				<%= render :partial => 'metadata_component', :locals => {:componentIndex => i} %>
-				<%= render :partial => 'default_viewer', :locals => {:objectType => 'complex'} %>
-
+				<%= render :partial => 'default_viewer', :locals => {:objectType => 'complex'} %>				
 			<% end %>
 
 		</div>
@@ -104,4 +105,4 @@
 
 	<% end %>
 
-</section>
+</section> 

app/views/dams_objects/_document_viewer.html.erb

@@ -1,4 +1,5 @@
-<% if defined?(filePath) and defined?(displayFilePath)%>
+<%= render :partial => 'restricted_access', :locals => {:access_notice => access_notice } %>
+<% if access_notice.nil? and defined?(filePath) and defined?(displayFilePath)%>
 
   <% viewFilePath = filePath.gsub('/download', '') %>
 

app/views/dams_objects/_restricted_access.html.erb

@@ -0,0 +1,7 @@
+<% unless access_notice.nil? %>
+  <div class="restricted-notice-complex">
+    <div>
+      <%= access_notice %>
+    </div>
+  </div>
+<% end %>

app/views/dams_objects/_simple_object_viewer.html.erb

@@ -27,7 +27,7 @@
 		<% when 'video-service' %>
 			<%= render :partial => 'video_viewer', :locals => {:filePath => service_file_path, :icon => display_file_path, :downloadFilePath => download_file_path, :downloadDerivativePath => download_derivative_path} %>
 		<% when 'document-service' %>
-	    <%= render :partial => 'document_viewer', :locals => {:filePath => service_file_path, :displayFilePath => display_file_path, :downloadDerivativePath => download_derivative_path} %>
+	    <%= render :partial => 'document_viewer', :locals => {:access_notice => nil, :filePath => service_file_path, :displayFilePath => display_file_path, :downloadDerivativePath => download_derivative_path} %>
 			<%= render :partial => 'metadata_data_file', :locals => {:fileName => service_file} %>
 			<%= render :partial => 'data_viewer', :locals => {:displayFilePath => display_file_path, :filePath => service_file_path, :objectType => 'simple', :pdfFilePath => pdf_file_path, :sourcefilePath => source_file_path} %>
 		<% when 'data-service' %>

app/views/dams_objects/_video_viewer_complex.html.erb

@@ -6,10 +6,9 @@
    wowzaURL = grabWowzaURL(fieldData,objid,cmpid)
    dataForDynamicLoad = "{\"file_type\":\"video\",\"display_file_path\":\"\",\"service_file_path\":\"#{wowzaURL}\"}"
 %>
+<%= render :partial => 'restricted_access', :locals => {:access_notice => access_notice } %>
 
-<% if wowzaURL != nil %>
-
+<% if access_notice.nil? && wowzaURL != nil %>
   <video controls="controls" id="dams-video-<%=componentIndex%>" data='<%=dataForDynamicLoad%>'>Loading the player...</video>
-
 <% end %>
-<%= render :partial => 'admin_download', :locals => {:downloadFilePath => downloadFilePath, :downloadDerivativePath => downloadDerivativePath  } %>
+<%= render :partial => 'admin_download', :locals => {:downloadFilePath => downloadFilePath, :downloadDerivativePath => downloadDerivativePath  } if access_notice.nil?%>

config/deploy/qa.rb

@@ -1,5 +1,5 @@
 set :stage, :qa
-set :branch, 'develop'
+set :branch, (ENV['BRANCH'] || fetch(:branch, 'develop'))
 server 'lib-hydrahead-qa.ucsd.edu', user: 'conan', roles: %w{web app db sitemap_noping}
 server 'lib-hydratail-qa.ucsd.edu', user: 'conan', roles: %w{web app db sitemap_noping}
 set :rails_env, "qa"

lib/dams/controller_helper.rb

@@ -882,5 +882,15 @@ def referrer_controller( request )
         end
       end
     end
+
+  def metadata_display?(data)
+    result = false
+    unless data.nil?
+      data.each do |datum|
+        result = true if datum.include?('localDisplay') || datum.include?('metadataDisplay')
+      end
+    end
+    result
+  end
   end
 end

spec/features/access_control_spec.rb

@@ -35,7 +35,7 @@
     visit catalog_index_path( {:q => 'object'} )
     expect(page).to have_selector('h3', 'Public Object')
     expect(page).to have_no_content('Curator Object')
-    expect(page).to have_no_content('Local Object')
+    expect(page).to have_content('Local Object')
     expect(page).to have_no_content('Hidden Object')
   end
   scenario 'anonymous user viewing public object' do
@@ -50,8 +50,7 @@
   end
   scenario 'anonymous user viewing local object' do
     visit dams_object_path @localObj.pid
-    expect(page).to have_selector('h1','You are not allowed to view this page.')
-    expect(page).to have_no_content('Local Object')
+    expect(page).to have_content('Local Object')
   end
   scenario 'anonymous user viewing file attached to hidden object' do
     visit file_path( @hiddenObj, '_1.txt' )

spec/features/dams_object_spec.rb

@@ -703,6 +703,46 @@
   end
 end
 
+describe "User wants to view a metadata-only complex object" do
+  let(:restricted_note) {'Restricted View Content not available. Access may granted for research purposes at the discretion of the UC San Diego Library. For more information please contact the Research Data Curation Program, UC San Diego, La Jolla, 92093-0175 (https://lib.ucsd.edu/rdcp)'}
+  before do
+    @otherRight = DamsOtherRight.create pid: 'xx58718348', permissionType: "metadataDisplay"
+    @metadataOnlyCollection = DamsProvenanceCollection.create pid: 'xx91824453', titleValue: "Test UCSD IP only Collection with metadata-only visibility", visibility: "local"    
+    @metadataOnlyObj = DamsObject.create(pid: "xx99999999")
+    @metadataOnlyObj.damsMetadata.content = File.new('spec/fixtures/damsComplexObject10.rdf.xml').read
+    @metadataOnlyObj.save!
+    solr_index @otherRight.pid
+    solr_index @metadataOnlyCollection.pid
+    solr_index @metadataOnlyObj.pid
+    Capybara.javascript_driver = :poltergeist
+    Capybara.current_driver = Capybara.javascript_driver  
+    sign_in_developer
+  end
+
+  after do
+    @otherRight.delete
+    @metadataOnlyCollection.delete
+    @metadataOnlyObj.delete
+  end
+
+  scenario 'should see Restricted View access control information' do
+    visit dams_object_path @metadataOnlyObj.pid
+    expect(page).to have_selector('#component-pager-label', :text=>'Component 1 of 4')
+    expect(page).to have_content('Interval 1 (dredge, rock)')
+    expect(page).to have_selector('div.restricted-notice-complex', text: restricted_note)
+    expect(page).to have_selector('div.file-metadata', text: 'Access Restricted View')
+  end
+
+  scenario 'should see Restricted View access control info in other component when clicking on navigation arrow' do 
+    visit dams_object_path @metadataOnlyObj.pid
+    click_button 'component-pager-forward'
+    find('#component-pager-label').should have_content('Component 2 of 4')
+    expect(page).to have_content('Files')
+    expect(page).to have_selector('div.restricted-notice-complex', text: restricted_note)
+    expect(page).to have_selector('div.file-metadata', text: 'Access Restricted View')
+  end
+end
+
 describe "curator embargoed object view" do
   before do
     @otherRights = DamsOtherRight.create pid: 'zz58718348', permissionType: "metadataDisplay", basis: "fair use",