From 26147d0c9eca26ef4bebed3b3950a6315d0b0527 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 17 Sep 2019 11:40:49 +0300 Subject: [PATCH 1/8] Fixes bug on get Draft Dmps when clicking "VIEW ALL" on DRAFT table on /home and makes Draft radio button on filters checked --- .../ui/dataset/listing/criteria/dataset-criteria.component.html | 2 +- .../ui/dataset/listing/criteria/dataset-criteria.component.ts | 1 + .../src/app/ui/dataset/listing/dataset-listing.component.html | 2 +- .../src/app/ui/dataset/listing/dataset-listing.component.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html index 5c3839e8b..51bdd3dfb 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html @@ -16,7 +16,7 @@
{{'CRITERIA.DATA-SETS.STATUS'| translate}}
- {{ 'TYPES.DATASET-STATUS.DRAFT' | translate }} + {{ 'TYPES.DATASET-STATUS.DRAFT' | translate }} {{ 'TYPES.DATASET-STATUS.FINALISED' | translate }} {{ 'TYPES.DATASET-STATUS.ANY' | translate }} diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts index 708c4c574..c25d3a896 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts @@ -43,6 +43,7 @@ import { DatasetService } from '../../../../core/services/dataset/dataset.servic export class DatasetCriteriaComponent extends BaseCriteriaComponent implements OnInit { @Input() dmpSearchEnabled; + @Input() status; public criteria: any; public filteringTagsAsync = false; public filteredTags: ExternalSourceItemModel[]; diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html index c9889f88f..e92a69879 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html @@ -15,7 +15,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index 705f03cf3..0cd581f27 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -81,8 +81,8 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB if (this.status != null && this.status == DatasetStatus.Draft) { this.criteria.setCriteria(this.getDraftCriteria()); - this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); + this.refresh(); } }); } From e884153bf2acc5eda79124a7543c8ba0f465b4a4 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 17 Sep 2019 11:45:09 +0300 Subject: [PATCH 2/8] Fixes bug on fetching multiple instances of the same Organisations. --- .../src/main/java/eu/eudat/controllers/Organisations.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java index 0cc2bf1b9..8ba8d4ac2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java @@ -26,12 +26,10 @@ import java.util.Map; @RequestMapping(value = {"/api"}) public class Organisations extends BaseController { - private OrganisationsExternalSourcesModel organisationsExternalSourcesModel; private OrganisationsManager organisationsManager; @Autowired - public Organisations(ApiContext apiContext, OrganisationsExternalSourcesModel organisationsExternalSourcesModel, OrganisationsManager organisationsManager) { + public Organisations(ApiContext apiContext, OrganisationsManager organisationsManager) { super(apiContext); - this.organisationsExternalSourcesModel = organisationsExternalSourcesModel; this.organisationsManager = organisationsManager; } @@ -41,7 +39,7 @@ public class Organisations extends BaseController { @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type ) throws HugeResultSet, NoURLFound { List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getOrganisations(query, type); - OrganisationsExternalSourcesModel organisationsExternalSourcesModel = this.organisationsExternalSourcesModel.fromExternalItem(remoteRepos); + OrganisationsExternalSourcesModel organisationsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(organisationsExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); } From 059f0e459e443c52b6a68e6e385a4d325b27b445 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 17 Sep 2019 13:55:18 +0300 Subject: [PATCH 3/8] Adds new logo icon - ARGOS --- .../src/app/ui/auth/login/img/open-dmp.png | Bin 20615 -> 14767 bytes .../src/app/ui/auth/login/img/open-dmp_v1.png | Bin 0 -> 20615 bytes .../app/ui/auth/login/login.component.scss | 2 +- .../src/app/ui/sidebar/sidebar.component.css | 4 ++-- .../src/assets/images/OpenDMP(v1).png | Bin 0 -> 5764 bytes dmp-frontend/src/assets/images/OpenDMP.png | Bin 5764 -> 8251 bytes .../scss/core/_sidebar-and-main-panel.scss | 3 ++- dmp-frontend/src/favicon.ico | Bin 1150 -> 615 bytes dmp-frontend/src/favicon_v1.ico | Bin 0 -> 1150 bytes 9 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 dmp-frontend/src/app/ui/auth/login/img/open-dmp_v1.png create mode 100644 dmp-frontend/src/assets/images/OpenDMP(v1).png create mode 100644 dmp-frontend/src/favicon_v1.ico diff --git a/dmp-frontend/src/app/ui/auth/login/img/open-dmp.png b/dmp-frontend/src/app/ui/auth/login/img/open-dmp.png index d7a2f8f5361d3eba87dfd8bd7bd684818323a7b6..462c21158f97744298b8445d4e412847ce63b40d 100644 GIT binary patch literal 14767 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 literal 20615 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 diff --git a/dmp-frontend/src/app/ui/auth/login/img/open-dmp_v1.png b/dmp-frontend/src/app/ui/auth/login/img/open-dmp_v1.png new file mode 100644 index 0000000000000000000000000000000000000000..d7a2f8f5361d3eba87dfd8bd7bd684818323a7b6 GIT binary patch literal 20615 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 literal 0 HcmV?d00001 diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss index 9527477ec..cb43b7f4d 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.scss +++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss @@ -202,7 +202,7 @@ span.orcidIconMedium { .login-logo { background: url(img/open-dmp.png) no-repeat; - width: 370px; + width: 273px; height: 300px; background-size: cover; margin-top: -10em; diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar.component.css index c6ad38929..8ff816181 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.css @@ -2,11 +2,11 @@ width: 60px; display: block; max-height: none; - margin-left: 100px; + margin-left: 50px; } .logo-img img { - width: 60px; + width: 155px; top: 0px; position: inherit; } diff --git a/dmp-frontend/src/assets/images/OpenDMP(v1).png b/dmp-frontend/src/assets/images/OpenDMP(v1).png new file mode 100644 index 0000000000000000000000000000000000000000..6259b5813e2f53d5a2afbd4aa3e14d5a5a6b9cdd GIT binary patch literal 5764 zcmV-~7JKQ5P)wrfC8dI ztqVvMsfx9W#URQ!KmlphRz+L1h^VNj715$$5zvZCksSfE5tW3^ge3uz$-L+H$4o*J zlF3YV`}6xe^E{dNo_p?j?>Bcl_uM<8s{F{&1$Y85fnNhh8`hkf!Dwg$YJg_IpMibA zSm1hKFEFtojjAc+N7zCP;7(v3(7F{xyA*vbAFWbR^)Et1rs=OzLuH60cl+6wDB0i$g64H0r@&RhP z7AlfZ`gxBok*s`SEC74M^(Pnv`Vuysc^TX!5`^2DAr4GU!A)YZj=lt9pp zVpx)PZkV*S{@%uSSR2}a^5{E!c{kIge*(RUDtemUm$af=Y$VIy+Q*3#=NLAqGt+-{ zsnnJ5d!P4U;+_Y8aHIw6XI|*in?fU zBf5@$ty%9)ojySLy)W{nSqEdD@cZ7II(^V}^lQy(U%7v1P(tG4mjnc#EBZIcC|~n@ zlb*{%^FAT>Yh+aLxuSo^$1e%+BU7!TK?x~n8uXl?SCxJi-ZY5& z@9alxbVQ~3KHQMbxXJJG!Me1Ibr!hz$MRi_x&2*^9?!2ZzahdkgQE#+Qnq&#^s0iU zLC;m^U1|#rHtp>_WZC^9JYD+Pu&X=q*dMPXylD`HP8W-p?qJ!Qd+}!CRRi1e=$U88af5reWn;ipZ03Lth%~?|an->YWgAI1JQy7WASuP}|l`NKA;~ zUu#mx&v!Co z!)%;A=VZ->bgz>JK_1z)aq^$4vbnZUuY|-UEK3Js{K?b0WhhO<0!ce`vQime2#Jl3 z;7nd&nbzSWGInpg!{%?M>Z0DdtlqwVxuF-%Xe0X41gGq z?e&6sBSebKajjd1VzKyN{!6OSlB|Y<$&q}RUgZU3%&B%nxhoj0|B2{7PZE@T)xi400rHvsUNCFmv&udY? zP?ybc0Pq1&X{~g%HRsylv3@CS-!_czv+_7tZfmwQTDNS%wZm;RkMQnxDUX(sA^c~n zR}z~5Hv!(aC2N4XB%}i{7g%>7HRp@+iC=Ed=GC|N@r!Xi{8AbcY~`+7dviLkfaP!P z!&zjONl(u_#nUf-#by1YXw%ZaHQkNZb;H&voadMAwGbVRct+O}@uldjTx7@;8nOqjp%&!)D0AwG_C;OQH(_Vni9h&j8ZY_xI zT>V9O0A+U30VzXi90&ILKHe( zEPG?GUrMu%x^HzC)~A~7600g>3was1^C!6#eSf!yR0vO ze)(q$7dV||8_W7nGZ{DeU7lUK!!L!l&f#Pq%je#tb_vR=J4RME3RW!ELgp>=A>AN>hUR(nOKBNBJ?>OJ1 zn*N`vytbhsRzgE6p21h;y7vLw)3HtLm--J7Sp0en?aT4;!s#~!?r8?Nm} zs}>>rb?#7Z8q>YjZ5Tbw#`|kiId!IhZM%-prd22{nuk;-{*}k(dPBVuqKb;4Gb&08 z4GG|~_$b~_PUS#q4)3o`W0-GUieCr~u`)KX3!i@ZJ>6`PToK>CQdu!{hHBmHdsK#c zcb)9oFy&+5ql(gkgRG26>_YmXlZ+V=OHhz+o?xfbr2IOkG8D&PwTK9zSyQh^Q9kn6 zTCZprUzSzxLn*Vvbnbi+hqK*rxd8!gvwW@Om`>qDck=CM$8R6q$m{R!$5c3Z>O6Cw z{G6QJaz`7K9ISeuPYP=p4Ho_0Ysm5hLv(HF7~ha!EBD{oj~0<3j)0AGUb=O_|?t5FY4CPGf(lz!cWeIV6O?klQ z40V78-w)ZfY03kt`Y=AO;$u36lY8ns@BI6lO1-itPZ!`UGQCY_%R^Q5;f5vy8UY~y zdp1p3farJ-@272WA6FQ5b!UcN*@?wVcW~&t3n4_R@a~!vHhlUm(J*z8o)Lqi88s}1b(=GJ zX!?K>f0b7#$3UhBohj_Od-EN8YHD|FqS0Ngv2EMkPGE7bgy&usLjNG}2cW69JdqK> zbZqZcq!?!uo=`da#NLhfR@pr^1R5P7#qd;^qgTRnPgn>UsmS%fXu#h{?UN{LfK{fP z{jjkTQH(}QNHIJW_%`r%LW0BEB&_Y&qsQ}~Y167nyV7!j0oHunp`InUJih%s={t`6 z)6?pH98lFC;phmp)31DnBUA6 z_2$Y6l-X)bT$p_~@DI<|<;h7=lPgm)eEzXER>QSdp(SwMrDliqGu!`=_;~gp6z_Kh ztGq#gJdpfgn`0$iR&4CNuD0l}KLZ@N$uMz8u74=*qXhsR4fLZ}n`3duj!*f#+0e+* zQq{Oo>}DX|!?IUX_qf(_(K097e{Eyqz{7w&rfuH>oc z%@mmjM$A9l*8u3zV^LE~*LvJXn4KU=Ax#KR%dq!K%dn45&9Jw}pfj)v0Oj65>*;!l zb*(K3j9Qx%WmpP=!YMLrirxb9eu;q6*J2p!uUq(SX*5uQ<2Nn0a)uvY%Ydnjsf5-IQKZv3CJ;&%hEDtKfZUby^Iqs zEzSOIT84c*$ZtK5rr2zb5mi@3Nd>kaM%>4mMUhT5fkIM4EOJD05U!0kbQfFxjjhB znEf|_l>nkFY3N%#Yl`HVZ9Wj??&9wXQ%5g2QvRaF-uiM&thVfOTmZvtRc`i6xNxiV7J6bUt+=yEm{sCT8wH19OI<{3$ilzQYzh z=Vs7BfK8QM7GX_FhJ8~-`fN7G08wrP;!$$MkgZNv;ES1=Nx9`^MI1&2hOY9BpkeY!%TL zRk$6v0{EpU&$xtsFw|Qh< zHB_s*%VU(l3#dGekc8V?4UmWEH9~kg?>5qv1 z#iOugY^;I zh`i!!S>DJ1u&S^|;1S>&o6RvXJ>9;tDy4-1h0oxwpl`!lMwJPpQST8V%>YDjs!}}N zD^&10yDJ@GWmYoRmujA0OmJWg401llg+<_z6OmD?E49VcS5zcH&}j+*z}bTHmVZ^J z?22H`$gqDA8{=34OcUi9;$vJ9~?j$Z@61Q3{3K>$Hw*Uoc$rer=^=E8vP zogFrWo(N#FT@6X`^x1&{CUXvE+S9!m8XM!N&ii>qg5ywdU{KH-K&d+w<;iV#Q)y5{ zkR|Z#^QLn#o)!zdyV2gN)*@M~0EU$rrju(uGn@Z*vCVlTI8>i6y;_frb#%hyDc}YG zQC>+sWUpw6--GlXXac`r46_T1v?>3&aHm1zkc}C+hO# zq_!80f2Hx>jFx8-7aVyH(VGEG!RPME7gzyOQtYR@c6KDXgjWSFRnv)g; zE6@ih9d@%cIE+dIlLbZ!WXIYZ@1UGU8KZ*dhDv$#(4mL30lGxbxkp7e2#gF4B&SP^ zW0NAEBihw~@hG9DTv&twh*nI9Dq&RwkIqBP63)tTcNTc+hsY?OnxVog0yhKM&23TZ zeaYi1N~XOjnf9;aoD-Rp^SaapXEJpd~5 zm1mDbP^ogQS7DGt$Bs{hSgoh~h!8JIM-}#{vhC0zzEQPT7+PbCajX&;r|@QahW+NQ zF^(Z7GFZ_V1GcNdM`>yH3hxMM-`)`#6hyqC^hG#{!S;?FIk0h~y{NQIaDa>#tFB8; zwOPx#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;jv63FrU-AFN44K~#8N?Oh3+995mJ2ukQ9StF>d2ja21 zx~{P6iMSr1vbu}P5>XITR0K7`boC^}gBD5BuVxYs1z{jlJxN3*Kr+=chVWx$M375B z?yw;DA%}<%0vN(%zyGV(J>6aZI=Z^5Co_59@Av&CQ2%$->-WBT=l>bo4YrnEVyv}a zXN*)1HHPhzjcR2Wyu@%SznvV~W5`R@sMC!PeVf^9;z$$fsowPBre-L?Jej5+Q#tmym|`_4GoPD zTs!bm2*?ujo?i5d$`qkvZ!ks&->BY5LqkKu2h>Ay>`_)orXKG%oRxd1H`CD2&}hNx z({dOdUdo8a6sCQPF}6CV-cUnBLqlQp>Kz~u=kmfamu6RAfVWUSZrWdc$TUj(Tx`|ThCA*hOGt(mC-%+L1J{dX~*mISGby_M4~l z)|B?B=k_!-5(j!*8Phrp0(3vbZtG+*TeP0an%0ku(m+P#jE7?{V#Hy(@*!jO>X)fE z*U-@D6t6P-vk<#qL3GAjMQGA!itBcsFJ7y%*o-j@i5>f1MjWOo?JdTdv;IlFy@rNH zM<|tE29a6s5uI&-81mkoDfYcu<#YnHfZ^CL@B%SSIb1nZy}gEpMtp3Y0de_htJpNr zv|d0j@Y&R8T7PHLRm4#DN)l$3VHb}5aaI_nGlvJ4sJGY9(1?p%kM&`9A)!TVOfjA< zT9;+b{?E@g`}fEkyJ$D+aizhT3&iWQz1F@+_gskJW=~$gjA`|%EW2ebP1=Prk%K%7jGEWQAdR^IY}z8X6jLkSq2b-6|~T zWo@9XE6QZjfF9`b*1UleJsmB28X6kyf)^I?L-lx4kuUarpfzt0 z#l@2%dc*b+GR;<0E2})V=~9cHhDImgL@!(H`&adN+eUYXxBIG8n=x#c7~3?dMNdPc z6HL13k-MbT1GA0lz%G%w)o@)bZ407TtsLKCmo_Iy^u8=T;RKV0{7Hd&^IRJ3ur?x? z6l|T5@3r2VFIY!pi{kWb(Yh488~=VHYg&KJnbrgN@2f$Z78A2Q<#$pT6}T&ySy=iy zwExdz1l5NT)P=~)2K@U`${+X`p4|>TSdYB+XM3$L&R$S{g9_Re%>1r+eYRkIF;@^L zArBWJKX-u07nPrQ2zk8@{1yJakhZxQjoaCR&~?!xk)!jY!}bph*R?zO!6PpzQMnny z=Q<(KqSqDB=5bW6&9rwjh^UNbsvsQ$@vUl&KOSkLyLb@wdJN)nO17}%;QVn*UV$W1 z5g2)Xz1KPlY2Si$+d0Ed2LbLx+nd+47d2_jJ9Q_d@g<~nr7RylFFaunz4!yl^lL`X zvYl0o$pRm%j48g1{9V;{{)*xmig3A3#bHE zI<@Gjl)DC0po?4Uh!4ki?zP^nf^~#+MX$~+XlTEfeO&qFD%p5IuLr%{6^JW2??lwA zDvC28Rvo(%+pRQ^p&n48`6If=RL`3;uQW>~6$`t5tCT}rtJ>@thZ7$Uc2PEU(K{F2 z;Ho{sG~SrhqNh^s3g~Nz%J^(+9r2|pPEkQSLYG9(C5EEe?=F6oO1eFin}XmWp5J)lO_HX#F7}5*?$Agte>8`h@3r2dQge~2=t;q=tZ!+wK^%vWy%@;U z=JX(@j{S@;M=Jc@#cJg^)?Tu*3D3uy)9IMq6}^IWaBKYtBF#%BF)Zt<=n+kEecSU? z7|K&mhmDV;X+4Mb_7uWAg?|Tn6>4V8!ve0mxKVF>J~XWtkiU)Swf+r%pKd3Qu)mxH zOr;zRa>y-y!Ntdt%CCs>LmA?~H&IX1W5dxDf26rgm1>HjM;myn_5jmp8z|@YZiG1W zN2@7n@-;i|XFxCu##o?}03jM{q}=bk;s7(M6ZEXT(9V|inhnXEmrdd@CJ zb?~c*KS`f|-4wkUs2@&i{Rm^G*te$&9~-FPfue`XPm|VYpkAVqZ-R~Y+;$iX;v|)P zB#=W6Hl8Mm%@C0_nS%Hvc_|`cpoNN=X8-OPQ+$;gBpsq??e86LL$wEZKP>^OC_74=vD3iMgygunYZD}9-Hk*k?Ule zLt;HWyQpGJ2P2g#pKdI6P4wo>J9U=qm9*3kMc=P1!gTEOFHH2Pf$my5Eys}>EUnPy z=Zn43U`pW4TpSFahq(Ns%0eKdD>Mi%6UPMQwu-(FsvtaMZ&93p_YGXBL_57gg@^?D z@Q_$?an)&xKW7W#;}Lr1GiDuYy&HMBgN>&~^0{f2|3ifd1pP+%T^?oQQAD|H$jul3 ztb+K0JgbL&JWwYm{0XEYder-IDt9prmU>l>OF@hRcY=5gUg)A4X*f||Axuv64w3Pt z1@eK%rW=c06TMuq{F&CeQ6uWj`KYw4@KI$&@Q#MKVWLOdXq0IH)Ix zO|Wmi3Ka;{Lz@rp67}{m@?fOQLjn6AbMZ7WqM(q7$@apeNm+%0 zzS_uNQ%?gg_C$Srp4^m+!Bk5K(n=8+NlF)FG#+r&k0^yj-{2-~t^X>T#sMjX;M zplhP%=64u>zvoNxu)={Z;O6X!)xqPD#~VE9b;hoU9z~JU(9oIYWBG6{vqkGlW!fI-vkJA9UIJ}L*?P{MM%6YJ{+#8uS`@cXoG#Tyx#TL)++_UU8GO`#*OZ1F+ z^L7dmg=e!1Px0NeN1I)dH{V4E)Ym_CBKBysXL9k@88YmHFdoQ;Q-q+5D$|aDeEy7! zzeZ@tJZ0)Z$j6d~-xn*>wt;-zhC2BaNBp+GP)13MUPZJtQtC;4Og(K2TJ%_^E_$@3 z0+q*S8-RG0dK1c&_VHc7+u^sOJ62*MHPM^9nvOgDnTu1Bw!17`ysNVI0QK)!Hk=}c zs6SJtv4HnJii>xG!F%?QKi`iPk+#Vw(~dx^zFhnbT&GMuz;E{n#=em^#r|-RV+`7F z$+0#ykhtj4#WjtM)UoCKk9yh`wCJ%+UG&IfMPr#a(G-7ZtdMm6lC=X7&t)))Re4hr zz10xCfUOcVJPJDSPdz0rT#b3N-1an1BWQ&&Qxru%W_zrUDpN1y`Bgf%%jXTxUW{FC zEuglEIG^*RQKxvc-cDOUtI&KHMN>Q%b?ZOrZ0NMzB3xj zypi}l7ArFe8p5J6`Ar@_7dSr_fYd~fyr6IwPATI3ZdaCG&^$x{QxCCW4rAilsOWcZEtSEfxM2LtFa|AhvWD`h3rlPvN86`PH;q^di!+KO@s@ z#YkltYo8v|6TP{scR+dnsj<8piD#czmL8zN-Oq&~k`q#878!|(9_kC~^gI$^E-p!V zPBr+PEP7I3V#C&Giby9W(gO1EQ%{~6X7_D5AccuS_}2!0+)ZE?gj8 zH}QR$1?6|e7C{2(M4bM;6zWVXj~*M zdM#c)(766mpI7Sc@D{YM$KS>1^_>8o1a@2Sh^dJlO&m9tbrVgCj#l|1Z}xwh4F}SP zYfkCZw!G_xi5{MBf|x$T5d!@zo(G<>tr7KWW2R943X%+MG=X!MAmZxSyG$p5fLzGs zt48#WKcP$$LB=fqJC{zKw7n?=@*@>?4mXryGs^xla)%#j;RAuzwMG&&nH!1(MNbw; zt9u-pOi$d)%9LU{qPI2d2vl%Sh<+Q1;|T>}N_<={@%|?$ zQ(sUo6m}vuO(9RiaNs&Hjij@^$}|yV=a=8frBkPA-Kb21f%c5iBS{JZJn;*+oKn zq9?C7Tr~UG@*7oBk%4f5tCcjAR;Iq7v$Jg2s6@G_s60S#=l5(F#r*uGdn?mKkex5y z!KKr{n_w1s*ohD48&L;WAzTC(V4=Jw(`)^kinVxH%7W;V&L~Jgg#7-{s~& zBqVydLf>5E!_)I<+VJR9<~66aJK{2oZQuRB%W;(1GQ`#(d>AU?0e_y5jN85Jqf^lZJyQ&`VH6`c_iPLKV&4b2bZVsGwleJ) zbFY45CV<|Bbl=0t*@AUURMN#dsDwdBy-rg}2O??FBhaKa z7gqxxhMDigd%n0NcsNIms#DNBR>0|&Ako9KFkgIaU2z!(^t1|mIxg`%bdEC#a7z4%K1{R{8J<96kXD+lJ`X_q6Z-CxvghS;s#Y#;PIsEoshp_ZHZkC1^9{CQq)hadHiY%yQxv^`4b;?F-Aj-BfbfCy-q~XL z+sZT^N~H{b7yq08gG3L2=mq!OaSF=<*a&_-sJ4HhYi-jQ5< zHHL{E()|h-u11JXNAqSO?)O7QkM7Z6!`0|+)a@APtq1Q}ELx{3QxDJ!3^+N$&$&ef z9X&%lLG!MEQ>F=GvP6$Cykak;|JUa9r#v^x_evO<@13+8Dp=5h6^2;i=D0-T_dnqw zDM~6UEVfnAlk;W)q9hwtX`sCg{SC+$`wr*gtuw5rXZHUK$~Iv2+H`(aO4AkURU}703|L0}zLG8yi*;`S*1O8wKR81@Qzeaz0`ld8F^0Jf5H0V&6dV zU|aL~Eua-+KHfUVlxc#PY|$gEwO@yP{1)ktH|J#v(XpQb{U_Bs1HRN2ooD1K1vQF0 zI^KE#;EV2Y7*QvBOF=j7rzU#6*4MfCY77-U0KycwKMf7{Ub_57nMX#pU>(ZG*T8Vm zqp}O0w=9Ycv3sLmF3m(70T)5Z_yfH(;e&bv7f#Z&UZkBK%Ct?$9_X*xc^*Om|DF)#~w!+US^EgZ&7cOIOsBKR80RPJf;VGuY|A#p6)>To-TX65kZ&VAkOe(RS`sw1Q&5V%7$0O z2kFe9o;C~W<@Q=-F1{M^n{TA@Q6X4B^xi_^#)T&$Z&%0Z?a6I%zGui?(#afUo*=dr z(W{|~FB;{cTDi43U)vZR^h%w|HO6RVZq)OsaY4fyu0kk|=Xw_>;(~~T3Gw;P8)6tn zE~{9iC3@i-c+2F9C=?KtrCj(rsZmSsG~vRRD=z*ZMDhtXo>oQ>Jp#Q48-9Wqo{Ezq z&+kF-koNI3^})ndXIL*!0%^kTRxW&v7($=bjwsVd17i6Y7gwE0%xALL)VW8-&sGW$Li89aM(m0B zR-htY&ZQ#>Vc6N{CVOh!Y#7D3qDOO;TzoY~YP5js0Xd|RxvXY;%J1Z+3)DH>MR-@% z*$2yrqKDs*hM~S^svCHUhOGC`v!Zh524NkdSxb}Jnq~r;;=ba2%cteDK5e9 zyr=I}3q+AtyJZHuz|H`ou^C_0UFD9xpZn&P98l- zOY~@SE*gmM&=mQNym}~m%uzOX%U+*#3+yXspg+c6atyEze*;esu#75t0NvAz^!$(A zHS>Pdi?tZOS}30%LI^F?g$wZi?`^T;X^Ktx`QrU5>2UNc+Zpi(ZuFLvz9GIP8ZHOKLzvsS)E7-eC zr!=h>@bNlCB^ep+#X>3P4TP9KNn3eTvMHcd^c;J_z57&yW1nSIhelo6lX|^hQoz@8 zC08+AqM;)C_Vu-~r8bg&lorgXsM{ zh2Ll&-(FywqDP?NYa2bjcDadqyeg@-;kxTe;zA&vc<;aF3nJ0GLA+rip^Qs&MJm zS+LeA(>l@=J@SNtI38||bAsajwy#M5lyAaSV0*WDxeauE-E(saq9;MCrtZr94S2`c z;)giyK=^Ma=DYwqAWj$O2yGEElq=Iw;9c@LK+Q6AE7si1P$V_HA(W1P*ujX=-m zzqoj7lq;?=k()>RAo~hvfWM*nB))Mo&a00G-Al@l-J-kJ3O!?xpPQTaEnPi~NO(vn!P166EuE z>d`ipWmn(~y`xzyq+mR0T(Byg29*YemmeT|sEzO740UvLM`Jt1)~z$7^HKT15eGux z524%F=!|IWYgUs6dX}`62SU9c<&8uKJec-0$_0SbRy{*8W6r!&XVD!#a+IR-Mt?KC z)~9G8WLD3zIb`RWPZnqwx?^u>5)3ICwv+az+eC07#JOre+?@ByCSz5A_ht(9V6%t9h&T#N-V|e+yAw2xKzcjIK)huI_#7?@P;>FpqA2cpl8R#)W zLqkJj0@n__6vDBV6_g1=aO}T8eAdJEG^0ASG+o*QNaqSL_>yqPeg=7pewI)}LqkJi zthA#P8o%Duw#mng>WY2T8)#@~XtW8M6C0^~0llYf`+iz?Z{BZ=(dE0VoNH)kXmkK~ zOGpvIayz)~xN>*o3hm{_@X!HMVlSbFhQ<^FZCP12_;zE&J_e$Lq3_@@glAp%Xs<)M t7vS${=z)I27#VtvUZK^{*dAaQ{|_8?J7|x*9xea?002ovPDHLkV1g!S_1gdd literal 5764 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 diff --git a/dmp-frontend/src/favicon_v1.ico b/dmp-frontend/src/favicon_v1.ico new file mode 100644 index 0000000000000000000000000000000000000000..afc6615b9c328a646b883c7bdf377690e4e745a7 GIT binary patch literal 1150 zcmbVMSxA&o6#j$W+9b%Aphb&ZT3jkC_pQ)UqZ*+SgHi~RsNSL%UwSa5Mx5NHSsaGR zOa&v!D2WiueJVA~h*mSV$#R_apZU7y%AH1g>kjw7_kQ=BbIXKcaNBM8+|iD~dOh3@JJ%Gl!i+eNn|o1zEE&q6mFQNLKz2IevdyEXvJ}eTRcKJ8 z;d_7AA{#rXWpT*dhnnb(FlO$9F(U>wdp5(A6$ksQ1#MRfpihl}bMBXLAN}fb?%&;` ziD&Lt)B^=W8UF7=@UQg*DiA3=&ic6NbXN(SuxD| zO4J`uhMxIe9kl`Km|(OND)8y~6Q91_G6Ukhr9i=bQ}5r3?urtg6OZg>HmXp|^b7~1 z(RBJSC|;Xo+Q)%)@&_EVKk=Y27l!m`?#FrjQQgDzlVm$fi+%CWydOdB-XJvRXXE#`FT4imtW5~xz7S`otXRyAkKyUn zB2-1J$JEG>FMirk4ykTNTbo$^llc3+)i*KRXoM*{j&nyfO!YwZNJIE9*1nosxE&sd z@-3@b{odd*)B|Q+CBxS67^$wgu9x+i-w-w?-@ZX>Q9cGVDqe54nJKofz{3l9m>4v3 c4I%5N{tr$$5pvW+qOTXQzdbJg2mW{c1GN<%S^xk5 literal 0 HcmV?d00001 From 33552ecd701cb5c377b221272f02fef1e50147ea Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 17 Sep 2019 13:59:44 +0300 Subject: [PATCH 4/8] Renames OpenDMP to ARGOS --- .../src/app/ui/about/about.component.html | 4 ++-- .../explore-dataset-listing.component.html | 2 +- .../sidebar-footer/faq/faq-dialog.component.html | 10 +++++----- dmp-frontend/src/assets/i18n/en.json | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dmp-frontend/src/app/ui/about/about.component.html b/dmp-frontend/src/app/ui/about/about.component.html index b96169314..16d8dfe91 100644 --- a/dmp-frontend/src/app/ui/about/about.component.html +++ b/dmp-frontend/src/app/ui/about/about.component.html @@ -6,8 +6,8 @@
-

