Commit Graph

3465 Commits

Author SHA1 Message Date
Sofia Papacharalampous e2efdf416e fixes on tenant urls 2024-06-13 11:34:44 +03:00
Sofia Papacharalampous 854a513c01 fixes on tenant urls 2024-06-13 11:16:53 +03:00
Sofia Papacharalampous 2ed4669c4a fixes on router links 2024-06-13 09:44:57 +03:00
Sofia Papacharalampous f4d847a9d4 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-12 18:20:44 +03:00
Sofia Papacharalampous b2d68ed16e more routerLink fixes 2024-06-12 18:19:25 +03:00
Efstratios Giannopoulos bed9a4e311 bug fixes 2024-06-12 18:04:50 +03:00
Sofia Papacharalampous 28f8df5a36 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
2024-06-12 17:44:20 +03:00
Sofia Papacharalampous 39ddf4377d fixed routerLink (in progess) 2024-06-12 17:40:29 +03:00
Diamantis Tziotzios 4f557b8c30 frontend language and culture update 2024-06-12 17:36:56 +03:00
Sofia Papacharalampous 92ca0d46a5 fixed routerLink (in progess) 2024-06-12 17:03:24 +03:00
Diamantis Tziotzios 355920fd6a router utils service to generate correct tenant aware urls 2024-06-12 14:14:26 +03:00
Sofia Papacharalampous 2b728da7c6 clean up 2024-06-12 13:31:24 +03:00
Sofia Papacharalampous ac28863ebe Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/description/editor/description-editor.resolver.ts
#	dmp-frontend/src/app/ui/description/editor/description-editor.routing.ts
2024-06-12 13:30:45 +03:00
Sofia Papacharalampous 8036a8c57e added tenant and actions related (like copy/new-version) info on breadcrumbs 2024-06-12 13:22:58 +03:00
amentis 2db746784d dmp contact lock bug fix 2024-06-12 12:48:27 +03:00
Efstratios Giannopoulos 41583745be add code to prefilling source 2024-06-12 12:42:53 +03:00
Efstratios Giannopoulos 3608a6297e blueprint import changes 2024-06-12 11:43:18 +03:00
Efstratios Giannopoulos 626161bb3f Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-06-12 11:42:38 +03:00
Efstratios Giannopoulos ffa2f57c34 blueprint dmp import changes 2024-06-12 11:42:19 +03:00
Diamantis Tziotzios 947a4cc087 cleanup 2024-06-12 11:36:25 +03:00
Diamantis Tziotzios f75428595f fixes 2024-06-12 10:43:32 +03:00
Diamantis Tziotzios ce3277edb7 ui bug fix 2024-06-11 14:16:18 +03:00
Sofia Papacharalampous 9ac14c5393 bug fix 2024-06-11 13:42:35 +03:00
Sofia Papacharalampous fe34afec05 fixed description discard changes 2024-06-11 13:37:21 +03:00
Sofia Papacharalampous 6899bf7c26 ui fixes 2024-06-11 10:40:27 +03:00
Diamantis Tziotzios 6280aa79bc Dockerfile update 2024-06-11 09:55:35 +03:00
Alexandros Mandilaras e4ee88a421 update pathing on Dockerfile 2024-06-11 00:46:25 +03:00
Sofia Papacharalampous 081e0fca11 fixes on merge account 2024-06-10 17:49:49 +03:00
Sofia Papacharalampous 6d5b6f4859 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-10 17:28:11 +03:00
Sofia Papacharalampous fa8ed92718 fixed next/previous buttons on table of contents 2024-06-10 17:27:43 +03:00
Diamantis Tziotzios 7bd2608cb4 fixes 2024-06-10 17:05:22 +03:00
Sofia Papacharalampous ce29dce0a5 fixes on visibility and nested-sections previous/next 2024-06-10 15:18:25 +03:00
Sofia Papacharalampous cbb94f3897 added previous and next objects when building tocentries 2024-06-10 13:46:15 +03:00
Efstratios Giannopoulos 6c0f66f498 no message 2024-06-07 17:55:33 +03:00
Efstratios Giannopoulos 363c9bada0 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-06-07 17:21:36 +03:00
Efstratios Giannopoulos 13bd401995 fix duplicate reference for multiple fields 2024-06-07 17:21:20 +03:00
amentis 1f4b389d49 ui handle description fieldset multiplicity 2024-06-07 16:30:43 +03:00
Diamantis Tziotzios 2474a71b14 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-07 16:25:47 +03:00
Diamantis Tziotzios 050a72e8c7 handled tenant change across open tabs. 2024-06-07 16:25:28 +03:00
amentis 1130b60c35 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-06-07 16:12:15 +03:00
amentis d28bba30ee ui handle description fieldset multiplicity 2024-06-07 16:11:55 +03:00
Diamantis Tziotzios 8940394aa5 changed description editor table of contents 2024-06-07 16:06:27 +03:00
Sofia Papacharalampous 8a8aa40ac9 bug fix 2024-06-07 14:33:31 +03:00
Sofia Papacharalampous 30b4537a40 fixed error messages 2024-06-07 14:26:01 +03:00
amentis 1203c15bfc add description field url case 2024-06-07 13:42:37 +03:00
amentis 98411e2b26 bug fixes 2024-06-07 13:06:36 +03:00
amentis 66fe4cf311 invite dmp user changes 2024-06-07 12:24:43 +03:00
Diamantis Tziotzios f424e01b6a dmp invitation fix 2024-06-07 11:36:12 +03:00
Diamantis Tziotzios 47adaf7fdf more ui fixes 2024-06-07 10:48:52 +03:00
Diamantis Tziotzios 72d2728474 bug fix 2024-06-07 09:49:19 +03:00
Diamantis Tziotzios eaa802872a changes desciption editor form field logic to apply validation from form control instead of required html attribute 2024-06-06 20:19:22 +03:00
Sofia Papacharalampous d606cd4058 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-06 17:56:03 +03:00
Sofia Papacharalampous 8b3f1874cf fixed discard-changes bug on new dmps 2024-06-06 17:55:50 +03:00
Diamantis Tziotzios a4df13a051 added tenant code to url 2024-06-06 17:31:20 +03:00
amentis db25687dd5 handle plan and description when description template is inactive 2024-06-06 16:50:22 +03:00
Sofia Papacharalampous 631e4bef8b add functionality on merge-account screen to first validate the token before showing the confimation-form 2024-06-06 14:57:24 +03:00
Sofia Papacharalampous e9a59671ea Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-06 13:48:34 +03:00
Sofia Papacharalampous 26335b9e85 changed invitation email error response 2024-06-06 13:48:23 +03:00
amentis e1e00a9087 handle plan invite button with inprogress flag 2024-06-06 12:26:49 +03:00
Sofia Papacharalampous 80b3b9169c removed edit option from finalized dmp-blueprint listing items 2024-06-06 11:41:34 +03:00
Sofia Papacharalampous 8ab082fa8a changed you-username on dmp and description overview.2 2024-06-06 11:18:27 +03:00
Sofia Papacharalampous 293104bd42 changed you-username on dmp and description overview 2024-06-06 11:16:16 +03:00
Efstratios Giannopoulos b3258e35eb Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-06-05 17:43:19 +03:00
Efstratios Giannopoulos ebdeeb6e7d tenant login changes 2024-06-05 17:42:56 +03:00
amentis 313e20a32c Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-06-05 17:40:22 +03:00
amentis a15d87fd94 add baq language 2024-06-05 17:39:37 +03:00
Sofia Papacharalampous 53aef80477 bug fix 2024-06-05 17:35:39 +03:00
Sofia Papacharalampous e586f01836 added more error handers (in progress) and did some clean up 2024-06-05 15:59:44 +03:00
Sofia Papacharalampous c6989a5d44 clean up comments 2024-06-05 12:47:06 +03:00
amentis cfe5247706 handle ui import description without description template error 2024-06-05 12:09:41 +03:00
amentis 32bb9ac735 handle ui import description without description template error 2024-06-05 12:08:15 +03:00
Sofia Papacharalampous b2715dcf24 fix on dashboard's url parameter "type" 2024-06-05 11:30:31 +03:00
Sofia Papacharalampous 1069c6374d fixed user field's buttons on dmp editor 2024-06-05 10:58:14 +03:00
Sofia Papacharalampous ad09f63b64 fix on description-editor reference-type field 2024-06-05 10:34:03 +03:00
Sofia Papacharalampous 9c00938640 reversed description-template reference type preview changes 2024-06-05 10:30:21 +03:00
Sofia Papacharalampous 035c50872b Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-04 18:08:28 +03:00
Sofia Papacharalampous d01180ab87 reference field ui fix 2024-06-04 18:08:12 +03:00
amentis 7e402c2b41 handle backend errors where user is inactive 2024-06-04 17:37:09 +03:00
Diamantis Tziotzios c98070d533 angular 18 update 2024-06-04 16:58:18 +03:00
Sofia Papacharalampous 4932dfe9e2 error handling refactor and also added the notification/annotation error codes 2024-06-04 14:54:04 +03:00
Sofia Papacharalampous 82b53314b9 ui fix on navbar 2024-06-04 11:20:33 +03:00
Sofia Papacharalampous 386aa5de05 breadcrumb navigation refactor 2024-06-03 17:29:27 +03:00
Sofia Papacharalampous 05eb000ba3 minor styling fix 2024-06-03 16:46:40 +03:00
amentis 2ab249de43 language small fix 2024-06-03 16:35:48 +03:00
Sofia Papacharalampous 6aba26aa3e fix on breadcrumbs 2024-06-03 16:27:38 +03:00
Sofia Papacharalampous 601b748388 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-06-03 15:52:36 +03:00
Sofia Papacharalampous c5ee926e65 clean up 2024-06-03 15:52:09 +03:00
Sofia Papacharalampous 6659efd1e1 fixed change detection bug on description-editor with prefill 2024-06-03 15:51:48 +03:00
amentis e487ca8a02 permissions changes 2024-06-03 15:13:57 +03:00
amentis 878869ce61 fix dmp new version already draft error 2024-06-03 13:59:07 +03:00
Sofia Papacharalampous 1ae6d6a20a styling fixes 2024-06-03 12:30:34 +03:00
Sofia Papacharalampous 280975679f error handling refactoring: added new errors, fixed translations and fixed error handling on overviews 2024-06-03 12:18:42 +03:00
Sofia Papacharalampous 13db96b770 ui fix 2024-05-31 18:37:28 +03:00
Sofia Papacharalampous a9377e6765 added description breadcrumbs (in progress) and ui fixes 2024-05-31 18:26:22 +03:00
Sofia Papacharalampous 9c4c0bcb66 added dmp breadcrumbs 2024-05-31 17:29:03 +03:00
Sofia Papacharalampous 69cc029438 ui fixes on sidenav and plan/dmp editor to match the production 2024-05-31 16:53:44 +03:00
Sofia Papacharalampous ea7b267460 breadcrumb fixes 2024-05-31 15:36:10 +03:00
Sofia Papacharalampous 56a4ed4da8 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-05-31 14:23:46 +03:00
Efstratios Giannopoulos f05962a3b2 login and tenant ui fixes 2024-05-31 14:07:23 +03:00
Sofia Papacharalampous bd9f327500 backend error translation fixes 2024-05-31 13:58:52 +03:00
Sofia Papacharalampous 46347d4583 error handling refactoring 2024-05-31 13:47:32 +03:00
Diamantis Tziotzios 0fe7d693e4 rich text editor update 2024-05-31 09:58:22 +03:00
amentis 6b33fa2f66 styling changes 2024-05-30 18:08:49 +03:00
Sofia Papacharalampous 6f4611055e breadcrumbs styling fixes 2024-05-30 18:02:35 +03:00
Sofia Papacharalampous 9e441079fb handle errors refactor 2024-05-30 17:18:18 +03:00
Efstratios Giannopoulos f156d79ace tenant fixes 2024-05-30 15:56:37 +03:00
Sofia Papacharalampous fa6d100b41 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-05-30 13:49:18 +03:00
Sofia Papacharalampous 998ef45541 styling changes on reference-type-editor dialog 2024-05-30 13:48:02 +03:00
Efstratios Giannopoulos aaa8452c26 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-05-30 13:26:54 +03:00
Efstratios Giannopoulos 687fe81b9a deposit url fix 2024-05-30 13:26:35 +03:00
amentis 948b224469 description multiplicity fix 2024-05-30 13:19:37 +03:00
Sofia Papacharalampous f0d0fc280d dashboard ui fix 2024-05-30 13:04:50 +03:00
Sofia Papacharalampous bba1c78d82 bug fix on overview authors-listing 2024-05-30 13:04:31 +03:00
amentis d4dcc76391 small fix 2024-05-30 11:41:07 +03:00
Diamantis Tziotzios 8f3dbe0ccd added common error handling function 2024-05-30 10:57:34 +03:00
Diamantis Tziotzios b72adf92d5 cleanup 2024-05-29 18:56:47 +03:00
amentis a088e7b2dc dmp overview edit button fix 2024-05-29 17:53:37 +03:00
Sofia Papacharalampous 6fcf4ccfe1 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-05-29 17:14:01 +03:00
Sofia Papacharalampous 05f344b980 added preview buttons for finalized dmps and descriptions 2024-05-29 17:13:42 +03:00
amentis b02d7ef975 add dmp contact pop up dialog 2024-05-29 17:12:42 +03:00
Sofia Papacharalampous bbbaeffde9 table view preview bug fix 2024-05-29 17:02:58 +03:00
amentis 37c0666ca6 blueprint multiplicity ui validate 2024-05-29 16:59:26 +03:00
amentis c610f34b8f description template multiplicity ui validate 2024-05-29 16:53:13 +03:00
Sofia Papacharalampous 30fb0eb7ed analytics service refactoring 2024-05-29 15:31:08 +03:00
Sofia Papacharalampous ae4595874b Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-05-29 14:59:53 +03:00
Sofia Papacharalampous e20afa164c initialized dashoboard's sort-by on modified 2024-05-29 14:59:13 +03:00
Sofia Papacharalampous 68b5bc7dd6 pagination bug fix on how found-last-page gets calculated 2024-05-29 14:52:32 +03:00
amentis 16b0a3089e dmp new version keep title, descripion changes after blueprint change 2024-05-29 14:50:02 +03:00
Sofia Papacharalampous 3437311fc9 ui fixes on dmp-new-version dialog 2024-05-29 13:52:28 +03:00
amentis 9edec938df new version ui small fix 2024-05-29 09:40:07 +03:00
amentis d7719d4299 update new version logic and remove user id from dmp contacts 2024-05-28 18:55:35 +03:00
Diamantis Tziotzios 4043a67c9c Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
2024-05-28 18:12:58 +03:00
Diamantis Tziotzios c3085a944d cleanup 2024-05-28 18:11:25 +03:00
Sofia Papacharalampous 65cfffaa2b trackPageView using analytics service instead of calling directly matomo service 2024-05-28 17:56:56 +03:00
Sofia Papacharalampous a6b30ec965 added sorting option on dmp and description listings 2024-05-28 16:50:37 +03:00
Sofia Papacharalampous 221894564a replaced orcid icon with the unauthorized icon 2024-05-28 15:37:59 +03:00
Sofia Papacharalampous 063f6aaf77 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-05-28 14:58:04 +03:00
Sofia Papacharalampous 25c00ed545 description template editor: enable reordering from not-selected questions 2024-05-28 14:57:47 +03:00
Diamantis Tziotzios 20a7936d93 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-05-28 14:44:05 +03:00
Diamantis Tziotzios 514df5c660 rename schematics to semantics 2024-05-28 14:43:47 +03:00
Sofia Papacharalampous 572f970c1e description template editor: made drag and drop more user friendly 2024-05-28 14:37:11 +03:00
amentis 7407fc6c39 import dmp blueprint fix 2024-05-28 11:31:15 +03:00
Sofia Papacharalampous bf393e8d24 ui fixes on description template editor 2024-05-28 11:05:36 +03:00
Sofia Papacharalampous a26233b8c2 increase semantics width on dmp blueprint editor 2024-05-28 10:48:48 +03:00
Sofia Papacharalampous 65aece63e0 description template editor ui fix on reordering 2024-05-27 16:13:37 +03:00
Sofia Papacharalampous 6e7972ed8f description-template-editor: removed reordering options from toolkit 2024-05-27 14:30:45 +03:00
Sofia Papacharalampous af2ed33f31 remove double * from custom auto-select reference type fields 2024-05-27 14:11:52 +03:00
Sofia Papacharalampous 115a2c6a3b description-template: enable reordering when dragging the card 2024-05-27 13:53:05 +03:00
Sofia Papacharalampous 71b25867a7 description-template table view: added numbering on title 2024-05-27 13:05:57 +03:00
Sofia Papacharalampous c2a86a4aa2 stop propagation and removed redirect when downloading xml from listing 2024-05-27 12:46:19 +03:00