update resolver presentation to conform to modern service (DLC-1052)

- update resolver cleaning in SolrDocument
- update resolver links in static source

Author: barmintor

app/helpers/dcv/dcv_url_helper.rb

@@ -87,7 +87,7 @@ def library_policies_url
   end
 
   def terms_of_use_url
-    'https://library.columbia.edu/resolve/lweb0208'
+    'https://resolver.library.columbia.edu/lweb0208'
   end
 
   def site_edit_link(sep: ' | ', **link_opts)

app/models/solr_document.rb

@@ -96,7 +96,10 @@ def clean_resolver(link_src)
     if link_src
       link_uri = URI(link_src)
       if link_uri.path == "/cgi-bin/cul/resolve" && link_uri.host == "www.columbia.edu"
-        return "https://library.columbia.edu/resolve/#{link_uri.query}"
+        return "https://resolver.library.columbia.edu/#{link_uri.query}"
+      end
+      if link_uri.host == "library.columbia.edu" && link_uri.path =~ /^\/resolve\/([^\/]+)/
+        return "https://resolver.library.columbia.edu/#{$1}"
       end
     end
     link_src

app/views/catalog/_secondary_nav.html.erb

@@ -16,7 +16,7 @@
 		</li>
 	</ul>
 	<ul class="nav nav-pills">
-		<li class="nav-item"><a onclick="window.open(this.href);return false;" data-toggle="tooltip" data-placement="bottom" href="https://library.columbia.edu/resolve/lweb0164" title="See All Digital Collections" class="nav-link">All Collections <i class="fa fa-external-link"></i></a></li>
+		<li class="nav-item"><a onclick="window.open(this.href);return false;" data-toggle="tooltip" data-placement="bottom" href="https://resolver.library.columbia.edu/lweb0164" title="See All Digital Collections" class="nav-link">All Collections <i class="fa fa-external-link"></i></a></li>
 	<%- if params[:action] == 'home' && @subsite.persistent_url -%>
 		<li class="nav-item"><button data-copy="<%= @subsite.persistent_url %>" title="Click to copy to clipboard" class="btn btn-secondary nav-link mx-auto" onclick="clipboardFromElement(this);"><span class="fa fa-copy"></span> Permanent URL</button></li>
 	<%- elsif @document&.has_persistent_url? -%>

app/views/sites/edit.html.erb

@@ -176,14 +176,14 @@
   <span id="tooltip-nav-menu-label" title="Link Group Label">The label for this group of links, which will be presented as a drop-down menu if there are multiple links. If the group has only one link, the group label will not be displayed and the link will be presented directly in the site navigation bar.</span>
   <span id="tooltip-nav-link-label" title="Link Label">The label used for a link in a drop-down menu or, if it is the only link in a group, the site navigation bar.</span>
   <span id="tooltip-nav-link" title="Link To">The URL associated with this link. Full URLs will indicate that they are links to external resources. If a page slug is given and the link is marked as internal, a link to the named page will be built.</span>
