DACCESS 2025 Sprint 1 - Merge dev to main

README.md

@@ -83,3 +83,10 @@ You can run RSPEC tests by supplying -s flag.
     ./run_test.sh -r YOUR_RAILS_ENV_FILE -f features/catalog_search/item_view.feature
     ./run_test.sh -sr YOUR_RAILS_ENV_FILE
     ./run_test.sh -sr YOUR_RAILS_ENV_FILE -f spec/helpers/advanced_helper_spec.rb
+
+## Parallel Testing
+Testing has been updated to allow for parallel testing with cucumber tests. 
+### To run tests in parallel:
+* Update constant `NUM_PROCESSES=1` in  `jenkins/cucumber-features.sh` to the number of processes you want to run in parallel.
+* Currently, Jenkins has a maximum of 4 processes.
+* Set to `NUM_PROCESSES=$(nproc --all)` to use all available processors.

blacklight-cornell/Gemfile

@@ -44,7 +44,7 @@ gem "marc"
 gem "blacklight-marc", "~> 6.3"
 gem "rb-readline", "~> 0.5.x"
 gem "net-ldap"
-gem "nokogiri", ">= 1.14.3"
+gem "nokogiri", "~> 1.16.7"
 gem "rufus-scheduler"
 gem "addressable", ">= 2.8.0"
 gem "redis-session-store"
@@ -90,6 +90,7 @@ group :test do
   gem "capybara-email"
   gem "simplecov", :require => false
   gem "simplecov-rcov", :require => false
+  gem 'parallel_tests'
 end
 
 gem "jquery-rails"
@@ -121,8 +122,8 @@ gem "font-awesome-rails"
 gem "blacklight_cornell_requests", git: "https://github.com/cul-it/blacklight-cornell-requests", tag: "v5.2"
 # gem 'blacklight_cornell_requests', :path => '/Users/matt/code/cul/d&a/blacklight-cornell-requests'
 # gem 'my_account', :path => '/Users/matt/code/cul/d&a/cul-my-account'
-gem "cul-folio-edge", git: "https://github.com/cul-it/cul-folio-edge", tag: "v3.1"
-gem "my_account", git: "https://github.com/cul-it/cul-my-account", tag: "v2.3.3"
+gem "cul-folio-edge", git: "https://github.com/cul-it/cul-folio-edge", tag: "v3.2"
+gem "my_account", git: "https://github.com/cul-it/cul-my-account", tag: "v2.3.4"
 gem "ruby-saml", ">= 1.12.1"
 gem "bento_search", "~> 2.0.0.rc1"
 gem "celluloid", "0.17.4" # Required for bento_search multisearcher

blacklight-cornell/Gemfile.lock

@@ -40,20 +40,20 @@ GIT
 
 GIT
   remote: https://github.com/cul-it/cul-folio-edge
-  revision: c34dab4611ce57dfca2308344e03a72dbc92ff44
-  tag: v3.1
+  revision: bfdc3a28749ce826caf7dd1c415dd044a72a8b4f
+  tag: v3.2
   specs:
-    cul-folio-edge (3.1)
+    cul-folio-edge (3.2)
       rest-client
 
 GIT
   remote: https://github.com/cul-it/cul-my-account
-  revision: c03cd679cb1d730e1f1da24705854941c7e566ad
-  tag: v2.3.3
+  revision: 81a6040fff2fe0e2e534cd32deb68a7fa0e926be
+  tag: v2.3.4
   specs:
-    my_account (2.3.3)
+    my_account (2.3.4)
       blacklight (>= 7.0)
-      cul-folio-edge (~> 3.1)
+      cul-folio-edge (~> 3.2)
       rails (~> 6.1)
       rest-client
       xml-simple
@@ -543,13 +543,13 @@ GEM
     net-ssh (5.2.0)
     netrc (0.11.0)
     nio4r (2.7.1)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.16.8-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.16.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     nori (2.7.0)
       bigdecimal
