From df1ea7a5a59913743a3135387640cbbc1a162303 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 8 Jan 2025 15:44:38 -0500
Subject: [PATCH] Combined jump links: configurable linking modes

---
 config/vufind/combined.ini                    |  5 +++
 .../VuFindTest/Mink/CombinedSearchTest.php    | 32 ++++++++++++++++++-
 .../templates/combined/jump-links.phtml       | 18 ++++++++++-
 .../templates/combined/results-list.phtml     | 13 +++++---
 .../templates/combined/results.phtml          | 10 +++++-
 .../templates/combined/jump-links.phtml       | 18 ++++++++++-
 .../templates/combined/results-list.phtml     | 13 +++++---
 .../templates/combined/results.phtml          | 10 +++++-
 8 files changed, 106 insertions(+), 13 deletions(-)

diff --git a/config/vufind/combined.ini b/config/vufind/combined.ini
index 2731d258d40..119b00a5934 100644
--- a/config/vufind/combined.ini
+++ b/config/vufind/combined.ini
@@ -99,6 +99,11 @@ columns = 3
 stack_placement = distributed
 ; Jump links appear above the search results and link to each result module
 ;jump_links = true
+; If jump_links is true, this setting can control what types of links are used:
+; 'anchor' will create anchor links that jump to the matching column on the page
+; 'link' will link directly to the expanded search results
+; The default is 'anchor'
+;jump_links_mode = anchor
 
 [Solr]
 label = Catalog
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CombinedSearchTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CombinedSearchTest.php
index d435e635af5..2bc9e5711ba 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CombinedSearchTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CombinedSearchTest.php
@@ -239,16 +239,34 @@ public function testCombinedSearchResultsMixedAjax(): void
         $this->assertResultsForDefaultQuery($page);
     }
 
+    /**
+     * Data provider for testJumpMenu()
+     *
+     * @return array[]
+     */
+    public static function jumpMenuProvider(): array
+    {
+        return [
+            'anchor mode' => ['anchor'],
+            'link mode' => ['link'],
+        ];
+    }
+
     /**
      * Test that the jump menu can be enabled.
      *
+     * @param string $linkMode Linking mode to activate
+     *
      * @return void
+     *
+     * @dataProvider jumpMenuProvider
      */
