Commit Graph

812 Commits

Author SHA1 Message Date
George Kalampokis d1df83f689 Add query db fallback for DMPs 2021-06-25 19:27:02 +03:00
George Kalampokis 4a4042d621 Fix various library issues with postgres and elastic 2021-06-25 12:32:58 +03:00
George Kalampokis a48ac5fa0f When exporting external dataset fields, export and it's type 2021-06-23 17:29:45 +03:00
George Kalampokis 11b4d462cf Add type to External Datasets Data 2021-06-22 18:29:58 +03:00
George Kalampokis 42a22b4a65 Improve external researcher support 2021-06-17 18:48:18 +03:00
George Kalampokis 885f897adc Fix issue when updating researchers from DMP 2021-06-17 18:01:47 +03:00
George Kalampokis e94944abb1 Merge remote-tracking branch 'origin/Development' into Development 2021-06-17 13:58:36 +03:00
George Kalampokis 78186fb96d If the invitation is accepted then send the user to the accepted DMP if the user click again the link from the email 2021-06-17 13:58:28 +03:00
Diamantis Tziotzios 6c6cc061fc Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2021-06-15 15:43:56 +03:00
Diamantis Tziotzios d3d6c4a6aa prometheus fix 2021-06-15 15:43:45 +03:00
George Kalampokis c193dd2c09 Fix numbering issue with word and PDF export 2021-06-14 18:01:29 +03:00
George Kalampokis e615c403d3 Final fix over storing array of data from Datasets 2021-06-14 18:01:04 +03:00
George Kalampokis dcf88479bd Allow to store and retrieve combobox multivalues with commas 2021-06-14 14:21:27 +03:00
George Kalampokis be311f238b Add visibility rules checkup on dataset finalize checkup 2021-06-01 12:30:01 +03:00
George Kalampokis 8a5f9d3536 Add support for nested sections 2021-05-18 13:45:41 +03:00
George Kalampokis b76a787972 Hide grants without any active dmp 2021-05-10 17:17:08 +03:00
George Kalampokis 95f8eb15c9 Even more fixes for imports and exports 2021-05-10 16:55:44 +03:00
George Kalampokis 6f658db27f Fix issues with import and export of dataset template 2021-05-10 16:10:18 +03:00
George Kalampokis 1d5befaf6a Add new endpoint in order to validate datasets 2021-05-10 13:40:08 +03:00
George Kalampokis 15c3a6fcb5 Export properly the data for each field type on dataset templates 2021-05-07 14:38:21 +03:00
George Kalampokis af432cf329 Fixed issue with multiplicity fields 2021-05-06 18:58:55 +03:00
Diamantis Tziotzios ae2168b2d7 bug fix regarding template import 2021-05-05 11:20:43 +03:00
George Kalampokis fe8a0ff109 Fix vaious issues with organizations 2021-04-30 14:45:00 +03:00
George Kalampokis 8a7cfab3b8 Fix various issues 2021-04-30 13:10:11 +03:00
George Kalampokis cdae5ae574 Fix minor issues when creating a researcher 2021-04-30 11:08:06 +03:00
George Kalampokis df5281eeaa Allow to manually add reference 2021-04-29 11:28:46 +03:00
George Kalampokis 77bcb95ad7 Fix issues when cloning dataset templates 2021-04-27 10:38:20 +03:00
George Kalampokis e5264780c3 When finalize DMP properly finalize it's datasets first 2021-04-21 18:21:52 +03:00
Diamantis Tziotzios ede8bbf48e metrics update 2021-04-15 18:30:16 +03:00
George Kalampokis 961a4df270 Add total Users metric 2021-04-13 12:19:55 +03:00
George Kalampokis 3d9a2b2331 Fix various issues with various template fields 2021-04-13 10:46:06 +03:00
George Kalampokis 48730e7937 Fix issue when accessing dataset profile users when there are no users. 2021-04-12 12:12:21 +03:00
George Kalampokis c27ff1d446 Add missing metrics counters and made the metrics init task scheduled (per Hour) (ref #294) 2021-04-12 12:00:07 +03:00
George Kalampokis 27bf69268e Fix issue when creating new dataset profile 2021-04-12 10:49:22 +03:00
George Kalampokis aca31dc9da Add prometheus integration (ref #294) 2021-04-09 19:05:04 +03:00
George Kalampokis c57820d6b1 Remove "External References" from docx generation 2021-04-08 16:48:14 +03:00
George Kalampokis 4156875bae Refactor and add logic for removing users from Dataset Templates 2021-04-07 19:08:57 +03:00
George Kalampokis bc3c8b44d2 Add option to add or remove users from Dataset Templates 2021-04-07 19:03:22 +03:00
George Kalampokis af04e34b6f Add new User Role Dataset Template Editor. 2021-04-06 19:03:00 +03:00
George Kalampokis c929eb3a2b When uploading to zenodo upload both pdf and the RDA json files 2021-04-05 14:03:14 +03:00
George Kalampokis 5b930a6870 Export and Import Dataset Template description and language 2021-04-05 11:40:25 +03:00
George Kalampokis e88f88d97c Fix critical issue when creating comboboxes with the multiple selection untouched 2021-02-23 17:33:55 +02:00
George Kalampokis ca38f0b0a4 Make user guide multilingual 2020-12-10 11:34:01 +02:00
George Kalampokis 3b00b76f19 Add option to make static dataset profile fields with autocomplete to have multiple values 2020-12-09 17:51:30 +02:00
George Kalampokis c18e3f8e3c Add null check for additionalInfo to UserListingModel fromDataModel 2020-12-03 14:07:45 +02:00
George Kalampokis d6970cc49a Add avatarUrl on UserListingModel 2020-12-02 14:19:43 +02:00
George Kalampokis fcd24fd907 Add community when depositing to zenodo (ARGOS). 2020-11-23 18:16:32 +02:00
George Kalampokis 66358acfcf Replace the openDMP Affiliation on Zenodo with either a configurable
affiliation or the related organizations of the DMP
2020-11-19 18:39:25 +02:00
George Kalampokis 1e0b828a48 Prevent to check deleted Datasets when checking which Dataset Templates are in use 2020-11-16 18:31:41 +02:00
George Kalampokis a3d662aed1 Fix minor spelling mistake 2020-11-13 18:29:16 +02:00
George Kalampokis cbbfec2ccc Updated RDA Mapper's Cardinality check 2020-11-13 18:26:09 +02:00
George Kalampokis 0ad797d033 Revert last commit 2020-11-12 16:39:47 +02:00
George Kalampokis ffc140f84b When creating or updating Datasets return also the
DatasetProfileDefinition
2020-11-12 15:50:34 +02:00
George Kalampokis 7973e04090 Fix minor issue with identifier validation 2020-11-12 10:14:42 +02:00
George Kalampokis f5533e1b95 Prevent user to send merge request email to itself 2020-11-10 17:39:43 +02:00
George Kalampokis cda31be0bd Allow remote fetcher to retrieve data with POST requests and added a new
OpenAire repository source
2020-11-06 18:45:20 +02:00
George Kalampokis 2ff9b95fdf Made identifier validation field to work properly 2020-11-06 16:29:33 +02:00
George Kalampokis e061448830 Initial commit for the new Dataset Template Field (identifier
validation) part 2
2020-11-05 18:32:19 +02:00
George Kalampokis da9872576e Initial commit for the new Dataset Template Field (identifier validator) 2020-11-05 18:20:37 +02:00
George Kalampokis 70056bd0a9 Fix issue with login for new users 2020-11-04 16:52:10 +02:00
George Kalampokis df8af6e6cd Trim time on Dataset's modified time in order to match with the Database 2020-10-30 11:29:43 +02:00
George Kalampokis 2354d9bb5c When calling the createOrUpdate endpoint on the Dataset Controller,
return a DatasetWizardModel instead of the dataset's id
2020-10-29 17:12:59 +02:00
George Kalampokis 03da1f3f7b When merging users delete the remaining credentials of the user to be
merged
2020-10-29 12:08:09 +02:00
George Kalampokis c1d473f8d4 When merging users remove the email from the user to be merged 2020-10-29 11:54:15 +02:00
George Kalampokis 4c60b2bb06 When creating a new credential assign the user's email 2020-10-27 18:08:16 +02:00
George Kalampokis ff169ae806 Made User Merge logic functional 2020-10-27 18:06:58 +02:00
George Kalampokis 981eb48d89 Add email for Merge requests 2020-10-27 12:06:32 +02:00
George Kalampokis 2b89f646ee Fix emails that are sent with images 2020-10-27 12:01:18 +02:00
George Kalampokis 8c2ae8cf46 Add null check on the Organisation fromMap mapper 2020-10-26 18:03:07 +02:00
George Kalampokis 9674ec2b6b Add user merge related services and updates on existing services on the frontend 2020-10-26 10:36:20 +02:00
George Kalampokis e1212383ff Add expirimental logic for userMerge (+ some updates for DB) 2020-10-23 18:40:17 +03:00
George Kalampokis 56d6b12555 Add Organization and roleOrganization to the User Info. Also allow to
edit the user's name from the updateSettings
2020-10-23 11:48:27 +03:00
George Kalampokis b878bf9d8f Fix issue when importing from RDA and the predefined template(s) inside the json does not exist on the database 2020-10-13 11:05:01 +03:00
George Kalampokis a78044920a Fixed issues with elastic and last public version 2020-10-12 12:45:32 +03:00
George Kalampokis 78903bf930 Add the backend logic to export all users to .csv 2020-10-07 17:29:53 +03:00
George Kalampokis 7a3b4a18ca Fixed compile issues 2020-10-07 14:22:37 +03:00
Diamantis Tziotzios e65bce0f5a Merge branch 'ui-redesign' into Development
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
#	dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java
#	dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
2020-10-06 16:43:20 +03:00
George Kalampokis e2326e1070 Minor refactoring 2020-10-06 11:50:14 +03:00
apapachristou a1b067071a Backend: Fixes modified time check on save dmp without previous reload. Frontend: Adds dialog to proceed to dataset editor on "save & add dataset" 2020-10-06 11:21:15 +03:00
George Kalampokis ae03077795 Fixed various issues with the new externalUrls restTemplate 2020-10-05 16:21:42 +03:00
George Kalampokis c02157be8c Replace HttpUrlConnection with RestTemplate for the external Urls 2020-10-05 11:26:35 +03:00
George Kalampokis 674ce48b8b DMP's create or Update endpoint will return a DMP model 2020-10-01 18:54:01 +03:00
George Kalampokis 7b9ae7c91d Add support for Zenodo license autocomplete source 2020-10-01 16:08:32 +03:00
George Kalampokis b3be89fb88 Allow to invite others with just the email even if they don't have an
user
2020-09-29 12:41:47 +03:00
George Kalampokis 08271c88cb When getting just the email for invitation, find it's user and set it's
id to the invited user
2020-09-28 12:36:37 +03:00
George Kalampokis 9dd76a739d If RDA Export fail show properly an error message 2020-09-24 12:37:03 +03:00
George Kalampokis 9b403bb480 Create or update dataset endpoint will return the id of the
created/updated dataset
2020-09-17 13:34:44 +03:00
George Kalampokis 36b380e738 Check if the grant can be edited only when the grant is internal 2020-09-16 18:37:24 +03:00
George Kalampokis da7fc0def3 Fixed various issues with DMP imports and exports (mostly RDA) 2020-09-15 13:21:22 +03:00
George Kalampokis 4cc44814e2 Minor improvements to error checkups 2020-09-14 18:09:57 +03:00
George Kalampokis 7b800b2347 Fix multiList on xml export 2020-09-11 16:54:32 +03:00
George Kalampokis 2390a33a98 When uploading dataset template xmls delete the working directory copy of the file 2020-09-11 16:31:57 +03:00
George Kalampokis 7f83b0f19a Fixed minor issue with template import 2020-09-11 15:57:52 +03:00
George Kalampokis 88ea24d367 Fixed issues when retrieving data from external sources 2020-09-11 14:29:12 +03:00
George Kalampokis b66fe982f5 Update Tags field with multiple autocomplete like in the dataset editor 2020-09-11 14:27:53 +03:00
George Kalampokis b847389b96 Add ORCID source to all the profiles and replace the content type from xml to json 2020-09-11 12:07:49 +03:00
George Kalampokis aac277020a Add support for zenodo source on autocomplete combobox 2020-09-10 18:06:37 +03:00
George Kalampokis 5be674d07e Allow wordlist combobox type to have multiple values 2020-09-10 18:04:14 +03:00
George Kalampokis 13ac3634d6 Improve compatibility for openAire sources 2020-09-09 17:50:47 +03:00
George Kalampokis f0502b94df Change the tags on the dmp editor to a multiple auto select, that allow to create tags or use existing ones 2020-09-09 17:49:45 +03:00
George Kalampokis 2a53a0aa7d When showing researchers retrieved by ORCID source show also and their ORCID in parenthesis 2020-09-09 17:42:55 +03:00
George Kalampokis 7300e2fe85 When creating a DMP with datasets, add datasets after the DMP is created 2020-09-08 17:50:38 +03:00
George Kalampokis a706a9c8f6 Improve the retrieval of the datasetpagedefinition from the dmp api 2020-09-08 16:42:35 +03:00
George Kalampokis db0cee542c When creating or updating a DMP with datasets, check the datasets template validity from the datasets of the request and not from the ones in DB 2020-09-08 10:53:10 +03:00
George Kalampokis 1dbe320706 Improve expiredAt calculation 2020-09-07 18:15:52 +03:00
George Kalampokis 7dcf2a1ef1 Minor build fix 2020-09-04 17:09:24 +03:00
George Kalampokis d890763b41 Updated The DatasetWizardModel on the backend in order to be similar to it's front end counterpart 2020-09-04 17:00:34 +03:00
George Kalampokis 072a1c8a18 Change the filename of the exported DMP (also affects DOI generation) (ref #288) 2020-09-03 18:08:53 +03:00
George Kalampokis e4713d60bd When creating a new version of a DMP return the Id of the new DMP 2020-09-03 17:57:14 +03:00
George Kalampokis f2613c4c87 When exporting to World and PDF with world list field return it's label instead of it's value (ref #287) 2020-09-03 10:50:28 +03:00
George Kalampokis fc7f8d4278 When exporting to World and PDF with world list field return it's label instead of it's value (ref #287) 2020-09-03 10:46:11 +03:00
George Kalampokis 8951b61b3b Return the id of the cloned dmp when calling the dmp/clone endpoint 2020-09-02 18:32:12 +03:00
George Kalampokis e1368e270a Update Zenodo's file API 2020-08-25 17:30:29 +03:00
George Kalampokis fa86258197 Fixed minor issue with Zenodo file names 2020-08-24 12:03:29 +03:00
George Kalampokis 4d249eeae4 Changed the file format when creating Zenodo Deposit 2020-08-24 10:49:50 +03:00
gpapavgeri b3b9de6979 Add researchers to dmp in DatasetOverviewModel 2020-08-06 11:14:42 +03:00
George Kalampokis edf64328d9 Fix parsing issues with auto complete 2020-08-03 17:01:06 +03:00
George Kalampokis 1c876cbcca RecentActivity can now be sorted by finalizedAt and publishedAt 2020-07-31 17:04:18 +03:00
George Kalampokis 83bd977484 If finalized Dataset has no finalized At date then use it's DMP finalized At date 2020-07-31 14:06:16 +03:00
George Kalampokis 5d44d8bf45 Fixed issue when finalizing datasets from the DMP Overview. 2020-07-31 14:04:49 +03:00
George Kalampokis feee5b49e9 Ditto 2020-07-31 13:34:01 +03:00
George Kalampokis 2faf1a0d78 When getting public paged Datasets, allow to set custom order 2020-07-31 13:33:32 +03:00
George Kalampokis f97546ff38 Add finalized RecentActivity sort function 2020-07-31 13:21:01 +03:00
George Kalampokis 168b634681 Fix minor authentication issue 2020-07-31 13:16:29 +03:00
George Kalampokis f86ba70d24 Fixed consistency issues with the public statistics 2020-07-31 12:20:29 +03:00
George Kalampokis 4b30d56d91 Fixed issue if dataset has no profile 2020-07-29 17:52:51 +03:00
George Kalampokis dc83a3a09c Fixed Various issues when creating or updating DMP with datasets 2020-07-28 17:35:55 +03:00
George Kalampokis eb8e4a96e6 Reworked Recent Activity ordering and force status to be ordered in reverse of the others 2020-07-27 18:16:32 +03:00
George Kalampokis 22493569fa Allow to create or update DMP and it's datasets with one endpoint (post full) 2020-07-27 13:09:30 +03:00
George Kalampokis 3b09bef7d5 Fixed minor issues with the elastic search on recent activity 2020-07-24 12:38:16 +03:00
George Kalampokis 9c9db0b646 Improve data integrity of recent Activity data retrieval and added elastic support to it 2020-07-24 12:12:54 +03:00
George Kalampokis b7b8e0b0e8 Change the profile from DatasetListingModel from String to DatasetProfileOverviewModel 2020-07-24 11:46:11 +03:00
George Kalampokis b0067f20b5 Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign 2020-07-24 10:50:34 +03:00
George Kalampokis db8debef86 RecentActivityModel will store profile as DatasetProfileOverviewModel instead of just string 2020-07-24 10:50:16 +03:00
gpapavgeri 762f873db1 Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign 2020-07-23 16:24:43 +03:00
George Kalampokis ac00b01943 Fixed various issues when creating world document and storing data to the elastic 2020-07-23 12:24:49 +03:00
George Kalampokis d1992b37c4 Fixed various issues when creating world document and storing data to the elastic 2020-07-23 12:01:37 +03:00
gpapavgeri 3d1b0adc6e add status to DmpOverviewModel used in DatasetOverviewModel 2020-07-22 17:46:21 +03:00
George Kalampokis 14df3a4bbe Add dataset filter like in getPaged on DataManagementPlanManager 2020-07-22 15:40:07 +03:00
George Kalampokis f3c1244600 Separate RecentActivityTableRequest's offset to dmp and dataset offset (backend) 2020-07-22 10:28:25 +03:00
George Kalampokis a60151560b Temporary removed async gets for datasets (TODO: make them async again) 2020-07-21 17:30:12 +03:00
George Kalampokis e6da46730b Improved Dataset error handling when retrieving data 2020-07-21 16:05:34 +03:00
George Kalampokis ac24143c0d Sanitize user output on frontend 2020-07-17 13:19:10 +03:00
George Kalampokis 4127a05da4 Add Email Field on Principal 2020-07-17 13:15:44 +03:00
George Kalampokis 69fc698866 Unified datasets and datasetWizard Controllers 2020-07-15 12:33:10 +03:00
George Kalampokis aa930f097a Fixed issue with DMPs that are having a user assigned multiple times 2020-07-10 16:30:44 +03:00
George Kalampokis 916557db0a Minor bugfix 2020-07-10 14:28:45 +03:00
George Kalampokis fcbb0dfdf8 Fixed invitation system and made it to check if a user is already invited to the DMP 2020-07-10 13:53:27 +03:00
George Kalampokis 9751d0fb78 Fixed issue with invitation properties 2020-07-10 12:36:47 +03:00
George Kalampokis caec63be38 Fixed issue when saving auto complete data 2020-07-10 12:36:01 +03:00