Commit graph

6470 commits

Author SHA1 Message Date
43d15ecca1 fix: broken js on page prevents working developer panel 2021-09-15 14:26:27 +02:00
c33db4d5b7 fix: Parse text nodes separately 2021-09-15 14:02:04 +02:00
37bd35cdfe Added special characters conversion on file import and export for online translations 2021-07-07 17:45:40 +02:00
ae68588206 Online translation added to Developer panel settings 2021-07-06 13:36:19 +02:00
Brian Lowe
a7e1e60c7e
Update version numbers in pom.xmls (#239)
* Update version numbers in pom.xmls

* Restore -SNAPSHOT
2021-06-21 04:10:08 -05:00
9565fbd925
Merge pull request #232 from brianjlowe/issue/VIVO-1983
[VIVO-1983] Limit label management values to current locale
2021-06-17 23:33:44 +02:00
Brian Lowe
762388e88b Retrieve locales used in label statements instead of only selectable locales 2021-06-16 22:02:48 +03:00
1e7cc745bc
Merge pull request #236 from brianjlowe/issue/VIVO-1985
[VIVO-1985] Compare locales of equal rank alphabetically to provide consistent fallback
2021-06-16 20:16:39 +02:00
Brian Lowe
93fd5a5f39 Retrieve locales used in label statements instead of only selectable locales 2021-06-16 21:16:24 +03:00
Brian Lowe
33ae07dcbf Use language-neutral model to match data property statements to literal hashes. 2021-06-10 13:05:02 +03:00
Brian Lowe
20507a75fb Remove erroneous addition of language-awareness to request OntModels that failed to respect the specified language option. 2021-06-10 13:04:18 +03:00
Brian Lowe
1d89cbc908
Log ConfigurationProperties bean at DEBUG level. (#237) 2021-06-09 08:10:57 -06:00
Brian Lowe
1720272155
[VIVO-1997] Log blank node deletion messages at DEBUG instead of WARN (#238)
* Log blank node deletion messages at debug level instead of warn.

* Switch to more informative debug message about blank node deletion.
2021-06-09 08:10:12 -06:00
Brian Lowe
27353bfb91 Count labels and distinct languages using same query; revert changes to lib-properties.ftl. 2021-06-04 16:59:27 +03:00
d21dc92b0b
Use unique key in account activation link and reset password link (#234)
* Use unique key for email activation and password reset

* Renamed old variable from hash to key

* Check for null before setting email key for backward compatibility. Removed comment about old behaviour.

* Send password_change_invalid_key message instead of password_change_not_pending on key mismatch.
2021-06-03 15:59:29 +03:00
Brian Lowe
3c04cc0f80
Abort TDB write transaction before ending if not successfully committed (#230) 2021-06-02 09:55:23 -06:00
Ben
1819fa1dd4
Merge pull request #235 from brianjlowe/issue/VIVO-1989
[VIVO-1989] URL-encode vCard-related resource URIs appended to edit links
2021-06-02 09:30:30 -06:00
Brian Lowe
7a24e259e8 URL-encode vCard-related resource URIs appended to edit links 2021-06-01 15:45:48 +03:00
Brian Lowe
e7993668b6 Sort locales of the same priority level alphabetically for consistent selection of fallback language 2021-06-01 15:10:56 +03:00
Brian Lowe
63639fc852 Update view labels servlet to use current language filtering 2021-05-28 17:12:02 +03:00
Brian Lowe
c07af3d794 Count labels with language filtering 2021-05-28 15:51:06 +03:00
Ben
5075d78537
Update example config files to current best practices (#229) 2021-05-06 12:33:37 +03:00
Ben
bbead68e88
Merge pull request #220 from brianjlowe/issue/VIVO-1974
Add usePreciseSubqueries property to example.runtime.properties.  Hav…
2021-05-05 10:36:54 -06:00
Ben
71ca39d597
[VIVO-1736] - Bugfix for redirecting user to home page after login (#227)
* Add trailing slash to home page redirect if contextPath empty

* Add redirect path to debug log

* Remove outdated code comment
2021-05-03 20:03:17 +03:00
Ben
cd437a503e
Merge pull request #222 from brianjlowe/issue/VIVO-1615
Fix errors preventing TPF server from working with TDB. Resolve https…
2021-04-27 10:43:48 -06:00
Brian Lowe
0b9919c55d
Replace hardcoded en locale with current locale in lang and xml:lang attributes (#228) 2021-04-21 11:53:41 -05:00
Brian Lowe
3984203552
Implement nextBinding() method in FIlteredResultSet. (#215) 2021-04-21 10:14:31 -05:00
Ben
bc12d2037c
Merge pull request #224 from brianjlowe/issue/VIVO-1976
Move event listening to RDFServiceGraph level to avoid adding a new r…
2021-04-12 08:28:20 -06:00
Brian Lowe
b6062fe4a0 Add note to example.runtime.properties that TPF should not be used if Vitro contains restricted data. 2021-04-09 18:15:57 +03:00
Ben
b283a8342a
Add subject to reindex in AdditionalURIsForObjectProperties (#225)
Co-authored-by: Georgy Litvinov <git@litvinovg.pro>
2021-04-09 17:39:15 +03:00
Ben
ebca021bc4
Merge pull request #223 from brianjlowe/issues/VIVO-1973
Allow site admins to edit pages in page management. Resolve https://j
2021-04-09 07:47:57 -06:00
Ben
c5a716e90e
Merge pull request #226 from vivo-project/revert-221-bugfix/VIVO-1736
Revert "[VIVO-1736] - Bugfix for redirecting user to home page after login"
2021-04-06 11:25:11 -06:00
Brian Lowe
def81c9013 Revert "Bugfix for redirecting user to home page after login (#221)"
This reverts commit 2ad521e9da.
2021-04-06 20:21:51 +03:00
Brian Lowe
93bd5183e2 Move event listening to RDFServiceGraph level to avoid adding a new redundant listener each time a model is made for an existing RDFServiceGraph. Resolve https://jira.lyrasis.org/browse/VIVO-1976 2021-04-06 17:15:50 +03:00
Brian Lowe
70aefebedf Allow site admins to edit pages in page management. Resolve https://jira.lyrasis.org/browse/VIVO-1973 2021-04-06 14:36:30 +03:00
Brian Lowe
cdfb18a455 Fix errors preventing TPF server from working with TDB. Resolve https://jira.lyrasis.org/browse/VIVO-1615 2021-04-06 12:53:26 +03:00
Ben
2ad521e9da
Bugfix for redirecting user to home page after login (#221)
https://jira.lyrasis.org/browse/VIVO-1736
2021-04-06 11:44:53 +03:00
Brian Lowe
ff8ba8adcc Add usePreciseSubqueries property to example.runtime.properties. Have RDFServiceTDB report a preference for precise optionals as does SDB. 2021-03-29 16:17:37 +03:00
Ralph O'Flinn
193b38159a
revert deployment changes (#219)
Co-authored-by: William Welling <wwelling@library.tamu.edu>
2021-03-24 01:47:08 -05:00
Brian Lowe
6b612316ee
Use same fallback locale used by RDFFilesLoader when setting locale on request. Resolves https://jira.lyrasis.org/browse/VIVO-1959 (#212) 2021-02-18 08:50:32 -06:00
Andrew Woods
eb949919b5
Sprint i18n with main (#209)
* Layer uqam updates onto master (minus trailing whitespace)

* Update RDFServiceFactorySingle.java

* Sprint i18n whitespace (#143)

* Removed extraneous whitespace
   - modified:   api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java

* move RootUserPolicy.java from VIVO to Vitro repo.

* Remove blank line

* Fixed indentations

* Update whitespace for: TemplateProcessingHelper.java

* Update whitespace for: RDFServiceModel.java

* Removed extraneous whitespaces.

* Tagging UQAM Comments with following tags

-Add-Feature
-Optimization
-Linguistic-Management
-Bug-Correction

* Resolve compilation failures in Vitro tests

* Remove whitespace changes from SelectListGeneratorVTwo.java

* Add null check on field values of RDF Form (#158)

Resolves: https://jira.lyrasis.org/browse/VIVO-1800

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Fix incorrect tool-tip in language selection dropdown (#156)

Resolves: https://jira.lyrasis.org/browse/VIVO-1783

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Sprint i18n/lang filtering model (#159)

* Add language-aware graph filtering instead of layering on additional RDFService

Resolves: https://jira.lyrasis.org/browse/VIVO-1771

* Remove hardcoded link label (#161)

Resolves: https://jira.lyrasis.org/browse/VIVO-1779

* Enable filtering of non-enabled i18n language files from being loaded into triple store (#160)

Define name of available language listing file (found in Vitro-languages)
Update RDFFilesLoader method interfaces to include ServletContext

Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Add i18n version of Edit page title (#157)

Related to: https://jira.lyrasis.org/browse/VIVO-1779

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Changing ontology extensions for n3 & assigning a base IRI to each (#163)

ontology

Co-authored-by: michelheon <heon@videotorn.ca>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

https://jira.lyrasis.org/browse/VIVO-1862

* Update sprint-i18n with master branch (#166)

* Make data property richtext editor option selectable from UI

* [VIVO-1755] - Better error handling when reasoner disabled (#137)

* Better error handling when reasoner disabled

* Change reasoner error log message to debug

* Extend reasoner status error handling

* Improve reasoner error log message and extend to JenaAdminActions

* Bump up log level for admin action to 'warn' and edit admin panel error message

* Change Model writer lang from "N3-PP" to "N3" (#149)

Resolves: https://jira.lyrasis.org/browse/VIVO-1761

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* [VIVO-1851] - Add 'remove' option to named graph management page (#162)

* Add 'remove' option to named graph management page

Resolves: https://jira.lyrasis.org/browse/VIVO-1851

* [VIVO-1872] - Add download option to SPARQL Query page (#164)

* Add download option to SPARQL Query page

* Set SPARQL query results content type even if downloading

* Address pull request comments

Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* [VIVO-1839] - Use language name for selector instead of flags (#165)

* Use language name for selector instead of flags
* Add country name to language selector
* Increase min-width of language dropdown
* Update data tree comment in languageSelector.ftl
* Min-width for language dropdown
* Language dropdown css adjustment
* Capitalize locale label
* Indent on languageSelector.ftl

Resolves: https://jira.lyrasis.org/browse/VIVO-1839

* Adds internationalization to the admin/sparql-query page (#167)

* Adds internationalization to the admin/sparql-query page

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1873

* Add i18n for 'save query result'

Related to: https://jira.lyrasis.org/browse/VIVO-1873

* code review

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* removed redundat files which are now available via Vitro- and VIVO-languages

* Making UQAM-optimization aware of https://

* Add parent reference to installer/pom.xml (#174)

Resolves: https://jira.lyrasis.org/browse/VIVO-1903

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Revert non-function RDF changes (#177)

Related to: https://jira.lyrasis.org/browse/VIVO-1905

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Ensure 'other' in Individual->Teaching->advisees->type is translated

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1881

* Re-add logic from commit 7420957

* [VIVO-1812] use i18n translation for validation messages (#179)

* replace constants with i18n text in BasicValidationVTwo
* use constants for i18n template key

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1812

* added js_string at i18n strings to handle quotes properly, ticket vivo-1842 (#180)

Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842

* [VIVO-1870] simplify and concat translation for browse by vclass (#182)

* simplify and concat translation for browse by vclass

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1870

* [VIVO-1900] i18n: added empty check for getCountry, fixing bug with spanish label (es) (#181)

* added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900

* [VIVO 1870] update i18n key to JavaScript mapping (#183)

* update menupage-script i18n key to JavaScript mapping

Follow-on to resolution of: https://jira.lyrasis.org/browse/VIVO-1870

* [VIVO-1837] get i18n bundle from WebappDaoFactoryConfig preferred locales (#178)

* apply i18n text to VClassDaoJena.getLabelForClass
* expose i18n bundle through webapp dao factory interface
* use whole messages for i18n
* if request available use request bundle else use context bundle
* clear cache when context theme directory changes
* make getOverridingLocale from context private
* select locale based on preferred locale from webapp dao factory
* use first preferred local even when no selectable locales available on context
* build default preferred locales from default preferred languages

Resolves: https://jira.lyrasis.org/browse/VIVO-1837

* Ensure that "available langs" include base langs (#185)

Resolves: https://jira.lyrasis.org/browse/VIVO-1922

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Ensure I18nStub is initialized before pertinent tests (#186)

Resolves: https://jira.lyrasis.org/browse/VIVO-1923

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* add additional null checks to ensure context is ready for theme change (#187)

* [VIVO-1915] i18n - Adding a label with language tag through the "new" manageLabelsForindividualAddForm.ftl does not take the setting for language tag (#184)

* Fixed bug when addng a label with language tag through managLabelsForindividualAddForm, re ticket VIVO-1915

* removed the language select for managing multi language labels, ticket vivo-1915

* readded the fix for language selection because of the fr-CA version of the manageLabelsForIndividualftl, ticket vivo-1915

* removed earlier fix, removed comments, modified ManageLabelGenrator, ticket vivo-1915

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915

* - replaced hard coded "or"s with i18n().or

* [VIVO-1925] i18n: Editing labels results in new label (#188)

* fixed bug: Editing language labels results in new label, ticket vivo-1925

Resolves: https://jira.lyrasis.org/browse/VIVO-1925

* Enable lang selection without need for 'available-langs.properties' (#169)

* Enable lang selection without need for 'available-langs.properties'
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Reduce number of times QuerySolutions are looped in LanguageFilteringRDFService (#194)

- No functional change in this update

Resolves: https://jira.lyrasis.org/browse/VIVO-1931

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Prevent 'ProcessRdfForm.parseN3ToRDF' from using null linguisticContext (#197)

Resolves: https://jira.lyrasis.org/browse/VIVO-1944

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* [Vivo 1918] i18n: Reload firsttime files on start-up if changed (#195)

Co-authored-by: Andrew Woods <awoods@lyrasis.org>

* [VIVO-1936] i18n: updated the language comment in runtime.properties

* ftl function to capitalize group name affording override

* Further i18n for BasicValidationVTwo.java

* Fixed DeletePropertyController.java - getting localname of property properly (#200)

* Fixed DeletePropertyController.java - getting localname of property properly

Resolves: https://jira.lyrasis.org/browse/VIVO-1816

* Removed hardcoded time units by properties calls in dateTimeWithPrecision.ftl

* Use i18n values for date time form (#204)

Resolves: https://jira.lyrasis.org/browse/VIVO-1953

* VIVO-1929: patch authorizing create individual form (#206)

* patch authorizing create individual form

Resolves: https://jira.lyrasis.org/browse/VIVO-1929

* Issue/vivo 1947 (#205)

* Make data property richtext editor option selectable from UI
* Better error handling when reasoner disabled
* Change reasoner error log message to debug
* Extend reasoner status error handling
* Improve reasoner error log message and extend to JenaAdminActions
* Bump up log level for admin action to 'warn' and edit admin panel error message
* Change Model writer lang from "N3-PP" to "N3" (#149)
* Prevent ontology editor and N3 editing from deleting property values in languages other than the one associated with the editing request. [https://jira.lyrasis.org/browse/VIVO-1947]

Resolves: https://jira.lyrasis.org/browse/VIVO-1947

Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com>
Co-authored-by: Andrew Woods <awoods@lyrasis.org>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Remove comments

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: Nicolas D <46490666+nicalico@users.noreply.github.com>
Co-authored-by: VIVO UQAM <62542918+UQAM-VIVO@users.noreply.github.com>
Co-authored-by: Matthias Luehr <luehr@hs-mittweida.de>
Co-authored-by: michelheonuqam <heon.michel@uqam.ca>
Co-authored-by: Brian Lowe <brianjlowe@gmail.com>
Co-authored-by: j-dornbusch <joachim.dornbusch@ehess.fr>
Co-authored-by: Michel Heon <heon@videotron.ca>
Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com>
Co-authored-by: dofeldsc <dofeldsc@uos.de>
Co-authored-by: root <root@vivo-development.hs-mittweida.de>
Co-authored-by: gneissone <mbgross@unavco.org>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: Kampe <Benjamin.Kampe@tib.eu>
Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com>
Co-authored-by: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com>
Co-authored-by: nicolasdickner <dickner.nicolas@uqam.ca>
2021-02-10 11:04:01 -06:00
William Welling
28188e9719
VIVO-1960: GitHub Actions Continued (#211)
* run tests during CI build
* build CI use java 11

Follow-on to: https://jira.lyrasis.org/browse/VIVO-1960
2021-02-09 17:45:53 -05:00
William Welling
06d9f5d333
VIVO-1960: GitHub Build Action (#210)
* add build workflow
* remove travis
* update readme badge

Partially resolves: https://jira.lyrasis.org/browse/VIVO-1960
2021-02-09 15:01:47 -05:00
Andrew Woods
8b9a7484b3
Create vivo/home on application start-up (#192)
* Create vivo/home on application start-up

- Add logic for untarring vivo-home

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Require runtime.properties and applicationSetup.n3 be in 'config/' dir

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Support loading config files with or without 'default' prefix
* Prioritize without the prefix

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Add leading slash to location of vivo-home.tar resource path
* This allows for deployment in both Tomcat and Jetty

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Ensure VIVO_HOME is populated whether it is empty or not

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Require common properties to be in JNDI

Properties include:
- vitro/home
- vitro/appName
- vitro/rootUserAddress
- vitro/defaultNamespace

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* VIVO-1443: non destructive vivo home untarring (#2)

* Upgrade Jena version to 3.16.0 (#196)

Related to: https://jira.lyrasis.org/browse/VIVO-1943

* remove example-settings.xml
* update home directory untar non-destructive
* checksum digest to retain modified files
* compare checksum from digest with existing file
* overwrite files that have not changed
* add command to manually generate checksum digest
* simplify parsing checksum digest using pattern

Co-authored-by: Andrew Woods <awoods@lyrasis.org>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* not overwrite existing file if same as tar entry (#3)

* Upgrade Jena version to 3.16.0 (#196)

Related to: https://jira.lyrasis.org/browse/VIVO-1943

* remove example-settings.xml
* update home directory untar non-destructive
* checksum digest to retain modified files
* compare checksum from digest with existing file
* overwrite files that have not changed
* add command to manually generate checksum digest
* simplify parsing checksum digest using pattern
* do not overwrite file if same as already exists

Co-authored-by: Andrew Woods <awoods@lyrasis.org>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Update log messages for clarity

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com>
2021-02-05 10:58:37 -06:00
Andrew Woods
936305be2a
Upgrade Jena version to 3.16.0 (#196)
Related to: https://jira.lyrasis.org/browse/VIVO-1943

Co-authored-by: Andrew Woods <awoods@duraspace.org>
2020-12-03 07:56:29 -06:00
Ben
119413413a
Adjust SPARQL node logic to add datatypes to literals only if lacking a language tag (#175) 2020-07-21 17:01:39 +03:00
Ben
e198fce908
[VIVO-1872] - Add download option to SPARQL Query page (#164)
* Add download option to SPARQL Query page

* Set SPARQL query results content type even if downloading

* Address pull request comments
2020-05-27 23:58:20 -05:00
Ben
42c69ef04b
[VIVO-1851] - Add 'remove' option to named graph management page (#162)
* Add 'remove' option to named graph management page

Resolves: https://jira.lyrasis.org/browse/VIVO-1851
2020-05-13 13:19:52 -04:00
Andrew Woods
6d30a0fcd4
Change Model writer lang from "N3-PP" to "N3" (#149)
Resolves: https://jira.lyrasis.org/browse/VIVO-1761

Co-authored-by: Andrew Woods <awoods@duraspace.org>
2020-04-07 21:30:56 +03:00
Ben
edef9309ab
[VIVO-1755] - Better error handling when reasoner disabled (#137)
* Better error handling when reasoner disabled

* Change reasoner error log message to debug

* Extend reasoner status error handling

* Improve reasoner error log message and extend to JenaAdminActions

* Bump up log level for admin action to 'warn' and edit admin panel error message
2020-03-31 11:25:26 -05:00