MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
3,625 Commits 37 Branches 247 Tags 110 MiB
Commit Graph

1441 Commits

Author SHA1 Message Date
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
George Kalampokis 563711eae4 Fix issue saving tags from template when the field is a textField 2022-03-15 17:52:58 +02:00
George Kalampokis d3a1e85ba9 Fix issue with keeping non Admin users on Dataset Templates 2022-03-08 13:37:26 +02:00
George Kalampokis 56499223cf Fix issue with Grant authentication 2022-03-02 17:51:41 +02:00
George Kalampokis 75fc8a1d13 Update some entities based on the Db configuration 2022-03-02 17:51:17 +02:00
George Kalampokis 608c4f3fc0 Add get Parent values on json Searcher 2022-03-02 10:56:28 +02:00
George Kalampokis 5ea8b9b964 Minor fix for visibility Rules Service 2022-03-01 17:14:02 +02:00
George Kalampokis 1e572b3214 Fix issue with prefilling mapping 2022-03-01 17:11:14 +02:00
George Kalampokis ea72f64ed4 Replace DB DOIFunder with a json config file 2022-03-01 14:37:49 +02:00
George Kalampokis c3aff92cd4 Don't include Funder if it's not in the Doi Funder Table 2022-02-28 16:28:31 +02:00
George Kalampokis 5a3f871c58 Remove various unnecessary info messages 2022-02-28 15:24:10 +02:00
George Kalampokis 93aa2d36e5 Fix another issue with login 2022-02-24 10:47:12 +02:00
George Kalampokis 69a94fa236 Make email nullable field 2022-02-23 12:02:03 +02:00
George Kalampokis 94a225cf9f Add Description on Dataset Export 2022-02-22 16:39:35 +02:00
Bernaldo Mihasi 494ee47620 zenodo prefilling customizations 2022-02-22 15:53:25 +02:00
George Kalampokis 3c42ee3531 Improve tags pre-filling mapping 2022-02-22 14:15:51 +02:00
Bernaldo Mihasi 0bd08c2fac fixed tag prefilling 2022-02-22 14:00:22 +02:00
George Kalampokis 817ee9b44d Fixed ParsedTags 2022-02-22 13:39:52 +02:00
George Kalampokis f6cb4a40d2 Generalized (again) dataset prefilling 2022-02-22 11:58:39 +02:00
George Kalampokis d1eab0d019 Fix issue with not showing datasets on all version listing 2022-02-22 11:30:22 +02:00
George Kalampokis 4bdb27fcef Merge remote-tracking branch 'origin/Development' into Development 2022-02-21 17:48:52 +02:00
George Kalampokis ad8239ca5e Improve if statement on Prefilling Mapping 2022-02-21 17:48:40 +02:00
Bernaldo Mihasi 1a43c28496 add more prefilled fields 2022-02-21 17:38:16 +02:00
George Kalampokis b6c28be3b3 Optimize Dashboard's recent activity logic, removed various unused fields from Listing Models and implement toDataModel conversion logic in some models 2022-02-21 17:16:32 +02:00
George Kalampokis 71b1010ea1 Merge remote-tracking branch 'origin/Development' into Development 2022-02-18 17:52:04 +02:00
George Kalampokis d16e130dc6 Optimize general metric counter 2022-02-18 17:51:57 +02:00
George Kalampokis 11ff99fd77 Improve and generalize prefilling logic 2022-02-18 17:51:32 +02:00
argirok 3aa1c1ae59 fix issue with pub api #7326#note-5 the value was a number instaed of search 2022-02-18 17:41:33 +02:00
argirok cc926970ca Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development 
 Conflicts:
	dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts
 2022-02-18 17:09:34 +02:00
