MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
3,307 Commits 29 Branches 189 Tags 89 MiB
Commit Graph

3307 Commits

Author SHA1 Message Date
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
Konstantinos Triantafyllou 4425a0bb5d Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development 2021-12-09 16:18:48 +02:00
Konstantinos Triantafyllou 7b00d14a70 Rename Discard button to Back in Dataset Template Editor (Admin). #7262 2021-12-09 16:18:38 +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
Konstantina Galouni b7d622e330 #7225: In dataset template, rename "users" to "editors" and add hint | #7226: In dataset templates, default descending sorting by "created". 
1.  dataset-profile-listing.component.html: #7226: In <mat-table> added matSortActive="created" matSortDirection="desc".
2. dataset-profile-editor.component.html: #7225: Added hint in section 1.4 to make prominent when the new editors will receive an informative email.
3. assets/i18n/: #7225: In every language file, renamed "users" to "editors" (DATASET-TEMPLATE-USERS, DATASET-TEMPLATE-REMOVE-USER, DATASET-TEMPLATE-NO-USERS-YET, DATASET-TEMPLATE-VALIDATE-AND-ADD-USER) and added DATASET-TEMPLATE-USERS-HINT.
 2021-11-30 12:21:03 +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
George Kalampokis 9dc4d52f91 Fix issue with Dataset copy status 2021-11-23 11:24:42 +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
Konstantina Galouni 52c7796e8e #7183: Do not query for authors (DMP invitation) until 3 letters have been typed. 
1. multiple-auto-complete.component.ts:
   a. Added @Input field minLength (default 0)
   b. In method "_onInputFocus()" filter results, only if query >= minLength.
2. dmp-invitation-dialog.component.html: In <app-multiple-auto-complete>, added property [minLength]="3" (invite users to a DMP).
 2021-11-22 13:36:02 +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
Konstantina Galouni 7a7f12b83a Fixed #7182: Required field names appearing in the warning modal. 
dataset-wizard.component.ts & dmp-editor.component.ts & form-validation-errors-dialog.component.ts:
a. For 'mat-select', use placeholder instead of aria-label.
b. [Bug fix] For 'app-multiple-auto-complete' dig into 2 more levels (formControl.nativeElement.firstChild.firstChild.firstChild.children) --> reason: commit de99784b5e: moved <input> inside <mat-chip-list>.
 2021-11-16 11:47:24 +02:00
George Kalampokis 7820235258 Improve html type field exports 2021-11-09 17:44:47 +02:00
Diamantis Tziotzios adeca327a2 ES lang update 2021-11-09 16:30:59 +02:00
Diamantis Tziotzios 1ec46b6840 es lang update 2021-11-09 16:23:57 +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
Konstantina Galouni de99784b5e In multiple and single autocomplete do not show "no results found" when user is typing | in multiple auto complete added parameter to check if "no results found" will be displayed | in multiple auto complete show full width for input & wrap title into multiple lines. 
1. multiple-auto-complete.component.html:
   a. #7137: show full width for input ([matAutocompleteConnectedTo]="origin") | wrap title into multiple lines (added classes "title-subtitle-fn", "subtitle-fn", "subtitle-fn-inner" and updated classes "title-fn", "title-fn-inner").
   b. single-auto-complete.component.html: #7136: Show "No results found" when user is not typing and there are no results.
   c. added check to show this label according to "showNoResultsLabel" input parameter.
2. multiple-auto-complete.component.ts & single-auto-complete.component.ts:
   a. Added field "queryValue", input "showNoResultsLabel".
   b. increase "requestDelay" from 400 to 600ms.
3. multiple-auto-complete.component.scss: wrap title into multiple lines (added classes "title-subtitle-fn", "subtitle-fn", "subtitle-fn-inner" and updated classes "title-fn", "title-fn-inner").
4. dmp-invitation-dialog.component.html: In <app-multiple-auto-complete> added parameter [showNoResultsLabel]="false".
 2021-11-09 14:14:19 +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 8899e1ba65 Merge remote-tracking branch 'origin/Development' into Development 2021-11-02 18:13:42 +02:00
