Commit Graph

1320 Commits

Author SHA1 Message Date
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
amentis 11bb1a3c8c create Supportive Material query public 2023-11-06 15:25:04 +02:00
amentis fda8fcef2c create Supportive Material Entity, (persist in progress) 2023-11-03 18:09:19 +02:00
George Kalampokis 7bb8e850e8 Add first implementation of the new Repository Deposit Service 2023-11-03 17:54:26 +02:00
Efstratios Giannopoulos 08caf64d02 DescriptionTemplate refactor 2023-11-03 14:53:10 +02:00
amentis 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
Efstratios Giannopoulos 732dfd9bfb DmpBlueprint feractor 2023-11-02 14:13:13 +02:00
Efstratios Giannopoulos ac15e33a87 DescriptionTemplate refactor 2023-11-01 18:12:59 +02:00
Efstratios Giannopoulos 4e08d9f073 DescriptionTemplate refactor 2023-11-01 12:03:23 +02:00
amentis 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
amentis f744573f02 add reference search builders, lookup 2023-10-30 17:15:40 +02:00
Efstratios Giannopoulos c06253bb20 DescriptionTemplate refactor 2023-10-30 15:07:59 +02:00
amentis a0ac8df5ba rename sourceType 2023-10-30 10:43:50 +02: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
amentis 9d3cc9e3d2 rename sourceType to referenceSourceType 2023-10-27 18:29:06 +03:00
amentis 92c165e904 add references definition xml,builder, persist 2023-10-27 17:35:35 +03:00
amentis aecac1995d rename External Reference to Reference 2023-10-26 14:38:18 +03:00
amentis bbb21fadba rename External Reference to Reference 2023-10-26 12:07:04 +03:00
amentis 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
Efstratios Giannopoulos de566729f1 DmpBlueprint refactor 2023-10-24 18:00:11 +03:00
Efstratios Giannopoulos 167d3d4a4b DmpBlueprint refactor 2023-10-23 18:13:34 +03:00
amentis 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
Diamantis Tziotzios 6a8cb2c853 more frontend dmp blueprint listing changes 2023-10-23 11:58:15 +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
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
amentis 0bd3ff6898 fix external references enums 2023-10-20 17:44:41 +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
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
amentis 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
amentis 5203ec4b72 fix remote fetcher 2023-10-18 13:53:52 +03:00
Thomas Georgios Giannos b7d22b5b07 Moving existing entities from Data module to Core module 2023-10-18 13:04:53 +03:00
amentis 1cda821d9c fix issue 2023-10-18 13:00:17 +03:00
amentis ad91234fd9 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2023-10-18 12:28:13 +03:00
amentis 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
amentis 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
amentis f67ada842e commit 2023-10-18 10:31:57 +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 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
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
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 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 0b901205ee Adding auditing, naming convention change in API endpoints for description types 2023-10-06 12:13:09 +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 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 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 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 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 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
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 030f1ccf8e add repository logo 2023-01-17 14:41:04 +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 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 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
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
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
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
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
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
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
argirok 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
argirok 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