#7662: Popup message when merging email accounts from the user profile | [Bug fix] Truncate title of dataset and show tooltip in dmp clone popup.

1. user-profile.component.ts: Added PopupNotificationDialogComponent when email for validating account has been sent.
2. login.component.ts: Added @Input() redirect: boolean = true; - if this is false do not redirect to home page.
3. add-account-dialog.component.html: Add parameter redirect="false" in <app-login>.
4. clone-dialog.component.html: [Bug fix] Truncate title of dataset and show tooltip in dmp clone popup.
5. i18n/: In language files added "USER-PROFILE.MERGING-EMAILS-DIALOG.TITLE" and "USER-PROFILE.MERGING-EMAILS-DIALOG.MESSAGE".

dmp-frontend/src/app/ui/auth/login/login.component.ts

@@ -32,6 +32,7 @@ declare const FB: any;
 })
 export class LoginComponent extends BaseComponent implements OnInit, AfterViewInit {
 
+	@Input() redirect: boolean = true;
 	@Input() mergeUsers: boolean;
 
 	public auth2: any;
@@ -58,7 +59,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
 	) { super(); }
 
 	ngOnInit(): void {
-		if(this.authService.current()){
+		if(this.authService.current() && (this.redirect == true)){
 			this.router.navigate(['home']);
 		}
 		this.matomoService.trackPageView('loginPage');

dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html

@@ -59,7 +59,7 @@
 				<mat-card class="mat-card">
 					<mat-selection-list #selectedItems (selectionChange)="selectionChanged(selectedItems)">
 						<mat-list-option *ngFor="let dataset of data.datasets;" [value]="dataset.id">
-							{{dataset.label}}
+							<span class="text-truncate" [matTooltip]="dataset.label">{{dataset.label}}</span>
 						</mat-list-option>
 					</mat-selection-list>
 				</mat-card>

dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html

@@ -3,7 +3,7 @@
 		<h1 mat-dialog-title class="title">{{'USER-PROFILE.ACTIONS.LINK-NEW-ACCOUNT' | translate}}</h1>
 		<span class="ml-auto align-self-center" (click)="closeDialog()"><mat-icon class="close-icon">close</mat-icon></span>
 	</div>
-	<app-login *ngIf="hasEmail" [mergeUsers]="true"></app-login>
+	<app-login *ngIf="hasEmail" [mergeUsers]="true" redirect="false"></app-login>
 	<div *ngIf="!hasEmail">
 		<div  mat-dialog-content class="definition-content pt-2">
 			<mat-form-field class="full-width">

dmp-frontend/src/app/ui/user-profile/user-profile.component.ts

@@ -31,6 +31,7 @@ import { FormValidationErrorsDialogComponent } from '@common/forms/form-validati
 import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
 import { MatomoService } from '@app/core/services/matomo/matomo-service';
 import { HttpClient } from '@angular/common/http';
+import {PopupNotificationDialogComponent} from "@app/library/notification/popup/popup-notification.component";
 
 const availableLanguages: any[] = require('../../../assets/resources/language.json');
 
@@ -306,7 +307,14 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
 		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
 			if (result) {
 				this.mergeEmailConfirmation.sendConfirmationEmail(result).pipe(takeUntil(this._destroyed))
-					.subscribe(res => { }, err => { });
+					.subscribe(res => {
+						this.dialog.open(PopupNotificationDialogComponent, {
+							data: {
+								title: this.language.instant('USER-PROFILE.MERGING-EMAILS-DIALOG.TITLE'),
+								message: this.language.instant('USER-PROFILE.MERGING-EMAILS-DIALOG.MESSAGE')
+							}, maxWidth: '30em'
+						});
+					}, err => { });
 			}
 		});
 	}

dmp-frontend/src/assets/i18n/de.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Abmeldung"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Einstellungen",
 			"TIMEZONE": "Zeitzone",

dmp-frontend/src/assets/i18n/en.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Log Out"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Settings",
 			"TIMEZONE": "Time Zone",

dmp-frontend/src/assets/i18n/es.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Cerrar la sesión"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Configuración",
 			"TIMEZONE": "Zona horaria",

dmp-frontend/src/assets/i18n/gr.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Αποσύνδεση"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Ρυθμίσεις",
 			"TIMEZONE": "Ζώνη Ώρας",

dmp-frontend/src/assets/i18n/hr.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Odjava"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Postavke",
 			"TIMEZONE": "Vremenska zona",

dmp-frontend/src/assets/i18n/pt.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Terminar Sessão"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Definições",
 			"TIMEZONE": "Fuso horário",

dmp-frontend/src/assets/i18n/sk.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Odhlásiť sa"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Nastavenia",
 			"TIMEZONE": "Časové pásmo",

dmp-frontend/src/assets/i18n/sr.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Odjavite se"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Podešavanja",
 			"TIMEZONE": "Vremenska zona",

dmp-frontend/src/assets/i18n/tr.json

@@ -1657,6 +1657,10 @@
 		"LOG-OUT": "Çıkış Yap"
 	},
 	"USER-PROFILE": {
+		"MERGING-EMAILS-DIALOG": {
+			"TITLE": "Link new account",
+			"MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+		},
 		"SETTINGS": {
 			"TITLE": "Ayarlar",
 			"TIMEZONE": "Zaman Dilimi",