George Kalampokis
cff9af75c6
Merge remote-tracking branch 'origin/Development' into Development
2021-12-16 11:44:57 +02:00
George Kalampokis
316d0903c8
Improve RDA mapping (contributed by M.Aldo)
2021-12-16 11:44:34 +02:00
Konstantinos Triantafyllou
feecac994d
Merge remote-tracking branch 'origin/Development' into Development
2021-12-15 16:26:21 +02:00
Konstantinos Triantafyllou
ade9b42d12
Add a placeholder field in multiplicity. (BackEnd)
...
Add a placeholder input in editor for multiplicity add new field button.
2021-12-15 16:26:06 +02:00
George Kalampokis
42c5dbb3b2
Make distribiution to parse as list
2021-12-14 18:05:10 +02:00
George Kalampokis
6964aa1d47
Fix minor typo
2021-12-14 17:07:00 +02:00
George Kalampokis
a9e7ef1798
Rename prefilling get endpoint to generate
2021-12-10 16:07:00 +02:00
George Kalampokis
728ea9a24f
Add prefilling backend endpoints
2021-12-10 15:37:39 +02:00
George Kalampokis
17b72cde60
Fix issue with time parsing
2021-12-08 16:42:16 +02:00
George Kalampokis
0a39e64f9a
Merge remote-tracking branch 'origin/Development' into Development
2021-12-07 17:16:41 +02:00
George Kalampokis
33784f3ee2
Add missing null check up
2021-12-07 17:16:22 +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
e165259c81
Fix and improve remote fetcher caching
2021-11-29 17:26:29 +02:00
George Kalampokis
6ce7fec059
Fix critical issue with multiAutoComplete on autocomplete field types
2021-11-29 11:27:59 +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
8524bce2e0
Add support for the exported date format on wordBuilder
2021-11-24 16:41:01 +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
George Kalampokis
53e298f66a
Fix issue with Dataset copy not working on the dataset listing
2021-11-23 11:30:08 +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
c0599d5fed
Fix issue of reloading externalUrls
2021-11-19 11:20:47 +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
4eb15da95a
Trim out hours from date picker export on xml and json(ref #7185 )
2021-11-17 11:12:34 +02:00
George Kalampokis
4da99d6d83
Trim out hours from date picker export (ref #7185 )
2021-11-17 10:30:31 +02:00
George Kalampokis
cecc59eba6
Fix issue with file imports (ref #7184 )
2021-11-16 15:55:32 +02:00
George Kalampokis
7820235258
Improve html type field exports
2021-11-09 17:44:47 +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
db4d1006c6
Fix various issues with word/PDF export
2021-11-02 18:06:00 +02:00
George Kalampokis
39795f177f
Fix critical issue with file exports on chromium based web browsers
2021-11-02 14:50:20 +02:00
Konstantina Galouni
7fefdd6aad
Added rich text area field type for response in dataset > chapter > section > questions.
...
1. RichTextAreaData.java: [NEW] file to extend FieldData.
2. ModelBuilder.java: Added case for richTextarea type.
3. ExportXmlBuilderDatasetProfile.java: Added case for RICH_TEXT_AREA.
4. ViewStyle.java: Define RICH_TEXT_AREA("richTextarea").
2021-11-01 15:38:16 +02:00
George Kalampokis
6ff9ea2d05
When exporting to word/PDF HTML styled text, make <br> tag to be parsed once
2021-11-01 11:49:20 +02:00
George Kalampokis
0010ad846a
When exporting to word/PDF HTML styled text, it will be preperly indented and it can read the change line character
2021-11-01 11:39:43 +02:00
George Kalampokis
5a66754cbd
Make DMP language Mandatory and set default language to English
2021-10-29 15:08:58 +03: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
900a377d5f
Fix critical issue with RDA Comoon Standard text load
2021-10-26 17:54:58 +03:00
George Kalampokis
93baa4a281
Add support for more html tags on the Document/PDF exporter
2021-10-26 16:21:28 +03:00
George Kalampokis
2c29469590
Allow to configure the path of the email templates (ref #7122 )
2021-10-25 16:06:08 +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
d0d918682b
Refactor remote fetcher and made it independent of sun libraries
2021-10-13 17:48:46 +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
0e97e6c0a8
Fix issues with external sources
2021-10-08 12:14:09 +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
cb1d7b5340
Replace altChunk html to docx with direct parsing (manual)
2021-10-06 15:15:41 +03:00
George Kalampokis
ef5e6a92e0
Fix critical issue with Dataset Template xml import
2021-10-06 15:02:21 +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
fc7c39081a
Improve configuration loader
2021-09-28 14:15:50 +03:00
George Kalampokis
99e4d231c2
Possible patch some leaks
2021-09-27 18:14:21 +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
0257ff713b
Remove the actuator from the prometheus path
2021-09-07 10:29:57 +03:00
George Kalampokis
6f92409f1e
Update Spring boot framework to version 2.5.2
2021-09-07 09:42:31 +03:00
George Kalampokis
93ba59ef5a
Fixed word parsing issue with datasetIdentifier and validation fields
2021-08-27 12:58:06 +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
f01e89799b
Merge remote-tracking branch 'origin/Development' into Development
2021-07-23 18:29:40 +03:00
George Kalampokis
9da0f4e776
Allow to re insert users on Dataset profile
2021-07-23 18:27:49 +03:00
Kristian Ntavidi
59e3af2fa0
Fix adding dataset dropdown on datasets listing
...
* Get timecreated from backend
* Protect front from crashing when creationTime is not provided
2021-07-23 12:05:07 +03:00
George Kalampokis
596550d3de
Extend user token duration to 10 days
2021-07-21 11:17:32 +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
75d9726bca
Fix issue with xml export of autocomplete and multiautocomplete fields
2021-07-20 12:23:55 +03:00
George Kalampokis
15af25e292
Fix issue saving array of data from dataset
2021-07-20 11:37:28 +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
1512d0c424
If BooleanDecision has no value thenm return null when exporting to docx and pdf
2021-07-19 14:08:48 +03:00
Diamantis Tziotzios
ad245dde5d
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
2021-07-07 20:40:24 +03:00
Diamantis Tziotzios
b8b78f6653
user guide path fix
...
(cherry picked from commit bd15b1e2c7
)
2021-07-07 20:40:00 +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
d5cd90814a
Improve error handling
2021-07-06 13:33:58 +03:00
George Kalampokis
efe177f0b1
Fix issues with xml import and issues with zenodo deposit
2021-07-06 12:58:38 +03:00
George Kalampokis
c57e10a033
Fix issue with zenodo depositions
2021-07-06 10:29:14 +03:00
George Kalampokis
244bfa5c54
Fix various critical issues
2021-07-02 14:02:32 +03:00
George Kalampokis
4e3b98f1ff
Improvements over MS Word Document export
2021-06-30 17:17:17 +03:00
George Kalampokis
d1e3aae36d
Fix critical issue with dataset's copy dropdown
2021-06-30 12:51:12 +03:00
George Kalampokis
dcd7f24cac
Fix listing issues and improve elastic query
2021-06-29 11:45:20 +03:00
George Kalampokis
03b7699973
Reduce severity
2021-06-25 19:29:51 +03:00
George Kalampokis
d1df83f689
Add query db fallback for DMPs
2021-06-25 19:27:02 +03:00
George Kalampokis
4a4042d621
Fix various library issues with postgres and elastic
2021-06-25 12:32:58 +03:00
George Kalampokis
a48ac5fa0f
When exporting external dataset fields, export and it's type
2021-06-23 17:29:45 +03:00
George Kalampokis
11b4d462cf
Add type to External Datasets Data
2021-06-22 18:29:58 +03:00
George Kalampokis
42a22b4a65
Improve external researcher support
2021-06-17 18:48:18 +03:00
George Kalampokis
885f897adc
Fix issue when updating researchers from DMP
2021-06-17 18:01:47 +03:00
George Kalampokis
e94944abb1
Merge remote-tracking branch 'origin/Development' into Development
2021-06-17 13:58:36 +03:00
George Kalampokis
78186fb96d
If the invitation is accepted then send the user to the accepted DMP if the user click again the link from the email
2021-06-17 13:58:28 +03:00
Diamantis Tziotzios
6c6cc061fc
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
2021-06-15 15:43:56 +03:00
Diamantis Tziotzios
d3d6c4a6aa
prometheus fix
2021-06-15 15:43:45 +03:00
George Kalampokis
c193dd2c09
Fix numbering issue with word and PDF export
2021-06-14 18:01:29 +03:00
George Kalampokis
e615c403d3
Final fix over storing array of data from Datasets
2021-06-14 18:01:04 +03:00
George Kalampokis
dcf88479bd
Allow to store and retrieve combobox multivalues with commas
2021-06-14 14:21:27 +03:00
George Kalampokis
be311f238b
Add visibility rules checkup on dataset finalize checkup
2021-06-01 12:30:01 +03:00
George Kalampokis
8a5f9d3536
Add support for nested sections
2021-05-18 13:45:41 +03:00
George Kalampokis
b76a787972
Hide grants without any active dmp
2021-05-10 17:17:08 +03:00
George Kalampokis
95f8eb15c9
Even more fixes for imports and exports
2021-05-10 16:55:44 +03:00
George Kalampokis
6f658db27f
Fix issues with import and export of dataset template
2021-05-10 16:10:18 +03:00
George Kalampokis
1d5befaf6a
Add new endpoint in order to validate datasets
2021-05-10 13:40:08 +03:00
George Kalampokis
15c3a6fcb5
Export properly the data for each field type on dataset templates
2021-05-07 14:38:21 +03:00
George Kalampokis
af432cf329
Fixed issue with multiplicity fields
2021-05-06 18:58:55 +03:00
Diamantis Tziotzios
ae2168b2d7
bug fix regarding template import
2021-05-05 11:20:43 +03:00
George Kalampokis
fe8a0ff109
Fix vaious issues with organizations
2021-04-30 14:45:00 +03:00
George Kalampokis
8a7cfab3b8
Fix various issues
2021-04-30 13:10:11 +03:00
George Kalampokis
cdae5ae574
Fix minor issues when creating a researcher
2021-04-30 11:08:06 +03:00
George Kalampokis
df5281eeaa
Allow to manually add reference
2021-04-29 11:28:46 +03:00
George Kalampokis
501ca9fcc2
Put elastic search index into the configurations
2021-04-27 16:53:15 +03:00
George Kalampokis
77bcb95ad7
Fix issues when cloning dataset templates
2021-04-27 10:38:20 +03:00
George Kalampokis
e5264780c3
When finalize DMP properly finalize it's datasets first
2021-04-21 18:21:52 +03:00
Diamantis Tziotzios
ede8bbf48e
metrics update
2021-04-15 18:30:16 +03:00
George Kalampokis
961a4df270
Add total Users metric
2021-04-13 12:19:55 +03:00
George Kalampokis
3d9a2b2331
Fix various issues with various template fields
2021-04-13 10:46:06 +03:00
George Kalampokis
48730e7937
Fix issue when accessing dataset profile users when there are no users.
2021-04-12 12:12:21 +03:00
George Kalampokis
c27ff1d446
Add missing metrics counters and made the metrics init task scheduled (per Hour) (ref #294 )
2021-04-12 12:00:07 +03:00
George Kalampokis
27bf69268e
Fix issue when creating new dataset profile
2021-04-12 10:49:22 +03:00
George Kalampokis
aca31dc9da
Add prometheus integration (ref #294 )
2021-04-09 19:05:04 +03:00
George Kalampokis
c57820d6b1
Remove "External References" from docx generation
2021-04-08 16:48:14 +03:00
George Kalampokis
4156875bae
Refactor and add logic for removing users from Dataset Templates
2021-04-07 19:08:57 +03:00
George Kalampokis
bc3c8b44d2
Add option to add or remove users from Dataset Templates
2021-04-07 19:03:22 +03:00
George Kalampokis
af04e34b6f
Add new User Role Dataset Template Editor.
2021-04-06 19:03:00 +03:00
George Kalampokis
c929eb3a2b
When uploading to zenodo upload both pdf and the RDA json files
2021-04-05 14:03:14 +03:00
George Kalampokis
5b930a6870
Export and Import Dataset Template description and language
2021-04-05 11:40:25 +03:00
George Kalampokis
e88f88d97c
Fix critical issue when creating comboboxes with the multiple selection untouched
2021-02-23 17:33:55 +02:00
apapachristou
2ed101888d
fix syntax on application-devel.properties
2020-12-14 19:37:06 +02:00
Diamantis Tziotzios
af5ab43c2e
db pool connection fix
2020-12-14 19:23:10 +02:00
Diamantis Tziotzios
ef0a40b739
export template updated
2020-12-10 17:29:34 +02:00
George Kalampokis
ca38f0b0a4
Make user guide multilingual
2020-12-10 11:34:01 +02:00
George Kalampokis
3b00b76f19
Add option to make static dataset profile fields with autocomplete to have multiple values
2020-12-09 17:51:30 +02:00
George Kalampokis
c18e3f8e3c
Add null check for additionalInfo to UserListingModel fromDataModel
2020-12-03 14:07:45 +02:00
George Kalampokis
d6970cc49a
Add avatarUrl on UserListingModel
2020-12-02 14:19:43 +02:00
George Kalampokis
fcd24fd907
Add community when depositing to zenodo (ARGOS).
2020-11-23 18:16:32 +02:00
George Kalampokis
66358acfcf
Replace the openDMP Affiliation on Zenodo with either a configurable
...
affiliation or the related organizations of the DMP
2020-11-19 18:39:25 +02:00
George Kalampokis
1e0b828a48
Prevent to check deleted Datasets when checking which Dataset Templates are in use
2020-11-16 18:31:41 +02:00
George Kalampokis
a3d662aed1
Fix minor spelling mistake
2020-11-13 18:29:16 +02:00
George Kalampokis
cbbfec2ccc
Updated RDA Mapper's Cardinality check
2020-11-13 18:26:09 +02:00
George Kalampokis
0ad797d033
Revert last commit
2020-11-12 16:39:47 +02:00
George Kalampokis
ffc140f84b
When creating or updating Datasets return also the
...
DatasetProfileDefinition
2020-11-12 15:50:34 +02:00
George Kalampokis
7973e04090
Fix minor issue with identifier validation
2020-11-12 10:14:42 +02:00
George Kalampokis
d40265544d
Add Validators external urls for both staging and production profiles
2020-11-10 17:40:55 +02:00
George Kalampokis
f5533e1b95
Prevent user to send merge request email to itself
2020-11-10 17:39:43 +02:00
George Kalampokis
8161d382ad
Fixed minor external url issue
2020-11-09 10:32:55 +02:00
George Kalampokis
cda31be0bd
Allow remote fetcher to retrieve data with POST requests and added a new
...
OpenAire repository source
2020-11-06 18:45:20 +02:00
George Kalampokis
2ff9b95fdf
Made identifier validation field to work properly
2020-11-06 16:29:33 +02:00
George Kalampokis
e061448830
Initial commit for the new Dataset Template Field (identifier
...
validation) part 2
2020-11-05 18:32:19 +02:00
George Kalampokis
da9872576e
Initial commit for the new Dataset Template Field (identifier validator)
2020-11-05 18:20:37 +02:00
George Kalampokis
70056bd0a9
Fix issue with login for new users
2020-11-04 16:52:10 +02:00
George Kalampokis
df8af6e6cd
Trim time on Dataset's modified time in order to match with the Database
2020-10-30 11:29:43 +02:00
George Kalampokis
2354d9bb5c
When calling the createOrUpdate endpoint on the Dataset Controller,
...
return a DatasetWizardModel instead of the dataset's id
2020-10-29 17:12:59 +02:00
George Kalampokis
03da1f3f7b
When merging users delete the remaining credentials of the user to be
...
merged
2020-10-29 12:08:09 +02:00
George Kalampokis
c1d473f8d4
When merging users remove the email from the user to be merged
2020-10-29 11:54:15 +02:00
George Kalampokis
4c60b2bb06
When creating a new credential assign the user's email
2020-10-27 18:08:16 +02:00
George Kalampokis
ff169ae806
Made User Merge logic functional
2020-10-27 18:06:58 +02:00
George Kalampokis
981eb48d89
Add email for Merge requests
2020-10-27 12:06:32 +02:00
George Kalampokis
2b89f646ee
Fix emails that are sent with images
2020-10-27 12:01:18 +02:00
George Kalampokis
8c2ae8cf46
Add null check on the Organisation fromMap mapper
2020-10-26 18:03:07 +02:00
George Kalampokis
9674ec2b6b
Add user merge related services and updates on existing services on the frontend
2020-10-26 10:36:20 +02:00
George Kalampokis
e1212383ff
Add expirimental logic for userMerge (+ some updates for DB)
2020-10-23 18:40:17 +03:00
George Kalampokis
56d6b12555
Add Organization and roleOrganization to the User Info. Also allow to
...
edit the user's name from the updateSettings
2020-10-23 11:48:27 +03:00
George Kalampokis
b878bf9d8f
Fix issue when importing from RDA and the predefined template(s) inside the json does not exist on the database
2020-10-13 11:05:01 +03:00
George Kalampokis
a78044920a
Fixed issues with elastic and last public version
2020-10-12 12:45:32 +03:00
George Kalampokis
78903bf930
Add the backend logic to export all users to .csv
2020-10-07 17:29:53 +03:00
George Kalampokis
7a3b4a18ca
Fixed compile issues
2020-10-07 14:22:37 +03:00
Diamantis Tziotzios
e65bce0f5a
Merge branch 'ui-redesign' into Development
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
# dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java
# dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
2020-10-06 16:43:20 +03:00
George Kalampokis
e2326e1070
Minor refactoring
2020-10-06 11:50:14 +03:00
apapachristou
a1b067071a
Backend: Fixes modified time check on save dmp without previous reload. Frontend: Adds dialog to proceed to dataset editor on "save & add dataset"
2020-10-06 11:21:15 +03:00
George Kalampokis
49cd48943a
Merge branch 'ui-redesign' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
2020-10-05 16:27:43 +03:00
George Kalampokis
ae03077795
Fixed various issues with the new externalUrls restTemplate
2020-10-05 16:21:42 +03:00
Diamantis Tziotzios
0d408ff68a
fixes
2020-10-05 12:08:57 +03:00
George Kalampokis
c02157be8c
Replace HttpUrlConnection with RestTemplate for the external Urls
2020-10-05 11:26:35 +03:00
George Kalampokis
674ce48b8b
DMP's create or Update endpoint will return a DMP model
2020-10-01 18:54:01 +03:00
George Kalampokis
7b9ae7c91d
Add support for Zenodo license autocomplete source
2020-10-01 16:08:32 +03:00
George Kalampokis
b3be89fb88
Allow to invite others with just the email even if they don't have an
...
user
2020-09-29 12:41:47 +03:00
George Kalampokis
08271c88cb
When getting just the email for invitation, find it's user and set it's
...
id to the invited user
2020-09-28 12:36:37 +03:00
George Kalampokis
9dd76a739d
If RDA Export fail show properly an error message
2020-09-24 12:37:03 +03:00
George Kalampokis
9b403bb480
Create or update dataset endpoint will return the id of the
...
created/updated dataset
2020-09-17 13:34:44 +03:00
George Kalampokis
36b380e738
Check if the grant can be edited only when the grant is internal
2020-09-16 18:37:24 +03:00
George Kalampokis
da7fc0def3
Fixed various issues with DMP imports and exports (mostly RDA)
2020-09-15 13:21:22 +03:00
George Kalampokis
4cc44814e2
Minor improvements to error checkups
2020-09-14 18:09:57 +03:00
George Kalampokis
7b800b2347
Fix multiList on xml export
2020-09-11 16:54:32 +03:00
George Kalampokis
2390a33a98
When uploading dataset template xmls delete the working directory copy of the file
2020-09-11 16:31:57 +03:00
George Kalampokis
7f83b0f19a
Fixed minor issue with template import
2020-09-11 15:57:52 +03:00
George Kalampokis
88ea24d367
Fixed issues when retrieving data from external sources
2020-09-11 14:29:12 +03:00
George Kalampokis
b66fe982f5
Update Tags field with multiple autocomplete like in the dataset editor
2020-09-11 14:27:53 +03:00
George Kalampokis
b847389b96
Add ORCID source to all the profiles and replace the content type from xml to json
2020-09-11 12:07:49 +03:00
George Kalampokis
3944191c4e
Add EOSC Services API (ref #290 )
2020-09-10 18:30:30 +03:00
George Kalampokis
aac277020a
Add support for zenodo source on autocomplete combobox
2020-09-10 18:06:37 +03:00
George Kalampokis
5be674d07e
Allow wordlist combobox type to have multiple values
2020-09-10 18:04:14 +03:00
George Kalampokis
13ac3634d6
Improve compatibility for openAire sources
2020-09-09 17:50:47 +03:00
George Kalampokis
f0502b94df
Change the tags on the dmp editor to a multiple auto select, that allow to create tags or use existing ones
2020-09-09 17:49:45 +03:00
George Kalampokis
183ce385a9
Add OpenAire source for the external Datasets
2020-09-09 17:44:08 +03:00
George Kalampokis
2a53a0aa7d
When showing researchers retrieved by ORCID source show also and their ORCID in parenthesis
2020-09-09 17:42:55 +03:00
George Kalampokis
7300e2fe85
When creating a DMP with datasets, add datasets after the DMP is created
2020-09-08 17:50:38 +03:00
George Kalampokis
a706a9c8f6
Improve the retrieval of the datasetpagedefinition from the dmp api
2020-09-08 16:42:35 +03:00
George Kalampokis
db0cee542c
When creating or updating a DMP with datasets, check the datasets template validity from the datasets of the request and not from the ones in DB
2020-09-08 10:53:10 +03:00
George Kalampokis
1dbe320706
Improve expiredAt calculation
2020-09-07 18:15:52 +03:00
George Kalampokis
7dcf2a1ef1
Minor build fix
2020-09-04 17:09:24 +03:00
George Kalampokis
d890763b41
Updated The DatasetWizardModel on the backend in order to be similar to it's front end counterpart
2020-09-04 17:00:34 +03:00
George Kalampokis
072a1c8a18
Change the filename of the exported DMP (also affects DOI generation) (ref #288 )
2020-09-03 18:08:53 +03:00
George Kalampokis
e4713d60bd
When creating a new version of a DMP return the Id of the new DMP
2020-09-03 17:57:14 +03:00
George Kalampokis
f2613c4c87
When exporting to World and PDF with world list field return it's label instead of it's value (ref #287 )
2020-09-03 10:50:28 +03:00
George Kalampokis
fc7f8d4278
When exporting to World and PDF with world list field return it's label instead of it's value (ref #287 )
2020-09-03 10:46:11 +03:00
George Kalampokis
8951b61b3b
Return the id of the cloned dmp when calling the dmp/clone endpoint
2020-09-02 18:32:12 +03:00
George Kalampokis
e1368e270a
Update Zenodo's file API
2020-08-25 17:30:29 +03:00
George Kalampokis
fa86258197
Fixed minor issue with Zenodo file names
2020-08-24 12:03:29 +03:00
George Kalampokis
4d249eeae4
Changed the file format when creating Zenodo Deposit
2020-08-24 10:49:50 +03:00
gpapavgeri
b3b9de6979
Add researchers to dmp in DatasetOverviewModel
2020-08-06 11:14:42 +03:00
George Kalampokis
edf64328d9
Fix parsing issues with auto complete
2020-08-03 17:01:06 +03:00
George Kalampokis
1c876cbcca
RecentActivity can now be sorted by finalizedAt and publishedAt
2020-07-31 17:04:18 +03:00
George Kalampokis
83bd977484
If finalized Dataset has no finalized At date then use it's DMP finalized At date
2020-07-31 14:06:16 +03:00
George Kalampokis
5d44d8bf45
Fixed issue when finalizing datasets from the DMP Overview.
2020-07-31 14:04:49 +03:00
George Kalampokis
feee5b49e9
Ditto
2020-07-31 13:34:01 +03:00
George Kalampokis
2faf1a0d78
When getting public paged Datasets, allow to set custom order
2020-07-31 13:33:32 +03:00
George Kalampokis
f97546ff38
Add finalized RecentActivity sort function
2020-07-31 13:21:01 +03:00
George Kalampokis
168b634681
Fix minor authentication issue
2020-07-31 13:16:29 +03:00
George Kalampokis
f86ba70d24
Fixed consistency issues with the public statistics
2020-07-31 12:20:29 +03:00
George Kalampokis
4b30d56d91
Fixed issue if dataset has no profile
2020-07-29 17:52:51 +03:00
George Kalampokis
dc83a3a09c
Fixed Various issues when creating or updating DMP with datasets
2020-07-28 17:35:55 +03:00
George Kalampokis
eb8e4a96e6
Reworked Recent Activity ordering and force status to be ordered in reverse of the others
2020-07-27 18:16:32 +03:00
George Kalampokis
22493569fa
Allow to create or update DMP and it's datasets with one endpoint (post full)
2020-07-27 13:09:30 +03:00
George Kalampokis
3b09bef7d5
Fixed minor issues with the elastic search on recent activity
2020-07-24 12:38:16 +03:00
George Kalampokis
9c9db0b646
Improve data integrity of recent Activity data retrieval and added elastic support to it
2020-07-24 12:12:54 +03:00
George Kalampokis
b7b8e0b0e8
Change the profile from DatasetListingModel from String to DatasetProfileOverviewModel
2020-07-24 11:46:11 +03:00
George Kalampokis
b0067f20b5
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
2020-07-24 10:50:34 +03:00
George Kalampokis
db8debef86
RecentActivityModel will store profile as DatasetProfileOverviewModel instead of just string
2020-07-24 10:50:16 +03:00
gpapavgeri
762f873db1
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
2020-07-23 16:24:43 +03:00
George Kalampokis
ac00b01943
Fixed various issues when creating world document and storing data to the elastic
2020-07-23 12:24:49 +03:00
George Kalampokis
d1992b37c4
Fixed various issues when creating world document and storing data to the elastic
2020-07-23 12:01:37 +03:00
gpapavgeri
3d1b0adc6e
add status to DmpOverviewModel used in DatasetOverviewModel
2020-07-22 17:46:21 +03:00
George Kalampokis
14df3a4bbe
Add dataset filter like in getPaged on DataManagementPlanManager
2020-07-22 15:40:07 +03:00
George Kalampokis
f3c1244600
Separate RecentActivityTableRequest's offset to dmp and dataset offset (backend)
2020-07-22 10:28:25 +03:00
George Kalampokis
a60151560b
Temporary removed async gets for datasets (TODO: make them async again)
2020-07-21 17:30:12 +03:00
George Kalampokis
e6da46730b
Improved Dataset error handling when retrieving data
2020-07-21 16:05:34 +03:00
George Kalampokis
5cc6a5117a
Fixed path issue with externalUrls on devel (backend)
2020-07-17 16:11:40 +03:00
George Kalampokis
ac24143c0d
Sanitize user output on frontend
2020-07-17 13:19:10 +03:00
George Kalampokis
4127a05da4
Add Email Field on Principal
2020-07-17 13:15:44 +03:00
George Kalampokis
69fc698866
Unified datasets and datasetWizard Controllers
2020-07-15 12:33:10 +03:00
George Kalampokis
aa930f097a
Fixed issue with DMPs that are having a user assigned multiple times
2020-07-10 16:30:44 +03:00
George Kalampokis
916557db0a
Minor bugfix
2020-07-10 14:28:45 +03:00
George Kalampokis
fcbb0dfdf8
Fixed invitation system and made it to check if a user is already invited to the DMP
2020-07-10 13:53:27 +03:00
George Kalampokis
9751d0fb78
Fixed issue with invitation properties
2020-07-10 12:36:47 +03:00
George Kalampokis
caec63be38
Fixed issue when saving auto complete data
2020-07-10 12:36:01 +03:00
George Kalampokis
451ed453f9
Add role to the invitation model
2020-07-10 10:11:41 +03:00
George Kalampokis
052430d97c
Minor fixes
2020-07-09 15:02:16 +03:00
George Kalampokis
b8a1ed3f07
Minor bugfix
2020-07-09 13:47:39 +03:00
George Kalampokis
4e249e4b8b
Add get All Versions Endpoint to the Backend
2020-07-09 13:11:43 +03:00
gpapavgeri
f919a8d81a
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
2020-07-09 10:18:19 +03:00
gpapavgeri
a4b61c2172
dmp&dataset overview_remove user & invite user update
2020-07-09 10:17:49 +03:00
George Kalampokis
e428e8a5df
When creating new DMPs pre-set the visibility (restricted) and the contact (creator). They can be changed later in the draft phase.
2020-07-08 18:26:07 +03:00
George Kalampokis
a728e7da4a
If DMP is lacking the visibility option then create a Zenodo DOI with resstricted file access and no license
2020-07-08 16:59:15 +03:00
George Kalampokis
8ffdfdba1f
If DMP is lacking the visibility option then create a Zenodo DOI with resstricted file access and no license
2020-07-08 16:56:55 +03:00
George Kalampokis
ace12c3140
Add updateusers end point for DMP
2020-07-07 12:22:45 +03:00
George Kalampokis
47d8c65814
Merge branch 'advanced_rda' into ui-redesign
...
# Conflicts:
# dmp-frontend/src/app/ui/dmp/dmp.module.ts
2020-07-06 18:20:37 +03:00
George Kalampokis
58e22926b1
Merge branch 'advanced_rda' into Development
2020-07-06 18:19:02 +03:00
George Kalampokis
f432caa584
When getting user statistics on the dashboard make sure the DMP count to be distinct
2020-07-06 14:18:42 +03:00
George Kalampokis
84bb291cd6
Make DMP total count to use distinct in order to avoid counting duplicate entries
2020-07-06 14:11:14 +03:00
George Kalampokis
d10615d13a
Replace dmp and grant form String to DataManagementOverviewMaodel and GrantOverviewModel on DatasetOverviewModel
2020-07-06 11:58:59 +03:00
George Kalampokis
7f56afad5f
Add OpenAIRE source for external Datasets
2020-07-06 11:40:00 +03:00
George Kalampokis
372c9bb074
Add support for Dataset Overview
2020-07-03 16:11:54 +03:00
George Kalampokis
d51099cedc
Further fixes and improvements over recent activity
2020-07-03 13:55:25 +03:00
George Kalampokis
acf8b58728
Fixed and improved the recent activity manager
2020-07-03 12:18:53 +03:00
George Kalampokis
7197892352
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
2020-07-03 11:37:40 +03:00
George Kalampokis
150667350c
Further Fixes over Recent Activity model
2020-07-03 11:23:13 +03:00
Diamantis Tziotzios
1615707418
Merge branch 'Development' into ui-redesign
...
# Conflicts:
# dmp-frontend/src/app/app-routing.module.ts
# dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
# dmp-frontend/src/app/ui/navbar/navbar.component.html
# dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html
# dmp-frontend/src/assets/i18n/en.json
# dmp-frontend/src/assets/i18n/es.json
# dmp-frontend/src/assets/i18n/gr.json
2020-07-03 11:21:46 +03:00
George Kalampokis
71279a716e
Minor changes to Recent Activity Model
2020-07-03 10:43:54 +03:00
George Kalampokis
b57f6fb73c
Recent Activity controller will require a custom DataTable Request
2020-07-03 10:43:19 +03:00
George Kalampokis
6d491b5930
Rda mapper will now be able to use the new DMP fields
2020-07-02 18:36:18 +03:00
George Kalampokis
094cff06b1
Properly remove associate Collaborators from a DMP
2020-07-02 17:24:50 +03:00
George Kalampokis
1ec90d7b52
Properly remove associate Collaborators from a DMP
2020-07-02 17:09:54 +03:00
George Kalampokis
64624ca6f1
Properly remove associate Collaborators from a DMP
2020-07-02 17:08:38 +03:00
George Kalampokis
f5093a6995
Add type to the recent activity model
2020-07-02 11:59:58 +03:00
George Kalampokis
325979a896
Add criteria for the recent activity model
2020-07-02 11:57:59 +03:00
George Kalampokis
64078eb283
Add isProfileLatestVersion on DatasetListingModel
2020-06-30 18:29:06 +03:00
George Kalampokis
f821938542
Created a new Recent Activity model and backend end-point that contains more details about it's objects
2020-06-30 16:59:06 +03:00
George Kalampokis
1cec40a4da
Add isPublic on DtasetListingModel
2020-06-30 16:14:18 +03:00
George Kalampokis
3c18ed4a0c
Add users on DatasetListingModel
2020-06-30 14:37:35 +03:00
George Kalampokis
ecd7898237
Code clean up
2020-06-29 13:00:34 +03:00
George Kalampokis
e8c90e66a5
Add support for newer versions of java (11) (expirimental)
2020-06-29 12:50:35 +03:00
George Kalampokis
6e4e23e00d
Add Zenodo file visibility field for DMP (ref #274 )
2020-06-29 12:23:53 +03:00
George Kalampokis
346c731aae
Fixed issue not passing DMP Extra Properties on clones and new Versions
2020-06-26 18:57:04 +03:00
George Kalampokis
b0dddeeb51
Add DMP Zenodo license field (ref #274 )
2020-06-26 11:46:18 +03:00
George Kalampokis
d81d6e8568
Allow splash to send contact emails
2020-06-25 19:39:10 +03:00
George Kalampokis
55d3feb4e3
Fixed minor issues with RDA Mapping
2020-06-25 13:30:47 +03:00
George Kalampokis
791f2fee61
Add currency field type for dataset templates
2020-06-25 13:00:29 +03:00
George Kalampokis
a4e21003c8
Add language column on the DMP quick wizard Editor (ref #273 )
2020-06-18 15:55:15 +03:00
George Kalampokis
ac43dc8bd9
Updated application-devel.properties language.path
2020-06-17 17:32:52 +03:00
George Kalampokis
e539278d78
Fixed and improved the dataset template export/import to/from xml
2020-06-17 12:30:54 +03:00
George Kalampokis
b28fc644f6
Add additional Data Repository OpenAIRE source
2020-06-16 18:45:26 +03:00
George Kalampokis
bb8f30fa3a
Add OpenAIRE Organizations source for the ExternalUrls
2020-06-16 17:22:48 +03:00
George Kalampokis
ddd0b60d37
Load various resources from classpath instead of an actual path on Stagging and Production
2020-06-16 11:19:27 +03:00
George Kalampokis
a8015064a8
Prevent storing Tags if the elastic service is unavailable
2020-06-16 11:17:07 +03:00
George Kalampokis
4a9c589636
Fixed maven depedency issues
2020-06-16 11:07:18 +03:00
George Kalampokis
4cf46aea14
Allow rda keywords with text fields to be stored to the elastic as regular tags
2020-06-12 18:19:32 +03:00
George Kalampokis
c7892f45df
Tags created by the form by using the rda standard keyword or the tag field will be stored to the dataset's tags in elastic
2020-06-12 17:25:53 +03:00
George Kalampokis
c5f4701f97
Fixed issue when creating DMP through the wizard
2020-06-11 17:59:53 +03:00
George Kalampokis
7c9d7d7fd0
Remove unused class
2020-06-10 16:18:24 +03:00
George Kalampokis
ba091fad6c
Remove User Association Table
2020-06-10 16:09:26 +03:00
George Kalampokis
33423b92f6
Removed HTTP-Logger (deprecated)
2020-06-10 13:18:04 +03:00
George Kalampokis
7695772d55
Updated production settings
2020-06-09 18:01:26 +03:00
George Kalampokis
314c62e1aa
Prevent duplicate researchers to be added when importing from RDA json
2020-06-09 17:12:09 +03:00
George Kalampokis
12587ee865
Add rda support for researchers and tags field
2020-06-09 16:25:50 +03:00
George Kalampokis
c927e41d83
Add dmp contributors for the RDA Common Standards
2020-06-08 18:34:26 +03:00
George Kalampokis
89fb26a693
Finished the implementation of the dataset Identifier field and added mapping support for the RDA (alongside the tags field)
2020-06-08 18:31:34 +03:00
George Kalampokis
46cfc3dae6
Add new fields for the Dataset Template (incomplete but functional)
2020-06-04 18:37:30 +03:00
George Kalampokis
81c3e220e8
Fixed issue when upload dmps without set profile
2020-06-03 12:43:31 +03:00
George Kalampokis
78ee4673ee
Add ExtraProperties for DMP and language for Dataset Template
2020-06-03 12:13:31 +03:00
George Kalampokis
58a41edea7
Add new source for data repositories and updated H2020 template
2020-05-29 17:13:02 +03:00
George Kalampokis
effc3c8431
Improve support for External sources
2020-05-29 17:10:18 +03:00
George Kalampokis
0e89ec50a6
Fixed minor issue when importing RDA Distributions
2020-05-29 16:08:40 +03:00
George Kalampokis
4d91f0c7af
Even more fixes for RDA import
2020-05-29 14:42:21 +03:00
George Kalampokis
7c327949dd
Allow to set default dataset template when importing RDA json files
2020-05-29 13:39:18 +03:00
George Kalampokis
5b0a66ce06
Removed deprecated configurations and added additional RDA Common Standards for dataset Templates
2020-05-29 11:57:21 +03:00
George Kalampokis
544eb92d86
Improved Import process
2020-05-29 11:35:32 +03:00
George Kalampokis
d0952d91c5
Re-configure RDA Mappers
2020-05-28 18:38:08 +03:00
George Kalampokis
62c61a8119
Allow Dmps to un-finalize if they are not published or not having a DOI (ref #272 )
2020-05-26 14:31:47 +03:00
George Kalampokis
2b9c2ee1e7
Add support for multiple sources on dataset autocomplete templates
2020-05-25 17:14:42 +03:00
George Kalampokis
33ec8b81c0
Fixed logback paths
2020-05-20 15:37:21 +03:00
George Kalampokis
f5773589ff
When selecting profiles from DMP editor or DMP wizard. All templates will be sorted alphabetically (ref #268 )
2020-05-19 18:35:50 +03:00
George Kalampokis
da7f90eb18
When creating Zenodo DOI publish the DMP but keep the files under restricted access and don't give identifier back until it go public. Also add zenodo proxy for the identifier (ref #257 )
2020-05-15 16:19:35 +03:00
Diamantis Tziotzios
0a4cad8292
bug fix
2020-05-12 19:54:52 +03:00
George Kalampokis
af62e192ae
Improved deployment
2020-05-12 13:10:23 +03:00
George Kalampokis
0eb0707fd5
Add openaire grant on DOI creation (ref #257 )
2020-05-06 18:11:33 +03:00
George Kalampokis
42b2ff67f6
Fixed issue when retrieving grants using funderId
2020-05-06 18:02:19 +03:00
George Kalampokis
7784547bea
When generating DOI it will remain unpublished until the DMP got published, add reference identifier to the DMP (public overview) and add collaborators (associated users and researchers) to DOI generation (ref #257 )
2020-05-05 18:31:32 +03:00
George Kalampokis
f397ce6c72
Fixed issue when creating new users
2020-05-04 17:19:23 +03:00
George Kalampokis
5d6fbd3e37
Improve self deployment
2020-05-04 17:15:52 +03:00
George Kalampokis
08737cbbf0
Minor bugfix
2020-05-04 16:00:23 +03:00
George Kalampokis
391a88a236
The invite pop up will show only user collaborating with DMP that the current user also is collaborating (ref #258 )
2020-05-04 15:47:30 +03:00
George Kalampokis
75fc400349
Added postgres on docker compose
2020-04-29 14:03:19 +03:00
George Kalampokis
411de18e9f
Fixed issue when creating DMP from the creation Wizard
2020-04-28 18:27:31 +03:00
George Kalampokis
d67e68d0d9
Improve self deployment
2020-04-27 16:21:03 +03:00
George Kalampokis
05e2374f97
When exporting to JSON export it with pretty text
2020-04-22 18:43:19 +03:00