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
Efstratios Giannopoulos
amentis
Thomas Georgios Giannos
George Kalampokis
Diamantis Tziotzios
Bernaldo Mihasi
Konstantina Galouni