OpenDMP is an online tool in support of automated processes to creating, managing, sharing and linking DMPs with research artifacts they correspond to. It is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning that addresses FAIR and Open best practices and assumes no barriers for its use and adoption. It does so by applying common standards for machine-actionable DMPs as defined by the global research data community of RDA and by communicating and consulting with researchers, research communities and funders to better reflect on their needs. -

OpenDMP provides a flexible environment and an easy interface for users to navigate and use.

+

ARGOS is an online tool in support of automated processes to creating, managing, sharing and linking DMPs with research artifacts they correspond to. It is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning that addresses FAIR and Open best practices and assumes no barriers for its use and adoption. It does so by applying common standards for machine-actionable DMPs as defined by the global research data community of RDA and by communicating and consulting with researchers, research communities and funders to better reflect on their needs. +

ARGOS provides a flexible environment and an easy interface for users to navigate and use.

diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html index d5cc013fd..632e26f3d 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html @@ -1,6 +1,6 @@
-

Welcome to OpenDMP

+

Welcome to ARGOS

Create, Link, Share Data Management Plans

diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html index 72b3ef809..c4f4f2a6a 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html @@ -7,16 +7,16 @@
-

What is OpenDMP?

-

OpenDMP is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. OpenDMP technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. OpenDMP is comprised of two major features: the OpenDMP template and the Dataset Description.

