Merge branch 'release-2.12.x' into TASK-5931

opencb · May 14, 2024 · d63eee3 · d63eee3
2 parents f9407f1 + 023f596
commit d63eee3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/sites/iva/iva-app.js b/src/sites/iva/iva-app.js
@@ -886,11 +886,9 @@ class IvaApp extends LitElement {
             let query = {};
             // Check if key=value list exist
             if (hashQuery.includes("=")) {
-                const filters = hashQuery.split("&");
-                for (const filter of filters) {
-                    const [key, value] = filter.split("=");
-                    query[key] = value;
-                }
+                Array.from(new URLSearchParams(hashQuery).entries()).forEach(entry => {
+                    query[entry[0]] = entry[1];
+                });
             } else {
                 // Default query filter is 'id'
                 query = {id: hashQuery};

diff --git a/src/webcomponents/commons/filters/catalog-search-autocomplete.js b/src/webcomponents/commons/filters/catalog-search-autocomplete.js
@@ -237,7 +237,7 @@ export default class CatalogSearchAutocomplete extends LitElement {
             fields: this.RESOURCES[this.resource].fields,
             source: (params, success, failure) => {
                 const page = params?.data?.page || 1;
-                const attr = params?.data?.term ? {[this.searchField || this.RESOURCES[this.resource].searchField]: "~/" + params?.data?.term + "/i"} : null;
+                const attr = params?.data?.term ? {[this.searchField || this.RESOURCES[this.resource].searchField]: "~/" + params?.data?.term.trim() + "/i"} : null;
                 const filters = {
                     study: this.opencgaSession.study.fqn,
                     limit: this._config.limit,