From 9b837a27a824e263c2573dc722369844e788ea25 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 3 Aug 2020 13:22:18 +0300 Subject: [PATCH] Fixes error of mismatch model on client and server --- .../core/model/recent-activity/recent-dmp-activity.model.ts | 3 ++- .../recent-edited-activity/recent-edited-activity.component.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dmp-frontend/src/app/core/model/recent-activity/recent-dmp-activity.model.ts b/dmp-frontend/src/app/core/model/recent-activity/recent-dmp-activity.model.ts index a74d0bd79..b416e4cb0 100644 --- a/dmp-frontend/src/app/core/model/recent-activity/recent-dmp-activity.model.ts +++ b/dmp-frontend/src/app/core/model/recent-activity/recent-dmp-activity.model.ts @@ -2,11 +2,12 @@ import { RecentActivityModel } from './recent-activity.model'; import { RecentDatasetModel } from './recent-dataset-activity.model'; import { DmpAssociatedProfileModel } from '../dmp-profile/dmp-associated-profile'; import { UserInfoListingModel } from '../user/user-info-listing'; +import { DatasetUrlListing } from '../dataset/dataset-url-listing'; export class RecentDmpModel extends RecentActivityModel { doi: String; extraProperties: Map; - datasets: any[]; + datasets: DatasetUrlListing[]; associatedProfiles: DmpAssociatedProfileModel[]; organisations: String; groupId: string; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index d2eb2d218..82d2ef662 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -32,6 +32,7 @@ import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dat import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order'; import { Location } from '@angular/common'; import { LockService } from '@app/core/services/lock/lock.service'; +import { DatasetUrlListing } from '@app/core/model/dataset/dataset-url-listing'; @Component({ selector: 'app-recent-edited-activity', @@ -127,7 +128,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } } - getDatasets(activity: RecentDmpModel): RecentDatasetModel[] { + getDatasets(activity: RecentDmpModel): DatasetUrlListing[] { return activity.datasets; }