Thomas Georgios Giannos
693f1dba7f
Fetching and building grants for dmps for public API
2023-11-28 15:52:17 +02:00
Efstratios Giannopoulos
1b92af8762
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-11-28 15:09:01 +02:00
Efstratios Giannopoulos
75d31cf627
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
2023-11-28 15:07:41 +02:00
Efstratios Giannopoulos
c5461dbc62
add storage service
2023-11-28 15:05:58 +02:00
Thomas Georgios Giannos
df2086a0a7
Fetching and building researchers for dmps for public API
2023-11-28 15:05:51 +02:00
Thomas Georgios Giannos
92956f6598
Fetching and building users for dmps for public API
2023-11-28 14:25:29 +02:00
Thomas Georgios Giannos
0166bf8ece
Refactoring and preparing for dmp and dataset conversion for public API
2023-11-28 12:54:08 +02:00
61218ed220
add Language entity and UI
2023-11-27 18:22:13 +02:00
Thomas Georgios Giannos
6fb601929a
Migrating everything is needed for the public api refactor
2023-11-27 17:33:24 +02:00
Thomas Georgios Giannos
c3bb9b8ffa
Entities cleanup
2023-11-27 14:46:30 +02:00
Diamantis Tziotzios
e6b22a5b27
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-11-24 18:42:32 +02:00
Diamantis Tziotzios
396c6e5b95
more frontend changes
2023-11-24 18:42:23 +02:00
Efstratios Giannopoulos
aa0a86b4d1
migration changes
2023-11-24 18:19:22 +02:00
Efstratios Giannopoulos
c67e4c8c9f
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpDatasetProfileMigrationService.java
# dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/migration/MigrationController.java
2023-11-24 17:26:18 +02:00
Efstratios Giannopoulos
c6f10b6a29
add user contact migration
2023-11-24 17:18:28 +02:00
Thomas Georgios Giannos
8ee149f094
Fixing duplicate selection from DmpDescriptionTemplates
2023-11-24 16:46:30 +02:00
d554e87093
add tenant config
2023-11-24 15:12:02 +02:00
Efstratios Giannopoulos
e698b198e7
add description template to description
2023-11-24 12:39:26 +02:00
Efstratios Giannopoulos
9433beaaa6
dmp migration changes
2023-11-23 14:40:44 +02:00
Thomas Georgios Giannos
2936cbbb7a
Adding dataset migration service
2023-11-23 10:26:40 +02:00
18452725bc
add Tenant Entity
2023-11-22 18:01:58 +02:00
4187943654
add reference type auth enabled
2023-11-22 12:56:17 +02:00
Efstratios Giannopoulos
8536d8d03a
dmp changes
2023-11-21 14:26:14 +02:00
Efstratios Giannopoulos
f92b0c238a
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-11-21 13:16:50 +02:00
Efstratios Giannopoulos
91af36cdcd
config updates
2023-11-21 13:16:33 +02:00
Efstratios Giannopoulos
c0e57b363d
elastic manage service
2023-11-21 13:15:31 +02:00
e1985368aa
add dependencies to reference type source base
2023-11-21 12:51:26 +02:00
Efstratios Giannopoulos
e62d765796
code clean up
2023-11-21 12:15:29 +02:00
Efstratios Giannopoulos
64d92e864d
user clean up
2023-11-21 11:49:15 +02:00
Thomas Georgios Giannos
eb9ae3af48
Allignment with core changes
2023-11-21 10:00:18 +02:00
Thomas Georgios Giannos
4d01463c72
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
2023-11-20 17:14:54 +02:00
Thomas Georgios Giannos
caf7ec09c4
Adding converter for Instants to Dates
2023-11-20 17:11:57 +02:00
Efstratios Giannopoulos
6de7268465
user changes
2023-11-20 17:09:24 +02:00
Efstratios Giannopoulos
3b3dc6fffd
sync db tables for description
2023-11-20 17:08:43 +02:00
Thomas Georgios Giannos
3a033a655b
Fixing issues, resolving column naming conflicts between old and new entity classes
2023-11-20 16:44:55 +02:00
Efstratios Giannopoulos
91f7dbd785
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-11-17 19:02:02 +02:00
Efstratios Giannopoulos
a97976296b
user refactor
2023-11-17 19:01:44 +02:00
Thomas Georgios Giannos
6e65d22fce
Adding new version of dmp-migration-tool to resolve java version issues, moving previous to 'old' folder to delete later
2023-11-16 17:25:22 +02:00
f2ee851bab
reference type persist and editor
2023-11-16 15:40:25 +02:00
Efstratios Giannopoulos
dec8f6354c
remove old data entities
2023-11-16 14:01:39 +02:00
Efstratios Giannopoulos
7c8b385146
add elastic dev config
2023-11-16 10:43:41 +02:00
Efstratios Giannopoulos
6c49b7e7c2
description persist
2023-11-15 17:06:49 +02:00
e9ae5126f8
fix reference type persist and editor
2023-11-15 16:09:24 +02:00
Efstratios Giannopoulos
5cfdc4be07
elastic changes
2023-11-15 14:34:48 +02:00
Efstratios Giannopoulos
332ee8c59e
add version status to dmp, description template
2023-11-14 18:18:20 +02:00
Efstratios Giannopoulos
e103f40763
change queryable dependencies
2023-11-14 16:27:46 +02:00
Efstratios Giannopoulos
0e1408e532
add public description
2023-11-14 16:08:48 +02:00
Efstratios Giannopoulos
1324029804
remove old elastic
2023-11-14 13:41:57 +02:00
Efstratios Giannopoulos
f0264eefb9
elastic changes
2023-11-14 12:24:14 +02:00
Thomas Georgios Giannos
34ce4f6928
Adding export on dmp service and controller (existing service not yet wired up)
2023-11-14 11:44:01 +02:00
Thomas Georgios Giannos
d50a058296
Small fix
2023-11-13 17:05:25 +02:00
Thomas Georgios Giannos
5edaf1c74e
Adding dmp user association, adding finalization status check on persist workflow
2023-11-13 16:46:35 +02:00
Thomas Georgios Giannos
ff35ad6aab
Renames on 'datas'
2023-11-13 09:39:31 +02:00
Thomas Georgios Giannos
1cee5fb49f
Various fixes
2023-11-10 19:11:15 +02:00
Thomas Georgios Giannos
0c4cf467d8
Adding description cloning method on service, adding missing functionality on dmp new-version and cloning, dmp persist fix
2023-11-10 16:13:55 +02:00
c2c1d834cc
fix reference type persist and editor
2023-11-10 13:03:08 +02:00
3ecb1ed982
rename reference type definition fields and fix listing
2023-11-09 18:25:35 +02:00
Thomas Georgios Giannos
009dad8cba
Adding clone dmp persist model, exposing new version and clone methods to the API
2023-11-09 14:10:32 +02:00
Efstratios Giannopoulos
41fc3407eb
description refactor
2023-11-09 11:29:42 +02:00
Efstratios Giannopoulos
7ef668eede
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/query/DmpUserQuery.java
2023-11-08 18:45:01 +02:00
Efstratios Giannopoulos
c1b9e72c2f
query authz first implementation
2023-11-08 18:42:52 +02:00
Thomas Georgios Giannos
dab5986688
Adding new version dmp persist model, moving associated users and references to new dmp with new version
2023-11-08 17:13:07 +02:00
Efstratios Giannopoulos
0bbad595f5
update logging, db configurations
2023-11-08 13:37:16 +02:00
Thomas Georgios Giannos
e22ba13caf
Adding user as owner on new dmp persist
2023-11-08 11:45:33 +02:00
Efstratios Giannopoulos
e81e6dd89a
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
...
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBuilder.java
2023-11-07 17:08:44 +02:00
Efstratios Giannopoulos
8cd8da6d98
add public models
2023-11-07 17:07:24 +02:00
Thomas Georgios Giannos
24aba556ef
Small fix
2023-11-07 16:34:26 +02:00
Thomas Georgios Giannos
3e15749b56
Added dmp users on dmp builder
2023-11-07 16:18:18 +02:00
Thomas Georgios Giannos
4e99fb08e9
merge
2023-11-07 16:12:54 +02:00
Thomas Georgios Giannos
0e6a59ef3d
Added dmp users on dmp builder
2023-11-07 16:05:12 +02:00
Efstratios Giannopoulos
0644e61962
description refactor
2023-11-07 14:53:36 +02:00
Thomas Georgios Giannos
4a8c3640de
Added dmp user censor
2023-11-07 14:44:26 +02:00
Thomas Georgios Giannos
001cd0828b
Added dmp description template deletions on description template deleter
2023-11-07 14:32:37 +02:00
cfb7da7968
fix referenceTypePersist
2023-11-07 14:02:28 +02:00
5001968da7
fix issue
2023-11-07 13:18:17 +02:00
88bf760165
create referenceType entity
2023-11-07 13:15:25 +02:00
Efstratios Giannopoulos
df5ae4a278
description refactor
2023-11-07 13:11:21 +02:00
Efstratios Giannopoulos
ac8d36d1d5
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-11-07 12:37:02 +02:00
Efstratios Giannopoulos
1469e22185
description refactor
2023-11-07 12:36:36 +02:00
Thomas Georgios Giannos
f878601609
Added missing converter annotations on entity enums
2023-11-07 12:28:40 +02:00
Thomas Georgios Giannos
ee68224f58
Added DmpUser table and stack
2023-11-07 12:12:14 +02:00
Thomas Georgios Giannos
ea58ed2e44
Fix on entity doi entity id, removed reference on Dmps, fix on dmp reference query
2023-11-07 11:09:54 +02:00
Efstratios Giannopoulos
05f73889be
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
2023-11-07 10:32:02 +02:00
Efstratios Giannopoulos
662c5ad7e8
description refactor
2023-11-07 10:29:27 +02:00
Diamantis Tziotzios
a9eb2b4513
fix backend build error
2023-11-07 10:02:09 +02:00
George Kalampokis
1ef613c87e
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
2023-11-06 17:43:24 +02:00
George Kalampokis
9e27558df7
Update some of the queries in the new Deposit mapper
2023-11-06 17:43:20 +02:00
Thomas Georgios Giannos
d3cd37d57a
Fix on dmp persist
2023-11-06 17:43:03 +02:00
Thomas Georgios Giannos
a5f46e9328
Adding description templates on dmp persist
2023-11-06 17:42:12 +02:00
George Kalampokis
49e34f9abc
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
2023-11-06 17:25:00 +02:00
George Kalampokis
5ceed08b9c
Add missing apply filter
2023-11-06 17:22:36 +02:00
Efstratios Giannopoulos
20873ca13e
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/Admin.java
2023-11-06 17:17:34 +02:00
Efstratios Giannopoulos
87e22040c5
description template migration
2023-11-06 17:16:55 +02:00
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
Thomas Georgios Giannos
Efstratios Giannopoulos
amentis
Diamantis Tziotzios
George Kalampokis
Bernaldo Mihasi
Konstantina Galouni
Konstantinos Triantafyllou
argirok