Adds: Drafts, Removes: Recent Edited Activity Table from Dashboard

dmp-frontend/src/app/ui/dashboard/dashboard.component.html

@@ -62,11 +62,11 @@
 						<app-recent-visited-activity></app-recent-visited-activity>
 					</div>
 				</div>
-				<div class="row">
+				<!-- <div class="row">
 					<div class="col-lg-12 col-md-12">
 						<app-recent-edited-activity></app-recent-edited-activity>
 					</div>
-				</div>
+				</div> -->
 
 			</div>
 

dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css

@@ -7,8 +7,27 @@
 }
 
 .draft-desc {
+	position: relative;
+	overflow: hidden;
+	height: 60px;
+	font-size: 14px;
 	padding-top: 15px;
-  padding-bottom: 15px;
+	margin-bottom: 30px;
+}
+
+.draft-desc:after {
+	content: "";
+	text-align: right;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	width: 70%;
+	height: 1.4em;
+	background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%);
+}
+
+td:hover .draft-desc:after {
+	background: rgba(255, 255, 255, 0);
 }
 
 .draft-subtitle {
@@ -24,3 +43,12 @@
 .drafts-more-btn {
 	text-align: right;
 }
+
+.project-pill {
+	width: 80%;
+	border: 1px solid rgb(231, 230, 230);
+	color: rgb(145, 145, 145);
+	background-color: rgb(242, 242, 242);
+	border-radius: 10em;
+	text-align: center;
+}

dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html

@@ -4,54 +4,12 @@
 			<h4 class="card-title">DRAFTS</h4>
 			<p class="card-category">Draft Registrations</p>
 		</div>
-    <a href="#" class="view-all">VIEW ALL</a>
+		<div class="view-all" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}</div>
 	</div>
 	<div class="card-body table-responsive">
 		<table class="table table-hover">
-      <tbody>
+			<tbody *ngIf="datasetDrafts != null">
-        <tr>
+				<tr *ngFor="let dataset of datasetDrafts" (click)="redirect(dataset.id, datasetDraftsTypeEnum.Dataset)" style="cursor: pointer;">
-          <td>
-            <div class="row">
-              <div class="col-md-2" style="padding-top: 36px">
-                <i class="material-icons-outlined grey">view_agenda</i>
-              </div>
-              <div class="col-md-10">
-                <div class="drafts-more-btn">
-                  <i class="material-icons more-icon">more_horiz</i>
-                </div>
-                <div class="draft-title">
-                  Dataset: Clarin-D For Dmp: Dmp for Project: Real time
-                  application
-                </div>
-                <div class="draft-subtitle">03.08.2019</div>
-                <div class="draft-desc">
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
-                  do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-                  Ut enim ad minim veniam, quis nostrud exercitation ullamco
-                  laboris nisi ut aliquip ex ea commodo consequat. Duis aute
-                  irure dolor in reprehenderit in voluptate velit esse cillum
-                  dolore eu fugiat nulla pariatur. Excepteur sint occaecat
-                  cupidatat non proident, sunt in culpa qui officia deserunt
-                  mollit anim id est laborum.
-                </div>
-                <ul
-                  class="nav md-pills max-width-80 nav-justified pills-rounded pills-outline-default"
-                >
-                  <li class="nav-item">
-                    <a
-                      class="nav-link active"
-                      data-toggle="tab"
-                      href="#panel81"
-                      role="tab"
-                      >Clarin-D</a
-                    >
-                  </li>
-                </ul>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
 					<td>
 						<div class="row">
 							<div class="col-md-2" style="padding-top: 36px">
@@ -61,29 +19,20 @@
 								<div class="drafts-more-btn">
 									<i class="material-icons more-icon">more_horiz</i>
 								</div>
-                <div class="draft-title">Title unavailable</div>
+								<div class="draft-title">
-                <div class="draft-subtitle">03.08.2019</div>
+									Dataset: {{ dataset.label }} For Dmp: {{ dataset.dmp }} For Project: {{ dataset.project }}
-                <div class="draft-desc">
-                  Description unavailable
 								</div>
-                <ul
+								<div class="draft-subtitle">{{ dataset.created | date: "shortDate"}}</div>
-                  class="nav md-pills max-width-80 nav-justified pills-rounded pills-outline-default"
+								<div class="draft-desc">{{ dataset.description }}</div>
-                >
+								<div class="project-pill">{{ dataset.profile }}</div>
-                  <li class="nav-item">
-                    <a
-                      class="nav-link active"
-                      data-toggle="tab"
-                      href="#panel81"
-                      role="tab"
-                      >Clarin-D</a
-                    >
-                  </li>
-                </ul>
 							</div>
 						</div>
 					</td>
 				</tr>
 			</tbody>
+			<tbody *ngIf="datasetDrafts == null">
+				<td></td>
+			</tbody>
 		</table>
 	</div>
 </div>

dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts

