From d2a5e050e128e2af1f933e4a710f9dbf0c577a4f Mon Sep 17 00:00:00 2001 From: Moises Sacal <moisbo@gmail.com> Date: Tue, 8 Oct 2019 10:50:45 +1100 Subject: [PATCH] cleaning views --- src/components/Router.js | 2 ++ src/components/views/SubDocHorizontal.js | 12 ++++++++---- src/index.js | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/components/Router.js b/src/components/Router.js index 3f4b6ad..99f8fe5 100644 --- a/src/components/Router.js +++ b/src/components/Router.js @@ -72,6 +72,7 @@ const Router = async function (state) { } } } else { + // TODO: Move some of these config data to config const res = await solrService.search({api: state.config.api}, { start: state.main.start, page: state.main.page, @@ -86,6 +87,7 @@ const Router = async function (state) { state.main.searchText = ''; state.facetResult = res.facets; const facetContent = FacetController.get({data: state.facetResult['facet_fields'][state.facets[0]], toJSON: true}); + // TODO: Move this to config const facetData = FacetController.display({data: facetContent, config: { name: 'Dataset_author_facetmulti', route: '#view/', diff --git a/src/components/views/SubDocHorizontal.js b/src/components/views/SubDocHorizontal.js index 45c9298..4a2c1e5 100644 --- a/src/components/views/SubDocHorizontal.js +++ b/src/components/views/SubDocHorizontal.js @@ -5,24 +5,28 @@ const SubDocHorizontal = function (data) { const div = $('<div class="row">'); const headerDiv = $('<div class="col-sm-2">').html(data.fieldName); div.append(headerDiv); + if (isIterable(data.value)) { for (let key of data.value) { try { const a = $('<a>'); - const subDiv = $('<div class="col-sm">'); + const subEle = $('<span class="">'); const sub = JSON.parse(key); const href = `/#view/${sub['@id']}`; a.attr('href', href); a.attr('title', sub['name']); a.text(sub['name']); a.addClass("link"); - subDiv.append(a); - div.append(subDiv); + subEle.append(a); + div.append(subEle); + } catch (e) { - div.append('') + div.append(''); } } } + + return div; } diff --git a/src/index.js b/src/index.js index abd2543..35225e9 100644 --- a/src/index.js +++ b/src/index.js @@ -38,6 +38,7 @@ let state = { related: [], viewFields: [ {display: "SubDocHorizontal", field: "author", fieldName: 'Author/s'}, + {display: "", field: "affiliation", fieldName: 'Affiliation'}, {display: "", field: "license", fieldName: 'Licence'}, {display: "SubDocDate", field: "datePublished", fieldName: 'Date Published'}, {display: "SubDoc", field: "contactPoint", fieldName: 'Contact Point', template: '${item.name} ${item.email}'}, @@ -46,7 +47,7 @@ let state = { facets: ['Dataset_author_facetmulti'], facetsDisplay: [ {name: 'Dataset_author_facetmulti', displayText: 'Top Authors'}, - //{name: 'Keywords', displayText: 'Top Keywords'} + {name: 'Keywords', displayText: 'Top Keywords'} ], facetData: [], facetLimit: 5, -- GitLab