diff --git a/dmp-frontend/src/app/datasets_new/dataset-listing.component.html b/dmp-frontend/src/app/datasets_new/dataset-listing.component.html index 6490e3ec5..3c0c089bd 100644 --- a/dmp-frontend/src/app/datasets_new/dataset-listing.component.html +++ b/dmp-frontend/src/app/datasets_new/dataset-listing.component.html @@ -13,16 +13,34 @@ {{row.label}} - - - {{'DATASET-LISTING.COLUMNS.REFERNCE' | translate}} - {{row.reference}} + + + {{'DATASET-LISTING.COLUMNS.DMP' | translate}} + {{row.dmp}} - - - {{'DATASET-LISTING.COLUMNS.URI' | translate}} - {{row.uri}} + + + {{'DATASET-LISTING.COLUMNS.PROFILE' | translate}} + {{row.profile}} + + + + + {{'DATASET-LISTING.COLUMNS.DATAREPOSITORIES' | translate}} + {{row.dataRepositories}} + + + + + {{'DATASET-LISTING.COLUMNS.REGISTRIES' | translate}} + {{row.registries}} + + + + + {{'DATASET-LISTING.COLUMNS.SERVICES' | translate}} + {{row.services}} diff --git a/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts b/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts index fee90cb5d..0ee505e33 100644 --- a/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts +++ b/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts @@ -27,7 +27,7 @@ export class DatasetListingComponent implements OnInit { @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent; dataSource: DatasetDataSource | null; - displayedColumns: String[] = ['label', 'reference', 'uri', 'status', 'description', 'created', 'actions']; + displayedColumns: String[] = ['label','dmp' ,'profile' , 'dataRepositories', 'registries','services', 'status', 'description', 'created', 'actions']; statuses = [ {value: '0', viewValue: 'Active'}, diff --git a/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.html b/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.html index 5cdfd4d13..681d5ae3c 100644 --- a/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/datasets_new/editor/dataset-editor.component.html @@ -57,7 +57,7 @@ + (inputChange)="filterdataRepositories($event)" requireMatch>
{{chip.name.substring(0, 1).toUpperCase()}}
{{chip.name}} @@ -67,11 +67,11 @@ {{option.name}}
- +
+ (inputChange)="filterRegistries($event)" requireMatch>
{{chip.name.substring(0, 1).toUpperCase()}}
{{chip.name}} @@ -81,7 +81,7 @@ {{option.name}}
- +
{ - this.filteredOrganisations = items; - this.filteringOrganisationsAsync = false; + this.filtereddataRepositories = items; + this.filtereddataRepositoriesAsync = false; // this.filteredOrganisations = items.filter((filteredObj: any) => { // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true; @@ -124,15 +124,15 @@ export class DatasetEditorComponent implements AfterViewInit { } } - filterResearchers(value: string): void { + filterRegistries(value: string): void { - this.filteredResearchers = undefined; + this.filteredRegistries = undefined; if (value) { - this.filteringResearchersAsync = true; + this.filteredRegistriesAsync = true; this.externalSourcesService.searchDMPResearchers(value).subscribe(items => { - this.filteredResearchers = items; - this.filteringResearchersAsync = false; + this.filteredRegistries = items; + this.filteredRegistriesAsync = false; // this.filteredOrganisations = items.filter((filteredObj: any) => { // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true; diff --git a/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts b/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts index 633ab7fcc..376e7f918 100644 --- a/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts +++ b/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts @@ -2,18 +2,28 @@ import { Serializable } from "../Serializable"; export class DatasetListingModel implements Serializable { public id: String; - public label:String; - public reference: String; - public uri: String; + public label:String; + public dmp: String; + public profile: String; + public dataRepositories: String; + public registries: String; + public services: String; public description: String; public status: Number; public created: Date; + //public uri: String; + // public reference: String; fromJSONObject(item: any): DatasetListingModel { this.id = item.id; this.label = item.label; - this.reference = item.reference; - this.uri = item.uri; + this.dmp = item.dmp; + this.profile = item.profile; + this.dataRepositories = item.dataRepositories; + this.registries = item.registries; + this.services = item.services; + //this.reference = item.reference; + //this.uri = item.uri; this.status = item.status; this.description = item.description; this.created = item.created; diff --git a/dmp-frontend/src/assets/lang/en.json b/dmp-frontend/src/assets/lang/en.json index 7f8115f00..d1197085d 100644 --- a/dmp-frontend/src/assets/lang/en.json +++ b/dmp-frontend/src/assets/lang/en.json @@ -43,7 +43,12 @@ "STATUS": "Status", "DESCRIPTION": "Description", "CREATED": "Created", - "ACTIONS": "Actions" + "ACTIONS": "Actions", + "DMP": "Dmp", + "PROFILE": "Profile", + "DATAREPOSITORIES": "Data Repositories", + "REGISTRIES": "Registries", + "SERVICES": "Services" } }, "PROJECT-EDITOR": {