From 8caad8bb3e5dc3a16ea07f503623904d66b1964b Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Thu, 6 Aug 2020 14:02:50 +0300
Subject: [PATCH] Changes on create new dataset editor (2nd commit)

---
 dmp-frontend/src/app/ui/dmp/dmp.module.ts     |  1 -
 .../dataset-info/dataset-info.component.html  | 12 ++++++--
 .../dataset-info/dataset-info.component.ts    | 28 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/dmp.module.ts b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
index b32ef737b..c4b629388 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.module.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.module.ts
@@ -83,7 +83,6 @@ import { DatasetDescriptionFormModule } from '../misc/dataset-description-form/d
 		DmpCloneComponent,
 		AddOrganizationComponent,
 		DmpCriteriaDialogComponent,
-		AddOrganizationComponent,
 		AddCostComponent,
 		CostListingComponent,
 		StartNewDmpDialogComponent,
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
index 77afea1dc..9b3cea48f 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
@@ -12,17 +12,25 @@
 					<div><span class="material-icons-outlined align-bottom">info</span> {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}</div>
 				</div>
 				<div class="profile-form">
-					<mat-form-field appearance="outline">
+					<mat-form-field *ngIf="!isNewDataset">
 						<app-multiple-auto-complete required='true' [formControl]="formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration">
 						</app-multiple-auto-complete>
 						<mat-error *ngIf="formGroup.get('profiles').hasError('backendError')">
 							{{formGroup.get('profiles').getError('backendError').message}}</mat-error>
 						<mat-error *ngIf="formGroup.get('profiles').hasError('required')">
 							{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-						<button matSuffix class="input-btn" [disabled]="formGroup.get('profiles').disabled" (click)="availableProfiles($event)">
+						<button matSuffix class="input-btn" [disabled]="formGroup.get('profiles').disabled" (click)="allAvailableProfiles($event)">
 							<mat-icon class="icon-btn">view_list</mat-icon>
 						</button>
 					</mat-form-field>
+					<mat-form-field *ngIf="isNewDataset">
+						<mat-select placeholder=" {{'DATASET-WIZARD.FIRST-STEP.PROFILE'| translate}}" [required]="true" formControlName="profile" (click)="loadDatasetProfiles()">
+							<mat-option *ngFor="let profile of availableProfiles" [value]="profile.id">
+								{{profile.label}}
+							</mat-option>
+						</mat-select>
+						<mat-error *ngIf="formGroup.get('profile').hasError('backendError')">{{formGroup.get('profile').getError('backendError').message}}</mat-error>
+					</mat-form-field>
 				</div>
 				<div class="col pb-3 d-flex">
 					<span class="not-found">{{'DMP-EDITOR.DATASET-INFO.FIND' | translate}}</span>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts
index 43dda3552..c3441979f 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts
@@ -18,6 +18,8 @@ import { DmpProfileService } from '@app/core/services/dmp/dmp-profile.service';
 import { AvailableProfilesComponent } from '../available-profiles/available-profiles.component';
 import { DmpEditorModel } from '../dmp-editor.model';
 import { Router } from '@angular/router';
+import { RequestItem } from '@app/core/query/request-item';
+import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
 
 @Component({
 	selector: 'dataset-info',
@@ -32,9 +34,12 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit {
 	@Input() isPublic: boolean;
 	@Input() isFinalized: boolean;
 	@Input() isNewVersion: boolean;
+	@Input() isNewDataset: boolean;
 	@Input() isClone: boolean;
 	@Output() onFormChanged: EventEmitter<any> = new EventEmitter();
 
+	availableProfiles: DatasetProfileModel[] = [];
+
 	selectedDmpProfileDefinition: DmpProfileDefinition;
 	profilesAutoCompleteConfiguration: MultipleAutoCompleteConfiguration;
 
@@ -42,6 +47,7 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit {
 		private language: TranslateService,
 		private configurationService: ConfigurationService,
 		private externalSourcesService: ExternalSourcesService,
+		private datasetWizardService: DatasetWizardService,
 		private dialog: MatDialog,
 		private _service: DmpService,
 		private dmpProfileService: DmpProfileService,
@@ -73,8 +79,11 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit {
 			this.formGroup.get('extraProperties').get('publicDate').patchValue(new Date());
 		}
 
+		// this.loadDatasetProfiles();
+
 		this.formGroup.valueChanges.pipe(takeUntil(this._destroyed))
 			.subscribe(x => {
+				console.log('value changes')
 				this.profilesAutoCompleteConfiguration = {
 					filterFn: this.filterProfiles.bind(this),
 					initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x.id).indexOf(resultItem.id) === -1))),
@@ -114,7 +123,24 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit {
 			})
 	}
 
-	availableProfiles(event: MouseEvent) {
+	loadDatasetProfiles() {
+		console.log(this.formGroup);
+		console.log(this.dmp);
+		const datasetProfileRequestItem: RequestItem<DatasetProfileCriteria> = new RequestItem();
+		datasetProfileRequestItem.criteria = new DatasetProfileCriteria();
+		console.log(this.formGroup.value.id);
+		datasetProfileRequestItem.criteria.id = this.formGroup.value.id;
+		if (datasetProfileRequestItem.criteria.id) {
+			this.datasetWizardService.getAvailableProfiles(datasetProfileRequestItem)
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(items => {
+				this.availableProfiles = items;
+			});
+		}
+		console.log(this.availableProfiles);
+	}
+
+	allAvailableProfiles(event: MouseEvent) {
 		event.stopPropagation();
 		const dialogRef = this.dialog.open(AvailableProfilesComponent, {
 			data: {