Bernaldo Mihasi da5ba952e1 rda export import tag bug, format preffiling fixed 2022-02-17 10:11:34 +02:00
Bernaldo Mihasi bf77a85acb Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development 2022-02-11 13:11:40 +02:00
Bernaldo Mihasi eedcf0dfb0 fix freetext-format bug in prefilling temporarily 2022-02-11 13:09:29 +02:00
George Kalampokis fac6a93c0a Fix minor worldBuilder issue and a minor refactor 2022-02-10 13:21:21 +02:00
George Kalampokis 4740fbe8e0 Refactor visibilityRuleService 2022-02-09 15:23:16 +02:00
Konstantinos Triantafyllou 26e10b1299 Add URL Validator type in validators. Free Text can have URL validator. 2022-02-08 14:31:36 +02:00
Bernaldo Mihasi 80e5e12f29 fix export-import dataset missing rda mappings 2022-02-08 14:04:26 +02:00
Bernaldo Mihasi 815fc05af6 fix missing section titles from word export 2022-02-08 09:44:55 +02:00
Diamantis Tziotzios 14550e0536 visibility rule fix on word builder 2022-02-04 18:17:51 +02:00
Diamantis Tziotzios 2b71cddc39 Fix for word generator not merging multiple visibility rule results 2022-02-04 16:38:05 +02:00
argirok 938f98100f Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development 2022-02-04 10:05:32 +02:00
Bernaldo Mihasi 048189952c format prefilling fixes 2022-02-02 14:15:33 +02:00
George Kalampokis eaa0c67177 Add multiplicity field on Sections 2022-01-31 11:15:23 +02:00
Diamantis Tziotzios 1c318ddff5 dataset templates metric renamed 2022-01-28 16:02:07 +02:00
Bernaldo Mihasi 125a97baed keyword-tags exported-imported fixes, prefilling more mapping 2022-01-28 14:55:52 +02:00
George Kalampokis 70d37cead1 Fix wrong metrics count for Dataset Template 2022-01-27 11:05:40 +02:00
argirok 90b49194ac Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development 2022-01-24 12:11:39 +02:00
George Kalampokis 01d32427c3 Add additional checks when generating world documents 2022-01-24 11:30:03 +02:00
George Kalampokis f95a704787 Make remote fetcher's value normalization more type safe 2022-01-24 11:29:06 +02:00
argirok a3c4b3c143 Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development 
 Conflicts:
	dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcherUtils.java
 2022-01-24 11:12:56 +02:00
argirok 858fa3ee71 #7326 - static APIs 
1. Rename of "Registries" to "Metadata"
2. add apis for taxonomy, licenses, publications
3. change data repositories: from querying all registered to all of type data repository
4. add separate APIs for journals and pub repositories
 2022-01-21 15:44:51 +02:00
George Kalampokis 8f56b1874b Add extra prefilling mapping fields and add better support for prefilling tags 2022-01-19 17:51:30 +02:00
George Kalampokis ce386ac047 Refactor Remote Fetcher's json parser 2022-01-19 12:12:20 +02:00
Bernaldo Mihasi 61de8c4df0 dmp import fixes 2022-01-18 11:38:24 +02:00
George Kalampokis 64ec74363b Merge remote-tracking branch 'origin/Development' into Development 2022-01-13 13:33:13 +02:00
George Kalampokis 5a70ce7602 Fix issue of not keeping dataset template users after version update 2022-01-13 13:26:30 +02:00
Bernaldo Mihasi 641088e289 Remove local configs, commited by mistake 2022-01-12 16:31:07 +02:00
DESKTOP-4ES9U2E\aldom dc1f59d8b5 Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development 2022-01-12 14:11:18 +02:00
DESKTOP-4ES9U2E\aldom 9d5d685ad6 ethical_issues added to DatasetRDAMapper, minor fixes to dmp docx export 2022-01-12 14:10:00 +02:00
George Kalampokis 91f98a8759 Rename sample tag 2022-01-12 11:45:57 +02:00
George Kalampokis db01f2d119 Add fixedMappings for prefilling 2022-01-12 11:43:32 +02:00
George Kalampokis 1d68b2a379 Minor improvement for dataset prefilling 2022-01-07 18:06:19 +02:00
DESKTOP-4ES9U2E\aldom 16c124cc3d Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development 
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetIdRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DistributionRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/KeywordRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/LicenseRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/SecurityAndPrivacyRDAMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/TechnicalResourceRDAMapper.java
 2021-12-30 11:28:15 +02:00
DESKTOP-4ES9U2E\aldom e675ad7c9d madmp changes 2021-12-29 15:24:46 +02:00
Konstantinos Triantafyllou c8b388b546 1. Change configuration of Zenodo to production. 
2. Add default multiplicity placeholder and remove tooltip
3. Disable reordering of fields if template is finalized.
4. Create Dataset Wizard: Add prefilling functionality
 2021-12-22 15:59:58 +02:00
George Kalampokis 814a9b2fee Fix bad RDA Common Standard name and minor RDA mapper improvement 2021-12-20 14:19:17 +02:00
George Kalampokis 209b180158 Add missing file 2021-12-17 16:36:47 +02:00
George Kalampokis 22d3d131cc Even more improvements to RDA mapping (partial contribution by M.Aldo) and fixed issue with RDA Additional Options 2021-12-17 16:21:32 +02:00
George Kalampokis eb7d0d04fc Even more improvements to RDA mapping (partial contribution by M.Aldo) 2021-12-17 12:59:10 +02:00
George Kalampokis cff9af75c6 Merge remote-tracking branch 'origin/Development' into Development 2021-12-16 11:44:57 +02:00
George Kalampokis 316d0903c8 Improve RDA mapping (contributed by M.Aldo) 2021-12-16 11:44:34 +02:00
Konstantinos Triantafyllou feecac994d Merge remote-tracking branch 'origin/Development' into Development 2021-12-15 16:26:21 +02:00
Konstantinos Triantafyllou ade9b42d12 Add a placeholder field in multiplicity. (BackEnd) 
Add a placeholder input in editor for multiplicity add new field button.
 2021-12-15 16:26:06 +02:00