@@ -587,6 +587,9 @@ GEM
       scrub_rb (~> 1.0)
     orm_adapter (0.5.0)
     ostruct (0.6.0)
+    parallel (1.26.3)
+    parallel_tests (4.8.0)
+      parallel
     parslet (2.0.0)
     piwik_analytics (1.0.2)
       actionpack
@@ -903,13 +906,14 @@ DEPENDENCIES
   mysql2 (= 0.5.6)
   net-ldap
   net-smtp
-  nokogiri (>= 1.14.3)
+  nokogiri (~> 1.16.7)
   omniauth (~> 2.0)
   omniauth-facebook (~> 5.0)
   omniauth-google-oauth2 (~> 0.8)
   omniauth-oauth2
   omniauth-rails_csrf_protection
   omniauth-saml (>= 2.1.2)
+  parallel_tests
   parslet
   piwik_analytics (~> 1.0.1)
   protected_attributes_continued

blacklight-cornell/app/assets/javascripts/linked_data/author_browse.js

@@ -134,8 +134,8 @@ function AuthorBrowse() {
     const { citizenship, education, entity, image, pseudonyms } = parsedWikidata;
 
     if (image) {
-      $('#agent-image').attr('src', image.url);
-      $('#img-container').show();
+      $('#bio-image').attr('src', image.url);
+      $('#img-container').removeClass('d-none');;
       $('#wiki-image-acknowledge').html(`<br/>Image: ${wikidataConnector.imageAttributionHtml(image)}`);
     } else {
       $('#comment-container').removeClass();
@@ -208,11 +208,11 @@ function AuthorBrowse() {
 
   // when there's no wikidata or an error occurs in one of the ajax calls
   function displayCatalogMetadata() {
-    $('#bio-desc').removeClass('d-none');
+    $('#bio-without-ld').removeClass('d-none');
   };
 
   function displayLinkedData() {
-    $('#info-details').removeClass('d-none');
+    $('#bio-with-ld').removeClass('d-none');
     $('#ref-info').addClass('mt-4');
   };
 

blacklight-cornell/app/assets/javascripts/linked_data/author_title_browse.js

@@ -6,6 +6,7 @@ function AuthorTitleBrowse() {
   // TODO: Add ability to exclude excludeEntities.yml?
 
   async function renderLinkedData() {
+    let wikidata = {};
     try {
       // Query Library of Congress for localName that can be used to fetch Wikidata results
       const headingAttr = $('#author-title-heading').data('heading');
@@ -14,11 +15,13 @@ function AuthorTitleBrowse() {
 
       if (localName) {
         // If LOC name found for heading, query Wikidata for additional data to display
-        const wikidata = await bamwowHelper.getWikidata(localName);
-        renderWikidata(wikidata);
+        wikidata = await bamwowHelper.getWikidata(localName);
       }
     } catch(err) {
       console.log(err);
+    } finally {
+      // Either display linked data or default catalog metadata
+      showDetails(wikidata);
     }
   };
 
@@ -27,37 +30,50 @@ function AuthorTitleBrowse() {
     return bamwowHelper.reformatHeading(headingAttr);
   };
 
-  function renderWikidata(data) {
+  function showDetails(data) {
     if (bamwowHelper.canRender(data)) {
-      const fieldHtml = generateFieldHtml(data);
-      $('dl#item-details').append(fieldHtml);
+      renderWikidata(data);
+      displayLinkedData();
+    } else {
+      displayCatalogMetadata();
+    }
+  };
 
-      const sourceLinkHtml = generateWikidataSourceLinks(data);
-      $('#wiki-acknowledge').html(sourceLinkHtml);
+  // when there's no wikidata or an error occurs in one of the ajax calls
+  function displayCatalogMetadata() {
+    $('#bio-without-ld').removeClass('d-none');
+  };
 
-      // Show details
-      $('#info-details').removeClass('d-none');
-      $('#ref-info').addClass('mt-4');
-    }
+  function displayLinkedData() {
+    $('#bio-with-ld').removeClass('d-none');
+    $('#ref-info').addClass('mt-4');
+  };
+
+  function renderWikidata(data) {
+    const fieldHtml = generateFieldHtml(data);
+    $('dl#item-details').append(fieldHtml);
+
+    const sourceLinkHtml = generateWikidataSourceLinks(data);
+    $('#wiki-acknowledge').html(sourceLinkHtml);
   }
 
   // Generate fields
   function generateFieldHtml(data) {
     let html = '';
     if (data.codes?.length) {
-      const codesArr = data.codes.map(code => `<dt>${code.catalogLabel} : ${code.code} *</dt>`);
+      const codesArr = data.codes.map(code => `<li class='list-unstyled'>${code.catalogLabel} : ${code.code} *</li>`);
       html += (
-        `<dt class="col-sm-4">Catalog numbers:</dt>
-        <dd class="col-sm-8">
-          <dl class="dl-horizontal">${codesArr.join(' ')}</dl>
+        `<dt>Catalog numbers:</dt>
+        <dd>
+          <ul class='list-group'>${codesArr.join(' ')}</ul>
         </dd>`
       );
     }
     if ('createdFor' in data) {
       const { loc: createdForLoc, label: createdForLabel } = data.createdFor;
       html += (
-        `<dt class="blacklight-wd-created col-sm-4">Created for:</dt>
-        <dd class="col-sm-8" loc="${createdForLoc}">${createdForLabel} *</dd>`
+        `<dt class="blacklight-wd-created">Created for:</dt>
+        <dd loc="${createdForLoc}">${createdForLabel} *</dd>`
       );
     }
 
@@ -68,7 +84,7 @@ function AuthorTitleBrowse() {
         let value = data[prop];
         if (prop === 'date') value = bamwowHelper.formatDates(value);
         if ($.isArray(value)) value = value.join(', ');
-        html += `<dt class="col-sm-4">${label}:</dt><dd class="col-sm-8">${value} *</dd>`;
+        html += `<dt>${label}:</dt><dd>${value} *</dd>`;
       }
     });
 

blacklight-cornell/app/assets/javascripts/linked_data/subject_browse.js

@@ -102,8 +102,8 @@ function SubjectDataBrowse() {
 
   function renderWikiImage(image) {
     if (image) {
-      $('#subject-image').attr('src', image.url);
-      $('#img-container').show();
+      $('#bio-image').attr('src', image.url);
+      $('#img-container').removeClass('d-none');;
       $('#wiki-image-acknowledge').html(`<br/>Image: ${wikidataConnector.imageAttributionHtml(image)}`);
     } else {
       $('#comment-container').removeClass();
@@ -154,11 +154,11 @@ function SubjectDataBrowse() {
   };
 
   function displayCatalogMetadata() {
-    $('#bio-desc').removeClass('d-none');
+    $('#bio-without-ld').removeClass('d-none');
   };
 
   function displayLinkedData() {
-    $('#info-details').removeClass('d-none');
+    $('#bio-with-ld').removeClass('d-none');
     $('#ref-info').addClass('mt-4');
   };
 

blacklight-cornell/app/assets/javascripts/linked_data/utils/wikidata_connector.js

@@ -65,6 +65,8 @@ function WikidataConnector() {
     });
   }
 
+  // TODO: Strip html from Wikidata response?
+  //       Example where response doesn't fit in below format: "Shakespeare, William, 1564-1616." (headingType=[subject, author])
   function imageAttributionHtml(image) {
     const wmcUrl = `https://commons.wikimedia.org/wiki/${encodeURIComponent(image.title)}`;
     const titleHtml = `"<a href="${wmcUrl}">${image.name || image.title}</a>"`;

blacklight-cornell/app/assets/javascripts/search_form.js

@@ -0,0 +1,106 @@
+document.addEventListener("DOMContentLoaded", function () {
+    const advancedSearchLink = document.getElementById("advanced-search-link");
+    // Select all inputs, selects, and textareas if no dynamic fields are found
+    let formFields = document.querySelectorAll("[data-dynamic='true']");
+    if (formFields.length === 0) {
+        formFields = document.querySelectorAll("input, select, textarea");
+    }
+
+    if (advancedSearchLink && formFields) {
+        const searchField = document.getElementById("q");
+        // Update the Advanced Search link dynamically
+        const updateAdvancedSearchLink = () => {
+            let params = new URLSearchParams();
+            let hasSearchText = searchField && searchField.value.trim().length > 0;
+
+            formFields.forEach((field) => {
+                if (field.name && field.value && field.name !== "q") {
+                    const fieldMappings = {
+                        authq: "q",
+                        browse_type: "search_field",
+                        search_field: "search_field"
+                    };
+
+                    const searchValueMappings = {
+                        author: "author",
+                        author_browse: "author",
+                        at_browse: "author",
+                        "catalog:author": "author",
+                        Author: "author",
+                        "Author-Title": "author",
+                        subject: "subject",
+                        subject_browse: "subject",
+                        "catalog:subject": "subject",
+                        Subject: "subject",
+                        publisher: "publisher",
+                        "catalog:publisher": "publisher",
+                        title: "title",
+                        title_starts: "title",
+                        "catalog:title": "title",
+                        journaltitle: "journaltitle",
+                        "catalog:journaltitle": "journaltitle",
+                        "catalog:lc_callnum": "lc_callnum",
+                        "Call-Number": "lc_callnum",
+                        callnumber_browse: "lc_callnum",
+                        lc_callnum: "lc_callnum"
+                    };
+
+                    if (field.name in fieldMappings) {
+                        if (field.name === "browse_type" || field.name === "search_field" || field.name === "search_field_row") {
+                            if (field.value in searchValueMappings) {
+                                params.append("search_field_row[]", searchValueMappings[field.value]);
+                                if (field.value === "title_starts") {
+                                    params.append("op_row[]", "begins_with");
+                                }
+                            }
+                        } else {
+                            params.append(fieldMappings[field.name], field.value);
+                        }
+                    } else if (field.name !== "authenticity_token" && field.name !== "utf8") {
+                        params.append(field.name, field.value);
+                    }
+                }
+            });
+
+            // Add q_row as a parameter if the search field has text
+            if (hasSearchText) {
+                params.append("q_row[]", searchField.value.trim()); // Append q_row
+            }
+
+            // Append other advanced search parameters if present
+            const opRow = document.querySelectorAll("[name='op_row[]']");
+            const searchFieldRow = document.querySelectorAll("[name='search_field_row[]']");
+            const booleanRow = document.querySelectorAll("[name='boolean_row[]']");
+            const facetFields = document.querySelectorAll("[name^='f[']");
+
+            opRow.forEach((field, index) => params.append(`op_row[${index}]`, field.value));
+            searchFieldRow.forEach((field, index) => params.append(`search_field_row[${index}]`, field.value));
+            booleanRow.forEach((field, index) => params.append(`boolean_row[${index}]`, field.value));
+
+            // Handle facets, including f[format]
+            const uniqueFacets = new Set();
+            facetFields.forEach((field) => {
+                const match = field.name.match(/^f\[(.+)\]$/); // Match f[key] format
+                if (match && match[1]) {
+                    const key = `f[${match[1]}]`;
+                    const value = field.value;
+                    const facetEntry = `${key}=${value}`;
+
+                    if (!uniqueFacets.has(facetEntry)) {
+                        uniqueFacets.add(facetEntry);
+                        params.append(key, value);
+                    }
+                }
+            });
+            // Update link href to use the /edit path
+            advancedSearchLink.href = `/edit?${params.toString()}`;
+        };
+
+        formFields.forEach((field) => {
+            field.addEventListener("input", updateAdvancedSearchLink);
+            field.addEventListener("change", updateAdvancedSearchLink);
+        });
+        updateAdvancedSearchLink();
+        advancedSearchLink.addEventListener("click", updateAdvancedSearchLink);
+    }
+});