-  <span id="tooltip-layout" title="Site Layout">The overall layout of markup for the site, governing the homepage and any configured site pages. "DLC default" defers to the design team's default configurations. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-palette" title="Site Palette">The color scheme for the site, governing the homepage and any configured site pages. "DLC default" defers to the design team's default configurations. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-search-type" title="Search Type">The search type for the site indicates how search results should be presented. "Catalog" indicates that search results should be presented in the context of filters on the general DLC catalog. "Local" indicates that search results should be presented as an isolated corpus, with the configured site layout and palettes. "Custom" indicates that a developer-implemented custom site provides this site's search, and should generally not be selected. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-homepage-facets" title="Show Homepage Facets">Configures the display of a facet panel on the site homepage, if supported by the configured layout. Facets are determined by the general DLC Catalog facets, but limited to facets for which the site's content has two or more values. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-images-portrait" title="Portrait Layout Images">Configures the repository PIDs of images for the site homepage, where supported by the configured layout. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-images-signature" title="Signature Layout Images">Manages the design assets for a site homepage configured with the signature layout. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-images-signature-banner" title="Signature Banner Image">The banner image for a site homepage configured with the signature layout. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
-  <span id="tooltip-images-signature-watermark" title="Signature/Watermark Image">The signature/watermark image for a site homepage configured with the signature layout. This is an SVG that is overlaid on the banner image. See the <a href="https://library.columbia.edu/resolve/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-layout" title="Site Layout">The overall layout of markup for the site, governing the homepage and any configured site pages. "DLC default" defers to the design team's default configurations. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-palette" title="Site Palette">The color scheme for the site, governing the homepage and any configured site pages. "DLC default" defers to the design team's default configurations. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-search-type" title="Search Type">The search type for the site indicates how search results should be presented. "Catalog" indicates that search results should be presented in the context of filters on the general DLC catalog. "Local" indicates that search results should be presented as an isolated corpus, with the configured site layout and palettes. "Custom" indicates that a developer-implemented custom site provides this site's search, and should generally not be selected. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-homepage-facets" title="Show Homepage Facets">Configures the display of a facet panel on the site homepage, if supported by the configured layout. Facets are determined by the general DLC Catalog facets, but limited to facets for which the site's content has two or more values. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-images-portrait" title="Portrait Layout Images">Configures the repository PIDs of images for the site homepage, where supported by the configured layout. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-images-signature" title="Signature Layout Images">Manages the design assets for a site homepage configured with the signature layout. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-images-signature-banner" title="Signature Banner Image">The banner image for a site homepage configured with the signature layout. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
+  <span id="tooltip-images-signature-watermark" title="Signature/Watermark Image">The signature/watermark image for a site homepage configured with the signature layout. This is an SVG that is overlaid on the banner image. See the <a href="https://resolver.library.columbia.edu/dlc-editor-docs" target="_blank">site editor documentation</a> for details.</span>
 </div>
 <%- buffer = "" %>
 <%- form_for(@subsite, builder: ::ValueIndexableFormBuilder) do |site_form| %>

app/views/sites/index.html.erb

@@ -32,7 +32,7 @@ featured_proj = controller.digital_projects.select { |proj| proj[:facet_value].p
                     <% @browse_lists.each do |facet_name, data| %>
                         <li class="nav-item"><a href="#tab_<%= facet_name %>" data-toggle="tab" class="nav-link"><%= data['display_label'] %></a></li>
                     <% end %>
-										<li class="float-right non-tab"><a onclick="window.open(this.href);return false;" data-toggle="tooltip" data-placement="top" href="https://library.columbia.edu/resolve/lweb0164" title="See All Digital Collections">All Collections <i class="fa fa-external-link"></i></a></li>
+										<li class="float-right non-tab"><a onclick="window.open(this.href);return false;" data-toggle="tooltip" data-placement="top" href="https://resolver.library.columbia.edu/lweb0164" title="See All Digital Collections">All Collections <i class="fa fa-external-link"></i></a></li>
                 </ul>
 
                 <!-- Tab panes -->

spec/models/solr_document_spec.rb

@@ -10,7 +10,7 @@
       include_context "indexed with a resolver source uri"
       it { is_expected.to have_persistent_url }
       context 'that is an old resolver' do
-        let(:resolver_url) { "https://library.columbia.edu/resolve/#{resolver_key}" }
+        let(:resolver_url) { "https://resolver.library.columbia.edu/#{resolver_key}" }
         it { is_expected.to satisfy {|doc| doc.persistent_url == resolver_url} }
       end
     end
@@ -79,4 +79,24 @@
       end
     end
   end
+  describe '#clean_resolver' do
+    let(:rkey) { 'lweb0138' }
+    let(:cgi_http) { "http://www.columbia.edu/cgi-bin/cul/resolve?#{rkey}" }
+    let(:cgi_https) { "https://www.columbia.edu/cgi-bin/cul/resolve?#{rkey}" }
+    let(:lweb_http) { "https://library.columbia.edu/resolve/#{rkey}" }
+    let(:lweb_https) { "https://library.columbia.edu/resolve/#{rkey}" }
+    let(:current_https) { "https://resolver.library.columbia.edu/#{rkey}" }
+    let(:na_https) { "https://nothing.library.columbia.edu/#{rkey}" }
+    it 'cleans cgi style' do
+      expect(solr_document.clean_resolver(cgi_http)).to eql(current_https)
+      expect(solr_document.clean_resolver(cgi_https)).to eql(current_https)
+    end
+    it 'cleans lweb style' do
+      expect(solr_document.clean_resolver(lweb_http)).to eql(current_https)
+      expect(solr_document.clean_resolver(lweb_https)).to eql(current_https)
+    end
+    it 'passes others through' do
+      expect(solr_document.clean_resolver(na_https)).to eql(na_https)
+    end
+  end
 end