-    public function testJumpMenu(): void
+    public function testJumpMenu(string $linkMode): void
     {
         $config = $this->getCombinedIniOverrides();
         $config['Solr:one']['ajax'] = true; // use mixed AJAX mode for more thorough test
         $config['Layout']['jump_links'] = true;
+        $config['Layout']['jump_links_mode'] = $linkMode;
         $this->changeConfigs(
             ['combined' => $config],
             ['combined']
@@ -262,6 +280,18 @@ public function testJumpMenu(): void
             $expectedContent,
             $this->findCssAndGetText($page, '.combined-jump-links')
         );
+        $firstLink = $this->findCss($page, '.combined-jump-links a')->getAttribute('href');
+        $secondLink = $this->findCss($page, '.combined-jump-links a', index: 1)->getAttribute('href');
+        $expectedFirstLink = $linkMode === 'anchor'
+            ? '#combined_Solr____one'
+            : '/Search/Results?hiddenFilters%5B%5D=building%3A%22journals.mrc%22&lookfor=id%3A%22testsample1%22'
+                . '+OR+id%3A%22theplus%2Bandtheminus-%22&type=AllFields';
+        $expectedSecondLink = $linkMode === 'anchor'
+            ? '#combined_Solr____two'
+            : '/Search/Results?hiddenFilters%5B%5D=building%3A%22weird_ids.mrc%22&lookfor=id%3A%22testsample1%22'
+                . '+OR+id%3A%22theplus%2Bandtheminus-%22&type=AllFields';
+        $this->assertStringEndsWith($expectedFirstLink, $firstLink);
+        $this->assertStringEndsWith($expectedSecondLink, $secondLink);
     }
 
     /**
diff --git a/themes/bootstrap3/templates/combined/jump-links.phtml b/themes/bootstrap3/templates/combined/jump-links.phtml
index 6567ce948a0..13bfc5c58fd 100644
--- a/themes/bootstrap3/templates/combined/jump-links.phtml
+++ b/themes/bootstrap3/templates/combined/jump-links.phtml
@@ -2,8 +2,24 @@
   <span><?=$this->translate('combined_jump_links_intro')?></span>
   <ul>
     <?php foreach ($combinedResults as $section) : ?>
+      <?php
+        // If we're in link mode, try to directly link to results, but fail back to the anchor if we don't
+        // have access to results, or if the results object is "combined" (indicating we're in AJAX mode
+        // and don't have results yet):
+        if (
+          ($mode ?? 'anchor') === 'link'
+          && ($results = $section['view']->results ?? null)
+          && !($results instanceof \VuFind\Search\Combined\Results)
+        ) {
+          $params = $results->getParams();
+          $lookfor = $results->getUrlQuery()->isQuerySuppressed() ? '' : $params->getDisplayQuery();
+          $href = $this->url($params->getOptions()->getSearchAction()) . $results->getUrlQuery()->setPage(1)->setLimit($params->getOptions()->getDefaultLimit());
+        } else {
+          $href = '#' . $section['domId'];
+        }
+      ?>
       <li class="<?= $this->escapeHtmlAttr($section['domId']) ?>">
-        <a href="#<?= $this->escapeHtmlAttr($section['domId']) ?>"><?= $this->transEsc($section['label']) ?></a>
+        <a href="<?= $this->escapeHtmlAttr($href) ?>" data-link-mode="<?= $this->escapeHtmlAttr($mode) ?>"><?= $this->transEsc($section['label']) ?></a>
       </li>
     <?php endforeach; ?>
   </ul>
diff --git a/themes/bootstrap3/templates/combined/results-list.phtml b/themes/bootstrap3/templates/combined/results-list.phtml
index 48512e34f08..cf82ca53f3c 100644
--- a/themes/bootstrap3/templates/combined/results-list.phtml
+++ b/themes/bootstrap3/templates/combined/results-list.phtml
@@ -45,19 +45,24 @@
 
   // Update result counts in jump links
   $classId = $this->escapeHtml($domId ?? 'combined_' . $searchClassId);
+  $jsMoreUrl = $this->escapeJs(html_entity_decode($moreUrl));
   $countsJs = <<<JS
       function updateJumpLink_$classId() {
         const combinedJumpLinks = document.querySelector('.combined-jump-links');
-        const link = combinedJumpLinks?.querySelector('.$classId');
-        if (link) {
+        const linkContainer = combinedJumpLinks?.querySelector('.$classId');
+        if (linkContainer) {
           let count = $recordTotal;
           count = count.toLocaleString();
           const spanText = document.createTextNode('(' + count + ')');
           const totalSpan = document.createElement('span');
           totalSpan.className = 'record-total';
           totalSpan.append(spanText);
-          link.append(totalSpan);
-          link.style.display = "inline";
+          linkContainer.append(totalSpan);
+          linkContainer.style.display = "inline";
+          const link = linkContainer.querySelector('a');
+          if (link.dataset.linkMode === 'link') {
+            link.href = "$jsMoreUrl";
+          };
           combinedJumpLinks.style.visibility = "inherit";
         }
       }
diff --git a/themes/bootstrap3/templates/combined/results.phtml b/themes/bootstrap3/templates/combined/results.phtml
index 2cc2bd085bc..28372944796 100644
--- a/themes/bootstrap3/templates/combined/results.phtml
+++ b/themes/bootstrap3/templates/combined/results.phtml
@@ -54,7 +54,15 @@
   </div>
 <?php endif; ?>
 <?php if ($config['Layout']['jump_links'] ?? false): ?>
-  <?=$this->render('combined/jump-links.phtml', ['combinedResults' => $this->combinedResults])?>
+  <?=
+    $this->render(
+        'combined/jump-links.phtml',
+        [
+        'combinedResults' => $this->combinedResults,
+        'mode' => $config['Layout']['jump_links_mode'] ?? 'anchor',
+      ]
+    )
+  ?>
 <?php endif; ?>
 <form id="search-cart-form" class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-searchresultsbulk')?>">
   <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', ['idPrefix' => ''])?>
diff --git a/themes/bootstrap5/templates/combined/jump-links.phtml b/themes/bootstrap5/templates/combined/jump-links.phtml
index 6567ce948a0..13bfc5c58fd 100644
--- a/themes/bootstrap5/templates/combined/jump-links.phtml
+++ b/themes/bootstrap5/templates/combined/jump-links.phtml
@@ -2,8 +2,24 @@
   <span><?=$this->translate('combined_jump_links_intro')?></span>
   <ul>
     <?php foreach ($combinedResults as $section) : ?>
+      <?php
+        // If we're in link mode, try to directly link to results, but fail back to the anchor if we don't
+        // have access to results, or if the results object is "combined" (indicating we're in AJAX mode
+        // and don't have results yet):
+        if (
+          ($mode ?? 'anchor') === 'link'
+          && ($results = $section['view']->results ?? null)
+          && !($results instanceof \VuFind\Search\Combined\Results)
+        ) {
+          $params = $results->getParams();
+          $lookfor = $results->getUrlQuery()->isQuerySuppressed() ? '' : $params->getDisplayQuery();
+          $href = $this->url($params->getOptions()->getSearchAction()) . $results->getUrlQuery()->setPage(1)->setLimit($params->getOptions()->getDefaultLimit());
+        } else {
+          $href = '#' . $section['domId'];
+        }
+      ?>
       <li class="<?= $this->escapeHtmlAttr($section['domId']) ?>">
-        <a href="#<?= $this->escapeHtmlAttr($section['domId']) ?>"><?= $this->transEsc($section['label']) ?></a>
+        <a href="<?= $this->escapeHtmlAttr($href) ?>" data-link-mode="<?= $this->escapeHtmlAttr($mode) ?>"><?= $this->transEsc($section['label']) ?></a>
       </li>
     <?php endforeach; ?>
   </ul>
diff --git a/themes/bootstrap5/templates/combined/results-list.phtml b/themes/bootstrap5/templates/combined/results-list.phtml
index 48512e34f08..cf82ca53f3c 100644
--- a/themes/bootstrap5/templates/combined/results-list.phtml
+++ b/themes/bootstrap5/templates/combined/results-list.phtml
@@ -45,19 +45,24 @@
 
   // Update result counts in jump links
   $classId = $this->escapeHtml($domId ?? 'combined_' . $searchClassId);
+  $jsMoreUrl = $this->escapeJs(html_entity_decode($moreUrl));
   $countsJs = <<<JS
       function updateJumpLink_$classId() {
         const combinedJumpLinks = document.querySelector('.combined-jump-links');
-        const link = combinedJumpLinks?.querySelector('.$classId');
-        if (link) {
+        const linkContainer = combinedJumpLinks?.querySelector('.$classId');
+        if (linkContainer) {
           let count = $recordTotal;
           count = count.toLocaleString();
           const spanText = document.createTextNode('(' + count + ')');
           const totalSpan = document.createElement('span');
           totalSpan.className = 'record-total';
           totalSpan.append(spanText);
-          link.append(totalSpan);
-          link.style.display = "inline";
+          linkContainer.append(totalSpan);
+          linkContainer.style.display = "inline";
+          const link = linkContainer.querySelector('a');
+          if (link.dataset.linkMode === 'link') {
+            link.href = "$jsMoreUrl";
+          };
           combinedJumpLinks.style.visibility = "inherit";
         }
       }
diff --git a/themes/bootstrap5/templates/combined/results.phtml b/themes/bootstrap5/templates/combined/results.phtml
index 2cc2bd085bc..28372944796 100644
--- a/themes/bootstrap5/templates/combined/results.phtml
+++ b/themes/bootstrap5/templates/combined/results.phtml
@@ -54,7 +54,15 @@
   </div>
 <?php endif; ?>
 <?php if ($config['Layout']['jump_links'] ?? false): ?>
-  <?=$this->render('combined/jump-links.phtml', ['combinedResults' => $this->combinedResults])?>
+  <?=
+    $this->render(
+        'combined/jump-links.phtml',
+        [
+        'combinedResults' => $this->combinedResults,
+        'mode' => $config['Layout']['jump_links_mode'] ?? 'anchor',
+      ]
+    )
+  ?>
 <?php endif; ?>
 <form id="search-cart-form" class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-searchresultsbulk')?>">
   <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', ['idPrefix' => ''])?>