+

What is ARGOS?

+

ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.


Who is it for?

-

OpenDMP is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. OpenDMP may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.

+

ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.


How can I use it?

-

OpenDMP is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.
OpenDMP can be used for: +

ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.
ARGOS can be used for:

A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs

The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform. @@ -24,7 +24,7 @@ The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it.

C. practicing in writing DMPs and Dataset Descriptions

- Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), openDMP may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions. + Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions.


diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index a68eb11ff..c911a50ac 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -107,12 +107,12 @@ "DATASETS": "Dataset Descriptions", "LOGIN": { "TITLE": "Login", - "TEXT": "You don't need to have a registered account for OpenDMP" + "TEXT": "You don't need to have a registered account for ARGOS" } }, "NAV-BAR": { "BREADCRUMB-ROOT": "Dashboard", - "TITLE": "OpenDMP", + "TITLE": "ARGOS", "GRANTS": "Grants", "GRANT": "Grant", "DMP": "DMP", @@ -120,7 +120,7 @@ "MY-DMPS": "MY DMPs", "DATASETS": "Dataset Descriptions", "DATASET": "Dataset", - "PUBLIC-DATASETS": "Explore OpenDMP", + "PUBLIC-DATASETS": "Explore ARGOS", "USERS": "Users", "DATASETS-ADMIN": "Dataset Templates", "DMP-PROFILES": "DMP Templates", @@ -902,7 +902,7 @@ }, "HOMEPAGE": { "OPEN-DMPS": { - "STATS": "OpenDMP Dashboard" + "STATS": "ARGOS Dashboard" }, "MY-DMPS": { "STATS": "My Dashboard" @@ -912,7 +912,7 @@ "TITLE": "-About-", "MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementation solution.", "CONTRIBUTORS": "Contributors", - "WELCOME": "Welcome to OpenDMP", + "WELCOME": "Welcome to ARGOS", "WELCOME-MESSAGE": "Create, Link, Share Data Management Plans" }, "FOOTER": { @@ -945,8 +945,8 @@ "MY-GRANTS": "My Grants", "GRANTS": "Grants", "MY-DMPS": "My DMPs", - "TITLE": "What is OpenDMP.eu?", - "INFO-TEXT": "OpenDMP.eu is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.", + "TITLE": "What is ARGOS?", + "INFO-TEXT": "ARGOS is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.", "ORGANIZATIONS": "Related Organizations", "DMPS": "DMPs", "MY-DATASETS": "My Dataset Descriptions", @@ -1032,7 +1032,7 @@ "AT-LEAST-ONE-DATASET-FINALISED": "You need to have at least one Dataset Description Finalized" }, "IMPACT": "This action will finalize your DMP, and you won't be able to edit it again.", - "AFTER-FINALIZATION": "After finalizing your DMP you can Publish it, and it'll be publicly available to the OpenDMP tool." + "AFTER-FINALIZATION": "After finalizing your DMP you can Publish it, and it'll be publicly available to the ARGOS tool." }, "DRAFTS": { "FOR-DMP": "For DMP:", From 6a4602a45eff499c3d3640ba2aaa37c17cce4a2d Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 17 Sep 2019 14:04:41 +0300 Subject: [PATCH 5/8] Fixes bug on updating Tags on Dataset Description. --- .../main/java/eu/eudat/logic/managers/DatasetManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index 09845b06a..b361cb96a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -334,12 +334,15 @@ public class DatasetManager { checkDatasetValidation(dataset); UserInfo userInfo = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build(); dataset.setCreator(userInfo); - updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel); + createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset); createDataRepositoriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao(), dataset); createServicesIfTheyDontExist(dataset); createExternalDatasetsIfTheyDontExist(dataset); - return apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); + Dataset dataset1 = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); + datasetWizardModel.setId(dataset1.getId()); + updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel); + return dataset1; } private void checkDatasetValidation(Dataset dataset) throws Exception { From e94a988b68d2dd041b48196db3e43e0d469efea4 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 17 Sep 2019 17:58:13 +0300 Subject: [PATCH 6/8] Fixes bug on login page responsiveness --- dmp-frontend/src/app/ui/auth/login/login.component.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss index cb43b7f4d..0ec524671 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.scss +++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss @@ -1,6 +1,6 @@ .login-screen { margin-top: 70px; - height: calc(100vh - 10px); + min-height: calc(100vh - 10px); } .login-card { @@ -102,7 +102,8 @@ min-height: 200px; padding: 25px; border-radius: 3px; - background: rgb(0, 112, 192); + background: #0c7489; + // background: rgb(0, 112, 192); display: flex; flex-direction: column; align-items: center; @@ -205,7 +206,6 @@ span.orcidIconMedium { width: 273px; height: 300px; background-size: cover; - margin-top: -10em; } .login-bg { From 11cc8ef0fadf0233a6de1c3bc48330d590eb3a34 Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Tue, 17 Sep 2019 18:16:02 +0300 Subject: [PATCH 7/8] language fix --- dmp-frontend/src/assets/i18n/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index c911a50ac..db93124b2 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -728,9 +728,9 @@ "DATAREPOSITORIES": "Data Repositories", "REGISTRIES": "Registries", "SERVICES": "Services", - "EXTERNAL-DATASETS": "External Dataset Descriptions", - "EXTERNAL-DATASET-TYPE": "External Dataset Descriptions Type", - "EXTERNAL-DATASET-INFO": "External Dataset Descriptions Info", + "EXTERNAL-DATASETS": "External Dataset", + "EXTERNAL-DATASET-TYPE": "External Dataset Type", + "EXTERNAL-DATASET-INFO": "External Dataset Info", "DATAREPOSITORIES-INFO": "Data Repositories Info", "TAGS": "Tags", "CREATE": "Create New" From 95168d78c7b9a1f5e7abe6219ba9d805d91a5014 Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Tue, 17 Sep 2019 18:34:52 +0300 Subject: [PATCH 8/8] gitignore update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8bd13f118..68711a876 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ dmp-frontend/.vscode/ *.docx +dmp-frontend/package-lock.json