From 173345ed17b8dd141aeb12fc622252802205e8e4 Mon Sep 17 00:00:00 2001 From: annabakouli Date: Thu, 21 Dec 2017 11:44:57 +0200 Subject: [PATCH] no message --- .../dataset-wizard.component.ts | 46 ++++++++++++++++++- .../editor/dataset-editor.component.html | 8 +--- .../editor/dataset-editor.component.ts | 40 +--------------- .../app/models/datasets/DatasetWizardModel.ts | 8 ++-- 4 files changed, 52 insertions(+), 50 deletions(-) diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts index 2c6568c43..0aff07bc9 100644 --- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts @@ -1,3 +1,5 @@ +import { TranslateService } from '@ngx-translate/core'; +import { BaseErrorModel } from '../models/error/BaseErrorModel'; import { ActivatedRoute, Router, Params} from '@angular/router'; import { DatasetService } from '../services/dataset/dataset.service'; import { DatasetWizardModel } from '../models/datasets/DatasetWizardModel'; @@ -13,6 +15,8 @@ import { DataManagementPlanModel } from "../models/data-managemnt-plans/DataMana import { JsonSerializer } from "../utilities/JsonSerializer"; import { Observable } from "rxjs/Observable"; import { RequestItem } from "../models/criteria/RequestItem"; +import { MatPaginator, MatSort, MatSnackBar } from "@angular/material"; +import { SnackBarNotificationComponent } from "../shared/components/notificaiton/snack-bar-notification.component"; @Component({ selector: 'app-dataset-wizard-component', @@ -33,8 +37,9 @@ export class DatasetWizardComponent implements AfterViewInit { private formBuilder: FormBuilder, private datasetService: DatasetService, private route: ActivatedRoute, - + public snackBar: MatSnackBar, public router: Router, + public language: TranslateService, ) { } @@ -103,4 +108,43 @@ export class DatasetWizardComponent implements AfterViewInit { public cancel(): void { //this.router.navigate(['/dataManagementPlans']); } + + + formSubmit(): void { + //this.touchAllFormFields(this.formGroup); + if (!this.isFormValid()) { return; } + this.onSubmit(); + } + + public isFormValid() { + return this.formGroup.valid; + } + + onSubmit(): void { + this.datasetService.createDataset(this.formGroup.value).subscribe( + complete => this.onCallbackSuccess(), + error => this.onCallbackError(error) + ); + } + + onCallbackSuccess(): void { + this.snackBar.openFromComponent(SnackBarNotificationComponent, { + data: { message: this.isNew ? 'GENERAL.SNACK-BAR.SUCCESSFUL-CREATION' : 'GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE', language: this.language }, + duration: 3000, + extraClasses: ['snackbar-success'] + }) + this.router.navigate(['/datasets']); + } + + onCallbackError(error: any) { + this.setErrorModel(error.error); + //this.validateAllFormFields(this.formGroup); + } + + public setErrorModel(errorModel: BaseErrorModel) { + Object.keys(errorModel).forEach(item => { + (this.datasetModel.errorModel)[item] = (errorModel)[item]; + }) + } + } \ No newline at end of file diff --git a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html index 62b863a58..766cc413a 100644 --- a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html @@ -79,7 +79,7 @@ + (inputChange)="filterServices($event)" requireMatch>
{{chip.label.substring(0, 1).toUpperCase()}}
{{chip.name}} @@ -92,12 +92,6 @@ -
- - - -
- diff --git a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts index 8343542b2..d5026a552 100644 --- a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts +++ b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts @@ -67,43 +67,7 @@ export class DatasetEditorComponent implements AfterViewInit { }); */ } - formSubmit(): void { - //this.touchAllFormFields(this.formGroup); - if (!this.isFormValid()) { return; } - //this.onSubmit(); - } - - public isFormValid() { - return this.formGroup.valid; - } - - onSubmit(): void { - this.datasetService.createDataset(this.formGroup.value).subscribe( - complete => this.onCallbackSuccess(), - error => this.onCallbackError(error) - ); - } - - onCallbackSuccess(): void { - this.snackBar.openFromComponent(SnackBarNotificationComponent, { - data: { message: this.isNew ? 'GENERAL.SNACK-BAR.SUCCESSFUL-CREATION' : 'GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE', language: this.language }, - duration: 3000, - extraClasses: ['snackbar-success'] - }) - this.router.navigate(['/datasets']); - } - - onCallbackError(error: any) { - this.setErrorModel(error.error); - //this.validateAllFormFields(this.formGroup); - } - - public setErrorModel(errorModel: BaseErrorModel) { - Object.keys(errorModel).forEach(item => { - (this.dataset.errorModel)[item] = (errorModel)[item]; - }) - } - + public cancel(): void { this.router.navigate(['/datasets']); } @@ -150,7 +114,7 @@ export class DatasetEditorComponent implements AfterViewInit { if (value) { this.filteredServicesAsync = true; - this.externalSourcesService.searchDMPResearchers(value).subscribe(items => { + this.externalSourcesService.searchDatasetService(value).subscribe(items => { this.filteredServices = items; this.filteredServicesAsync = false; diff --git a/dmp-frontend/src/app/models/datasets/DatasetWizardModel.ts b/dmp-frontend/src/app/models/datasets/DatasetWizardModel.ts index b3641e384..3d91ee0d9 100644 --- a/dmp-frontend/src/app/models/datasets/DatasetWizardModel.ts +++ b/dmp-frontend/src/app/models/datasets/DatasetWizardModel.ts @@ -63,11 +63,11 @@ export class DatasetWizardModel implements Serializable { baseContext.validation.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'label')] }); baseContext.validation.push({ key: 'profile', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'profile')] }); baseContext.validation.push({ key: 'uri', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'uri')] }); - baseContext.validation.push({ key: 'status', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'status')] }); + baseContext.validation.push({ key: 'status', validators: [ BackendErrorValidator(this.errorModel, 'status')] }); baseContext.validation.push({ key: 'description', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'description')] }); - baseContext.validation.push({ key: 'services', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'services')] }); - baseContext.validation.push({ key: 'registries', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'registries')] }); - baseContext.validation.push({ key: 'dataRepositories', validators: [Validators.required, BackendErrorValidator(this.errorModel, 'dataRepositories')] }); + baseContext.validation.push({ key: 'services', validators: [ BackendErrorValidator(this.errorModel, 'services')] }); + baseContext.validation.push({ key: 'registries', validators: [ BackendErrorValidator(this.errorModel, 'registries')] }); + baseContext.validation.push({ key: 'dataRepositories', validators: [BackendErrorValidator(this.errorModel, 'dataRepositories')] }); baseContext.validation.push({ key: 'dmp', validators: [BackendErrorValidator(this.errorModel, 'dmp')] }); //TODO return baseContext; }