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

1258 Commits

Author SHA1 Message Date
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
Diamantis Tziotzios 7a8375b988 Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' 
# Conflicts:
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
#	dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
 2021-12-09 12:18:39 +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
Diamantis Tziotzios 895dbcf098 Revert "user guide path fix" 
This reverts commit bd15b1e2c7.
 2021-07-07 20:39:41 +03:00
Diamantis Tziotzios bd15b1e2c7 user guide path fix 2021-07-07 20:39:22 +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 faabd343a9 Improve error handling 
(cherry picked from commit d5cd90814a)
 2021-07-06 13:41:09 +03:00
George Kalampokis e5a929f259 Fix issues with xml import and issues with zenodo deposit 
(cherry picked from commit efe177f0b1)
 2021-07-06 13:40:15 +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 d1fc10854c Fix issue with zenodo depositions 
(cherry picked from commit c57e10a033)
 2021-07-06 12:15:49 +03:00
George Kalampokis c57e10a033 Fix issue with zenodo depositions 2021-07-06 10:29:14 +03:00
George Kalampokis 2537923dc0 Fix various critical issues 
(cherry picked from commit 244bfa5c54)
 2021-07-05 11:10:11 +03:00
George Kalampokis 244bfa5c54 Fix various critical issues 2021-07-02 14:02:32 +03:00
George Kalampokis c1adbe283a Improvements over MS Word Document export 
(cherry picked from commit 4e3b98f1ff)
 2021-06-30 18:48:20 +03:00
George Kalampokis 4e3b98f1ff Improvements over MS Word Document export 2021-06-30 17:17:17 +03:00
George Kalampokis 04f230dff1 Fix critical issue with dataset's copy dropdown 
(cherry picked from commit d1e3aae36d)
 2021-06-30 12:52:32 +03:00
George Kalampokis d1e3aae36d Fix critical issue with dataset's copy dropdown 2021-06-30 12:51:12 +03:00