Merge pull request #69 from MITLibraries/rdi-238-update-view-online

Return sourceLink as href for view online links

Author: jazairi

.env.test

@@ -1,2 +1,3 @@
 TIMDEX_HOST=FAKE_TIMDEX_HOST
 TIMDEX_GRAPHQL=https://FAKE_TIMDEX_HOST/graphql
+TIMDEX_INDEX=FAKE_TIMDEX_INDEX

app/helpers/search_helper.rb

@@ -8,4 +8,10 @@ def trim_highlights(result)
 
     result['highlight'].reject { |h| displayed_fields.include? h['matchedField'] }
   end
+
+  def view_online(result)
+    return unless result['sourceLink'].present?
+
+    link_to 'View online', result['sourceLink'], class: 'button button-primary green'
+  end
 end

app/models/timdex_search.rb

@@ -53,6 +53,7 @@ class TimdexSearch < TimdexBase
             matchedField
             matchedPhrases
           }
+          sourceLink
         }
         aggregations {
           contentType {

app/views/search/_result.html.erb

@@ -27,6 +27,6 @@
   </div>
 
   <div class="result-get">
-    <%= link_to 'View online', "##{Random.rand(100000)}", class: 'button button-primary green' %>
+    <%= view_online(result) %>
   </div>
 </li>

test/controllers/search_controller_test.rb

@@ -362,7 +362,7 @@ def source_facet_count(controller)
       query = {
         q: 'data',
         advanced: 'true',
-        source: ['dspace@mit']
+        source: ['Woods Hole Open Access Server']
       }.to_query
       get "/results?#{query}"
       assert_response :success
@@ -384,9 +384,8 @@ def source_facet_count(controller)
       assert_response :success
       assert_nil flash[:error]
 
-      # Assumption is we'll always have at least 3 default sources
-      # DSpace, Aspace, Aleph (RDI sources are in now, but may not be default later)
-      assert(source_facet_count(@controller) > 3)
+      # Assumption is we'll have at least 2 RDI sources for the time being
+      assert(source_facet_count(@controller) > 2)
     end
   end
 
@@ -400,7 +399,7 @@ def source_facet_count(controller)
       query = {
         q: 'data',
         advanced: 'true',
-        source: ['dspace@mit', 'Woods Hole Open Access Server']
+        source: ['Abdul Latif Jameel Poverty Action Lab Dataverse', 'Woods Hole Open Access Server']
       }.to_query
       get "/results?#{query}"
       assert_response :success

test/helpers/search_helper_test.rb

@@ -19,10 +19,21 @@ class SearchHelperTest < ActionView::TestCase
 
   test 'returns correct set of highlights when result includes displayed and undisplayed fields' do
     result = { 'highlight' => [{ 'matchedField' => 'title', 'matchedPhrases' => 'Very important data' },
-                           { 'matchedField' => 'content_type', 'matchedPhrases' => 'Dataset' },
-                           { 'matchedField' => 'summary', 'matchedPhrases' => '2022' },
-                           { 'matchedField' => 'citation', 'matchedPhrases' => 'Datascientist, Jane' }] }
+                               { 'matchedField' => 'content_type', 'matchedPhrases' => 'Dataset' },
+                               { 'matchedField' => 'summary', 'matchedPhrases' => '2022' },
+                               { 'matchedField' => 'citation', 'matchedPhrases' => 'Datascientist, Jane' }] }
     assert_equal [{ 'matchedField' => 'summary', 'matchedPhrases' => '2022' },
-                 { 'matchedField' => 'citation', 'matchedPhrases' => 'Datascientist, Jane' }], trim_highlights(result)
+                  { 'matchedField' => 'citation', 'matchedPhrases' => 'Datascientist, Jane' }], trim_highlights(result)
+  end
+
+  test 'renders view_online link if sourceLink is present' do
+    result = { 'title' => 'A record', 'sourceLink' => 'https://example.org' }
+    assert_equal '<a class="button button-primary green" href="https://example.org">View online</a>',
+                 view_online(result)
+  end
+
+  test 'does not render view_online link if sourceLink is absent' do
+    result = { 'title' => 'A record' }
+    assert_nil view_online(result)
   end
 end

test/models/query_builder_test.rb

@@ -2,16 +2,17 @@
 
 class QueryBuilderTest < ActiveSupport::TestCase
   test 'query builder trims spaces' do
