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
Konstantinos Triantafyllou
81a5964a55
Remove google client id, commited by mistake
2021-10-19 11:50:24 +03:00
Konstantinos Triantafyllou
7a3f3f2fd5
Add reordering for inputs in a dataset template
2021-10-19 11:08:38 +03:00
Konstantina Galouni
eeb5479a98
form-composite-title.component.html: [Bug fix] Show "view more/less" functionality only if there is extendedDescription.
2021-10-15 13:56:45 +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
e8366aa61a
Fix critical issue with dataset pagination
2021-10-13 17:50:15 +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
045dd51014
Prevent the selection of an already selected dataset Templates
2021-10-13 16:10:56 +03:00
George Kalampokis
32e299fc45
Merge remote-tracking branch 'origin/Development' into Development
2021-10-13 11:49:17 +03:00
Konstantina Galouni
f9bf688085
dataset-wizard.component.html: Added in dropdown list "Save & Continue" option (same as Save). | assets/i18n/: Added DATASET-WIZARD.ACTIONS.SAVE-AND-CONTINUE in language files.
2021-10-12 18:53:07 +03:00
George Kalampokis
a4fef8e462
Refactor PDF conversion
2021-10-12 18:17:16 +03:00
Konstantina Galouni
198061aeaa
Description boxes in admin forms replaced with rich text editor <angular-editor>.
...
1. dataset-profile-editor-composite-field.component.ts & dataset-profile-editor-section.component.ts & dataset-profile-editor.component.ts: Initialize AngularEditorConfig.
2. dataset-profile-editor-composite-field.component.html & dataset-profile-editor-section.component.html & dataset-profile-editor.component.html: Use <angular-editor> in description.
3. multiple-auto-complete.component.html & dataset-profile-listing.component.html & form-section.component.html: Show description as html.
4. dataset-profile.module.ts: Imported HttpClientModule, AngularEditorModule (needed for <angular-editor>).
5. available-profiles.component.html: Show description as html, under the Dataset Template title, not as tooltip (matTooltip does not receive html).
6. available-profiles.component.ts: Added styleUrls: ['available-profiles.component.scss'].
7. available-profiles.component.scss: [NEW] Added css for class "list-option" to cut description if too long.
8. form-composite-title.component.html: Show description and extendedDescription as html | Add view more/less functionality to show/hide extendedDescription.
9. form-composite-title.component.ts: Added "public showExtendedDescription: boolean = false;" field.
10. form-composite-title.component.scss: Added css for "more" class, to make "view more/less" seem like link.
11. assets/i18n/: In language files added DATASET-EDITOR.QUESTION.EXTENDED-DESCRIPTION.VIEW-MORE (-LESS).
12. assets/styles.css: Added css for <angular-editor>, to be similar to the other text areas and forms.
2021-10-12 18:14:22 +03:00
George Kalampokis
1a821179db
Even more Fixes over dashboard's sorting
2021-10-12 18:06:14 +03:00
George Kalampokis
6de12fd0e8
Fix issue with RDA Common Standards
2021-10-12 18:05:38 +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
0506f2d3a3
Merge remote-tracking branch 'origin/Development' into Development
2021-10-06 18:17:47 +03:00
George Kalampokis
524cededb6
Fix issue when exporting to docx/pdf
2021-10-06 18:16:39 +03:00
Kristian Ntavidi
74ec2126f0
Visibility Rules fix
...
* Reduce sourceValue visibility value based on logic.
2021-10-06 16:32:06 +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
70538850a2
Merge remote-tracking branch 'origin/Development' into Development
2021-10-06 14:40:39 +03:00
George Kalampokis
407961e137
Fix critical issue with DMP queries without elastic
2021-10-06 14:21:54 +03:00
Kristian Ntavidi
907ad14269
#7028 Text area fields minRows defaults to 3
2021-10-06 12:25:44 +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
67b10528e3
Fix db creation scripts for linux
2021-10-01 12:37:20 +03:00
George Kalampokis
0886424b29
Fix db creation scripts for linux
2021-10-01 12:36:43 +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
Kristian Ntavidi
faeb7e0d62
improvement on computing ordinal on mutliplicity fields
2021-09-27 16:25:17 +03:00
Diamantis Tziotzios
9cac208546
upgrade to Angular 12
2021-09-24 21:52:14 +03:00
Kristian Ntavidi
d229189783
Visibility rule service refactor.
...
* Take into account other dependencies
* OR and AND logic support
2021-09-20 21:34:20 +03:00
Kristian Ntavidi
b40e30ee60
Fix issue with visibility rules on multiplicity fields.
...
* Append new visibility rules on creation of multiplicity item
* Compute visibility rules for multiplicityItems on loading data (Researchers page)
2021-09-20 14:34:09 +03:00
Kristian Ntavidi
ba865c9708
Dataset Editor (Researchers Page). Incrementing ordinals on multiplicity items.
2021-09-17 12:12:48 +03:00
George Kalampokis
1ae2788453
Fix various issues with spring update
2021-09-14 17:43:02 +03:00
Kristian Ntavidi
52c26cd864
Admin Dataset editor guard fix.
2021-09-09 09:09:27 +03:00