From 7cc584ac33ae51c3454fba14aea2a0b7bd0cb3f9 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Wed, 7 Oct 2020 13:14:19 +0300
Subject: [PATCH] Fixes spelling of variable name

---
 .../src/app/ui/dmp/editor/dmp-editor.component.ts     |  6 +++++-
 .../upload-dialogue/dmp-upload-dialogue.component.ts  |  1 -
 .../form-composite-field.component.html               |  4 ++--
 .../form-composite-field.component.scss               | 11 ++++++++++-
 .../tableOfContentsMaterial/table-of-contents.ts      |  4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index 7901b7ad4..e91c3cd46 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -839,7 +839,11 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 
 			this.formGroup.patchValue(JSON.parse(JSON.stringify(this.formGroupRawValue)));
 
-			this.formGroup.get('grant').get('existGrant').setValue(grantControl.existGrant);
+			if(this.formGroup.get('grant').get('existGrant')) {
+				this.formGroup.get('grant').get('existGrant').setValue(grantControl.existGrant);
+			} else {
+				this.formGroup.get('grant').setValue(grantControl);
+			}
 		} else {
 			this.formGroup.reset();
 			this.formGroup.get('extraProperties').get('visible').setValue(false);
diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
index 5e2fc0157..7446e4e0d 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
@@ -62,7 +62,6 @@ export class DmpUploadDialogue {
 	}
 
 	selectFile(event) {
-		console.log(event)
 		const fileList: FileList = event.addedFiles
 		this.data.fileList = fileList;
 		if (this.data.fileList.length > 0) {
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
index ca7f20f7d..ad40f0181 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
@@ -30,14 +30,14 @@
 				<app-form-composite-title class="row" [form]="form" [isChild]="isChild"></app-form-composite-title>
 			</div>
 			<div class="col align-self-center">
-				<div *ngFor="let fieldFormGroup of form.get('fields')['controls']; let i = index;" class="col-12 copositeField">
+				<div *ngFor="let fieldFormGroup of form.get('fields')['controls']; let i = index;" class="col-12 compositeField">
 					<!-- <div class="row">
 						<div class="col-12" *ngIf="(fieldFormGroup.get('multiplicity')?.value?.max - 1) > (fieldFormGroup.get('multiplicityItems')?.length)">
 							<a (click)="addMultipleField(i+1)" style="cursor: pointer">
 								Add one more field +
 							</a>
 						</div> -->
-					<app-form-field [form]="fieldFormGroup" class="col-12 copositeField" [datasetProfileId]="datasetProfileId"
+					<app-form-field [form]="fieldFormGroup" class="col-12 compositeField" [datasetProfileId]="datasetProfileId"
 						[isChild]="true"></app-form-field>
 					<!-- <div *ngIf="fieldFormGroup" class="col-12">
 							<div *ngFor="let multipleField of fieldFormGroup.get('multiplicityItems')['controls']; let j = index" class="row">
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.scss
index 6d8d3d674..9a16d04e5 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.scss
@@ -1,4 +1,13 @@
-.copositeField {
+.compositeField {
   padding-left: 0em !important;
   padding-top: 2em !important;
 }
+
+// ::ng-deep .mat-form-field-appearance-outline .mat-form-field-outline {
+// 	background: #fafafa !important;
+// }
+
+// ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+// 	font-size: 1rem;
+// 	padding: 0.6em 0 1em 0 !important;
+// }
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts
index 7e1fe4e9f..873d3023d 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts
@@ -32,7 +32,7 @@ export class TableOfContents extends BaseComponent implements OnInit {
 
 	links: Link[] = [];
 	container: string;
-	headerSelectors = '.toc-page-header, .toc-section-header, .toc-copositeField-header';
+	headerSelectors = '.toc-page-header, .toc-section-header, .toc-compositeField-header';
 	@Output() stepFound = new EventEmitter<LinkToScroll>();
 	subscription: Subscription;
 	linksSubject: Subject<HTMLElement[]> = new Subject<HTMLElement[]>();
@@ -79,7 +79,7 @@ export class TableOfContents extends BaseComponent implements OnInit {
 							section = header.id;
 							if (header.id.split('.')[4]) { show = false; }
 							else { show = true; }
-						} else if (header.classList.contains('toc-copositeField-header')) {
+						} else if (header.classList.contains('toc-compositeField-header')) {
 							name = (header.childNodes[0]).nodeValue.trim().replace(/^link/, '');
 							id = header.id;
 							// id = header.parentElement.parentElement.parentElement.id;