@@ -1,4 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
+import { DatasetService } from '../../../core/services/dataset/dataset.service';
+import { DataTableRequest } from '../../../core/model/data-table/data-table-request';
+import { DatasetCriteria } from '../../../core/query/dataset/dataset-criteria';
+import { DatasetListingModel } from '../../../core/model/dataset/dataset-listing';
+import { AuthService } from '../../../core/services/auth/auth.service';
+import { RecentActivityType } from '../../../core/common/enum/recent-activity-type';
+import { Router} from '@angular/router';
 
 @Component({
 	selector: 'app-drafts',
@@ -6,10 +13,52 @@ import { Component, OnInit } from '@angular/core';
 	styleUrls: ['./drafts.component.css']
 })
 export class DraftsComponent implements OnInit {
+	datasetDrafts: DatasetListingModel[];
+	datasetDraftsTypeEnum = RecentActivityType;
+	@Input() routerLink: string;
+	status: number;
 
-  constructor() { }
+	constructor(
+		private router: Router,
+		private datasetService: DatasetService,
+		private authentication: AuthService
+	) { }
 
 	ngOnInit() {
+		const fields: Array<string> = [];
+		const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 2, { fields: fields });
+		dmpDataTableRequest.criteria = new DatasetCriteria();
+		dmpDataTableRequest.criteria.status = 0;
+		this.datasetService.getPaged(dmpDataTableRequest).subscribe(response => {
+			this.datasetDrafts = response.data;
+		});
 	}
 
+	redirect(id: string, type: RecentActivityType) {
+		switch (type) {
+			case RecentActivityType.Project: {
+				this.router.navigate(["projects/edit/" + id]);
+				return;
+			}
+			case RecentActivityType.Dataset: {
+				this.router.navigate(["datasets/edit/" + id]);
+				return;
+			}
+			case RecentActivityType.Dmp: {
+				this.router.navigate(["plans/edit/" + id]);
+				return;
+			}
+			default:
+				throw new Error("Unsupported Activity Type ");
+		}
+	}
+
+	public isAuthenticated(): boolean {
+		return !!this.authentication.current();
+	}
+
+	navigateToUrl() {
+		if (!this.isAuthenticated()) { return; }
+		this.router.navigate(['/datasets'], { queryParams: { status: 0 } });
+	}
 }

dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts

@@ -34,6 +34,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 	pageEvent: PageEvent;
 	titlePrefix: String;
 	dmpId: string;
+	status: Number;
 	dmpSearchEnabled = true;
 
 	constructor(
@@ -54,6 +55,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 			.subscribe(async (params: Params) => {
 				const queryParams = this.route.snapshot.queryParams;
 				this.dmpId = queryParams['dmpId'];
+				this.status = queryParams['status'];
 				this.criteria.setRefreshCallback(() => this.refresh());
 				if (this.dmpId != null) {
 					this.dmpSearchEnabled = false;
@@ -69,6 +71,11 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 					this.refresh();
 					this.breadCrumbs = Observable.of([]);
 				}
+
+				if (this.status != null && this.status == 0) {
+					this.criteria.setCriteria(this.getDraftCriteria());
+					this.refresh();
+				}
 			});
 	}
 
@@ -88,6 +95,12 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 		return defaultCriteria;
 	}
 
+	getDraftCriteria(): DatasetCriteria {
+		const draftCriteria = new DatasetCriteria();
+		draftCriteria.status = 0;
+		return draftCriteria;
+	}
+
 	makeItPublic(id: String) {
 		this.datasetService.makeDatasetPublic(id)
 			.pipe(takeUntil(this._destroyed))

dmp-frontend/src/assets/css/demo.css

@@ -214,7 +214,7 @@ h4 {
 	margin-top: 5px;
 }
 
-.card-title h4 {
+.card-desc h4 {
 	text-transform: uppercase;
 }
 
@@ -259,7 +259,13 @@ h4 {
 	margin-top: 10px;
 	margin-right: 10px;
 	font-weight: 400;
+	cursor: pointer;
 	text-transform: uppercase;
+	color: rgb(106, 164, 217);
+}
+
+.view-all:hover {
+	color: rgb(46, 117, 182);
 }
 
 .card-header-plain h4 {
@@ -316,20 +322,6 @@ table > thead > tr > th,
 	z-index: 0;
 }
 
-.pills-outline-blue .nav-item .nav-link {
-	border: 1px solid rgb(231, 230, 230);
-	color: rgb(145, 145, 145);
-}
-.pills-outline-default .nav-item .nav-link.active {
-	border: 1px solid rgb(231, 230, 230);
-	color: rgb(145, 145, 145);
-	background-color: rgb(242, 242, 242);
-}
-.pills-outline-default .nav-item .nav-link.active:hover {
-	border: 1px solid rgb(231, 230, 230);
-	color: rgb(145, 145, 145);
-}
-
 .form-control:focus {
 	color: #495057;
 	background-color: rgba(0, 0, 0, 0);