Skip to content
Snippets Groups Projects
Commit 1772d2e2 authored by Mike Lynch's avatar Mike Lynch
Browse files

Fixed escaping of URLs as ids, tweaks to the layout so that it looks better without facets

parent d08a638b
Branches
No related merge requests found
...@@ -4,7 +4,7 @@ const SolrService = { ...@@ -4,7 +4,7 @@ const SolrService = {
get: async function (config, data) { get: async function (config, data) {
try { try {
let param = `get?id=`; let param = `get?id=`;
data = encodeURIComponent(`${data}`); data = encodeURIComponent(data);
const res = await axios.get(`${config.api}/${param}${data}`); const res = await axios.get(`${config.api}/${param}${data}`);
if (res.data) { if (res.data) {
return {data: res.data['doc'], status: res.status}; return {data: res.data['doc'], status: res.status};
...@@ -21,7 +21,8 @@ const SolrService = { ...@@ -21,7 +21,8 @@ const SolrService = {
if (text === '' || !text ) { if (text === '' || !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) { if(facets) {
query += `&facet=true%20&facet.field=${[...facets].join('&facet.field')}&facet.limit=${facetLimit || 5}`; query += `&facet=true%20&facet.field=${[...facets].join('&facet.field')}&facet.limit=${facetLimit || 5}`;
......
...@@ -2,9 +2,9 @@ const $ = require("jquery"); ...@@ -2,9 +2,9 @@ const $ = require("jquery");
const isIterable = require('../isIterable'); const isIterable = require('../isIterable');
const Facets = function (data) { const Facets = function (data) {
let html = `<ul class="list-group col-sm-4 col-xl-3">`; let html = '';
if(isIterable(data.facetsDisplay) ){
if(isIterable(data.facetsDisplay)){ html = `<ul class="list-group col-md-2">`;
for(let fd of data.facetsDisplay){ for(let fd of data.facetsDisplay){
html += `<li class="list-group-item"> html += `<li class="list-group-item">
<div> <div>
...@@ -26,9 +26,9 @@ const Facets = function (data) { ...@@ -26,9 +26,9 @@ const Facets = function (data) {
</div> </div>
</li>` </li>`
} }
html += `</ul>`;
}; };
html += `</ul>`;
return html; return html;
}; };
......
...@@ -44,9 +44,11 @@ let state = { ...@@ -44,9 +44,11 @@ let state = {
{display: "SubDoc", field: "contactPoint", fieldName: 'Contact Point', template: '${item.name} ${item.email}'}, {display: "SubDoc", field: "contactPoint", fieldName: 'Contact Point', template: '${item.name} ${item.email}'},
] ]
}, },
facets: ['Dataset_author_facetmulti'], facets: [
'Dataset_author_facetmulti'
],
facetsDisplay: [ facetsDisplay: [
{name: 'Dataset_author_facetmulti', displayText: 'Top Authors'}, //{name: 'Dataset_author_facetmulti', displayText: 'Top Authors'},
//{name: 'Keywords', displayText: 'Top Keywords'} //{name: 'Keywords', displayText: 'Top Keywords'}
], ],
facetData: [], facetData: [],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment