From e0211a019cef61af8368955cf6ec1b939dd04959 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Thu, 16 Apr 2020 18:36:17 +0300 Subject: [PATCH] Fixed issues with public dashboard --- .../app/ui/dashboard/dashboard.component.ts | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index 8649de976..ae07f228a 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -25,6 +25,8 @@ import { Observable, of as observableOf } from 'rxjs'; import { mergeMap, takeUntil } from 'rxjs/operators'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; +import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria'; +import { DatasetCriteria } from '@app/core/query/dataset/dataset-criteria'; @Component({ @@ -145,26 +147,31 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC } getPublicDmps() { - const dmpCriteria = new ExploreDmpCriteriaModel(); + const dmpCriteria = new DmpCriteria(); + dmpCriteria.allVersions = false; + dmpCriteria.isPublic = true; + dmpCriteria.onlyPublic = true; const fields: Array = new Array(); fields.push('-finalizedAt'); - const dataTableRequest: DataTableRequest = new DataTableRequest(0, 2, { fields: fields }); + const dataTableRequest: DataTableRequest = new DataTableRequest(0, 2, { fields: fields }); dataTableRequest.criteria = dmpCriteria; - return this.dmpService.getPublicPaged(dataTableRequest, "listing").pipe(takeUntil(this._destroyed)).subscribe(result => { this.dmpListingItems = result.data; }); + return this.dmpService.getPaged(dataTableRequest, "listing").pipe(takeUntil(this._destroyed)).subscribe(result => { this.dmpListingItems = result.data; }); } getPublicDatasets() { - const dmpCriteria = new ExploreDatasetCriteriaModel(); + const dmpCriteria = new DatasetCriteria(); + dmpCriteria.allVersions = false; + dmpCriteria.isPublic = true; const fields: Array = new Array(); fields.push('-modified'); - const dataTableRequest: DataTableRequest = new DataTableRequest(0, 4, { fields: fields }); + const dataTableRequest: DataTableRequest = new DataTableRequest(0, 4, { fields: fields }); dataTableRequest.criteria = dmpCriteria; - return this.datasetService.getPublicPaged(dataTableRequest).pipe(takeUntil(this._destroyed)).subscribe(result => { this.datasetListingItems = result.data; }); + return this.datasetService.getPaged(dataTableRequest).pipe(takeUntil(this._destroyed)).subscribe(result => { this.datasetListingItems = result.data; }); } dmpClicked(dmp: DmpListingModel) { if (!this.isAuthenticated()) { - this.router.navigate(['../explore-plans/overview', dmp.id], { relativeTo: this.route }); + this.router.navigate(['../explore-plans/publicOverview', dmp.id], { relativeTo: this.route }); } else { this.router.navigate(['/plans/publicEdit/' + dmp.id]); }