Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

dmp-frontend/src/app/dmps/editor/dmp-editor.component.html

@@ -21,12 +21,12 @@
                 <td-chips color="accent" [items]="filteredProfiles" formControlName="profiles" placeholder="{{'DMP-EDITOR.FIELDS.PROFILES' | translate}}"
                     (inputChange)="filterProfiles($event)" requireMatch>
                     <ng-template td-chip let-chip="chip">
-                        <div class="tc-grey-100 bgc-teal-700" td-chip-avatar>{{chip.name.substring(0, 1).toUpperCase()}}</div>
+                        <div class="tc-grey-100 bgc-teal-700" td-chip-avatar>{{chip.label.substring(0, 1).toUpperCase()}}</div>
-                        {{chip.name}}
+                        {{chip.label}}
                     </ng-template>
                     <ng-template td-autocomplete-option let-option="option">
                         <div layout="row" layout-align="start center">
-                            {{option.name}}
+                            {{option.label}}
                         </div>
                     </ng-template>
                     <mat-progress-bar [style.height.px]="2" *ngIf="filteredProfilesAsync" mode="indeterminate"></mat-progress-bar>

dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts

@@ -12,6 +12,10 @@ import { DataManagementPlanService } from "../../services/data-management-plan/d
 import { DataManagementPlanModel } from "../../models/data-managemnt-plans/DataManagementPlanModel";
 import { ExternalSourcesService } from "../../services/external-sources/external-sources.service";
 import { ExternalSourcesItemModel } from "../../models/external-sources/ExternalSourcesItemModel";
+import { RequestItem } from "../../models/criteria/RequestItem";
+import { DatasetProfileCriteria } from "../../models/criteria/dataset/DatasetProfileCriteria";
+import { DataManagementPlanCriteriaComponent } from "../../shared/components/criteria/data-management-plan/dmp-criteria.component";
+import { DatasetProfileModel } from "../../models/datasets/DatasetProfileModel";
 
 
 
@@ -24,6 +28,7 @@ import { ExternalSourcesItemModel } from "../../models/external-sources/External
 })
 export class DataManagementPlanEditorComponent implements AfterViewInit {
 
+
   isNew = true;
   dataManagementPlan: DataManagementPlanModel;
   formGroup: FormGroup = null;
@@ -33,7 +38,7 @@ export class DataManagementPlanEditorComponent implements AfterViewInit {
   filteredProfilesAsync: boolean = false;
   filteredOrganisations: ExternalSourcesItemModel[];
   filteredResearchers: ExternalSourcesItemModel[];
-  filteredProfiles: ExternalSourcesItemModel[];
+  filteredProfiles: DatasetProfileModel[];
 
   constructor(
     private dataManagementPlanService: DataManagementPlanService,
@@ -42,6 +47,7 @@ export class DataManagementPlanEditorComponent implements AfterViewInit {
     public snackBar: MatSnackBar,
     public router: Router,
     public language: TranslateService,
+    private _service: DataManagementPlanService
   ) {
 
   }
@@ -122,6 +128,7 @@ export class DataManagementPlanEditorComponent implements AfterViewInit {
         // });
 
       });
+      
     }
   }
 
@@ -149,14 +156,23 @@ export class DataManagementPlanEditorComponent implements AfterViewInit {
     if (value) {
       this.filteredProfilesAsync = true;
       
-      this.externalSourcesService.searchDMPProfiles(value).subscribe(items => {
+      // this.externalSourcesService.searchDMPProfiles(value).subscribe(items => {
+      //   this.filteredProfiles = items;
+      //   this.filteredProfilesAsync = false;
+
+      //   // this.filteredOrganisations = items.filter((filteredObj: any) => {
+      //   //   return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
+      //   // });
+
+      // });
+
+      const request = new RequestItem<DatasetProfileCriteria>();
+      let criteria = new DatasetProfileCriteria();
+      criteria.like = value;
+      request.criteria = criteria;
+      this._service.searchDMPProfiles(request).subscribe(items => {
         this.filteredProfiles = items;
         this.filteredProfilesAsync = false;
-
-        // this.filteredOrganisations = items.filter((filteredObj: any) => {
-        //   return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
-        // });
-
       });
     }
   }

dmp-frontend/src/app/models/criteria/dataset/DatasetProfileCriteria.ts

@@ -0,0 +1,5 @@
+import { BaseCriteria } from "../BaseCriteria";
+
+export class DatasetProfileCriteria extends BaseCriteria {
+
+}

dmp-frontend/src/app/models/datasets/DatasetProfileModel.ts

@@ -0,0 +1,13 @@
+import { Serializable } from "../Serializable";
+
+export class DatasetProfileModel  {
+    public id : String;
+    public label: String;
+
+    // fromJSONObject(item:any): DatasetProfileModel{
+    //     this.id = item.id;
+    //     this.label = item.label;
+        
+    //     return this;
+    // }
+}

dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts

@@ -9,6 +9,9 @@ import { DataTableData } from '../../models/data-table/DataTableData';
 import { DataManagementPlanModel } from '../../models/data-managemnt-plans/DataManagementPlanModel';
 import { DataManagementPlanListingModel } from '../../models/data-managemnt-plans/DataManagementPlanListingModel';
 import { DataManagementPlanCriteria } from '../../models/criteria/data-management-plan/DataManagementPlanCriteria';
+import { DatasetProfileCriteria } from '../../models/criteria/dataset/DatasetProfileCriteria';
+import { RequestItem } from '../../models/criteria/RequestItem';
+import { DatasetProfileModel } from '../../models/datasets/DatasetProfileModel';
 
 
 @Injectable()
@@ -41,4 +44,8 @@ export class DataManagementPlanService {
     inactivate(id: String): Observable<DataManagementPlanModel> {
         return this.http.delete<DataManagementPlanModel>(this.actionUrl + 'inactivate/' + id, { headers: this.headers });
     }
+
+    searchDMPProfiles(dataSetProfileRequest: RequestItem<DatasetProfileCriteria>): Observable<DatasetProfileModel[]> {
+        return this.http.post<DatasetProfileModel[]>(this.actionUrl + "datasetprofiles/get", dataSetProfileRequest, { headers: this.headers });
+    }
 }