Merge pull request #137 from ebsco/limiters-facets-update-issue-2311

omuzzyEBSCO · web-flow · commit 2baa5564ccd0 · 2024-10-07T12:16:22.000-07:00
Update to facet functionality
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 .vscode
-.perlcriticrc
+.perlcriticrc
+OMtesting.txt
diff --git a/Koha/Plugin/EDS.pm b/Koha/Plugin/EDS.pm
@@ -31,10 +31,10 @@ $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
 
 ################# DO NOT TOUCH - CONTROLLED BY build.py
 our $MAJOR_VERSION = "22.11";
-our $SUB_VERSION = "002";
+our $SUB_VERSION = "004";
 our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
 our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
-our $DATE_UPDATE = '2024-04-15';
+our $DATE_UPDATE = '2024-10-07';
 ######################################################
 
 ## Here is our metadata, some keys are required, some are optional
diff --git a/Koha/Plugin/EDS/admin/release_notes.xml b/Koha/Plugin/EDS/admin/release_notes.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- DO NOT TOUCH THIS FILE - controlled by build.py -->
 <kohaplugin>
-	<latestversion>22.11.002</latestversion>
+	<latestversion>22.11.004</latestversion>
 	<download>https://github.com/ebsco/edsapi-koha-plugin</download>
-	<lastupdated>2024/04/15</lastupdated>
+	<lastupdated>2024/10/07</lastupdated>
 	<releasenotes>
-		<release version="22.11.002" date="2024/04/15">
-			<note id="1" author="mabrahamson@ebsco.com">Builds community PRs into installer.</note>
+		<release version="22.11.004" date="2024/10/07">
+			<note id="1" author="omuzzy@ebsco.com">fixes issues where facets drop upon new selection.</note>
 		</release>
 	</releasenotes>
 </kohaplugin>
diff --git a/Koha/Plugin/EDS/js/EDSScript.tt b/Koha/Plugin/EDS/js/EDSScript.tt
@@ -41,7 +41,7 @@ edsConfig.pluginhttppath = "[% PLUGIN_HTTP_PATH %]";
 var searchBlockCount = 3;
 
 // DO NOT TOUCH - controlled by build.py
-var versionEDSKoha = "22.11002";
+var versionEDSKoha = "22.11004";
 ///////////////////////////////////////
 
 if (document.title == "") {
@@ -1095,10 +1095,9 @@ function UpdateFacet() {
 			str.push(e + "=" + multiFacet[e]);
 		}
 	}
-	window.location.href = document.URL.split("|")[0].replace("&default=1", "") + "|" + str.join("|");
+	window.location.assign(document.getElementById("searchTerm").parentElement.href.replace("&default=1", "").replace("action=removequery(1)","") + str.join("|"));
 }
 
-
 function SearchAgain() {
 	var resultsSelector = (jQuery('#noresultsfound').length) ? '#noresultsfound' : '#top-pages'; // top-pages for bootstrap
 	var searchQueryString = document.URL;
@@ -1111,7 +1110,7 @@ function SearchAgain() {
 	window.location.href = searchQueryString;
 }
 
-// Multile Facets END
+// Multiple Facets END
 
 //
 function PlacardTabs(placardTab) {
@@ -1331,5 +1330,4 @@ jQuery('body').on('click', '#translControl1', function () {
 	if (eds_sessionStorage.get('defaultsearch') == "eds") {
 		jQuery("#translControl1").autocomplete("search");
 	}
-});
-
+});
diff --git a/eds_plugin_22.11004.kpz b/eds_plugin_22.11004.kpz
diff --git a/version.json b/version.json
@@ -1,10 +1,10 @@
 {
     "MajorVersion": "22.11",
-    "MinorVersion": "002",
+    "MinorVersion": "004",
     "ReleaseNotes": [
         {
-            "author": "mabrahamson@ebsco.com",
-            "note": "Builds community PRs into installer."
+            "author": "omuzzy@ebsco.com",
+            "note": "fixes issues where facets drop upon new selection."
         }
     ],
     "ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ edsConfig.pluginhttppath = "[% PLUGIN_HTTP_PATH %]";`
`41`	`41`	`var searchBlockCount = 3;`
`42`	`42`
`43`	`43`	`// DO NOT TOUCH - controlled by build.py`
`44`		`-var versionEDSKoha = "22.11002";`
	`44`	`+var versionEDSKoha = "22.11004";`
`45`	`45`	`///////////////////////////////////////`
`46`	`46`
`47`	`47`	`if (document.title == "") {`
`@@ -1095,10 +1095,9 @@ function UpdateFacet() {`
`1095`	`1095`	`str.push(e + "=" + multiFacet[e]);`
`1096`	`1096`	`}`
`1097`	`1097`	`}`
`1098`		`- window.location.href = document.URL.split("\|")[0].replace("&default=1", "") + "\|" + str.join("\|");`
	`1098`	`+ window.location.assign(document.getElementById("searchTerm").parentElement.href.replace("&default=1", "").replace("action=removequery(1)","") + str.join("\|"));`
`1099`	`1099`	`}`
`1100`	`1100`
`1101`		`-`
`1102`	`1101`	`function SearchAgain() {`
`1103`	`1102`	`var resultsSelector = (jQuery('#noresultsfound').length) ? '#noresultsfound' : '#top-pages'; // top-pages for bootstrap`
`1104`	`1103`	`var searchQueryString = document.URL;`
`@@ -1111,7 +1110,7 @@ function SearchAgain() {`
`1111`	`1110`	`window.location.href = searchQueryString;`
`1112`	`1111`	`}`
`1113`	`1112`
`1114`		`-// Multile Facets END`
	`1113`	`+// Multiple Facets END`
`1115`	`1114`
`1116`	`1115`	`//`
`1117`	`1116`	`function PlacardTabs(placardTab) {`
`@@ -1331,5 +1330,4 @@ jQuery('body').on('click', '#translControl1', function () {`
`1331`	`1330`	`if (eds_sessionStorage.get('defaultsearch') == "eds") {`
`1332`	`1331`	`jQuery("#translControl1").autocomplete("search");`
`1333`	`1332`	`}`
`1334`		`-});`
`1335`		`-`
	`1333`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"MajorVersion": "22.11",`
`3`		`- "MinorVersion": "002",`
	`3`	`+ "MinorVersion": "004",`
`4`	`4`	`"ReleaseNotes": [`
`5`	`5`	`{`
`6`		`- "author": "mabrahamson@ebsco.com",`
`7`		`- "note": "Builds community PRs into installer."`
	`6`	`+ "author": "omuzzy@ebsco.com",`
	`7`	`+ "note": "fixes issues where facets drop upon new selection."`
`8`	`8`	`}`
`9`	`9`	`],`
`10`	`10`	`"ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"`