Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

dmp-frontend/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

dmp-frontend/src/app/models/projects/ProjectListingModel.ts

@@ -18,8 +18,8 @@ export class ProjectListingModel implements Serializable<ProjectListingModel> {
         this.reference = item.reference;
         this.uri = item.uri;
         this.status = item.status;
-        this.startDate = item.startdate;
-        this.endDate = item.enddate;
+        this.startDate = new Date(item.startdate);
+        this.endDate = new Date(item.enddate);
         this.description = item.description;
 
 		return this;

dmp-frontend/src/app/models/projects/ProjectModel.ts

@@ -11,7 +11,7 @@ export class ProjectModel implements Serializable<ProjectModel> {
 	public abbreviation: String;
 	public reference: String;
 	public uri: String;
-	public status: Status;
+	public status: Status = Status.Active;
 	public startDate: Date;
 	public endDate: Date;
 	public description: String;

dmp-frontend/src/app/shared/components/navigation/navigation.component.css

@@ -9,3 +9,14 @@
 .navbar-button {
 	text-transform: uppercase;
 }
+
+.user-label {
+	padding: 0 0 0 5px;
+	font-size: 14px;
+}
+
+.app-title {
+	color: inherit;
+	text-decoration: none;
+	padding-right: 15px;
+}

dmp-frontend/src/app/shared/components/navigation/navigation.component.html

@@ -1,10 +1,15 @@
 <mat-toolbar color="primary">
-	{{'NAV-BAR.TITLE' | translate}}
-	<span class="navbar-spacer"></span>
-	<div *ngIf="isAuthenticated()">
-		<a mat-button class="navbar-button" routerLink="/forms">Forms</a>
-		<!-- <a mat-button *ngIf="isAdmin()" class="navbar-button" routerLink="/configuration">Configuration</a>
-		<a mat-button *ngIf="isAdmin()" class="navbar-button" routerLink="/users">Users</a>
-		 --><button mat-icon-button class="navbar-icon" (click)="logout()"><mat-icon class="navbar-icon">exit_to_app</mat-icon></button>
-	</div>
-</mat-toolbar>
+		<a class="app-title" routerLink="/">{{'NAV-BAR.TITLE' | translate}}</a>
+		<div *ngIf="isAuthenticated()">
+			<button mat-button class="navbar-button" routerLink="/projects">{{'NAV-BAR.PROJECTS' | translate}}</button>
+			<button mat-button class="navbar-button" routerLink="/dmps">{{'NAV-BAR.DMPS' | translate}}</button>
+			<button mat-button class="navbar-button" routerLink="/datadets">{{'NAV-BAR.DATASETS' | translate}}</button>
+		</div>
+		<span class="navbar-spacer"></span>
+		<div *ngIf="isAuthenticated()">
+			<span class="user-label">{{this.getPrincipalName()}}</span>
+			<button mat-icon-button class="navbar-icon" (click)="logout()">
+				<mat-icon class="navbar-icon">exit_to_app</mat-icon>
+			</button>
+		</div>
+	</mat-toolbar>

dmp-frontend/src/app/shared/components/navigation/navigation.component.ts

@@ -18,7 +18,7 @@ export class NavigationComponent {
 	public logout(): void {
 		this.authentication.logout();
 	}
-
+	
 	public isAuthenticated(): boolean {
 		return !(!this.authentication.current())
 	}
@@ -33,4 +33,10 @@ export class NavigationComponent {
 		}
 		return false;
 	}
+
+	public getPrincipalName(): string {
+		const principal: Principal = this.authentication.current();
+		if (principal) { return principal.name; }
+		return '';
+	}
 }

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

@@ -8,10 +8,20 @@
             "MESSAGE": "Are you sure you want to delete this item?",
             "POSITIVE": "Yes",
             "NEGATIVE": "Cancel"
+        },
+        "SNACK-BAR": {
+            "SUCCESSFUL-CREATION": "Created Successfully",
+            "SUCCESSFUL-LOGIN": "Successful Login",
+            "SUCCESSFUL-LOGOUT": "Successful Logout",
+            "UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
+            "UNSUCCESSFUL-LOGIN": "Unsuccessful Login"
         }
     },
     "NAV-BAR": {
-        "TITLE": "DMPS"
+        "TITLE": "Data Management Plans",
+        "PROJECTS": "Projects",
+        "DMPS": "Plans",
+        "DATASETS": "Datasets"
     },
     "PROJECT-LISTING": {
         "TITLE": "Projects",
@@ -80,7 +90,7 @@
             "DESCRIPTION": "Description",
             "ORGANISATIONS": "Organisations",
             "RESEARCHERS": "Researchers",
-            "PROFILES":"Profiles"
+            "PROFILES": "Profiles"
         },
         "ACTIONS": {
             "SAVE": "Save",