diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
index afae52531..b9fd1d590 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
@@ -7,7 +7,7 @@
{{'DATASET-LISTING.TEXT-INFO' | translate}} {{'DATASET-LISTING.LINK-PUBLIC-DATASETS' | translate}} {{'DATASET-LISTING.TEXT-INFO-REST' | translate}}
{{'DATASET-LISTING.TEXT-INFO-PAR' | translate}}
-
@@ -38,8 +38,8 @@
- {{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
-
+ {{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
+
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts
index cb1b3f91c..d8f58b7d5 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts
@@ -93,8 +93,8 @@ export class DatasetEditorDetailsComponent extends BaseComponent implements OnIn
this.formGroup.disable();
}
- // console.log(this.formGroup);
- // this.registerFormListeners();
+ this.datasetWizardModel = new DatasetWizardEditorModel();
+ this.registerFormListeners();
if (this.datasetId) { // never gets in here
this.datasetWizardService.getSingle(this.datasetId)
@@ -187,8 +187,6 @@ export class DatasetEditorDetailsComponent extends BaseComponent implements OnIn
this.formGroup.get('profile').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => {
- // console.log('inhere');
- // console.log(this.formGroup.get('datasetProfileDefinition'));
this.datasetProfileValueChanged(x);
});
}
@@ -206,10 +204,10 @@ export class DatasetEditorDetailsComponent extends BaseComponent implements OnIn
}
}
- datasetProfileValueChanged(profiledId: string) {
- if (profiledId && profiledId.length > 0) {
+ datasetProfileValueChanged(profileId: string) {
+ if (profileId && profileId.length > 0) {
this.formGroup.removeControl('datasetProfileDefinition');
- this.getDefinition();
+ this.getDefinition(profileId);
}
}
@@ -221,9 +219,9 @@ export class DatasetEditorDetailsComponent extends BaseComponent implements OnIn
});
}
- getDefinition() {
+ getDefinition(profileId: string) {
// if (this.formGroup.invalid) { setTimeout(() => this.stepper.selectedIndex = 0); return; }
- this.datasetWizardService.getDefinition(this.formGroup.get('profile').value)
+ this.datasetWizardService.getDefinition(profileId)
.pipe(takeUntil(this._destroyed))
.subscribe(item => {
this.datasetWizardModel.datasetProfileDefinition = new DatasetDescriptionFormEditorModel().fromModel(item);
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 0e0b00568..75da135aa 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
@@ -24,7 +24,7 @@
-
+
{{profile.label}}
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 72f13999f..fb32f9e49 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
@@ -84,7 +84,8 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit {
this.formGroup.get('extraProperties').get('publicDate').patchValue(new Date());
}
- this.formGroup.valueChanges.pipe(takeUntil(this._destroyed))
+
+ this.formGroup.get('datasets')['controls'][0].get('dmp').valueChanges.pipe(takeUntil(this._destroyed))
.subscribe(x => {
// this.registerFormListeners();
this.loadDatasetProfiles();
@@ -165,16 +166,16 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit {
}
registerFormListeners() {
- this.formGroup.get('datasets')['controls'][0].get('dmp').valueChanges
- .pipe(takeUntil(this._destroyed))
- .subscribe(x => {
- this.dmpValueChanged(x);
- });
- this.formGroup.get('profile').valueChanges
- .pipe(takeUntil(this._destroyed))
- .subscribe(x => {
- this.datasetProfileValueChanged(x);
- });
+ // this.formGroup.get('datasets')['controls'][0].get('dmp').valueChanges
+ // .pipe(takeUntil(this._destroyed))
+ // .subscribe(x => {
+ // this.dmpValueChanged(x);
+ // });
+ // this.formGroup.get('profile').valueChanges
+ // .pipe(takeUntil(this._destroyed))
+ // .subscribe(x => {
+ // //this.datasetProfileValueChanged(x);
+ // });
}
datasetProfileValueChanged(profiledId: string) {
diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts
index 9e8f54f3a..4e401a070 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts
@@ -84,7 +84,6 @@ export class MainInfoComponent extends BaseComponent implements OnInit {
}
// this.formControl = this.formGroup.get('datasets')['controls'][0].get('dmp');
-
this.formGroup.valueChanges.pipe(takeUntil(this._destroyed))
.subscribe(x => {
this.onFormChanged.emit();