-    expected = { 'from' => '0', 'q' => 'blah' }
+    expected = { 'from' => '0', 'q' => 'blah', 'index' => 'FAKE_TIMDEX_INDEX' }
     search = { q: ' blah ' }
     assert_equal(expected, QueryBuilder.new(search).query)
   end
 
   test 'query builder handles supported fields' do
-    expected = { 'from' => '0', 'q' => 'blah', 'citation' => 'Citations are cool. Journal of cool citations. Vol 3, page 123.',
+    expected = { 'from' => '0', 'q' => 'blah',
+                 'citation' => 'Citations are cool. Journal of cool citations. Vol 3, page 123.',
                  'contributors' => 'Vonnegut, Kurt', 'fundingInformation' => 'National Science Foundation',
                  'identifiers' => 'doi://1234.123/123.123', 'locations' => 'Cambridge, MA',
-                 'subjects' => 'Subjects are the worst', 'title' => 'Hi I like titles' }
+                 'subjects' => 'Subjects are the worst', 'title' => 'Hi I like titles', 'index' => 'FAKE_TIMDEX_INDEX' }
     search = {
       q: ' blah ',
       citation: 'Citations are cool. Journal of cool citations. Vol 3, page 123.',
@@ -26,10 +27,11 @@ class QueryBuilderTest < ActiveSupport::TestCase
   end
 
   test 'query builder ignores unsupported fields' do
-    expected = { 'from' => '0', 'q' => 'blah', 'citation' => 'Citations are cool. Journal of cool citations. Vol 3, page 123.',
+    expected = { 'from' => '0', 'q' => 'blah',
+                 'citation' => 'Citations are cool. Journal of cool citations. Vol 3, page 123.',
                  'contributors' => 'Vonnegut, Kurt', 'fundingInformation' => 'National Science Foundation',
                  'identifiers' => 'doi://1234.123/123.123', 'locations' => 'Cambridge, MA',
-                 'subjects' => 'Subjects are the worst', 'title' => 'Hi I like titles' }
+                 'subjects' => 'Subjects are the worst', 'title' => 'Hi I like titles', 'index' => 'FAKE_TIMDEX_INDEX' }
     search = {
       q: ' blah ',
       citation: 'Citations are cool. Journal of cool citations. Vol 3, page 123.',
@@ -47,7 +49,7 @@ class QueryBuilderTest < ActiveSupport::TestCase
   test 'query builder ignores supported fields that were not included' do
     expected = { 'from' => '0', 'q' => 'blah', 'contributors' => 'Vonnegut, Kurt',
                  'fundingInformation' => 'National Science Foundation',
-                 'identifiers' => 'doi://1234.123/123.123' }
+                 'identifiers' => 'doi://1234.123/123.123', 'index' => 'FAKE_TIMDEX_INDEX' }
     search = {
       q: ' blah ',
       contributors: 'Vonnegut, Kurt',
@@ -65,7 +67,9 @@ class QueryBuilderTest < ActiveSupport::TestCase
   end
 
   test 'query builder index is nil if TIMDEX_INDEX not provided in env' do
-    search = { q: 'blah' }
-    assert_nil(QueryBuilder.new(search).query['index'])
+    ClimateControl.modify TIMDEX_INDEX: nil do
+      search = { q: 'blah' }
+      assert_nil(QueryBuilder.new(search).query['index'])
+    end
   end
 end

test/models/timdex_test.rb

@@ -10,7 +10,7 @@ def basic_search
 
   def basic_record
     {
-      'id' => 'jpal:doi:10.7910-DVN-MNIBOL'
+      'id' => 'jpal:doi:10.7910-DVN-MNIBOL', 'index' => ENV.fetch('TIMDEX_INDEX', nil).to_s
     }
   end
 

test/test_helper.rb

@@ -19,6 +19,7 @@
   config.allow_http_connections_when_no_cassette = false
   config.filter_sensitive_data('FAKE_TIMDEX_HOST') { ENV.fetch('TIMDEX_HOST').to_s }
   config.filter_sensitive_data('http://FAKE_TIMDEX_HOST/graphql/') { ENV.fetch('TIMDEX_GRAPHQL').to_s }
+  config.filter_sensitive_data('FAKE_TIMDEX_INDEX') { ENV.fetch('TIMDEX_INDEX').to_s }
 end
 
 module ActiveSupport