Diamantis Tziotzios
7a8375b988
Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'
...
# Conflicts:
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
# dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
# dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
2021-12-09 12:18:39 +02:00
Diamantis Tziotzios
2cb985c23c
bug fix
2021-12-07 16:52:49 +02:00
Diamantis Tziotzios
197de17aa5
no message
2021-12-06 15:32:38 +02:00
George Kalampokis
de4c430d91
Fix issue with related datasets on dashboard
2021-12-03 16:49:23 +02:00
George Kalampokis
b2825c8369
Fix issue with parsing some custom auto complete sources
2021-12-02 18:03:31 +02:00
George Kalampokis
19aa2bd411
Fix critical issue with public datasets
2021-11-25 16:45:29 +02:00
George Kalampokis
aed23a655b
When exporting DMP to xml or json get only the active/finalized datasets and not the deleted ones
2021-11-24 18:14:24 +02:00
George Kalampokis
fc71e95cf3
Make dataset queries to return distinct results (avoid duplicate Id issues)
2021-11-24 16:23:02 +02:00
George Kalampokis
e546362f58
Fix issue with elasticsearch inconsistencies
2021-11-23 14:05:57 +02:00
Konstantina Galouni
bb0c398120
#7183 : In DMP invitation, return authors whose name/ email contains the query string given by user (case insensitive).
...
1. InvitationsManager.java: Added method "getUsersWithCriteria()" to filter results according to "userInfoRequestItem.getCriteria().getLike()".
2. UserInvitationController.java: In method "getUsers()" added parameter "@RequestBody UserInfoRequestItem userInfoRequestItem" and call new method "invitationsManager.getUsersWithCriteria()" (instead of getUsers()).
2021-11-22 13:44:41 +02:00
George Kalampokis
38cd336bc9
Add transactional to makeFinalize on DMP and remove jackson parsing when depositing to zenodo
2021-11-18 18:27:20 +02:00
George Kalampokis
54b142000c
Merge remote-tracking branch 'origin/Development' into Development
2021-11-09 14:23:30 +02:00
George Kalampokis
1a373bc6f8
Add email notification when a user is added to a Dataset Template (ref #7148 )
2021-11-09 14:23:22 +02:00
Konstantina Galouni
71b8742b0f
LicenseManager.java & LocalFetchManager.java & TagController.java: #7135 : No case sensitivilty for licenses, managers and tags.
2021-11-09 14:17:46 +02:00
George Kalampokis
a7badfd9d5
Add nexus prometheus metrics
2021-11-09 13:05:38 +02:00
George Kalampokis
58ecadd79b
Fix issue with project creation
2021-11-09 10:19:20 +02:00
George Kalampokis
39795f177f
Fix critical issue with file exports on chromium based web browsers
2021-11-02 14:50:20 +02:00
George Kalampokis
fd26e2a742
Fix issue with DMP index not updating after a new user is invited
2021-10-27 18:16:44 +03:00
George Kalampokis
e66362ec38
Add prometheus metric for the number of grants used based on DMP status (ref #6462 )
2021-10-20 12:42:08 +03:00
George Kalampokis
942782fe3c
Use metrics predifined names instead of plain Strings
2021-10-13 17:49:32 +03:00
George Kalampokis
65644c3a35
Add extra sanity checks
2021-10-13 17:47:50 +03:00
George Kalampokis
a4fef8e462
Refactor PDF conversion
2021-10-12 18:17:16 +03:00
George Kalampokis
1a821179db
Even more Fixes over dashboard's sorting
2021-10-12 18:06:14 +03:00
George Kalampokis
29919f981a
Fix issue with recent activity sorting
2021-10-12 15:41:20 +03:00
George Kalampokis
7fe84d7de5
Eliminate Duplicate user when making a new version
2021-10-08 16:52:01 +03:00
George Kalampokis
a3af8ce3a5
Merge branch 'spring-update' into Development
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
# dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
# dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java
2021-10-08 16:04:52 +03:00
George Kalampokis
9919886c26
Fix issues with dataset sorting on Dashboard with Elasticsearch
2021-10-08 11:02:56 +03:00
George Kalampokis
77d50773b8
Merge branch 'improved_queries' into Development
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
2021-10-07 11:05:19 +03:00
George Kalampokis
524cededb6
Fix issue when exporting to docx/pdf
2021-10-06 18:16:39 +03:00
George Kalampokis
407961e137
Fix critical issue with DMP queries without elastic
2021-10-06 14:21:54 +03:00
George Kalampokis
3ec942cfa7
Add support for Html text when exporting to docx (alpha)
2021-10-05 17:58:46 +03:00
George Kalampokis
54c862ecbb
Minor metrics refactor
2021-10-05 13:09:02 +03:00
George Kalampokis
b66bde871a
Fix issue of new DMPs not showing on the user's listing with elasticsearch active ( #7010 )
2021-10-05 12:56:20 +03:00
George Kalampokis
91729bab6d
Optimize queries
2021-09-30 18:02:53 +03:00
George Kalampokis
defac6afcc
Fix issue with date formats on RDA import
2021-09-28 14:17:03 +03:00
George Kalampokis
06364873ca
Fix issue with unordered multiplicity fields
2021-09-27 18:11:55 +03:00
George Kalampokis
1ae2788453
Fix various issues with spring update
2021-09-14 17:43:02 +03:00
George Kalampokis
6f92409f1e
Update Spring boot framework to version 2.5.2
2021-09-07 09:42:31 +03:00
George Kalampokis
c964af25b5
Fix critical issue with public dataset query
2021-08-23 11:48:29 +03:00
George Kalampokis
5de811a76d
Vastly improve and optimize DMP and Dataset Queries (and with elastic)
2021-08-04 18:38:49 +03:00
George Kalampokis
4e87bd270e
Improve error handling when user has no zenodo access token
2021-08-02 18:31:10 +03:00
George Kalampokis
6a2099c2b9
Add user role check up when it's getting dataset profiles for the manager listing
2021-07-26 10:28:58 +03:00
George Kalampokis
9da0f4e776
Allow to re insert users on Dataset profile
2021-07-23 18:27:49 +03:00
George Kalampokis
c91059c854
Get latest available dataset profile instead of the version that is selected on the DMP
2021-07-20 12:55:52 +03:00
George Kalampokis
016acaaa0f
When counting organizations for the user count only the active ones
2021-07-19 18:34:29 +03:00
George Kalampokis
4b3468d513
Fix issue when validating dataset for finalization (needs rework)
2021-07-19 18:31:16 +03:00
George Kalampokis
d603fed61f
When new version is made keep all it's contributors
2021-07-06 16:56:37 +03:00
George Kalampokis
1c22ed2321
Add extraProperties for xml export/import and restore pdf export for zenodo deposit
2021-07-06 16:33:46 +03:00
George Kalampokis
faabd343a9
Improve error handling
...
(cherry picked from commit d5cd90814a
2021-07-06 13:41:09 +03:00
George Kalampokis
e5a929f259
Fix issues with xml import and issues with zenodo deposit
...
(cherry picked from commit efe177f0b1
2021-07-06 13:40:15 +03:00
Diamantis Tziotzios
George Kalampokis
Konstantina Galouni