George Kalampokis
e42bdcfc0a
Code cleanup
2023-11-06 16:58:01 +02:00
George Kalampokis
c6cdcc4b15
Apply requested changes to RepositoryDepositService
2023-11-06 16:56:59 +02:00
Efstratios Giannopoulos
d8b1211a12
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java
# dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
2023-11-06 16:19:06 +02:00
Efstratios Giannopoulos
81528dfe55
description refactor
2023-11-06 16:17:57 +02:00
11bb1a3c8c
create Supportive Material query public
2023-11-06 15:25:04 +02:00
Thomas Georgios Giannos
9b9cf0de4d
Adding dmp-description-template stack
2023-11-06 13:31:01 +02:00
fda8fcef2c
create Supportive Material Entity, (persist in progress)
2023-11-03 18:09:19 +02:00
George Kalampokis
c636b3e6b4
Minor query optimization
2023-11-03 18:00:06 +02:00
George Kalampokis
7bb8e850e8
Add first implementation of the new Repository Deposit Service
2023-11-03 17:54:26 +02:00
Thomas Georgios Giannos
b389ebf160
Fix on dmp references persisting flow
2023-11-03 16:47:54 +02:00
Thomas Georgios Giannos
2f20675348
Adding reference persisting on dmp persist (work in progress), adding separate persist models for dmp properties
2023-11-03 16:02:47 +02:00
Efstratios Giannopoulos
9cf91aab50
DescriptionTemplate refactor
2023-11-03 15:53:18 +02:00
Efstratios Giannopoulos
08caf64d02
DescriptionTemplate refactor
2023-11-03 14:53:10 +02:00
c37530c022
add supportive material editor to UI
2023-11-03 13:30:11 +02:00
Efstratios Giannopoulos
b6278ab1ef
DescriptionTemplate refactor
2023-11-03 11:55:26 +02:00
Efstratios Giannopoulos
d38f22ccbf
DescriptionTemplate refactor
2023-11-02 18:37:12 +02:00
Thomas Georgios Giannos
e02237e599
Adding new version service method for Dmps
2023-11-02 18:12:36 +02:00
Thomas Georgios Giannos
752935f6e5
Updating Dmp properties persist
2023-11-02 15:55:17 +02:00
Efstratios Giannopoulos
732dfd9bfb
DmpBlueprint feractor
2023-11-02 14:13:13 +02:00
Thomas Georgios Giannos
c3808b5548
Updating Dmp Entity fields to reflect the database changes (migration script not yet updated)
2023-11-02 13:45:32 +02:00
Efstratios Giannopoulos
ac15e33a87
DescriptionTemplate refactor
2023-11-01 18:12:59 +02:00
George Kalampokis
3c799063cc
Fix Deposit Configuration's Authentication system
2023-11-01 14:10:35 +02:00
Efstratios Giannopoulos
4e08d9f073
DescriptionTemplate refactor
2023-11-01 12:03:23 +02:00
be9761b103
add more fields to reference-type.yml
2023-10-31 17:57:41 +02:00
Efstratios Giannopoulos
7e391582b5
User DescriptionTemplate refactor
2023-10-31 17:24:03 +02:00
Diamantis Tziotzios
c08f05bc04
no message
2023-10-31 11:19:52 +02:00
Efstratios Giannopoulos
2b074f268d
DescriptionTemplate refactor
2023-10-30 18:02:20 +02:00
477e4e498e
add frontend reference search lookup
2023-10-30 17:53:30 +02:00
f744573f02
add reference search builders, lookup
2023-10-30 17:15:40 +02:00
Diamantis Tziotzios
557c444bc1
frontend description template listing component
2023-10-30 15:30:46 +02:00
Efstratios Giannopoulos
c06253bb20
DescriptionTemplate refactor
2023-10-30 15:07:59 +02:00
49d400662b
add reference definition censor
2023-10-30 10:57:24 +02:00
a0ac8df5ba
rename sourceType
2023-10-30 10:43:50 +02:00
Diamantis Tziotzios
9201f265d2
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-frontend/src/app/core/model/reference/reference.ts
2023-10-27 18:59:51 +03:00
Diamantis Tziotzios
7214745162
frontend dmp changes
2023-10-27 18:56:19 +03:00
Efstratios Giannopoulos
bdcaee004d
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
# dmp-backend/web/src/main/resources/config/permissions.yml
2023-10-27 18:52:34 +03:00
Efstratios Giannopoulos
57facf98e5
DescriptionTemplate refactor
2023-10-27 18:46:34 +03:00
9d3cc9e3d2
rename sourceType to referenceSourceType
2023-10-27 18:29:06 +03:00
92c165e904
add references definition xml,builder, persist
2023-10-27 17:35:35 +03:00
Thomas Georgios Giannos
65e8635c2f
Removing unused dataset entity classes
2023-10-27 17:32:07 +03:00
Thomas Georgios Giannos
e31970c7ea
Adding migration scripts for Dmp, DmpReference, Description and DescriptionReference entities, other fixes / clear up dmp entity
2023-10-27 17:05:48 +03:00
Thomas Georgios Giannos
8d1c988135
Adding DescriptionReference lookup and linking on description entity builder
2023-10-27 13:48:17 +03:00
Thomas Georgios Giannos
60ca51fe00
Adding DescriptionReference entity stack (former Dataset*** entities)
2023-10-27 11:59:37 +03:00
7508cf8698
add created, updated in DmpReference
2023-10-27 11:41:44 +03:00
Diamantis Tziotzios
e4203a3bb4
backend fixes
2023-10-27 09:54:49 +03:00
George Kalampokis
d983e1e38e
Add Deposit Security
2023-10-26 18:04:55 +03:00
aecac1995d
rename External Reference to Reference
2023-10-26 14:38:18 +03:00
f006587f4a
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
2023-10-26 12:09:36 +03:00
bbb21fadba
rename External Reference to Reference
2023-10-26 12:07:04 +03:00
Diamantis Tziotzios
4eca9b32c9
various backend fixes
2023-10-26 11:21:33 +03:00
Diamantis Tziotzios
129dbd163a
minor fixes dmp blueprints and Dmps.
2023-10-25 20:53:47 +03:00
45f8f51288
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-25 17:38:21 +03:00
032b30ed04
add DmpExternalReference to DmpBlueprint
2023-10-25 17:37:37 +03:00
Thomas Georgios Giannos
9a78d98751
Updating permissions.yml for dmps, entity_dois and descriptions
2023-10-25 16:55:10 +03:00
Thomas Georgios Giannos
c169a103b7
Updating censors for dmp and description entities
2023-10-25 14:49:37 +03:00
7df098a010
add more to external reference controller, service
2023-10-25 12:42:34 +03:00
Thomas Georgios Giannos
079382556f
Added controller for description entity (former dataset)
2023-10-25 11:48:19 +03:00
Thomas Georgios Giannos
7ab1313b83
Updated the dmp builder to be able to populate the associated descriptions on the dmps
2023-10-25 11:17:56 +03:00
bf8edfad92
add ExternalReference, DmpExternalReference entities
2023-10-24 18:47:13 +03:00
Efstratios Giannopoulos
a68ddd42ce
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java
2023-10-24 18:01:38 +03:00
Efstratios Giannopoulos
de566729f1
DmpBlueprint refactor
2023-10-24 18:00:11 +03:00
Thomas Georgios Giannos
e149b61b58
Adding 'dmp' query option on 'description' query
2023-10-24 17:24:51 +03:00
Thomas Georgios Giannos
1e733cf704
Connecting 'dmp' entity with 'description' entity (description builder populating dmp data)
2023-10-24 17:07:28 +03:00
Thomas Georgios Giannos
3e7b9ca90b
Optimize imports
2023-10-24 15:39:11 +03:00
Thomas Georgios Giannos
e27468b596
Adding basic service for 'description' entity
2023-10-24 15:38:15 +03:00
Thomas Georgios Giannos
485f7311cd
Adding builder and query for 'description' entity
2023-10-24 13:50:53 +03:00
Thomas Georgios Giannos
e3536285aa
Adding 'description' entity (former 'dataset' entity)
2023-10-24 12:47:48 +03:00
Efstratios Giannopoulos
a68668f07e
DmpBlueprint refactor
2023-10-24 12:13:05 +03:00
Thomas Georgios Giannos
dc380cdc01
Small fix on dmp entity id definition
2023-10-24 11:35:19 +03:00
Efstratios Giannopoulos
167d3d4a4b
DmpBlueprint refactor
2023-10-23 18:13:34 +03:00
10615c6fa9
fix front enums
2023-10-23 17:58:56 +03:00
Efstratios Giannopoulos
3b9b348d4d
update External Refence
2023-10-23 16:53:32 +03:00
Efstratios Giannopoulos
fe7d6f59b1
DmpBlueprint refacto
2023-10-23 15:58:33 +03:00
Thomas Georgios Giannos
f4d84aa807
Implemented controller for dmp entity, dmp lookup update
2023-10-23 14:45:05 +03:00
Thomas Georgios Giannos
074ca35970
Implemented service for dmp entity
2023-10-23 12:51:11 +03:00
Thomas Georgios Giannos
eeaa35fab5
Added censor, deleter and lookup for Dmp entity
2023-10-23 12:23:51 +03:00
Diamantis Tziotzios
172caabcd2
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-23 11:58:32 +03:00
Diamantis Tziotzios
6a8cb2c853
more frontend dmp blueprint listing changes
2023-10-23 11:58:15 +03:00
Thomas Georgios Giannos
61f2810fcc
Renamed DMP -> Dmp to be consistent with the other entities
2023-10-23 11:31:07 +03:00
Diamantis Tziotzios
6d6a4e0341
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-23 11:27:27 +03:00
Diamantis Tziotzios
0c1509a1a1
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
2023-10-23 11:27:03 +03:00
Thomas Georgios Giannos
10df3db7aa
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-23 11:17:23 +03:00
Thomas Georgios Giannos
c338a93d71
Implemented builder and query for DMP entity, refactored services package
2023-10-23 11:16:58 +03:00
Efstratios Giannopoulos
6cde8ae2a9
add cross origin config
2023-10-23 11:15:08 +03:00
Efstratios Giannopoulos
3ad7441bb5
DmpBlueprint refactor
2023-10-23 10:21:25 +03:00
Diamantis Tziotzios
3422b147c8
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-22 13:34:12 +03:00
Efstratios Giannopoulos
30bff76163
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java
2023-10-20 19:17:14 +03:00
Efstratios Giannopoulos
88088d64fd
DmpBlueprint refactor
2023-10-20 19:13:57 +03:00
Diamantis Tziotzios
9ed94450bd
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-20 18:01:15 +03:00
Diamantis Tziotzios
4d3098860d
description template type and dmp blueprint frontend changes
2023-10-20 18:01:09 +03:00
0bd3ff6898
fix external references enums
2023-10-20 17:44:41 +03:00
Thomas Georgios Giannos
a94cce47e8
Added DMP Entity (not integrated)
2023-10-20 16:48:55 +03:00
George Kalampokis
7d4b4c171b
Apply some minor fixes
2023-10-20 11:57:25 +03:00
Efstratios Giannopoulos
0b3178177a
changes for remote fetcher
2023-10-19 17:56:53 +03:00
Thomas Georgios Giannos
2a4e61f08f
Added controller for EntityDoi entity
2023-10-19 17:48:41 +03:00
Thomas Georgios Giannos
727702023f
Reverting changes on join DMP <-> EntityDoiEntity for now in order for the app to be able to run
2023-10-19 16:52:41 +03:00
Efstratios Giannopoulos
16604a8a50
bug fixes
2023-10-19 13:01:29 +03:00
Thomas Georgios Giannos
07ff58fbd9
Removing joins from DMP <-> EntityDoiEntity
2023-10-19 12:41:47 +03:00
Efstratios Giannopoulos
a235eb98f4
task #9088 Authorization model should be changed to be Permission based
2023-10-19 10:44:20 +03:00
Efstratios Giannopoulos
ce8ff28955
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java
# dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DepositManager.java
2023-10-18 19:03:35 +03:00
Efstratios Giannopoulos
52e59ac11c
task #9088 Authorization model should be changed to be Permission based
2023-10-18 18:52:03 +03:00
George Kalampokis
dc752f73ca
Partially fix Deposit Logic and add support for upcomming micro-services
2023-10-18 18:15:52 +03:00
7cba7b2346
add external references service
2023-10-18 18:05:39 +03:00
Thomas Georgios Giannos
a38342e534
Removed EntityDao logic, added template stack, controller not yet implemented, db script not yet run
2023-10-18 17:58:36 +03:00
Efstratios Giannopoulos
941f2d69cc
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-10-18 13:54:47 +03:00
Efstratios Giannopoulos
5c17027df2
fix delete user info additional data
2023-10-18 13:54:02 +03:00
5203ec4b72
fix remote fetcher
2023-10-18 13:53:52 +03:00
b2119abc08
fix issue
2023-10-18 13:48:20 +03:00
Thomas Georgios Giannos
b7d22b5b07
Moving existing entities from Data module to Core module
2023-10-18 13:04:53 +03:00
1cda821d9c
fix issue
2023-10-18 13:00:17 +03:00
ad91234fd9
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
2023-10-18 12:28:13 +03:00
17bb6bd4b0
add Supportive Material
2023-10-18 12:26:57 +03:00
Efstratios Giannopoulos
27bcc31e54
task #9088 Authorization model should be changed to be Permission based
2023-10-18 12:10:24 +03:00
3dee4857f8
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
...
Conflicts:
dmp-frontend/src/assets/config/config.json
2023-10-18 10:33:59 +03:00
f67ada842e
commit
2023-10-18 10:31:57 +03:00
b8affa3033
change pom
2023-10-18 09:58:05 +03:00
Efstratios Giannopoulos
43f77a4497
add status and inactive
2023-10-17 17:48:02 +03:00
Efstratios Giannopoulos
b3a73a50aa
task #9088 Authorization model should be changed to be Permission based
2023-10-17 17:13:34 +03:00
Diamantis Tziotzios
9fd30b1198
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/pom.xml
2023-10-17 15:56:28 +03:00
Diamantis Tziotzios
3eaf326c50
Description Template Types backend refactored to new format.
2023-10-17 15:55:00 +03:00
Efstratios Giannopoulos
7ed111e936
task #9088 Authorization model should be changed to be Permission based
2023-10-17 15:22:05 +03:00
Efstratios Giannopoulos
419c4d64f8
database enum handle implementation
2023-10-17 13:45:59 +03:00
Efstratios Giannopoulos
bd2807fbdf
remove zenodo from user info
2023-10-17 12:40:47 +03:00
Efstratios Giannopoulos
925f195f5a
database enum handle implementation
2023-10-17 12:39:29 +03:00
Efstratios Giannopoulos
6443654343
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-10-16 17:39:19 +03:00
Efstratios Giannopoulos
191f887530
database enum handle implementation
2023-10-16 17:38:12 +03:00
Thomas Georgios Giannos
b537810406
Removed redundant code that calculated count on queries, already implemented on the data tools package
2023-10-16 12:22:41 +03:00
Thomas Georgios Giannos
234aa359c0
Removed redundant code that calculated count on queries, already implemented on the data tools package
2023-10-16 12:21:58 +03:00
Efstratios Giannopoulos
d5c62539c5
task #9086 public urls support
2023-10-13 18:11:46 +03:00
George Kalampokis
5976084473
Fix security on LanguageController
2023-10-13 16:46:38 +03:00
George Kalampokis
a9a3273f62
Fix compilation errors and fix swagger ui description formatting
2023-10-13 09:50:22 +03:00
Efstratios Giannopoulos
5009d658ed
task #9045 Refactor authentication mechanism to support using Keycloak
2023-10-12 16:16:19 +03:00
Efstratios Giannopoulos
055d29b95f
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/web/pom.xml
# dmp-backend/web/src/main/resources/config/application.yml
2023-10-12 12:04:26 +03:00
Diamantis Tziotzios
958fc468fa
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-10-12 10:57:52 +03:00
Diamantis Tziotzios
6b2fae03dd
no message
2023-10-12 10:57:38 +03:00
George Kalampokis
b845450ebd
Update Swagger ui
2023-10-12 10:55:48 +03:00
Efstratios Giannopoulos
968f45d5b3
authn refactor
2023-10-11 17:53:12 +03:00
Efstratios Giannopoulos
8b05ee1d0f
add cache yml
2023-10-11 10:09:46 +03:00
George Kalampokis
de2f5e67fd
Fix profile issue
2023-10-11 09:53:24 +03:00
George Kalampokis
755c79b7af
Separate configuration to different files
2023-10-10 16:49:48 +03:00
George Kalampokis
166bea73bf
Replace the old .properties configuration files with the .yml
2023-10-09 16:02:14 +03:00
Thomas Georgios Giannos
55aecd9c57
Updating description template type controller with apropriate auditing and logging, added censor, refactored query building to conform with other projects workflows
2023-10-09 11:17:16 +03:00
George Kalampokis
cab2f1bc64
Add Environment variables
2023-10-09 10:38:46 +03:00
George Kalampokis
b5cbe6a3d8
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
2023-10-06 18:11:11 +03:00
George Kalampokis
70308db668
Add Authentication support for the remote fetcher and rework dataset template's autocomplete sources
2023-10-06 18:07:58 +03:00
Thomas Georgios Giannos
51fbbc933a
Fixing detached entity error, entity id is auto generated by hibernate
2023-10-06 16:46:44 +03:00
Thomas Georgios Giannos
c7778e80b9
Adding missing auditing configuration property
2023-10-06 15:22:38 +03:00
Thomas Georgios Giannos
39163ed6bc
Updating cite validation library to 2.1.0
2023-10-06 15:10:58 +03:00
Thomas Georgios Giannos
0b901205ee
Adding auditing, naming convention change in API endpoints for description types
2023-10-06 12:13:09 +03:00
George Kalampokis
05a724d757
Fix type definition issues
2023-10-05 15:23:48 +03:00
George Kalampokis
3d612812b0
Fix compile issue
2023-10-05 14:47:25 +03:00
Diamantis Tziotzios
66052f8af6
sync fixes
2023-10-05 14:12:39 +03:00
Bernaldo Mihasi
b7f68f1a7e
bug fixes
...
(cherry picked from commit 846405435c
2023-10-05 14:04:26 +03:00
Bernaldo Mihasi
03f2bc862e
1) update dmp blueprint listing table view, 2) create clone functionality for dmp blueprints, 3) section description is not required in editor, 4) in the deletion of a dmp blueprint check if any dmps are accosiated with it
2023-10-05 14:04:10 +03:00
Bernaldo Mihasi
4373bf4b00
bug fixes: 1) when creating description template type check only for non deleted types, 2) dmp docx/pdf export: check if system fields exist 3) when creating/updating dmp check if value for extra fields is set, 4) when unchecking the 'Description Templates' checkbox in the blueprint editor, clear any templates selected
2023-10-05 14:02:20 +03:00
Bernaldo Mihasi
09dcf5328d
add type attribute in xml import/export of a description template
...
(cherry picked from commit 3d10e8ad28
2023-10-05 14:00:30 +03:00
Bernaldo Mihasi
94c0f7ac9c
[wip] dmp xml upload changes, including section and extra fields information
2023-10-05 14:00:17 +03:00
Thomas Georgios Giannos
3f14528f16
Fixing UI incompatibilities
2023-10-05 11:41:11 +03:00
Thomas Georgios Giannos
074e374d9a
Removing old implementation of DescriptionTemplateType entity, fixing issues with entity scanning and field resolving on new implementation
2023-10-04 12:46:06 +03:00
Thomas Georgios Giannos
7c96078570
Updating Spring to version 6, adding service stack for DescriptionType entity
2023-10-03 17:29:45 +03:00
Bernaldo Mihasi
6b544e4702
bug fixes
2023-09-27 16:57:25 +03:00
Bernaldo Mihasi
2f4e123ac9
bug fixes
2023-09-27 12:54:18 +03:00
Bernaldo Mihasi
c99267d6cc
#8998 - implement import/export functionality for dmp blueprints
2023-09-26 09:35:59 +03:00
Bernaldo Mihasi
34580f917f
check if grant exists in word/pdf export
2023-09-22 12:57:47 +03:00
Bernaldo Mihasi
beac6be706
add missing grant checks
2023-09-22 09:31:12 +03:00
Bernaldo Mihasi
fbad63ee76
use dmp label in export file names if grant does not exist
2023-09-22 09:29:51 +03:00
Bernaldo Mihasi
79aaf23bb6
add missing grant checks
2023-09-21 10:20:32 +03:00
Bernaldo Mihasi
db08662cac
fix bug when creating new version or clone a dmp
2023-09-21 09:33:27 +03:00
Bernaldo Mihasi
69548e5a8b
check if grant exists in dmp/dataset elastic entities
2023-09-21 09:29:18 +03:00
Bernaldo Mihasi
367861c050
fix bugs: saving extra fields in dmp, showing draft blueprints when min or max of a description template are not set
2023-09-20 09:34:39 +03:00
Bernaldo Mihasi
93c5918251
make grant funder not mandatory for the creation/new version/clone of dmp
2023-09-18 17:48:54 +03:00
Bernaldo Mihasi
b1a832074d
small fixes, (wip) remove description template chip from dmp editor
2023-09-13 15:55:38 +03:00
Diamantis Tziotzios
cf6e041154
Merge remote-tracking branch 'origin/refactorArgosModel' into Development
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
# dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
2023-09-13 10:01:57 +03:00
Bernaldo Mihasi
c1858d582c
no message
2023-09-12 15:39:08 +03:00
Bernaldo Mihasi
6154a5fa51
fix associated dmps bugs in DMP table, new/existing DmpDatasetProfile entries were not saved/updated
2023-09-12 15:36:06 +03:00
Bernaldo Mihasi
bbe4975176
add hasTemplates property to sections, it indicates if descriptions templates can be added in a section
2023-09-11 08:59:47 +03:00
Bernaldo Mihasi
4219d90039
add "DmpSectionIndex" column to descriptions in order to know in which section of a dmp the description belongs, add "data" column in DmpDatasetProfile table, data stores in which sections a description template is saved
2023-09-11 08:57:09 +03:00
Bernaldo Mihasi
6073c4cd85
[WIP] refactor dmp export following the blueprint schema
2023-09-11 08:42:30 +03:00
Bernaldo Mihasi
cd80e78e40
add status to description template types, fix bugs in editor/listing
2023-09-11 08:40:03 +03:00
George Kalampokis
5019bc4271
Add manual addition of total users in prometheus
2023-08-04 11:55:46 +03:00
Bernaldo Mihasi
78946de1b5
change images source in emails to base64
...
(cherry picked from commit b94aa51489
2023-08-03 13:26:27 +03:00
Bernaldo Mihasi
17dbd198ad
fix dmp blueprint editor screen
2023-08-03 13:10:36 +03:00
Bernaldo Mihasi
b94aa51489
change images source in emails to base64
2023-08-03 11:19:33 +03:00
Diamantis Tziotzios
b6cade6e88
metrics change
...
(cherry picked from commit 903026e2c2
2023-08-03 10:28:56 +03:00
Diamantis Tziotzios
903026e2c2
metrics change
2023-08-03 10:28:18 +03:00
Bernaldo Mihasi
30abe4d4c9
#8952 - fix bug when merging two accounts did not have consistent behaviour.
2023-08-01 11:23:06 +03:00
Bernaldo Mihasi
634d49ea35
#8916 - when merging acoounts, save the main profile user as collaborator to elastic dmps/datasets
2023-07-27 10:07:40 +03:00
Bernaldo Mihasi
e01709f886
#8936 - fix bug when pid of object fetched was integer(PIC typed) instead of string
2023-07-27 10:06:04 +03:00
Bernaldo Mihasi
09d6528f8f
#8855 - #8856 - #8901 - #8902 [wip] implementing dmp blueprints
2023-07-25 15:51:29 +03:00
Bernaldo Mihasi
128b47d9c3
#8845 - #8846 : adding description template types, creation of description template type field in the dataset template editor, [wip] creation of admin page for creation/editing/deleting of description template types
2023-07-25 15:27:15 +03:00
Bernaldo Mihasi
bc279b1610
#8843 - 1. refactor the DatasetProfile Table to DescriptionTemplate name 2. add scripts for the new DescriptionTemplateType table 3. update english localization + frontend
2023-07-25 15:04:39 +03:00
Bernaldo Mihasi
3fc307c831
#8912 : adding new metadata/registries api in the configs
2023-07-21 17:04:41 +03:00
Bernaldo Mihasi
ee90ac37b6
no message
2023-07-20 13:34:56 +03:00
Bernaldo Mihasi
0918e55ac9
fix bug in dataset template editor when a field is an admin-input api and couldn't fetch results
2023-07-20 13:07:05 +03:00
Bernaldo Mihasi
2db9ea613f
catch error in prefilling when source mapping does not exist in the api's response
2023-07-20 13:00:24 +03:00
Konstantina Galouni
e878310b72
#8834 : Home page: Drafts query for both Datasets and DMPs.
...
1. RecentActivityCriteria.java: Added in RecentActivityCriteria field "private Integer status;", to be able to get only drafts.
2. DashBoardManager.java: In method "getNewRecentActivity()", add in Dataset and DMP requests status in criteria.
2023-07-17 18:10:49 +03:00
Bernaldo Mihasi
dd6a2a0df7
adding key property in the prefilling model as the identifier of the prefilling repository
2023-07-17 10:29:06 +03:00
Bernaldo Mihasi
1715463422
fix bugs in rda json export when rda semantics don't correspond to valid dataset field input type
2023-07-14 13:56:08 +03:00
Bernaldo Mihasi
a8ce14af70
#8726 - adding openaire prefilling
2023-07-14 13:47:01 +03:00
Bernaldo Mihasi
1a15e1ddde
add missing logger to Prefilling Mapper
2023-07-03 17:09:15 +03:00
Bernaldo Mihasi
000882cbdb
1) fix bug when tags don't show after saving the dataset
...
2) save the email when user logs in with orcid
3) refactor unlink, delete credential of user to be unlinked
2023-07-03 11:40:35 +03:00
Bernaldo Mihasi
1c0562d7e7
catch error when a field's external api is not available and interrupts prefilling process
2023-06-26 14:16:41 +03:00
Bernaldo Mihasi
cb972c394c
change maDmpTarget type in prefilling to semanticTarget
2023-06-22 13:47:01 +03:00
Bernaldo Mihasi
d996acdcc4
#8842 - add notification templates html files to application properties
2023-06-21 13:09:20 +03:00
Bernaldo Mihasi
741179a53f
#8740 - multiple configuration for a deposit repository
2023-06-21 12:46:37 +03:00
Bernaldo Mihasi
3630727fed
dmp profile bug fixes: 1) dmp profile was not saved 2) if you select external autocomplete field and change it to another type, the external field was saved
2023-06-21 12:20:30 +03:00
Bernaldo Mihasi
34e4761811
bug fixes regarding tickets: #8739 , #8763 , #8833
2023-06-21 12:17:22 +03:00
Bernaldo Mihasi
dfa2f0cd38
#8737 - make elastic fetch 100 inner hits instead of the default 3.
2023-06-21 12:05:51 +03:00
Bernaldo Mihasi
3d367b0589
#8765 - make pids coming from apis as hypelinks in export
2023-06-21 12:00:20 +03:00
Bernaldo Mihasi
b6505cda4e
refactor signing of saml2 authentication request
2023-06-21 11:51:26 +03:00
Bernaldo Mihasi
2aa1f76aab
use sha256 with rsa keys for saml2, fix bug for authentication request's id
2023-06-13 15:47:18 +03:00
Bernaldo Mihasi
1f666a5bf9
create saml2 authentication request in backend
2023-06-13 09:48:54 +03:00
Bernaldo Mihasi
4c9652abc3
saml2 metadata creation for sp
2023-06-12 15:05:51 +03:00
Bernaldo Mihasi
b2f2a79a5d
add unlink functionality in profile section, when an email is unlinked that account is starting from scratch resulting in an empty dashboard.
2023-05-23 17:15:11 +03:00
Bernaldo Mihasi
5e764559cf
fix typo (semantics)
2023-05-19 12:34:08 +03:00
Bernaldo Mihasi
a3ee9dccda
update deposit base repository version
2023-05-18 15:48:12 +03:00
Bernaldo Mihasi
758539eaa0
add zenodo related identifiers for schematics
2023-05-17 13:51:21 +03:00
Bernaldo Mihasi
af8fddb89c
#7911 - read pid and pid type from external api respones so as to save those values in the dataset field
2023-05-17 13:45:12 +03:00
Bernaldo Mihasi
a1fd03a444
fix out of memory error in management endpoints.
2023-04-26 17:27:21 +03:00
Bernaldo Mihasi
8c30c558b2
User Guide, ToS, FAQ, Glossary, About html pages can now be dynamically updated so that they can be changed per installation.
2023-04-26 17:25:59 +03:00
Bernaldo Mihasi
7b12d7b46d
temporarily endpoint for appending "rda." in schematic values of dataset profiles
2023-04-20 10:12:55 +03:00
Diamantis Tziotzios
89922eaecc
Merge remote-tracking branch 'origin/semantics' into Development
2023-04-18 11:19:48 +03:00
Bernaldo Mihasi
11a9abae42
version change in base deposit repository
2023-04-18 10:51:13 +03:00
Bernaldo Mihasi
8293535bb0
add zenodo properties in schematics
2023-04-18 09:41:01 +03:00
Konstantina Galouni
c9b4b35e39
h2020.docx: [Bug fix] Updated image of Argos in h2020.docx DMP template | DataManagementPlanManager.java & DatasetManager.java: Added parameter "isDataset" in fillFirstPage() | WordBuilder.java: [Bug fix] Added parameter isDataset in fillFirstPage() and added some checks in description.
2023-04-05 11:13:26 +03:00
Bernaldo Mihasi
63c866d74f
set creator in new/cloned/newVersioned dmp
2023-03-30 11:44:50 +03:00
Bernaldo Mihasi
b6b7a2444c
add xml attributes in dmp xml export
2023-03-30 11:44:00 +03:00
Bernaldo Mihasi
18a200f099
no message
2023-03-27 15:25:19 +03:00
Bernaldo Mihasi
18ccb3ca0c
changes in dmp deposit model
2023-03-27 15:24:50 +03:00
Bernaldo Mihasi
a90f21b6aa
fix issues in dmp xml export
2023-03-27 15:21:12 +03:00
Bernaldo Mihasi
376bb2ca53
changes in dmp deposit model
2023-03-27 14:59:47 +03:00
Bernaldo Mihasi
969df0357a
migrate rda properties in dataset profiles definitions in db to schematics
2023-03-27 14:58:45 +03:00
Bernaldo Mihasi
c35bc2efed
remove rda property from models
2023-03-27 14:52:37 +03:00
Bernaldo Mihasi
519cb260c6
fix issue with users returned as empty array, add researchers in response
2023-03-07 09:44:16 +02:00
Bernaldo Mihasi
87c9730524
puplic api return total count in response
2023-03-03 11:44:21 +02:00
Diamantis Tziotzios
9ebefa8369
Merge branch 'public_api_update' into Development
2023-03-03 10:23:52 +02:00
Konstantina Galouni
28c1c9b71d
h2020.docx & WordBuilder.java: Updated h2020.docx DMP template and added export of DMP description.
2023-02-28 11:01:44 +02:00
Bernaldo Mihasi
e2505039df
cleanup unused code
2023-02-21 14:09:33 +02:00
Bernaldo Mihasi
b273ca4ed7
search for schematics fields in prefilling
2023-02-21 12:44:48 +02:00
Bernaldo Mihasi
0c57bba0b4
rda json dmp import/export
2023-02-21 11:57:34 +02:00
Bernaldo Mihasi
9a8fc5e92e
schematics implementation, xml import export of dataset profiles
2023-02-21 11:46:44 +02:00
Bernaldo Mihasi
e22e348330
cleanup unused code
2023-02-21 11:41:07 +02:00
Bernaldo Mihasi
ab124e87ea
add new filters(grantLike, funderLike, collaboratorsLike)
2023-02-14 12:16:11 +02:00
Bernaldo Mihasi
57a400f817
update repository base version
2023-01-18 09:37:34 +02:00
Bernaldo Mihasi
030f1ccf8e
add repository logo
2023-01-17 14:41:04 +02:00
Diamantis Tziotzios
95c9d599e1
pom update
2023-01-17 10:31:34 +02:00
Diamantis Tziotzios
4dccaa93b8
Merge branch 'multipleRepos' into Development
2023-01-16 14:11:43 +02:00
Bernaldo Mihasi
66b2596036
delete files used for deposit in tmp storage
2022-12-27 09:44:43 +02:00
Bernaldo Mihasi
749dbefc38
1. return bad request when deposition failed and returned null
...
2. close modal with repositories after a successful deposition
2022-12-19 16:07:03 +02:00
Bernaldo Mihasi
80fba7c655
Merge branch 'multipleRepos' of https://code-repo.d4science.org/MaDgiK-CITE/argos into multipleRepos
2022-12-13 11:00:27 +02:00
Bernaldo Mihasi
fbc274282c
fix deposit base dependancy in web
2022-12-13 10:55:32 +02:00
Diamantis Tziotzios
ec985bf271
Dockerfile update
2022-12-13 10:46:36 +02:00
Bernaldo Mihasi
d0cde3c4c4
cleanup deposit since they are moved in another git repository
2022-12-13 10:12:12 +02:00
Bernaldo Mihasi
39d709f41d
no message
2022-12-13 09:46:00 +02:00
Bernaldo Mihasi
c6d37806c8
drop column doi from dmp and refactor code(replace single doi with list of dois)
2022-12-08 13:12:54 +02:00
Bernaldo Mihasi
8c95b16164
add temp storage in zenodo repository
2022-12-08 13:06:52 +02:00
Bernaldo Mihasi
ad00695d4e
fix bug allowing invalid characters in pdf name
2022-12-08 13:04:55 +02:00
Bernaldo Mihasi
572be373e5
don't deposit empty supportingFiles.zip when no files are uploaded in datasets
2022-12-08 13:02:08 +02:00
Diamantis Tziotzios
e1a3e9b7bc
Dockerfile update
2022-12-06 11:55:06 +02:00
Bernaldo Mihasi
b7e69d5fdf
repo config using enviroment variables instead of static strings
2022-12-06 11:50:54 +02:00
George Kalampokis
6caef3e890
Remove thread sleeps when trying to load config files and removed principal from Exception Handling Controller
2022-11-30 18:19:40 +02:00
Bernaldo Mihasi
679354f699
deposit datasets' attached files in zip format
2022-11-30 09:43:03 +02:00
Konstantinos Triantafyllou
c9c99be603
Merge branch 'table-field' into Development
2022-11-29 10:19:15 +02:00
Diamantis Tziotzios
75007286fc
elasticsearch cert change
2022-11-25 17:03:25 +02:00
Diamantis Tziotzios
ccc102a52d
add more elastic logs
2022-11-25 16:03:59 +02:00
Bernaldo Mihasi
ed79d27cdc
when making a new version in dataverse delete previous files
2022-11-25 11:20:45 +02:00
Bernaldo Mihasi
da211ca756
update dockerfile to include directory with repository jars
2022-11-24 17:31:16 +02:00
Bernaldo Mihasi
7a0e1c89f2
when finalizing a dmp and its access rights are open, make it publicly available in Argos
2022-11-24 16:29:11 +02:00
Bernaldo Mihasi
573aab059b
remove redundant parameter in deposit interface
2022-11-22 09:58:47 +02:00
Bernaldo Mihasi
5e2639848b
dmps are deposited in dataverse as datasets under a parent predefined dataverse collenction
...
when a new dmp version is created and deposited, the corresponding dataset in dataverse/collection in zenodo create a new version too
deposit dmps as published not drafts
2022-11-22 09:40:05 +02:00
George Kalampokis
0888b7cd74
Enable health and metrics built-in endpoints
2022-11-21 14:06:59 +02:00
Bernaldo Mihasi
6c13d3b68f
when new version is deposited, create dataset in existing dataverse
2022-11-14 09:34:49 +02:00
Konstantinos Triantafyllou
925fc3ce4a
Merge branch 'Development' into table-field
2022-11-10 17:54:28 +02:00
Bernaldo Mihasi
b4490cb0f3
[WIP] implement dataverse repository deposit
2022-11-10 10:12:11 +02:00
Konstantina Galouni
2bbf89e779
HtmlToWorldBuilder.java & WordBuilder.java: Added methods for exporting inputs of a question as table.
2022-11-08 14:39:23 +02:00
Diamantis Tziotzios
0cd20605f0
user guide image update
2022-11-02 15:39:42 +02:00
Bernaldo Mihasi
6b2bc3c1e0
cleanup code, add authorizationUrl and recordUrl in repositories config
2022-11-02 13:31:42 +02:00
Bernaldo Mihasi
59e26dbb8d
[WIP] EntityDoi table
2022-11-02 09:41:40 +02:00
Konstantina Galouni
37724380e9
#7276 - Added tableView true/false option in multiplicity
2022-11-01 16:24:28 +02:00
Bernaldo Mihasi
7d624a2daa
[WIP] system deposit authentication, using default repo token
2022-10-27 09:32:26 +03:00
Bernaldo Mihasi
ab66a5f1da
[WIP] implement zenodo repository deposit, add authentication for depositions
2022-10-26 13:50:01 +03:00
Bernaldo Mihasi
7dd2030eb3
[WIP] create deposit interface and implement multiple deposit repositories
2022-10-24 09:35:49 +03:00
Bernaldo Mihasi
20f618a5d7
fix request body examples in publicapi
2022-10-18 09:39:46 +03:00
Bernaldo Mihasi
2b692fa579
fix public api paths
2022-10-10 11:56:48 +03:00
Bernaldo Mihasi
ef327a0a57
expose public api
2022-10-04 13:06:49 +03:00
Bernaldo Mihasi
5087a37e15
dockerization
2022-09-13 10:35:56 +03:00
Konstantina Galouni
49e42e9cba
h2020_dataset.docx & WordBuilder.java & DataManagementPlanManager.java & DatasetManager.java: Updated footer of Dataset template to set title of DMP and Dataset.
2022-07-28 17:30:44 +03:00
George Kalampokis
fa723c07ae
Fix critical issue with open file handle leak on user guide folder
2022-07-28 11:23:39 +03:00
Konstantina Galouni
a2228a5fb6
#7597 , #7893 , #7895 , #7898 : Updated DMP template file (h2020.docx) for export | Added Dataset template file (h2020_dataset.docx) for export | Updated indentation on exported docs.
...
1. h2020.docx, h2020_dataset.docx: Updated DMP template & Added Dataset template.
2. application.properties, application-devel.properties, application-production.properties, application-staging.properties: Added property for dataset template file path configuration.h2020datasettemplate=documents/h2020_dataset.docx
3. ConfigLoader.java: Added method XWPFDocument getDatasetDocument();
4. DefaultConfigLoader.java: Added fiedls and methods for loading Dataset template (h2020_dataset.docx).
5. DataManagementPlanManager.java, DatasetManager.java, , HtmlToWorldBuilder.java, WordBuilder.java: Updated header/footer/first page in exports for DMPs and Datasets | Updated indentation in exports.
2022-07-26 17:00:54 +03:00
Konstantina Galouni
9b4c7aeb6f
DataManagementPlanManager.java: #7893 - Added description of Datasets on DMP exported word file.
2022-07-12 12:52:04 +03:00
Konstantinos Triantafyllou
304a6cfdb3
Backend: Fix a bug with compareTo of a field throwing an error because ordinal is not exists. FrontEnd: Initialize visibility rules for multiple fields coming from service according to their parents.
2022-06-23 15:38:48 +03:00
Konstantina Galouni
18e98938d5
WordBuilder.java: #7869 - In exported file fix hidden question title and a. /b. /c for empty answers.
...
a. fix hidden question title when more than 1 multiplicity answers,
b. fix hidden question title when no value in the last multiplicity answer,
c. Do not show a. / b. / c.... for empty multiplicity answers,
d. Do not show a. / b. / c.... when more than 1 multiplicity answers, but only one with value.
2022-06-23 15:32:05 +03:00
Diamantis Tziotzios
2ecce0acb0
elastic conf changes
2022-06-14 14:22:59 +03:00
Bernaldo Mihasi
8b26ff19b6
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
2022-06-14 10:25:53 +03:00
Bernaldo Mihasi
9c4d246ef5
heading changes on export template
2022-06-14 10:24:35 +03:00
Konstantina Galouni
772a041851
WordBuilder.java: #7837 - In exported file add comment filed as ParagraphStyle.HTML instead of ParagraphStyle.COMMENT.
2022-06-14 10:14:48 +03:00
Bernaldo Mihasi
0ac5902bfd
1. export redesign based on new word template
...
2. orcid researchers in export are clickable
2022-06-13 15:16:48 +03:00
Bernaldo Mihasi
73be5d9a98
1. export redesign: multiplicity #ref 7834, multiple select #ref 7836
...
2. fix bug in license api export
2022-06-08 16:27:47 +03:00
Bernaldo Mihasi
3433f58506
Add ssl support for elasticsearch
2022-06-08 16:23:49 +03:00
George Kalampokis
0235406246
Improve image caption styling
2022-06-07 14:52:48 +03:00
George Kalampokis
7985b13cca
Add image caption on Word/Pdf export
2022-06-07 13:10:06 +03:00
George Kalampokis
54c5017609
Add Export attribute on Dataset Profile's Field. By Default is set to true. The attribute determines if the field value will be included in the word/pdf export
2022-06-07 11:00:13 +03:00
George Kalampokis
5cd79a6368
When Exporting DMP to word/pdf sort it's Datasets based on creation date
2022-06-07 10:56:44 +03:00
George Kalampokis
ea8407eece
Fix critical issue when uploading Dataset Template
2022-06-07 10:33:37 +03:00
Diamantis Tziotzios
91566c9710
Merge branch 'saml2' into Development
2022-06-01 10:45:19 +03:00
Konstantina Galouni
79bc95b099
[Bug fix] DatasetProfileManager.java: In method "createNewVersionDatasetProfile()", do not set label and language from oldDatasetProfile.
2022-05-31 16:51:59 +03:00
George Kalampokis
e8a87765ee
Fix authorization issue with Dataset Templates not showing to their original creators (that are not Admins)
2022-05-31 16:14:25 +03:00
03f7afede8
update openaire publication API to accept DOI query
2022-05-30 16:15:16 +03:00
George Kalampokis
11b0db21ac
Reconfigure Zenodo prefilling query in order to query doi and conceptdoi alongside the title (ref #7802 )
2022-05-30 11:59:49 +03:00
George Kalampokis
757b1f70e8
Change default filterType to remote (ref #7799 & #7800 )
2022-05-26 15:03:45 +03:00
George Kalampokis
66511d2ed6
Further stability improvement over external urls query
2022-05-25 18:06:54 +03:00
George Kalampokis
0f4b209427
Add {query} field for external urls with configurable queries and make ORCID query more strict (similar to orcid's website) (ref #7798 )
2022-05-25 17:37:20 +03:00
George Kalampokis
3aff6ac90e
Allow to update Dataset Templates by uploading dataset Template .xml files (ref #7793 )
2022-05-25 14:50:00 +03:00
Bernaldo Mihasi
ff6d068ddd
sign artifact resolve-code + post binding
2022-05-25 10:30:59 +03:00
George Kalampokis
912a3cc095
Order datasets on DMP listing (ref #7746 )
2022-05-11 18:13:35 +03:00
Bernaldo Mihasi
6c36253f09
artifact binding + decryption of assertion
2022-05-11 10:38:10 +03:00
Bernaldo Mihasi
cfd0707f2a
bug fix: license api-fields didnt get prefilled
2022-05-04 11:11:25 +03:00
Bernaldo Mihasi
8ac8f9588c
#7680 : Support SAML Authentication
2022-04-28 12:03:01 +03:00
George Kalampokis
7c933d9f32
Refactor Zenodo deposit creation. Add model for mapping instead of relying on stringBuilder
2022-04-07 17:31:45 +03:00
George Kalampokis
e373baee7e
Fix critical issue when importing from xml with researchers
2022-04-07 17:31:44 +03:00
George Kalampokis
2a12f1b5be
Change Dataset sorting on DMP overview and editor from last modified to last created
2022-04-05 15:29:36 +03:00
George Kalampokis
ef6e3b8d7c
Sort Datasets by Modified date on DMP Overview and DMP Editor
2022-04-01 13:54:13 +03:00
Bernaldo Mihasi
7cfedf24a2
add missing enums to render styles
2022-03-31 17:49:33 +03:00
Bernaldo Mihasi
db8f10ac1e
fix issue with upload field in xml export
2022-03-31 17:02:27 +03:00
George Kalampokis
afb0be5b18
Make DMP export to be more consistent with the DMP shown on the front end UI
2022-03-29 15:13:58 +03:00
George Kalampokis
c41c89774b
Make Dataset Validation checker to no longer be exception depedant
2022-03-29 15:13:58 +03:00
George Kalampokis
3eb27c04f6
Fix critical issue with xml import
2022-03-29 11:32:52 +03:00
George Kalampokis
72507dd1b8
Fix issue with DMP json export if it have been imported from json
2022-03-29 10:57:06 +03:00
35ea0b5d6c
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
2022-03-29 10:32:39 +03:00
Konstantina Galouni
650e0ceb06
#7636 : [Bug fix] Copy dataset from latest activity or dataset listing: Reverting some changes from commit:b6c28be3b3
...
1. DatasetListingModel.java: Added field DatasetProfileOverviewModel profile, getter/setter and set profile in methods "fromDataModel()" and "toDataModel()".
2. RecentActivityModel.java: Added field DatasetProfileOverviewModel profile and getter/setter.
3. RecentDatasetModel.java: Set profile in methods "fromEntity()" and "fromDmpEntity()".
2022-03-28 17:02:57 +03:00
Bernaldo Mihasi
78895a1df1
no message
2022-03-24 09:43:13 +02:00
62b60b93a8
URLConfiguration add FilterType. When filterType is "local" the filtering is applied in argos backend - not throught the API
2022-03-23 16:03:42 +02:00
George Kalampokis
864b4bfec8
Make rda mapping more lax
2022-03-22 16:40:51 +02:00
Bernaldo Mihasi
116f9b99ea
fix tags - distribution_format word export
2022-03-22 14:03:22 +02:00
Konstantina Galouni
8734d7c1ba
#7528 : Fixes in exporting images to document.
...
WordBuilder.java: Use media types instead of file extension for IMAGE_TYPE_MAP | Calculate image dimensions inside document according to its initial ratio and remove from page size the top, bottom, left, right margins.
2022-03-21 18:19:51 +02:00
Bernaldo Mihasi
ba55881830
image export: pixels to points
2022-03-18 16:55:41 +02:00
George Kalampokis
3101cf0e42
Optimize image export
2022-03-17 17:08:45 +02:00
Bernaldo Mihasi
65b4e58aad
attach images in word export
2022-03-17 10:47:50 +02:00
Konstantina Galouni
2a9d8b8296
#7528 : [NEW] Upload files field type.
...
1. Datasets.java: In "delete()" method, call also fileManager.markAllFilesOfEntityIdAsDeleted.
2. DatasetManager.java: Added method "deleteOldFilesAndAddNew()" which is called by "createOrUpdate()", to mark as deleted files that are not used any more and save the new ones.
3. DatabaseRepository.java & DatabaseRepositoryImpl.java: Include in DAOs FileUploadDAO.
4. ModelBuilder.java & ViewStyle.java: Incluse "upload" field type.
5. field-data.ts:
a. In "getOrdinal()" method return Integer instead of int.
b. In "getValidations()" method added null check.
c. In methods "fromJsonObject()" and "toMap()" added special if clauses for "upload" field type.
6. application.properties:
a. Added property "file.storage", to set the folder where the files will be permanently saved.
b. Changed default spring.servlet.multipart.max-file-size and pring.servlet.multipart.max-request-size to 10 MB.
7. UserInvitationController.java: Deleted a print in System.out.
8. New files for upload field type: FileUploadDao.java, FileUploadDaoImpl.java, FileUpload.java, PostgreSQLEnumType.java (necessary for the enum EntityType), FileController.java, FileManager.java, UploadData.java.
2022-03-16 12:14:08 +02:00
George Kalampokis
dc06ba9201
Allow to return DMP with no Datasets for the Dataset Editor
2022-03-15 17:58:01 +02:00
George Kalampokis
4e0402df95
Fix issue with prefilling Mapper and empty array values
2022-03-15 17:55:40 +02:00
George Kalampokis
563711eae4
Fix issue saving tags from template when the field is a textField
2022-03-15 17:52:58 +02:00
George Kalampokis
d3a1e85ba9
Fix issue with keeping non Admin users on Dataset Templates
2022-03-08 13:37:26 +02:00
George Kalampokis
56499223cf
Fix issue with Grant authentication
2022-03-02 17:51:41 +02:00
George Kalampokis
75fc8a1d13
Update some entities based on the Db configuration
2022-03-02 17:51:17 +02:00
George Kalampokis
608c4f3fc0
Add get Parent values on json Searcher
2022-03-02 10:56:28 +02:00
George Kalampokis
5ea8b9b964
Minor fix for visibility Rules Service
2022-03-01 17:14:02 +02:00
George Kalampokis
1e572b3214
Fix issue with prefilling mapping
2022-03-01 17:11:14 +02:00
George Kalampokis
ea72f64ed4
Replace DB DOIFunder with a json config file
2022-03-01 14:37:49 +02:00
George Kalampokis
c3aff92cd4
Don't include Funder if it's not in the Doi Funder Table
2022-02-28 16:28:31 +02:00
George Kalampokis
5a3f871c58
Remove various unnecessary info messages
2022-02-28 15:24:10 +02:00
George Kalampokis
93aa2d36e5
Fix another issue with login
2022-02-24 10:47:12 +02:00
George Kalampokis
69a94fa236
Make email nullable field
2022-02-23 12:02:03 +02:00
George Kalampokis
94a225cf9f
Add Description on Dataset Export
2022-02-22 16:39:35 +02:00
Bernaldo Mihasi
494ee47620
zenodo prefilling customizations
2022-02-22 15:53:25 +02:00
George Kalampokis
3c42ee3531
Improve tags pre-filling mapping
2022-02-22 14:15:51 +02:00
Bernaldo Mihasi
0bd08c2fac
fixed tag prefilling
2022-02-22 14:00:22 +02:00
George Kalampokis
817ee9b44d
Fixed ParsedTags
2022-02-22 13:39:52 +02:00
George Kalampokis
f6cb4a40d2
Generalized (again) dataset prefilling
2022-02-22 11:58:39 +02:00
George Kalampokis
d1eab0d019
Fix issue with not showing datasets on all version listing
2022-02-22 11:30:22 +02:00
George Kalampokis
4bdb27fcef
Merge remote-tracking branch 'origin/Development' into Development
2022-02-21 17:48:52 +02:00
George Kalampokis
ad8239ca5e
Improve if statement on Prefilling Mapping
2022-02-21 17:48:40 +02:00
Bernaldo Mihasi
1a43c28496
add more prefilled fields
2022-02-21 17:38:16 +02:00
George Kalampokis
b6c28be3b3
Optimize Dashboard's recent activity logic, removed various unused fields from Listing Models and implement toDataModel conversion logic in some models
2022-02-21 17:16:32 +02:00
George Kalampokis
71b1010ea1
Merge remote-tracking branch 'origin/Development' into Development
2022-02-18 17:52:04 +02:00
George Kalampokis
d16e130dc6
Optimize general metric counter
2022-02-18 17:51:57 +02:00
George Kalampokis
11ff99fd77
Improve and generalize prefilling logic
2022-02-18 17:51:32 +02:00
3aa1c1ae59
fix issue with pub api #7326#note-5 the value was a number instaed of search
2022-02-18 17:41:33 +02:00
cc926970ca
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
...
Conflicts:
dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts
2022-02-18 17:09:34 +02:00
Bernaldo Mihasi
da5ba952e1
rda export import tag bug, format preffiling fixed
2022-02-17 10:11:34 +02:00
Bernaldo Mihasi
bf77a85acb
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
2022-02-11 13:11:40 +02:00
Bernaldo Mihasi
eedcf0dfb0
fix freetext-format bug in prefilling temporarily
2022-02-11 13:09:29 +02:00
George Kalampokis
fac6a93c0a
Fix minor worldBuilder issue and a minor refactor
2022-02-10 13:21:21 +02:00
George Kalampokis
4740fbe8e0
Refactor visibilityRuleService
2022-02-09 15:23:16 +02:00
Konstantinos Triantafyllou
26e10b1299
Add URL Validator type in validators. Free Text can have URL validator.
2022-02-08 14:31:36 +02:00
Bernaldo Mihasi
80e5e12f29
fix export-import dataset missing rda mappings
2022-02-08 14:04:26 +02:00
Bernaldo Mihasi
815fc05af6
fix missing section titles from word export
2022-02-08 09:44:55 +02:00
Diamantis Tziotzios
14550e0536
visibility rule fix on word builder
2022-02-04 18:17:51 +02:00
Diamantis Tziotzios
2b71cddc39
Fix for word generator not merging multiple visibility rule results
2022-02-04 16:38:05 +02:00
938f98100f
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
2022-02-04 10:05:32 +02:00
Bernaldo Mihasi
048189952c
format prefilling fixes
2022-02-02 14:15:33 +02:00
George Kalampokis
eaa0c67177
Add multiplicity field on Sections
2022-01-31 11:15:23 +02:00
Diamantis Tziotzios
1c318ddff5
dataset templates metric renamed
2022-01-28 16:02:07 +02:00
Bernaldo Mihasi
125a97baed
keyword-tags exported-imported fixes, prefilling more mapping
2022-01-28 14:55:52 +02:00
George Kalampokis
70d37cead1
Fix wrong metrics count for Dataset Template
2022-01-27 11:05:40 +02:00
90b49194ac
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
2022-01-24 12:11:39 +02:00
George Kalampokis
01d32427c3
Add additional checks when generating world documents
2022-01-24 11:30:03 +02:00
George Kalampokis
f95a704787
Make remote fetcher's value normalization more type safe
2022-01-24 11:29:06 +02:00
a3c4b3c143
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
...
Conflicts:
dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcherUtils.java
2022-01-24 11:12:56 +02:00
858fa3ee71
#7326 - static APIs
...
1. Rename of "Registries" to "Metadata"
2. add apis for taxonomy, licenses, publications
3. change data repositories: from querying all registered to all of type data repository
4. add separate APIs for journals and pub repositories
2022-01-21 15:44:51 +02:00
George Kalampokis
8f56b1874b
Add extra prefilling mapping fields and add better support for prefilling tags
2022-01-19 17:51:30 +02:00
George Kalampokis
ce386ac047
Refactor Remote Fetcher's json parser
2022-01-19 12:12:20 +02:00
Bernaldo Mihasi
61de8c4df0
dmp import fixes
2022-01-18 11:38:24 +02:00
George Kalampokis
64ec74363b
Merge remote-tracking branch 'origin/Development' into Development
2022-01-13 13:33:13 +02:00
George Kalampokis
5a70ce7602
Fix issue of not keeping dataset template users after version update
2022-01-13 13:26:30 +02:00
Bernaldo Mihasi
641088e289
Remove local configs, commited by mistake
2022-01-12 16:31:07 +02:00
dc1f59d8b5
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
2022-01-12 14:11:18 +02:00
9d5d685ad6
ethical_issues added to DatasetRDAMapper, minor fixes to dmp docx export
2022-01-12 14:10:00 +02:00
George Kalampokis
91f98a8759
Rename sample tag
2022-01-12 11:45:57 +02:00
George Kalampokis
db01f2d119
Add fixedMappings for prefilling
2022-01-12 11:43:32 +02:00
George Kalampokis
1d68b2a379
Minor improvement for dataset prefilling
2022-01-07 18:06:19 +02:00
16c124cc3d
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetIdRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DistributionRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/KeywordRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/LicenseRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/SecurityAndPrivacyRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/TechnicalResourceRDAMapper.java
2021-12-30 11:28:15 +02:00
e675ad7c9d
madmp changes
2021-12-29 15:24:46 +02:00
Konstantinos Triantafyllou
c8b388b546
1. Change configuration of Zenodo to production.
...
2. Add default multiplicity placeholder and remove tooltip
3. Disable reordering of fields if template is finalized.
4. Create Dataset Wizard: Add prefilling functionality
2021-12-22 15:59:58 +02:00
George Kalampokis
814a9b2fee
Fix bad RDA Common Standard name and minor RDA mapper improvement
2021-12-20 14:19:17 +02:00
George Kalampokis
209b180158
Add missing file
2021-12-17 16:36:47 +02:00
George Kalampokis
22d3d131cc
Even more improvements to RDA mapping (partial contribution by M.Aldo) and fixed issue with RDA Additional Options
2021-12-17 16:21:32 +02:00
George Kalampokis
eb7d0d04fc
Even more improvements to RDA mapping (partial contribution by M.Aldo)
2021-12-17 12:59:10 +02:00
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
ba8bae1a88
Update some maven dependencies
2021-12-14 12:09:15 +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
78688420d2
Fix minor issue with elastic date parsing
2021-12-09 15:11:07 +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
e8d71a8f66
Add additional null check
2021-11-23 11:44:50 +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
8e2fea2ea0
Merge remote-tracking branch 'origin/Development' into Development
2021-10-20 12:42:21 +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
35c4ec821e
Add a special query logic with group by and count
2021-10-20 12:40:44 +03:00
Diamantis Tziotzios
c3f28936af
Dockerfile update
2021-10-13 18:47:41 +03:00
Diamantis Tziotzios
887789d9e5
Dockerfiile update
2021-10-13 18:17:53 +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
1d48ee81b9
Add additional null check for Elastic's Dmp Repository
2021-10-08 11:18:22 +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
bfbc271b56
Fix elastic dataset consistency (impacts memory)
2021-08-24 17:05:28 +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
ce8b49deb0
Fix issue with DMP disappearing when editing Datasets
2021-08-03 12:15:54 +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
1eb9aadaea
IGNORE ME
2021-06-15 11:25:11 +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
a155f2cbec
Allow to search organizations based on reference
2021-04-30 15:25:31 +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
a28e26e594
Allow to query using exact reference
2021-04-29 11:58:03 +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
Diamantis Tziotzios
f30392864c
ci updates
2020-12-16 14:19:58 +02:00
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
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
Diamantis Tziotzios
28feacc7ef
CI Update
2020-09-24 17:25:08 +03:00
Diamantis Tziotzios
fe05ac9770
jenkins files
2020-09-24 17:20:33 +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
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
Efstratios Giannopoulos
amentis
Thomas Georgios Giannos
Diamantis Tziotzios
Bernaldo Mihasi
Konstantina Galouni
Konstantinos Triantafyllou
argirok
DESKTOP-4ES9U2E\aldom
Kristian Ntavidi
apapachristou
gpapavgeri