George Kalampokis db4d1006c6 Fix various issues with word/PDF export 2021-11-02 18:06:00 +02:00
Konstantina Galouni ca5883724a In Dataset Template selection cut description when templates are displayed in list and show description (instead of DMP-EDITOR.DATASET-DESCRIPTION.INTRO) in template preview. 
1. multiple-auto-complete.component.html: Added class "title-fn-inner" to cut the displayed description of dataset templates.
2. multiple-auto-complete.component.scss: Css for class "title-fn" updated and for class "title-fn-inner" added to cut the displayed description of dataset templates.
3. available-profiles.component.html: Added class "list-option-inner" to cut the displayed description of dataset templates.
4. available-profiles.component.scss: Css for class "list-option" updated and for class "list-option-inner" added to cut the displayed description of dataset templates.
5. dataset-preview-dialog.component.html: Added [datasetDescription]="data?.template?.description" in <app-dataset-description>
6. dataset-description.component.ts: Added in class, field "datasetDescription".
7. dataset-description.component.html: Show template datasetDescription (as html) instead of DMP-EDITOR.DATASET-DESCRIPTION.INTRO.
 2021-11-02 16:50:43 +02:00
George Kalampokis 39795f177f Fix critical issue with file exports on chromium based web browsers 2021-11-02 14:50:20 +02:00
Kristian Ntavidi e46de79ec2 #7133 Multiplicity visibility rule fix 
* Inherit visibility value from clone reference
 2021-11-02 12:28:55 +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
Konstantina Galouni 193e7410a8 Added rich text area field type for response in dataset > chapter > section > questions. 
1. dataset-profile.module.ts: Added in declarations "DatasetProfileEditorRichTextAreaFieldComponent".
2. dataset-profile-editor-composite-field.component.html: Added RichTextArea as input field type for response to a question.
3. dataset-profile-editor-composite-field.component.ts: In method "addNewInput()" added case for RichTextArea.
4. dataset-profile-field-view-style.ts & view-style-enum.ts: Added RichTextArea.
5. field-data.ts: Added interface RichTextAreaFieldData.
6. enum-utils.service.ts: In methods "toDatasetProfileFieldViewStyleString()" and "toDatasetProfileViewTypeString()" added cases for RichTextArea
7. field-editor-model.ts: Added richTextarea.
8. component-profile-editor-default-value.component.html: Added <mat-form-field> for RichTextArea (how rich text area is initialized when this type is selected as response).
9. dataset-profile-editor-field.component.html: Added <mat-option> for RichTextArea (to select it) and <app-dataset-profile-editor-rich-text-area-field-component> (to show it).
10. dataset-profile-editor-field.component.ts: Added RichTextArea case everywhere.
11. dataset-wizard.component.ts & dmp-editor.component.ts: In method "_getPlaceHolder()" added case for richTextarea.
12. dataset-description-form.module.ts: Imported RichTextEditorModule.
13. form-field.component.html: Added RichTextArea case with <rich-text-editor-component>.
14. assets/i18n/: Added DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-RICH-TEXT-AREA-TITLE, DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-RICH-TEXT-AREA-PLACEHOLDER and DMP-EDITOR.TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.RICH-TEXT-AREA.
15. field-data/rich-text-area-field-data-editor-model.ts & field-type/rich-textarea/: [NEW] Files for Rich Text Area field type.
 2021-11-01 15:30:21 +02:00
Konstantina Galouni 03009edaa3 Use <rich-text-editor-component> when html editor is needed - replace in dataset template descriprion, section & question descriptions. 
1. dataset-profile-editor-section.component.html & dataset-profile-editor.component.html & dataset-profile-editor-composite-field.component.html: Replace <angular-editor> with <rich-text-editor-component> (custom common component when rich text editor is set).
2. dataset-profile-editor-section.component.ts & dataset-profile-editor.component.ts & dataset-profile-editor-composite-field.component.ts: Remove AngularEditorConfig (this is set in RichTextEditorComponent).
3. dataset-profile.module.ts: Instead of AngularEditorModule, import RichTextEditorModule (common component where rich text editor is set).
4. styles.scss: Moved css for angular editor to dedicated css file (src/app/library/rich-text-editor/rich-text-editor.component.scss) and keep here only "form-field-subscript-wrapper" class.
 2021-11-01 15:10:00 +02:00