From 1772d2e27b886b3520981c15f8d69b4cb02ee81d Mon Sep 17 00:00:00 2001
From: Mike Lynch <mike@mikelynch.org>
Date: Fri, 8 Nov 2019 14:53:39 +1100
Subject: [PATCH] Fixed escaping of URLs as ids, tweaks to the layout so that
it looks better without facets
---
src/components/SolrService.js | 5 +++--
src/components/views/Facets.js | 8 ++++----
src/index.js | 6 ++++--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/components/SolrService.js b/src/components/SolrService.js
index 502132a..544576c 100644
--- a/src/components/SolrService.js
+++ b/src/components/SolrService.js
@@ -4,7 +4,7 @@ const SolrService = {
get: async function (config, data) {
try {
let param = `get?id=`;
- data = encodeURIComponent(`${data}`);
+ data = encodeURIComponent(data);
const res = await axios.get(`${config.api}/${param}${data}`);
if (res.data) {
return {data: res.data['doc'], status: res.status};
@@ -21,7 +21,8 @@ const SolrService = {
if (text === '' || !text ) {
text = '*';
}
- let query = `${param}${searchParam}${text}&start=${start}&page=${page}`;
+ let escText = text.replace(':', "\\:");
+ let query = `${param}${searchParam}${escText}&start=${start}&page=${page}`;
if(facets) {
query += `&facet=true%20&facet.field=${[...facets].join('&facet.field')}&facet.limit=${facetLimit || 5}`;
diff --git a/src/components/views/Facets.js b/src/components/views/Facets.js
index af03388..8e1625c 100644
--- a/src/components/views/Facets.js
+++ b/src/components/views/Facets.js
@@ -2,9 +2,9 @@ const $ = require("jquery");
const isIterable = require('../isIterable');
const Facets = function (data) {
- let html = `<ul class="list-group col-sm-4 col-xl-3">`;
-
- if(isIterable(data.facetsDisplay)){
+ let html = '';
+ if(isIterable(data.facetsDisplay) ){
+ html = `<ul class="list-group col-md-2">`;
for(let fd of data.facetsDisplay){
html += `<li class="list-group-item">
<div>
@@ -26,9 +26,9 @@ const Facets = function (data) {
</div>
</li>`
}
+ html += `</ul>`;
};
- html += `</ul>`;
return html;
};
diff --git a/src/index.js b/src/index.js
index 06ed68c..4eb3660 100644
--- a/src/index.js
+++ b/src/index.js
@@ -44,9 +44,11 @@ let state = {
{display: "SubDoc", field: "contactPoint", fieldName: 'Contact Point', template: '${item.name} ${item.email}'},
]
},
- facets: ['Dataset_author_facetmulti'],
+ facets: [
+ 'Dataset_author_facetmulti'
+ ],
facetsDisplay: [
- {name: 'Dataset_author_facetmulti', displayText: 'Top Authors'},
+ //{name: 'Dataset_author_facetmulti', displayText: 'Top Authors'},
//{name: 'Keywords', displayText: 'Top Keywords'}
],
facetData: [],
--
GitLab