George Kalampokis 42c5dbb3b2 Make distribiution to parse as list 2021-12-14 18:05:10 +02:00
George Kalampokis 6964aa1d47 Fix minor typo 2021-12-14 17:07:00 +02:00
George Kalampokis ba8bae1a88 Update some maven dependencies 2021-12-14 12:09:15 +02:00
George Kalampokis a9e7ef1798 Rename prefilling get endpoint to generate 2021-12-10 16:07:00 +02:00
George Kalampokis 728ea9a24f Add prefilling backend endpoints 2021-12-10 15:37:39 +02:00
George Kalampokis 78688420d2 Fix minor issue with elastic date parsing 2021-12-09 15:11:07 +02:00
George Kalampokis 17b72cde60 Fix issue with time parsing 2021-12-08 16:42:16 +02:00
George Kalampokis 0a39e64f9a Merge remote-tracking branch 'origin/Development' into Development 2021-12-07 17:16:41 +02:00
George Kalampokis 33784f3ee2 Add missing null check up 2021-12-07 17:16:22 +02:00
Diamantis Tziotzios 2cb985c23c bug fix 2021-12-07 16:52:49 +02:00
Diamantis Tziotzios 197de17aa5 no message 2021-12-06 15:32:38 +02:00
George Kalampokis de4c430d91 Fix issue with related datasets on dashboard 2021-12-03 16:49:23 +02:00
George Kalampokis b2825c8369 Fix issue with parsing some custom auto complete sources 2021-12-02 18:03:31 +02:00
George Kalampokis e165259c81 Fix and improve remote fetcher caching 2021-11-29 17:26:29 +02:00
George Kalampokis 6ce7fec059 Fix critical issue with multiAutoComplete on autocomplete field types 2021-11-29 11:27:59 +02:00
George Kalampokis 19aa2bd411 Fix critical issue with public datasets 2021-11-25 16:45:29 +02:00
George Kalampokis aed23a655b When exporting DMP to xml or json get only the active/finalized datasets and not the deleted ones 2021-11-24 18:14:24 +02:00
George Kalampokis 8524bce2e0 Add support for the exported date format on wordBuilder 2021-11-24 16:41:01 +02:00
George Kalampokis fc71e95cf3 Make dataset queries to return distinct results (avoid duplicate Id issues) 2021-11-24 16:23:02 +02:00
George Kalampokis e546362f58 Fix issue with elasticsearch inconsistencies 2021-11-23 14:05:57 +02:00
George Kalampokis e8d71a8f66 Add additional null check 2021-11-23 11:44:50 +02:00
George Kalampokis 53e298f66a Fix issue with Dataset copy not working on the dataset listing 2021-11-23 11:30:08 +02:00
Konstantina Galouni bb0c398120 #7183: In DMP invitation, return authors whose name/ email contains the query string given by user (case insensitive). 
1. InvitationsManager.java:  Added method "getUsersWithCriteria()" to filter results according to "userInfoRequestItem.getCriteria().getLike()".
2. UserInvitationController.java: In method "getUsers()" added parameter "@RequestBody UserInfoRequestItem userInfoRequestItem" and call new method "invitationsManager.getUsersWithCriteria()" (instead of getUsers()).
 2021-11-22 13:44:41 +02:00
