diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html index 863259f59..0fe69bab0 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html @@ -6,22 +6,23 @@

{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}

-
+
+ {{'GENERAL.INVITATION-DIALOG.HINT' | translate}} -
+
- + {{enumUtils.toRoleString(roles.Owner)}} {{enumUtils.toRoleString(roles.Member)}} - + +
@@ -67,4 +68,4 @@
- --> \ No newline at end of file + --> diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss index 77144b1ed..09aed5f9a 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss @@ -40,7 +40,7 @@ .mat-form-field-infix { border: none; padding: 14px; - } + } .mat-form-field-underline { display: none; } @@ -64,7 +64,7 @@ ::ng-deep .select-role { .mat-form-field-outline-start, - .mat-form-field-outline-gap, + .mat-form-field-outline-gap, .mat-form-field-outline-end { border: none !important; } @@ -74,6 +74,17 @@ } .invite-btn { + background: #ffffff 0% 0% no-repeat padding-box; + border: 1px solid #129d99; + border-radius: 30px; + opacity: 1; + width: 101px; + height: 43px; + color: #129d99; + font-weight: 500; +} + +.invite-btn-disabled { width: 6.64em; height: 2.93em; background: #FFFFFF; @@ -82,5 +93,6 @@ font-weight: bold; letter-spacing: -0.35px; color: #B5B5B5; - margin-bottom: 0.25em; + margin-bottom: 0.25em; + cursor: default; } diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts index 97d2e8627..fd87a879e 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts @@ -59,6 +59,7 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni initialItems: (excludedItems: any[]) => this.filterUsers('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => typeof(item) === 'string' ? item : item.name, titleFn: (item) => typeof(item) === 'string' ? item : item.name, + subtitleFn: (item) => item.email, valueAssign: (item) => { const result = typeof(item) === 'string' ? item : item.email; return result; @@ -97,9 +98,9 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni this.invitationService.inviteDmpInvitationUsers(invitationObject) .pipe(takeUntil(this._destroyed)) - .subscribe( - null, null, () => this.dialogRef.close() - ); + .subscribe(items => { + this.dialogRef.close(); + }); } closeDialog(): void { @@ -125,4 +126,8 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni // }); } + hasValue(): boolean { + return this.formGroup.get('users') && this.formGroup.get('users').value && this.formGroup.get('users').value.length > 0; + } + } diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 6be2afaf8..1bbd3c7e8 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -85,6 +85,9 @@ "MACHINE-ACTIONABLE": "for machine-actionable DMPs", "UPLOAD-FILE": "Upload File" }, + "INVITATION-DIALOG": { + "HINT": "Please press comma after each input of new user invitation" + }, "ACTIONS": { "VIEW-ALL": "Alles anzeigen", "SHOW-MORE": "Mehr anzeigen", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index dfd790613..5fa8230eb 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -86,6 +86,9 @@ "MACHINE-ACTIONABLE": "for machine-actionable DMPs", "UPLOAD-FILE": "Upload File" }, + "INVITATION-DIALOG": { + "HINT": "Please press comma after each input of new user invitation" + }, "ACTIONS": { "VIEW-ALL": "View All", "SHOW-MORE": "Show more", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index e2784748c..28c30982b 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -86,6 +86,9 @@ "MACHINE-ACTIONABLE": "for machine-actionable DMPs", "UPLOAD-FILE": "Upload File" }, + "INVITATION-DIALOG": { + "HINT": "Please press comma after each input of new user invitation" + }, "ACTIONS": { "VIEW-ALL": "Ver todo", "SHOW-MORE": "Mostrar más", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 73a293445..04129dbe6 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -86,6 +86,9 @@ "MACHINE-ACTIONABLE": "for machine-actionable DMPs", "UPLOAD-FILE": "Upload File" }, + "INVITATION-DIALOG": { + "HINT": "Please press comma after each input of new user invitation" + }, "ACTIONS": { "VIEW-ALL": "Προβολή όλων", "SHOW-MORE": "Δείτε περισσότερα", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index a2587e21b..17f9ed888 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -83,6 +83,9 @@ "MACHINE-ACTIONABLE": "for machine-actionable DMPs", "UPLOAD-FILE": "Upload File" }, + "INVITATION-DIALOG": { + "HINT": "Please press comma after each input of new user invitation" + }, "ACTIONS": { "VIEW-ALL": "Pozrieť všetko", "SHOW-MORE": "Ukázať viac", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index ed859e7b8..2f72435b3 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -85,6 +85,9 @@ "MACHINE-ACTIONABLE": "for machine-actionable DMPs", "UPLOAD-FILE": "Upload File" }, + "INVITATION-DIALOG": { + "HINT": "Please press comma after each input of new user invitation" + }, "ACTIONS": { "VIEW-ALL": "Tümüne Gör", "SHOW-MORE": "Daha fazla göster",