diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html index 4ee6d4ad0..d74ab8bae 100644 --- a/dmp-frontend/src/app/app.component.html +++ b/dmp-frontend/src/app/app.component.html @@ -22,7 +22,7 @@ diff --git a/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts b/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts index 5e721ccf9..4ce000575 100644 --- a/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts +++ b/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts @@ -6,22 +6,23 @@ import {Pipe, PipeTransform} from "@angular/core"; }) export class ProjectTableFilterPipe implements PipeTransform { - transform(array: any[], query: string): any { + transform(array: any[], query: string, userid : string, onlyMyProjects : boolean): any { - if (query) { + if (query || userid) { return _.filter(array, row => { - - return ( - - row.label.indexOf(query) > -1 - //|| row.version == query - //|| row.id.indexOf(query) > -1 - ) + if(onlyMyProjects){ + return (row.label.indexOf(query) > -1) && (row.creationUser==userid); + } + else{ + return row.label.indexOf(query) > -1; + } + }); } return array; } + } \ No newline at end of file diff --git a/dmp-frontend/src/app/projects/project.html b/dmp-frontend/src/app/projects/project.html index 5b5bb2ec4..3e382057a 100644 --- a/dmp-frontend/src/app/projects/project.html +++ b/dmp-frontend/src/app/projects/project.html @@ -1,16 +1,21 @@ - - + diff --git a/dmp-frontend/src/app/projects/projects.component.ts b/dmp-frontend/src/app/projects/projects.component.ts index 92899c1c3..bab4aacf8 100644 --- a/dmp-frontend/src/app/projects/projects.component.ts +++ b/dmp-frontend/src/app/projects/projects.component.ts @@ -59,6 +59,8 @@ export class ProjectsComponent implements OnInit{ project: any; + whoami: any; + onlyMyProjects : boolean = false; options: DatepickerOptions = { minYear: 1900, @@ -101,11 +103,22 @@ getEmptyProject(){ this.getProjects(); + this.serverService.whoami().subscribe( + response => { + this.whoami = response; + console.log(this.whoami) + }, + err => { + simple_notifier("danger",null,"Could not retrieve user config"); + } + ); + } - + getProjects(muted? : boolean){ - this.serverService.getProjectsOfUser().subscribe( + //this.serverService.getProjectsOfUser().subscribe( + this.serverService.getAllProjects().subscribe( response => { this.tableData = response; if(muted && muted!=true) diff --git a/dmp-frontend/src/app/services/server.service.ts b/dmp-frontend/src/app/services/server.service.ts index d89518072..c3744c62a 100644 --- a/dmp-frontend/src/app/services/server.service.ts +++ b/dmp-frontend/src/app/services/server.service.ts @@ -99,7 +99,6 @@ export class ServerService { return this.restBase.get("dmp/getofuser"); } - public createDmpForCurrentUser(data:any){ return this.restBase.post("dmp/createofuser", data); } @@ -140,6 +139,10 @@ public deleteDataset(dataset: any){ return this.restBase.post("dataset/softdelete", dataset); } +public whoami(){ + return this.restBase.get("user/whoami"); +} + /* logOut() { diff --git a/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts b/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts index 5c8868191..a86f3bff2 100644 --- a/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts +++ b/dmp-frontend/src/app/widgets/breadcrumb/breadcrumb.component.ts @@ -55,7 +55,7 @@ export class BreadcrumbComponent implements OnInit { let label = null; if(componentName == "ProjectsComponent") { - label = "My Projects"; + label = "Projects"; } if(componentName == "DmpComponent"){ label = "My Data Management Plans";
+ + + +
+ +