George Kalampokis c0599d5fed Fix issue of reloading externalUrls 2021-11-19 11:20:47 +02:00
George Kalampokis 38cd336bc9 Add transactional to makeFinalize on DMP and remove jackson parsing when depositing to zenodo 2021-11-18 18:27:20 +02:00
George Kalampokis 4eb15da95a Trim out hours from date picker export on xml and json(ref #7185) 2021-11-17 11:12:34 +02:00
George Kalampokis 4da99d6d83 Trim out hours from date picker export (ref #7185) 2021-11-17 10:30:31 +02:00
George Kalampokis cecc59eba6 Fix issue with file imports (ref #7184) 2021-11-16 15:55:32 +02:00
George Kalampokis 7820235258 Improve html type field exports 2021-11-09 17:44:47 +02:00
George Kalampokis 54b142000c Merge remote-tracking branch 'origin/Development' into Development 2021-11-09 14:23:30 +02:00
George Kalampokis 1a373bc6f8 Add email notification when a user is added to a Dataset Template (ref #7148) 2021-11-09 14:23:22 +02:00
Konstantina Galouni 71b8742b0f LicenseManager.java & LocalFetchManager.java & TagController.java: #7135: No case sensitivilty for licenses, managers and tags. 2021-11-09 14:17:46 +02:00
George Kalampokis a7badfd9d5 Add nexus prometheus metrics 2021-11-09 13:05:38 +02:00
George Kalampokis 58ecadd79b Fix issue with project creation 2021-11-09 10:19:20 +02:00
George Kalampokis db4d1006c6 Fix various issues with word/PDF export 2021-11-02 18:06:00 +02:00
George Kalampokis 39795f177f Fix critical issue with file exports on chromium based web browsers 2021-11-02 14:50:20 +02:00
Konstantina Galouni 7fefdd6aad Added rich text area field type for response in dataset > chapter > section > questions. 
1. RichTextAreaData.java: [NEW] file to extend FieldData.
2. ModelBuilder.java: Added case for richTextarea type.
3. ExportXmlBuilderDatasetProfile.java: Added case for RICH_TEXT_AREA.
4. ViewStyle.java: Define RICH_TEXT_AREA("richTextarea").
 2021-11-01 15:38:16 +02:00
George Kalampokis 6ff9ea2d05 When exporting to word/PDF HTML styled text, make <br> tag to be parsed once 2021-11-01 11:49:20 +02:00
George Kalampokis 0010ad846a When exporting to word/PDF HTML styled text, it will be preperly indented and it can read the change line character 2021-11-01 11:39:43 +02:00
George Kalampokis 5a66754cbd Make DMP language Mandatory and set default language to English 2021-10-29 15:08:58 +03:00
George Kalampokis fd26e2a742 Fix issue with DMP index not updating after a new user is invited 2021-10-27 18:16:44 +03:00
George Kalampokis 900a377d5f Fix critical issue with RDA Comoon Standard text load 2021-10-26 17:54:58 +03:00
George Kalampokis 93baa4a281 Add support for more html tags on the Document/PDF exporter 2021-10-26 16:21:28 +03:00
George Kalampokis 2c29469590 Allow to configure the path of the email templates (ref #7122) 2021-10-25 16:06:08 +03:00
George Kalampokis 8e2fea2ea0 Merge remote-tracking branch 'origin/Development' into Development 2021-10-20 12:42:21 +03:00
George Kalampokis e66362ec38 Add prometheus metric for the number of grants used based on DMP status (ref #6462) 2021-10-20 12:42:08 +03:00
George Kalampokis 35c4ec821e Add a special query logic with group by and count 2021-10-20 12:40:44 +03:00
Diamantis Tziotzios c3f28936af Dockerfile update 2021-10-13 18:47:41 +03:00
Diamantis Tziotzios 887789d9e5 Dockerfiile update 2021-10-13 18:17:53 +03:00
George Kalampokis 942782fe3c Use metrics predifined names instead of plain Strings 2021-10-13 17:49:32 +03:00
George Kalampokis d0d918682b Refactor remote fetcher and made it independent of sun libraries 2021-10-13 17:48:46 +03:00
George Kalampokis 65644c3a35 Add extra sanity checks 2021-10-13 17:47:50 +03:00
George Kalampokis a4fef8e462 Refactor PDF conversion 2021-10-12 18:17:16 +03:00
George Kalampokis 1a821179db Even more Fixes over dashboard's sorting 2021-10-12 18:06:14 +03:00
George Kalampokis 29919f981a Fix issue with recent activity sorting 2021-10-12 15:41:20 +03:00
George Kalampokis 7fe84d7de5 Eliminate Duplicate user when making a new version 2021-10-08 16:52:01 +03:00
George Kalampokis a3af8ce3a5 Merge branch 'spring-update' into Development 
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
#	dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
#	dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java
 2021-10-08 16:04:52 +03:00
George Kalampokis 0e97e6c0a8 Fix issues with external sources 2021-10-08 12:14:09 +03:00
George Kalampokis 1d48ee81b9 Add additional null check for Elastic's Dmp Repository 2021-10-08 11:18:22 +03:00
George Kalampokis 9919886c26 Fix issues with dataset sorting on Dashboard with Elasticsearch 2021-10-08 11:02:56 +03:00
George Kalampokis 77d50773b8 Merge branch 'improved_queries' into Development 
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
 2021-10-07 11:05:19 +03:00
George Kalampokis 524cededb6 Fix issue when exporting to docx/pdf 2021-10-06 18:16:39 +03:00
George Kalampokis cb1d7b5340 Replace altChunk html to docx with direct parsing (manual) 2021-10-06 15:15:41 +03:00
George Kalampokis ef5e6a92e0 Fix critical issue with Dataset Template xml import 2021-10-06 15:02:21 +03:00
George Kalampokis 407961e137 Fix critical issue with DMP queries without elastic 2021-10-06 14:21:54 +03:00
George Kalampokis 3ec942cfa7 Add support for Html text when exporting to docx (alpha) 2021-10-05 17:58:46 +03:00
George Kalampokis 54c862ecbb Minor metrics refactor 2021-10-05 13:09:02 +03:00
George Kalampokis b66bde871a Fix issue of new DMPs not showing on the user's listing with elasticsearch active (#7010) 2021-10-05 12:56:20 +03:00
George Kalampokis 91729bab6d Optimize queries 2021-09-30 18:02:53 +03:00
George Kalampokis defac6afcc Fix issue with date formats on RDA import 2021-09-28 14:17:03 +03:00
George Kalampokis fc7c39081a Improve configuration loader 2021-09-28 14:15:50 +03:00
George Kalampokis 99e4d231c2 Possible patch some leaks 2021-09-27 18:14:21 +03:00
George Kalampokis 06364873ca Fix issue with unordered multiplicity fields 2021-09-27 18:11:55 +03:00
George Kalampokis 1ae2788453 Fix various issues with spring update 2021-09-14 17:43:02 +03:00
George Kalampokis 0257ff713b Remove the actuator from the prometheus path 2021-09-07 10:29:57 +03:00
George Kalampokis 6f92409f1e Update Spring boot framework to version 2.5.2 2021-09-07 09:42:31 +03:00
George Kalampokis 93ba59ef5a Fixed word parsing issue with datasetIdentifier and validation fields 2021-08-27 12:58:06 +03:00
George Kalampokis bfbc271b56 Fix elastic dataset consistency (impacts memory) 2021-08-24 17:05:28 +03:00
George Kalampokis c964af25b5 Fix critical issue with public dataset query 2021-08-23 11:48:29 +03:00
George Kalampokis 5de811a76d Vastly improve and optimize DMP and Dataset Queries (and with elastic) 2021-08-04 18:38:49 +03:00
George Kalampokis ce8b49deb0 Fix issue with DMP disappearing when editing Datasets 2021-08-03 12:15:54 +03:00
George Kalampokis 4e87bd270e Improve error handling when user has no zenodo access token 2021-08-02 18:31:10 +03:00
George Kalampokis 6a2099c2b9 Add user role check up when it's getting dataset profiles for the manager listing 2021-07-26 10:28:58 +03:00
George Kalampokis f01e89799b Merge remote-tracking branch 'origin/Development' into Development 2021-07-23 18:29:40 +03:00
George Kalampokis 9da0f4e776 Allow to re insert users on Dataset profile 2021-07-23 18:27:49 +03:00
Kristian Ntavidi 59e3af2fa0 Fix adding dataset dropdown on datasets listing 
* Get timecreated from backend
* Protect front from crashing when creationTime is not provided
 2021-07-23 12:05:07 +03:00
George Kalampokis 596550d3de Extend user token duration to 10 days 2021-07-21 11:17:32 +03:00
George Kalampokis c91059c854 Get latest available dataset profile instead of the version that is selected on the DMP 2021-07-20 12:55:52 +03:00
George Kalampokis 75d9726bca Fix issue with xml export of autocomplete and multiautocomplete fields 2021-07-20 12:23:55 +03:00
George Kalampokis 15af25e292 Fix issue saving array of data from dataset 2021-07-20 11:37:28 +03:00
George Kalampokis 016acaaa0f When counting organizations for the user count only the active ones 2021-07-19 18:34:29 +03:00
George Kalampokis 4b3468d513 Fix issue when validating dataset for finalization (needs rework) 2021-07-19 18:31:16 +03:00
George Kalampokis 1512d0c424 If BooleanDecision has no value thenm return null when exporting to docx and pdf 2021-07-19 14:08:48 +03:00
Diamantis Tziotzios ad245dde5d Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2021-07-07 20:40:24 +03:00
Diamantis Tziotzios b8b78f6653 user guide path fix 
(cherry picked from commit bd15b1e2c7)
 2021-07-07 20:40:00 +03:00
George Kalampokis d603fed61f When new version is made keep all it's contributors 2021-07-06 16:56:37 +03:00
George Kalampokis 1c22ed2321 Add extraProperties for xml export/import and restore pdf export for zenodo deposit 2021-07-06 16:33:46 +03:00
George Kalampokis d5cd90814a Improve error handling 2021-07-06 13:33:58 +03:00
George Kalampokis efe177f0b1 Fix issues with xml import and issues with zenodo deposit 2021-07-06 12:58:38 +03:00
George Kalampokis c57e10a033 Fix issue with zenodo depositions 2021-07-06 10:29:14 +03:00
George Kalampokis 244bfa5c54 Fix various critical issues 2021-07-02 14:02:32 +03:00
George Kalampokis 4e3b98f1ff Improvements over MS Word Document export 2021-06-30 17:17:17 +03:00
George Kalampokis d1e3aae36d Fix critical issue with dataset's copy dropdown 2021-06-30 12:51:12 +03:00
George Kalampokis dcd7f24cac Fix listing issues and improve elastic query 2021-06-29 11:45:20 +03:00
George Kalampokis 03b7699973 Reduce severity 2021-06-25 19:29:51 +03:00
George Kalampokis d1df83f689 Add query db fallback for DMPs 2021-06-25 19:27:02 +03:00
George Kalampokis 4a4042d621 Fix various library issues with postgres and elastic 2021-06-25 12:32:58 +03:00
George Kalampokis a48ac5fa0f When exporting external dataset fields, export and it's type 2021-06-23 17:29:45 +03:00
George Kalampokis 11b4d462cf Add type to External Datasets Data 2021-06-22 18:29:58 +03:00
George Kalampokis 42a22b4a65 Improve external researcher support 2021-06-17 18:48:18 +03:00
George Kalampokis 885f897adc Fix issue when updating researchers from DMP 2021-06-17 18:01:47 +03:00
George Kalampokis e94944abb1 Merge remote-tracking branch 'origin/Development' into Development 2021-06-17 13:58:36 +03:00
George Kalampokis 78186fb96d If the invitation is accepted then send the user to the accepted DMP if the user click again the link from the email 2021-06-17 13:58:28 +03:00
Diamantis Tziotzios 6c6cc061fc Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2021-06-15 15:43:56 +03:00
Diamantis Tziotzios d3d6c4a6aa prometheus fix 2021-06-15 15:43:45 +03:00
George Kalampokis 1eb9aadaea IGNORE ME 2021-06-15 11:25:11 +03:00
George Kalampokis c193dd2c09 Fix numbering issue with word and PDF export 2021-06-14 18:01:29 +03:00
George Kalampokis e615c403d3 Final fix over storing array of data from Datasets 2021-06-14 18:01:04 +03:00
George Kalampokis dcf88479bd Allow to store and retrieve combobox multivalues with commas 2021-06-14 14:21:27 +03:00
George Kalampokis be311f238b Add visibility rules checkup on dataset finalize checkup 2021-06-01 12:30:01 +03:00
George Kalampokis 8a5f9d3536 Add support for nested sections 2021-05-18 13:45:41 +03:00
George Kalampokis b76a787972 Hide grants without any active dmp 2021-05-10 17:17:08 +03:00
George Kalampokis 95f8eb15c9 Even more fixes for imports and exports 2021-05-10 16:55:44 +03:00
George Kalampokis 6f658db27f Fix issues with import and export of dataset template 2021-05-10 16:10:18 +03:00
George Kalampokis 1d5befaf6a Add new endpoint in order to validate datasets 2021-05-10 13:40:08 +03:00
George Kalampokis 15c3a6fcb5 Export properly the data for each field type on dataset templates 2021-05-07 14:38:21 +03:00
George Kalampokis af432cf329 Fixed issue with multiplicity fields 2021-05-06 18:58:55 +03:00
Diamantis Tziotzios ae2168b2d7 bug fix regarding template import 2021-05-05 11:20:43 +03:00
George Kalampokis a155f2cbec Allow to search organizations based on reference 2021-04-30 15:25:31 +03:00
George Kalampokis fe8a0ff109 Fix vaious issues with organizations 2021-04-30 14:45:00 +03:00
George Kalampokis 8a7cfab3b8 Fix various issues 2021-04-30 13:10:11 +03:00
George Kalampokis cdae5ae574 Fix minor issues when creating a researcher 2021-04-30 11:08:06 +03:00
George Kalampokis a28e26e594 Allow to query using exact reference 2021-04-29 11:58:03 +03:00
George Kalampokis df5281eeaa Allow to manually add reference 2021-04-29 11:28:46 +03:00
George Kalampokis 501ca9fcc2 Put elastic search index into the configurations 2021-04-27 16:53:15 +03:00
George Kalampokis 77bcb95ad7 Fix issues when cloning dataset templates 2021-04-27 10:38:20 +03:00
George Kalampokis e5264780c3 When finalize DMP properly finalize it's datasets first 2021-04-21 18:21:52 +03:00
Diamantis Tziotzios ede8bbf48e metrics update 2021-04-15 18:30:16 +03:00
George Kalampokis 961a4df270 Add total Users metric 2021-04-13 12:19:55 +03:00
George Kalampokis 3d9a2b2331 Fix various issues with various template fields 2021-04-13 10:46:06 +03:00
George Kalampokis 48730e7937 Fix issue when accessing dataset profile users when there are no users. 2021-04-12 12:12:21 +03:00
George Kalampokis c27ff1d446 Add missing metrics counters and made the metrics init task scheduled (per Hour) (ref #294) 2021-04-12 12:00:07 +03:00
George Kalampokis 27bf69268e Fix issue when creating new dataset profile 2021-04-12 10:49:22 +03:00
George Kalampokis aca31dc9da Add prometheus integration (ref #294) 2021-04-09 19:05:04 +03:00
George Kalampokis c57820d6b1 Remove "External References" from docx generation 2021-04-08 16:48:14 +03:00
George Kalampokis 4156875bae Refactor and add logic for removing users from Dataset Templates 2021-04-07 19:08:57 +03:00
George Kalampokis bc3c8b44d2 Add option to add or remove users from Dataset Templates 2021-04-07 19:03:22 +03:00
George Kalampokis af04e34b6f Add new User Role Dataset Template Editor. 2021-04-06 19:03:00 +03:00
George Kalampokis c929eb3a2b When uploading to zenodo upload both pdf and the RDA json files 2021-04-05 14:03:14 +03:00
George Kalampokis 5b930a6870 Export and Import Dataset Template description and language 2021-04-05 11:40:25 +03:00
George Kalampokis e88f88d97c Fix critical issue when creating comboboxes with the multiple selection untouched 2021-02-23 17:33:55 +02:00
Diamantis Tziotzios f30392864c ci updates 2020-12-16 14:19:58 +02:00
apapachristou 2ed101888d fix syntax on application-devel.properties 2020-12-14 19:37:06 +02:00
Diamantis Tziotzios af5ab43c2e db pool connection fix 2020-12-14 19:23:10 +02:00
Diamantis Tziotzios ef0a40b739 export template updated 2020-12-10 17:29:34 +02:00
George Kalampokis ca38f0b0a4 Make user guide multilingual 2020-12-10 11:34:01 +02:00
George Kalampokis 3b00b76f19 Add option to make static dataset profile fields with autocomplete to have multiple values 2020-12-09 17:51:30 +02:00
George Kalampokis c18e3f8e3c Add null check for additionalInfo to UserListingModel fromDataModel 2020-12-03 14:07:45 +02:00
George Kalampokis d6970cc49a Add avatarUrl on UserListingModel 2020-12-02 14:19:43 +02:00
George Kalampokis fcd24fd907 Add community when depositing to zenodo (ARGOS). 2020-11-23 18:16:32 +02:00
George Kalampokis 66358acfcf Replace the openDMP Affiliation on Zenodo with either a configurable 
affiliation or the related organizations of the DMP
 2020-11-19 18:39:25 +02:00
George Kalampokis 1e0b828a48 Prevent to check deleted Datasets when checking which Dataset Templates are in use 2020-11-16 18:31:41 +02:00
George Kalampokis a3d662aed1 Fix minor spelling mistake 2020-11-13 18:29:16 +02:00
George Kalampokis cbbfec2ccc Updated RDA Mapper's Cardinality check 2020-11-13 18:26:09 +02:00
George Kalampokis 0ad797d033 Revert last commit 2020-11-12 16:39:47 +02:00
George Kalampokis ffc140f84b When creating or updating Datasets return also the 
DatasetProfileDefinition
 2020-11-12 15:50:34 +02:00
George Kalampokis 7973e04090 Fix minor issue with identifier validation 2020-11-12 10:14:42 +02:00
George Kalampokis d40265544d Add Validators external urls for both staging and production profiles 2020-11-10 17:40:55 +02:00
George Kalampokis f5533e1b95 Prevent user to send merge request email to itself 2020-11-10 17:39:43 +02:00
George Kalampokis 8161d382ad Fixed minor external url issue 2020-11-09 10:32:55 +02:00
George Kalampokis cda31be0bd Allow remote fetcher to retrieve data with POST requests and added a new 
OpenAire repository source
 2020-11-06 18:45:20 +02:00
George Kalampokis 2ff9b95fdf Made identifier validation field to work properly 2020-11-06 16:29:33 +02:00
George Kalampokis e061448830 Initial commit for the new Dataset Template Field (identifier 
validation) part 2
 2020-11-05 18:32:19 +02:00
George Kalampokis da9872576e Initial commit for the new Dataset Template Field (identifier validator) 2020-11-05 18:20:37 +02:00
George Kalampokis 70056bd0a9 Fix issue with login for new users 2020-11-04 16:52:10 +02:00
George Kalampokis df8af6e6cd Trim time on Dataset's modified time in order to match with the Database 2020-10-30 11:29:43 +02:00
George Kalampokis 2354d9bb5c When calling the createOrUpdate endpoint on the Dataset Controller, 
return a DatasetWizardModel instead of the dataset's id
 2020-10-29 17:12:59 +02:00
George Kalampokis 03da1f3f7b When merging users delete the remaining credentials of the user to be 
merged
 2020-10-29 12:08:09 +02:00
George Kalampokis c1d473f8d4 When merging users remove the email from the user to be merged 2020-10-29 11:54:15 +02:00
George Kalampokis 4c60b2bb06 When creating a new credential assign the user's email 2020-10-27 18:08:16 +02:00
George Kalampokis ff169ae806 Made User Merge logic functional 2020-10-27 18:06:58 +02:00
George Kalampokis 981eb48d89 Add email for Merge requests 2020-10-27 12:06:32 +02:00
George Kalampokis 2b89f646ee Fix emails that are sent with images 2020-10-27 12:01:18 +02:00
George Kalampokis 8c2ae8cf46 Add null check on the Organisation fromMap mapper 2020-10-26 18:03:07 +02:00
George Kalampokis 9674ec2b6b Add user merge related services and updates on existing services on the frontend 2020-10-26 10:36:20 +02:00
George Kalampokis e1212383ff Add expirimental logic for userMerge (+ some updates for DB) 2020-10-23 18:40:17 +03:00
George Kalampokis 56d6b12555 Add Organization and roleOrganization to the User Info. Also allow to 
edit the user's name from the updateSettings
 2020-10-23 11:48:27 +03:00
George Kalampokis b878bf9d8f Fix issue when importing from RDA and the predefined template(s) inside the json does not exist on the database 2020-10-13 11:05:01 +03:00
George Kalampokis a78044920a Fixed issues with elastic and last public version 2020-10-12 12:45:32 +03:00
George Kalampokis 78903bf930 Add the backend logic to export all users to .csv 2020-10-07 17:29:53 +03:00
George Kalampokis 7a3b4a18ca Fixed compile issues 2020-10-07 14:22:37 +03:00
Diamantis Tziotzios e65bce0f5a Merge branch 'ui-redesign' into Development 
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
#	dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java
#	dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
 2020-10-06 16:43:20 +03:00
George Kalampokis e2326e1070 Minor refactoring 2020-10-06 11:50:14 +03:00
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 49cd48943a Merge branch 'ui-redesign' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign 2020-10-05 16:27:43 +03:00
George Kalampokis ae03077795 Fixed various issues with the new externalUrls restTemplate 2020-10-05 16:21:42 +03:00
Diamantis Tziotzios 0d408ff68a fixes 2020-10-05 12:08:57 +03:00
George Kalampokis c02157be8c Replace HttpUrlConnection with RestTemplate for the external Urls 2020-10-05 11:26:35 +03:00
George Kalampokis 674ce48b8b DMP's create or Update endpoint will return a DMP model 2020-10-01 18:54:01 +03:00
George Kalampokis 7b9ae7c91d Add support for Zenodo license autocomplete source 2020-10-01 16:08:32 +03:00
George Kalampokis b3be89fb88 Allow to invite others with just the email even if they don't have an 
user
 2020-09-29 12:41:47 +03:00
George Kalampokis 08271c88cb When getting just the email for invitation, find it's user and set it's 
id to the invited user
 2020-09-28 12:36:37 +03:00
Diamantis Tziotzios 28feacc7ef CI Update 2020-09-24 17:25:08 +03:00
Diamantis Tziotzios fe05ac9770 jenkins files 2020-09-24 17:20:33 +03:00
George Kalampokis 9dd76a739d If RDA Export fail show properly an error message 2020-09-24 12:37:03 +03:00
George Kalampokis 9b403bb480 Create or update dataset endpoint will return the id of the 
created/updated dataset
 2020-09-17 13:34:44 +03:00
George Kalampokis 36b380e738 Check if the grant can be edited only when the grant is internal 2020-09-16 18:37:24 +03:00
George Kalampokis da7fc0def3 Fixed various issues with DMP imports and exports (mostly RDA) 2020-09-15 13:21:22 +03:00