From 2be59bbe0254dc1475b8474108f48a709b064504 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 21 Apr 2021 18:14:16 +0300 Subject: [PATCH 1/5] Fix issues preventing rendering and functioning of temporal graph. Resolve https://jira.lyrasis.org/browse/VIVO-1978 (#235) --- .../main/webapp/js/visualization/entitycomparison/util.js | 4 ++-- .../entitycomparison/entityComparisonSetup.ftl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js index 1e081393..0e754460 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js @@ -1069,7 +1069,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){ // console.log(processJSONData.currentEntityLevel); - if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") { + if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) { $.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations); } @@ -1193,7 +1193,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){ */ function reloadDataTablePagination(preselectedEntityURIs, jsonData){ - if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") { + if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) { /* * This will make sure that duplicate filters are not added. diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index fd4b7b4b..fac30ed6 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -34,7 +34,7 @@ <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> -<#assign publicationParameter = { "name": "${i18n().publication?js_string}", +<#assign publicationParameter = { "name": "publication", "pluralName": "${i18n().publications?js_string}", "verbName": "${i18n().published?js_string}", "dropDownText": "${i18n().by_publications?js_string}", @@ -44,7 +44,7 @@ "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison", "value": "${i18n().publications?js_string}" }> -<#assign grantParameter = { "name": "${i18n().grant?js_string}", +<#assign grantParameter = { "name": "grant", "pluralName": "${i18n().grants?js_string}", "verbName": "${i18n().granted?js_string}", "dropDownText": "${i18n().by_grants?js_string}", @@ -74,7 +74,7 @@ var activitiesLabel = { plural: '${i18n().activities?js_string}' }; var i18nStringsGuiEvents = { - temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}, + temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}', temporalGraphLower: '${i18n().temporal_graph?js_string?js_string}', viewString: '${i18n().view?js_string}', entityMaxNote: '${i18n().max_entity_note?js_string}', From 250566446fd287dd74a4db3316f844f71f50cf32 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 21 Apr 2021 19:53:35 +0300 Subject: [PATCH 2/5] Replace hardcoded en locale with current locale in lang attributes (#237) --- .../main/webapp/themes/tenderfoot/templates/page/page-home.ftl | 2 +- .../src/main/webapp/themes/tenderfoot/templates/page/page.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/page-home.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/page.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl index e2aa1b1c..d23c704d 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl @@ -15,7 +15,7 @@ <#import "lib-home-page.ftl" as lh> - + <#include "head.ftl"> <#if geoFocusMapsEnabled > diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl index 648b7bf2..92897492 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl @@ -3,7 +3,7 @@ <#import "lib-list.ftl" as l> - + <#include "head.ftl"> diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index 8db75bb7..a9783906 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -15,7 +15,7 @@ <#import "lib-home-page.ftl" as lh> - + <#include "head.ftl"> <#if geoFocusMapsEnabled > diff --git a/webapp/src/main/webapp/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl index f1a2d5b2..7ab1fc89 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page.ftl @@ -3,7 +3,7 @@ <#import "lib-list.ftl" as l> - + <#include "head.ftl"> From 29728b3b408516649d9763d72af010b08015a482 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 21 Apr 2021 19:54:23 +0300 Subject: [PATCH 3/5] =?UTF-8?q?Add=20additional=20URI=20finder=20that=20wi?= =?UTF-8?q?ll=20reindex=20a=20person=20if=20its=20associate=E2=80=A6=20(#2?= =?UTF-8?q?27)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add additional URI finder that will reindex a person if its associated title or email resource is deleted altogether. * Remove redundant identical query; eliminate unused prefix. --- .../everytime/searchIndexerConfigurationVivo.n3 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 index 85abdeae..bdc8a4fa 100644 --- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 +++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 @@ -117,6 +117,22 @@ } """ . +# URI finder that will find the relevant person to update when the +# property linking to the email or preferred title resource is removed +:vivoUriFinder_VCard_2 + a searchIndex:indexing.IndexingUriFinder , + searchIndex:indexing.SelectQueryUriFinder ; + rdfs:label "Preferred title / email person URI finder #2" ; + :hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#hasTitle" ; + :hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#hasEmail" ; + :hasSelectQuery """ + PREFIX obo: + SELECT ?uri + WHERE { + ?uri obo:ARG_2000028 ?subject . + } + """ . + :vivodocumentModifier_PreferredTitle a searchIndex:documentBuilding.SelectQueryDocumentModifier , searchIndex:documentBuilding.DocumentModifier ; From f4d187a60176737c1d137e4e80609ca565932aa7 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 21 Apr 2021 20:38:32 +0300 Subject: [PATCH 4/5] Allow 'create new' for vivo:governingAuthorityFor. Resolve https://jira.lyrasis.org/browse/VIVO-1820 (#234) --- .../src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 index ca536ba7..2fcfd609 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 @@ -5071,7 +5071,9 @@ vivo:governingAuthorityFor vitro:displayRankAnnot "70"^^xsd:int ; vitro:inPropertyGroupAnnot - . + ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . geo:agriculturalAreaYear vitro:hiddenFromDisplayBelowRoleLevelAnnot From fe1498319aaacd173ac49c141bab87f65834b828 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Tue, 27 Apr 2021 19:43:59 +0300 Subject: [PATCH 5/5] Add note to runtime.properties that TPF should not be used if VIVO contains restricted data. (#236) --- .../main/resources/config/example.runtime.properties | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index e5a9da9d..260eb17f 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -407,7 +407,15 @@ Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Ro # If you do not wish to use the claiming interface, set this property to nothing (empty) createAndLink.providers = doi, pmid - # Triple pattern fragments is a very fast, very simple means for querying a triple store. - # The triple pattern fragments API in VIVO puts little load on the server, providing a simple means for getting data from the triple store. The API has a web interface for manual use, can be used from the command line via curl, and can be used by programs. + # Triple Pattern Fragments is a very fast, very simple means for querying a + # triple store. The Triple Pattern Fragments API in VIVO puts little load on + # the server, providing a simple means for getting data from the triple store. + # The API has a web interface for manual use, can be used from the command + # line via curl, and can be used by programs. + # + # VIVO's Triple Pattern Fragments API does not require authentication and + # makes the full RDF graph available regardless of display or publish levels + # set on particular properties. Enable Triple Pattern Fragments only if your + # VIVO does not contain restricted data that should not be shared with others. # # tpf.activeFlag = true