diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
index 00d294dd3..e2d0f5166 100644
--- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
@@ -15,10 +15,10 @@ import { ExternalSourcesService } from '../../services/external-sources/external
import { DatasetWizardService } from '../../services/dataset-wizard/dataset-wizard.service';
import { TranslateService } from '@ngx-translate/core';
import { ActivatedRoute, Router, Params } from '@angular/router';
-import { Component, ViewChild, OnInit, AfterViewInit, ViewEncapsulation, TemplateRef, ChangeDetectionStrategy } from "@angular/core";
-import { FormGroup, Validators, FormBuilder, FormArray } from "@angular/forms";
+import { Component, ViewChild, OnInit, AfterViewInit, ViewEncapsulation, TemplateRef, ChangeDetectionStrategy } from '@angular/core';
+import { FormGroup, Validators, FormBuilder, FormArray } from '@angular/forms';
import * as FileSaver from 'file-saver';
-import { MatPaginator, MatSort, MatSnackBar, MatStepper, MatDialog } from "@angular/material";
+import { MatPaginator, MatSort, MatSnackBar, MatStepper, MatDialog } from '@angular/material';
import { ExternalDatasetCriteria } from '../../models/criteria/external-dataset/ExternalDatasetCriteria';
import { ExternalDatasetModel } from '../../models/external-dataset/ExternalDatasetModel';
import { RegistryCriteria } from '../../models/criteria/registry/RegistryCriteria';
@@ -43,423 +43,421 @@ import { ExternalDatasetReferencedModelHelperComponent } from '../dataset-refere
import { ServicesReferencedModelHelperComponent } from '../dataset-referenced-models-helper/services/services-referenced-model-helper.component';
@Component({
- selector: 'app-dataset-wizard-component',
- templateUrl: 'dataset-wizard.component.html',
- styleUrls: ['./dataset-wizard.component.scss'],
- encapsulation: ViewEncapsulation.None,
+ selector: 'app-dataset-wizard-component',
+ templateUrl: 'dataset-wizard.component.html',
+ styleUrls: ['./dataset-wizard.component.scss'],
+ encapsulation: ViewEncapsulation.None,
})
-export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
- breadCrumbs: Observable
;
- viewOnly = false;
- @ViewChild('stepper') stepper: MatStepper;
- //autocomplete Display Functions;
- externalDatasetDisplayFunc = (item) => item ? item.label : null;
- registriesDisplayFunc = (item) => item ? item.label : null;
- dataRepositoryDisplayFunc = (item) => item ? item.name : null;
- servicesDisplayFunc = (item) => item ? item.label : null;
- tagsDisplayFunc = (item) => item ? item.name : null;
+export class DatasetWizardComponent implements OnInit, AfterViewInit, IBreadCrumbComponent {
+ breadCrumbs: Observable;
+ viewOnly = false;
+ @ViewChild('stepper') stepper: MatStepper;
+ //autocomplete Display Functions;
+ //autocomplete Configurations;
+ externalDatasetAutoCompleteConfiguration: AutoCompleteConfiguration;
+ registriesAutoCompleteConfiguration: AutoCompleteConfiguration;
+ dataRepositoriesAutoCompleteConfiguration: AutoCompleteConfiguration;
+ servicesAutoCompleteConfiguration: AutoCompleteConfiguration;
+ tagsAutoCompleteConfiguration: AutoCompleteConfiguration;
+ dmpAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
+
+ externalSourcesConfiguration: ExternalSourcesConfiguration;
+
+ datasetWizardModel: DatasetWizardModel;
+ isNew = true;
+ formGroup: FormGroup;
+ datasetProfileDefinitionModel: DatasetProfileDefinitionModel;
+
+ availableProfiles: DatasetProfileModel[] = [];
+ itemId: string;
+ isLinear = false;
+ firstStepFormGroup: FormGroup;
+ secondFormGroup: FormGroup;
+
+ externalDatasetDisplayFunc = (item) => item ? item.label : null;
+ registriesDisplayFunc = (item) => item ? item.label : null;
+ dataRepositoryDisplayFunc = (item) => item ? item.name : null;
+ servicesDisplayFunc = (item) => item ? item.label : null;
+ tagsDisplayFunc = (item) => item ? item.name : null;
+ externalDatasetDisplaySubtitleFunc = (item) => item ? item.tag : null;
+ registriesDisplaySubtitleFunc = (item) => item ? item.tag : null;
+ dataRepositoryDisplaySubtitleFunc = (item) => item ? item.tag : null;
+ servicesDisplaySubtitleFunc = (item) => item ? item.tag : null;
+ tagsDisplaySubtitleFunc = (item) => item ? item.tag : null;
+
+ constructor(
+ private datasetWizardService: DatasetWizardService,
+ private formBuilder: FormBuilder,
+ private datasetService: DatasetService,
+ private route: ActivatedRoute,
+ public snackBar: MatSnackBar,
+ public router: Router,
+ public language: TranslateService,
+ public externalSourcesService: ExternalSourcesService,
+ public dataManagementPlanService: DataManagementPlanService,
+ public dialog: MatDialog,
+ public externalSourcesConfigurationService: ExternalSourcesConfigurationService
+ ) {
+
+ }
- //autocomplete Display Functions;
- externalDatasetDisplaySubtitleFunc = (item) => item ? item.tag : null;
- registriesDisplaySubtitleFunc = (item) => item ? item.tag : null;
- dataRepositoryDisplaySubtitleFunc = (item) => item ? item.tag : null;
- servicesDisplaySubtitleFunc = (item) => item ? item.tag : null;
- tagsDisplaySubtitleFunc = (item) => item ? item.tag : null;
+ ngOnInit() {
+ this.route
+ .data
+ .subscribe(v => this.viewOnly = v['public']);
- //autocomplete Configurations;
- externalDatasetAutoCompleteConfiguration: AutoCompleteConfiguration;
- registriesAutoCompleteConfiguration: AutoCompleteConfiguration;
- dataRepositoriesAutoCompleteConfiguration: AutoCompleteConfiguration;
- servicesAutoCompleteConfiguration: AutoCompleteConfiguration;
- tagsAutoCompleteConfiguration: AutoCompleteConfiguration;
- dmpAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
+ const dmpRequestItem: RequestItem = new RequestItem();
+ dmpRequestItem.criteria = new DataManagementPlanCriteria();
- externalSourcesConfiguration: ExternalSourcesConfiguration;
+ const externalDatasetRequestItem: RequestItem = new RequestItem();
+ externalDatasetRequestItem.criteria = new ExternalDatasetCriteria();
+ this.externalDatasetAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetSExternalDatasetservice.bind(this.externalSourcesService), externalDatasetRequestItem);
- datasetWizardModel: DatasetWizardModel;
- isNew = true;
- formGroup: FormGroup;
- datasetProfileDefinitionModel: DatasetProfileDefinitionModel;
+ const registriesRequestItem: RequestItem = new RequestItem();
+ registriesRequestItem.criteria = new RegistryCriteria();
+ this.registriesAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetRegistry.bind(this.externalSourcesService), registriesRequestItem);
- availableProfiles: DatasetProfileModel[] = [];
- itemId: string
- constructor(
- private datasetWizardService: DatasetWizardService,
- private formBuilder: FormBuilder,
- private datasetService: DatasetService,
- private route: ActivatedRoute,
- public snackBar: MatSnackBar,
- public router: Router,
- public language: TranslateService,
- public externalSourcesService: ExternalSourcesService,
- public dataManagementPlanService: DataManagementPlanService,
- public dialog: MatDialog,
- public externalSourcesConfigurationService: ExternalSourcesConfigurationService
- ) {
+ const dataRepositoriesRequestItem: RequestItem = new RequestItem();
+ dataRepositoriesRequestItem.criteria = new DataRepositoryCriteria();
+ this.dataRepositoriesAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetRepository.bind(this.externalSourcesService), dataRepositoriesRequestItem);
- }
+ const servicesRequestItem: RequestItem = new RequestItem();
+ servicesRequestItem.criteria = new ServicesCriteria();
+ this.servicesAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetService.bind(this.externalSourcesService), servicesRequestItem);
- isLinear = false;
- firstStepFormGroup: FormGroup;
- secondFormGroup: FormGroup;
+ const tagsRequestItem: RequestItem = new RequestItem();
+ tagsRequestItem.criteria = new TagsCriteria();
+ this.tagsAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetTags.bind(this.externalSourcesService), tagsRequestItem);
- ngOnInit() {
+ this.externalSourcesConfigurationService.getExternalSourcesConfiguration().subscribe(result => {
+ this.externalSourcesConfiguration = result;
+ this.externalSourcesConfiguration.dataRepositories.push({ key: '', label: 'All' });
+ this.externalSourcesConfiguration.externalDatasets.push({ key: '', label: 'All' });
+ this.externalSourcesConfiguration.registries.push({ key: '', label: 'All' });
+ this.externalSourcesConfiguration.services.push({ key: '', label: 'All' });
+ this.externalSourcesConfiguration.tags.push({ key: '', label: 'All' });
+ });
+
+ this.dmpAutoCompleteConfiguration = {
+ filterFn: this.searchDmp.bind(this),
+ items: this.searchDmp(''),
+ displayFn: (item) => item['label'],
+ titleFn: (item) => item['label'],
+ //mapFn: (item) => new JsonSerializer().fromJSONArray(item, ProjectReference).map(item => item.toDropdownList()),
+ loadDataOnStart: true
+ };
+
+ this.route.params.subscribe((params: Params) => {
+ this.itemId = params['id'];
+ const dmpId = params['dmpId'];
+ if (this.itemId != null) {
+ this.isNew = false;
+ this.datasetWizardService.getSingle(this.itemId).map(data => data as DatasetWizardModel)
+ .subscribe(data => {
+ this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel);
+ this.breadCrumbs = Observable.of([
+ {
+ parentComponentName: null,
+ label: 'Datasets',
+ url: '/datasets',
+ notFoundResolver: [
+ {
+ parentComponentName: null,
+ label: this.datasetWizardModel.dmp.project.label,
+ url: '/projects/edit/' + this.datasetWizardModel.dmp.project.id
+ },
+ {
+ parentComponentName: null,
+ label: this.datasetWizardModel.dmp.label,
+ url: '/dmps/edit/' + this.datasetWizardModel.dmp.id,
+ },
+ ]
+ }]);
+ this.formGroup = this.datasetWizardModel.buildForm();
+ if (this.datasetWizardModel.status === 1) {
+ this.formGroup.disable();
+ this.viewOnly = true;
+ }
+ if (this.viewOnly) { this.formGroup.disable(); }
+ this.loadDatasetProfiles();
+ });
+ } else if (dmpId != null) {
+ this.isNew = true;
+ this.dataManagementPlanService.getSingle(dmpId).map(data => data as DataManagementPlanModel)
+ .subscribe(data => {
+ this.datasetWizardModel = new DatasetWizardModel();
+ setTimeout(() => {
+ this.datasetWizardModel.dmp = data;
+ this.formGroup = this.datasetWizardModel.buildForm();
+ if (this.datasetWizardModel.status === 1) {
+ this.formGroup.disable();
+ this.viewOnly = true;
+ }
+ this.loadDatasetProfiles();
+
+ this.breadCrumbs = Observable.of([
+ {
+ parentComponentName: null,
+ label: 'Datasets',
+ url: '/datasets',
+ notFoundResolver: [
+ {
+ parentComponentName: null,
+ label: this.datasetWizardModel.dmp.project.label,
+ url: '/projects/edit/' + this.datasetWizardModel.dmp.project.id
+ },
+ {
+ parentComponentName: null,
+ label: this.datasetWizardModel.dmp.label,
+ url: '/dmps/edit/' + this.datasetWizardModel.dmp.id,
+ }]
+ }]);
+ });
+ });
+ } else {
+ this.datasetWizardModel = new DatasetWizardModel();
+ this.formGroup = this.datasetWizardModel.buildForm();
+ if (this.datasetWizardModel.status === 1) {
+ this.formGroup.disable();
+ this.viewOnly = true;
+ }
+
+ if (this.viewOnly) { this.formGroup.disable(); }
+
+ this.formGroup.get('dmp').valueChanges.subscribe(x => {
+ this.loadDatasetProfiles();
+ });
+ }
+ });
+ }
+
+ ngAfterViewInit() {
+ this.route.params.subscribe((params: Params) => {
+ const itemId = params['id'];
+ if (itemId != null) { this.stepper.selectedIndex = 2; }
+ });
+ }
+
+ searchDmp(query: string): Observable {
+ const dmpRequestItem: RequestItem = new RequestItem();
+ dmpRequestItem.criteria = new DataManagementPlanCriteria();
+ dmpRequestItem.criteria.like = query;
+ return this.dataManagementPlanService.get(dmpRequestItem);
+ }
+
+ loadDatasetProfiles() {
+ const datasetProfileRequestItem: RequestItem = new RequestItem();
+ datasetProfileRequestItem.criteria = new DatasetProfileCriteria();
+ datasetProfileRequestItem.criteria.id = this.formGroup.get('dmp').value.id;
+ if (datasetProfileRequestItem.criteria.id) {
+ this.datasetWizardService.getAvailableProfiles(datasetProfileRequestItem).subscribe(items => {
+ this.availableProfiles = JsonSerializer.fromJSONArray(items, DatasetProfileModel);
+ });
+ }
+ }
+
+ public cancel(): void {
+ //this.router.navigate(['/dataManagementPlans']);
+ }
+
+ getDefinition() {
+ if (this.isNew) {
+ this.datasetWizardService.getDefinition(this.formGroup.get('profile').get('id').value).subscribe(item => {
+ this.datasetWizardModel.datasetProfileDefinition = JsonSerializer.fromJSONObject(item, DatasetProfileDefinitionModel);
+ this.datasetProfileDefinitionModel = this.datasetWizardModel.datasetProfileDefinition;
+ this.formGroup.addControl('datasetProfileDefinition', this.datasetProfileDefinitionModel.buildForm());
+ });
+ }
+ }
- this.route
- .data
- .subscribe(v => this.viewOnly = v["public"]);
+ formSubmit(): void {
+ if (!this.isFormValid()) { return; }
+ this.onSubmit();
+ }
- let dmpRequestItem: RequestItem = new RequestItem();
- dmpRequestItem.criteria = new DataManagementPlanCriteria();
+ public isFormValid() {
+ return this.formGroup.valid;
+ }
- let externalDatasetRequestItem: RequestItem = new RequestItem();
- externalDatasetRequestItem.criteria = new ExternalDatasetCriteria();
- this.externalDatasetAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetSExternalDatasetservice.bind(this.externalSourcesService), externalDatasetRequestItem)
+ onSubmit(): void {
+ this.datasetWizardService.createDataset(this.formGroup.value).subscribe(
+ complete => {
+ this.datasetWizardService.getSingle(complete.id).subscribe(
+ result => {
+ this.datasetWizardModel = JsonSerializer.fromJSONObject(result, DatasetWizardModel);
+ }
+ );
+ this.onCallbackSuccess();
+ },
+ error => this.onCallbackError(error)
+ );
+ }
- let registriesRequestItem: RequestItem = new RequestItem();
- registriesRequestItem.criteria = new RegistryCriteria();
- this.registriesAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetRegistry.bind(this.externalSourcesService), registriesRequestItem)
-
- let dataRepositoriesRequestItem: RequestItem = new RequestItem();
- dataRepositoriesRequestItem.criteria = new DataRepositoryCriteria();
- this.dataRepositoriesAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetRepository.bind(this.externalSourcesService), dataRepositoriesRequestItem)
-
- let servicesRequestItem: RequestItem = new RequestItem();
- servicesRequestItem.criteria = new ServicesCriteria();
- this.servicesAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetService.bind(this.externalSourcesService), servicesRequestItem)
-
- let tagsRequestItem: RequestItem = new RequestItem();
- tagsRequestItem.criteria = new TagsCriteria();
- this.tagsAutoCompleteConfiguration = new AutoCompleteConfiguration(this.externalSourcesService.searchDatasetTags.bind(this.externalSourcesService), tagsRequestItem)
-
- this.externalSourcesConfigurationService.getExternalSourcesConfiguration().subscribe(result => {
- this.externalSourcesConfiguration = result;
- this.externalSourcesConfiguration.dataRepositories.push({ key: '', label: "All" })
- this.externalSourcesConfiguration.externalDatasets.push({ key: '', label: "All" })
- this.externalSourcesConfiguration.registries.push({ key: '', label: "All" })
- this.externalSourcesConfiguration.services.push({ key: '', label: "All" })
- this.externalSourcesConfiguration.tags.push({ key: '', label: "All" })
- })
-
- this.dmpAutoCompleteConfiguration = {
- filterFn: this.searchDmp.bind(this),
- items: this.searchDmp(''),
- displayFn: (item) => item["label"],
- titleFn: (item) => item["label"],
- //mapFn: (item) => new JsonSerializer().fromJSONArray(item, ProjectReference).map(item => item.toDropdownList()),
- loadDataOnStart: true
- };
-
- this.route.params.subscribe((params: Params) => {
- this.itemId = params['id'];
- const dmpId = params['dmpId'];
- if (this.itemId != null) {
- this.isNew = false;
- this.datasetWizardService.getSingle(this.itemId).map(data => data as DatasetWizardModel)
- .subscribe(data => {
- this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel);
- this.breadCrumbs = Observable.of([
- {
- parentComponentName: null,
- label: "Datasets",
- url: "/datasets",
- notFoundResolver: [
- {
- parentComponentName: null,
- label: this.datasetWizardModel.dmp.project.label,
- url: "/projects/edit/" + this.datasetWizardModel.dmp.project.id
- },
- {
- parentComponentName: null,
- label: this.datasetWizardModel.dmp.label,
- url: "/dmps/edit/" + this.datasetWizardModel.dmp.id,
- },
- ]
- }])
- this.formGroup = this.datasetWizardModel.buildForm();
- if (this.datasetWizardModel.status == 1) {
- this.formGroup.disable()
- this.viewOnly = true;
- }
- if (this.viewOnly) this.formGroup.disable();
- this.loadDatasetProfiles();
- });
- } else if (dmpId != null) {
- this.isNew = true;
- this.dataManagementPlanService.getSingle(dmpId).map(data => data as DataManagementPlanModel)
- .subscribe(data => {
- this.datasetWizardModel = new DatasetWizardModel();
- setTimeout(() => {
- this.datasetWizardModel.dmp = data;
- this.formGroup = this.datasetWizardModel.buildForm();
- if (this.datasetWizardModel.status == 1) {
- this.formGroup.disable()
- this.viewOnly = true;
- }
- this.loadDatasetProfiles();
-
- this.breadCrumbs = Observable.of([
- {
- parentComponentName: null,
- label: "Datasets",
- url: "/datasets",
- notFoundResolver: [
- {
- parentComponentName: null,
- label: this.datasetWizardModel.dmp.project.label,
- url: "/projects/edit/" + this.datasetWizardModel.dmp.project.id
- },
- {
- parentComponentName: null,
- label: this.datasetWizardModel.dmp.label,
- url: "/dmps/edit/" + this.datasetWizardModel.dmp.id,
- }]
- }])
- });
- });
- } else {
- this.datasetWizardModel = new DatasetWizardModel();
- this.formGroup = this.datasetWizardModel.buildForm()
- if (this.datasetWizardModel.status == 1) {
- this.formGroup.disable()
- this.viewOnly = true;
- }
-
- if (this.viewOnly) this.formGroup.disable();
-
- this.formGroup.get('dmp').valueChanges.subscribe(x => {
- this.loadDatasetProfiles();
- })
- }
- });
- }
-
- ngAfterViewInit() {
- this.route.params.subscribe((params: Params) => {
- let itemId = params['id'];
- if (itemId != null) this.stepper.selectedIndex = 2;
- })
- }
-
- searchDmp(query: string): Observable {
- let dmpRequestItem: RequestItem = new RequestItem();
- dmpRequestItem.criteria = new DataManagementPlanCriteria();
- dmpRequestItem.criteria.like = query;
- return this.dataManagementPlanService.get(dmpRequestItem);
- }
-
- loadDatasetProfiles() {
- let datasetProfileRequestItem: RequestItem = new RequestItem();
- datasetProfileRequestItem.criteria = new DatasetProfileCriteria();
- datasetProfileRequestItem.criteria.id = this.formGroup.get("dmp").value.id;
- if (datasetProfileRequestItem.criteria.id) this.datasetWizardService.getAvailableProfiles(datasetProfileRequestItem).subscribe(items => {
- this.availableProfiles = JsonSerializer.fromJSONArray(items, DatasetProfileModel);
- });
- }
-
- public cancel(): void {
- //this.router.navigate(['/dataManagementPlans']);
- }
-
- getDefinition() {
- if (this.isNew) {
- this.datasetWizardService.getDefinition(this.formGroup.get("profile").get("id").value).subscribe(item => {
- this.datasetWizardModel.datasetProfileDefinition = JsonSerializer.fromJSONObject(item, DatasetProfileDefinitionModel);
- this.datasetProfileDefinitionModel = this.datasetWizardModel.datasetProfileDefinition;
- this.formGroup.addControl("datasetProfileDefinition", this.datasetProfileDefinitionModel.buildForm())
- })
- }
- }
+ submit() {
+ this.datasetWizardService.createDataset(this.formGroup.value).subscribe(data => {
+ this.router.navigateByUrl('/datasets/dmp/' + this.formGroup.get('dmp').value.id);
+ });
+ }
- formSubmit(): void {
- if (!this.isFormValid()) { return; }
- this.onSubmit();
- }
+ save() {
+ if (!this.isFormValid()) { return; }
+ this.formGroup.get('status').setValue('0');
+ this.submit();
+ }
- public isFormValid() {
- return this.formGroup.valid;
- }
+ saveFinalize() {
+ if (!this.isFormValid()) { return; }
+ this.formGroup.get('status').setValue('1');
+ this.submit();
+ }
- onSubmit(): void {
- this.datasetWizardService.createDataset(this.formGroup.value).subscribe(
- complete => {
- this.datasetWizardService.getSingle(complete.id).subscribe(
- result => {
- this.datasetWizardModel = JsonSerializer.fromJSONObject(result, DatasetWizardModel);
- }
- )
- 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,
+ });
+ }
- submit() {
- this.datasetWizardService.createDataset(this.formGroup.value).subscribe(data => {
- this.router.navigateByUrl("/datasets/dmp/" + this.formGroup.get("dmp").value.id);
- });
- }
+ onCallbackError(error: any) {
+ this.setErrorModel(error.error);
+ }
+
+ public setErrorModel(errorModel: BaseErrorModel) {
+ Object.keys(errorModel).forEach(item => {
+ (this.datasetWizardModel.errorModel)[item] = (errorModel)[item];
+ });
+ }
+
+ downloadPDF(): void {
+ this.datasetWizardService.downloadPDF(this.itemId).subscribe(response => {
+ const blob = new Blob([response.body], { type: 'application/pdf' });
+ const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+
+ FileSaver.saveAs(blob, filename);
+ });
+ }
+
+ downloadXML(): void {
+ this.datasetWizardService.downloadXML(this.itemId).subscribe(response => {
+ const blob = new Blob([response.body], { type: 'application/xml' });
+ const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+
+ FileSaver.saveAs(blob, filename);
+ });
+ }
+
+ getFilenameFromContentDispositionHeader(header: string): string {
+ const regex: RegExp = new RegExp(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/g);
+
+ const matches = header.match(regex);
+ let filename: string;
+ for (let i = 0; i < matches.length; i++) {
+ const match = matches[i];
+ if (match.includes('filename="')) {
+ filename = match.substring(10, match.length - 1);
+ break;
+ } else if (match.includes('filename=')) {
+ filename = match.substring(9);
+ break;
+ }
+ }
+ return filename;
+ }
+
+ public redirectToProject() {
+ this.router.navigate(['projects/edit/' + this.datasetWizardModel.dmp.project.id]);
+ }
+
+ public redirectToDmp() {
+ this.router.navigate(['dmps/edit/' + this.datasetWizardModel.dmp.id]);
+ }
+
+ externalDatasetsOnItemChange(event) {
+ const externalDatasetModel = new ExternalDatasetModel(event.id, event.abbreviation, event.label, event.reference);
+ (this.formGroup.get('externalDatasets')).push(externalDatasetModel.buildForm());
+ }
+
+ registriesOnItemChange(event) {
+ const registryModel = new RegisterModel(event.abbreviation, event.definition, event.id, event.label, event.reference, event.uri);
+ (this.formGroup.get('registries')).push(registryModel.buildForm());
+ }
+
+ servicesOnItemChange(event) {
+ const serviceModel = new ServiceModel(event.abbreviation, event.definition, event.id, event.label, event.reference, event.uri);
+ (this.formGroup.get('services')).push(serviceModel.buildForm());
+ }
+
+ tagsOnItemChange(event) {
+ const serviceModel = new TagModel(event.id, event.name);
+ (this.formGroup.get('tags')).push(serviceModel.buildForm());
+ }
- save() {
- if (!this.isFormValid()) { return; }
- this.formGroup.get("status").setValue("0");
- this.submit();
- }
+ dataRepositoriesOnItemChange(event) {
+ const dataRepositoryModel = new DataRepositoryModel(event.id, event.name, event.abbreviation, event.uri, event.pid);
+ (this.formGroup.get('dataRepositories')).push(dataRepositoryModel.buildForm());
+ }
- saveFinalize() {
- if (!this.isFormValid()) { return; }
- this.formGroup.get("status").setValue("1");
- this.submit();
- }
+ addDataRepository() {
+ const dialogRef = this.dialog.open(DataRepositoryReferencedModelHelperComponent, {
+ height: '255px',
+ width: '700px',
+ data: {
- 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,
- })
- }
+ }
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ if (!result) { return; }
+ const dataRepositoryModel = new DataRepositoryModel(result.id, result.label, result.pid, result.uri, result.reference);
+ (this.formGroup.get('dataRepositories')).push(dataRepositoryModel.buildForm());
+ });
+ }
- onCallbackError(error: any) {
- this.setErrorModel(error.error);
- }
+ addRegistry() {
+ const dialogRef = this.dialog.open(RegistryReferencedModelHelperComponent, {
+ height: '255px',
+ width: '700px',
+ data: {
- public setErrorModel(errorModel: BaseErrorModel) {
- Object.keys(errorModel).forEach(item => {
- (this.datasetWizardModel.errorModel)[item] = (errorModel)[item];
- })
- }
+ }
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ if (!result) { return; }
+ const registryModel = new RegisterModel(result.abbreviation, result.definition, result.id, result.label, result.reference, result.uri);
+ (this.formGroup.get('registries')).push(registryModel.buildForm());
+ });
+ }
- downloadPDF(): void {
- this.datasetWizardService.downloadPDF(this.itemId).subscribe(response => {
- const blob = new Blob([response.body], { type: 'application/pdf' })
- const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+ addExternalDataset() {
+ const dialogRef = this.dialog.open(ExternalDatasetReferencedModelHelperComponent, {
+ height: '255px',
+ width: '700px',
+ data: {
- FileSaver.saveAs(blob, filename)
- })
- }
+ }
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ if (!result) { return; }
+ const externalDatasetModel = new ExternalDatasetModel(result.id, result.abbreviation, result.label, result.reference);
+ (this.formGroup.get('externalDatasets')).push(externalDatasetModel.buildForm());
+ });
+ }
- downloadXML(): void {
- this.datasetWizardService.downloadXML(this.itemId).subscribe(response => {
- const blob = new Blob([response.body], { type: 'application/xml' })
- const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+ addService() {
+ const dialogRef = this.dialog.open(ServicesReferencedModelHelperComponent, {
+ height: '255px',
+ width: '700px',
+ data: {
- FileSaver.saveAs(blob, filename)
- })
- }
-
- getFilenameFromContentDispositionHeader(header: string): string {
- const regex: RegExp = new RegExp(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/g);
-
- const matches = header.match(regex);
- let filename: string;
- for (let i = 0; i < matches.length; i++) {
- const match = matches[i];
- if (match.includes('filename="')) {
- filename = match.substring(10, match.length - 1);
- break;
- } else if (match.includes('filename=')) {
- filename = match.substring(9);
- break;
- }
- }
- return filename;
- }
-
- public redirectToProject() {
- this.router.navigate(["projects/edit/" + this.datasetWizardModel.dmp.project.id])
- }
-
- public redirectToDmp() {
- this.router.navigate(["dmps/edit/" + this.datasetWizardModel.dmp.id])
- }
-
- externalDatasetsOnItemChange(event) {
- let externalDatasetModel = new ExternalDatasetModel(event.id, event.abbreviation, event.label, event.reference);
- (this.formGroup.get("externalDatasets")).push(externalDatasetModel.buildForm());
- }
-
- registriesOnItemChange(event) {
- let registryModel = new RegisterModel(event.abbreviation, event.definition, event.id, event.label, event.reference, event.uri);
- (this.formGroup.get("registries")).push(registryModel.buildForm());
- }
-
- servicesOnItemChange(event) {
- let serviceModel = new ServiceModel(event.abbreviation, event.definition, event.id, event.label, event.reference, event.uri);
- (this.formGroup.get("services")).push(serviceModel.buildForm());
- }
-
- tagsOnItemChange(event) {
- let serviceModel = new TagModel(event.id, event.name);
- (this.formGroup.get("tags")).push(serviceModel.buildForm());
- }
-
-
- dataRepositoriesOnItemChange(event) {
- let dataRepositoryModel = new DataRepositoryModel(event.id, event.name, event.abbreviation, event.uri, event.pid);
- (this.formGroup.get("dataRepositories")).push(dataRepositoryModel.buildForm());
- }
-
- addDataRepository() {
- let dialogRef = this.dialog.open(DataRepositoryReferencedModelHelperComponent, {
- height: '255px',
- width: '700px',
- data: {
-
- }
- });
- dialogRef.afterClosed().subscribe(result => {
- if (!result) return
- let dataRepositoryModel = new DataRepositoryModel(result.id, result.label, result.pid, result.uri, result.reference);
- (this.formGroup.get("dataRepositories")).push(dataRepositoryModel.buildForm());
- });
- }
-
- addRegistry() {
- let dialogRef = this.dialog.open(RegistryReferencedModelHelperComponent, {
- height: '255px',
- width: '700px',
- data: {
-
- }
- });
- dialogRef.afterClosed().subscribe(result => {
- if (!result) return
- let registryModel = new RegisterModel(result.abbreviation, result.definition, result.id, result.label, result.reference, result.uri);
- (this.formGroup.get("registries")).push(registryModel.buildForm());
- });
- }
-
- addExternalDataset() {
- let dialogRef = this.dialog.open(ExternalDatasetReferencedModelHelperComponent, {
- height: '255px',
- width: '700px',
- data: {
-
- }
- });
- dialogRef.afterClosed().subscribe(result => {
- if (!result) return
- let externalDatasetModel = new ExternalDatasetModel(result.id, result.abbreviation, result.label, result.reference);
- (this.formGroup.get("externalDatasets")).push(externalDatasetModel.buildForm());
- });
- }
-
- addService() {
- let dialogRef = this.dialog.open(ServicesReferencedModelHelperComponent, {
- height: '255px',
- width: '700px',
- data: {
-
- }
- });
- dialogRef.afterClosed().subscribe(result => {
- if (!result) return
- let serviceModel = new ServiceModel(result.id, result.abbreviation, result.definition, result.uri, result.label, result.reference);
- (this.formGroup.get("services")).push(serviceModel.buildForm());
- });
- }
+ }
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ if (!result) { return; }
+ const serviceModel = new ServiceModel(result.id, result.abbreviation, result.definition, result.uri, result.label, result.reference);
+ (this.formGroup.get('services')).push(serviceModel.buildForm());
+ });
+ }
}
diff --git a/dmp-frontend/src/app/datasets/dataset.module.ts b/dmp-frontend/src/app/datasets/dataset.module.ts
index 0738d2286..73fdcd50f 100644
--- a/dmp-frontend/src/app/datasets/dataset.module.ts
+++ b/dmp-frontend/src/app/datasets/dataset.module.ts
@@ -12,7 +12,7 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { SharedModule } from '../shared/shared.module'
+import { SharedModule } from '../shared/shared.module';
import { BaseHttpService } from '../utilities/cite-http-service-module/base-http.service';
import { BaseHttpModule } from '../utilities/cite-http-service-module/cite-http.module';
import { MaterialModule } from '../shared/material/material.module';
@@ -30,73 +30,73 @@ import { ServicesDataService } from '../services/services/services-data.service'
import { DataRepositoryService } from '../services/datarepository/datarepository.service';
import { ExternalDatasetService } from '../services/external-dataset/external-dataset.service';
@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- HttpClientModule,
- SharedModule,
- MaterialModule,
- RouterModule.forChild(DatasetRoutes),
- ReactiveFormsModule,
- DynamicFormModule,
+ imports: [
+ CommonModule,
+ FormsModule,
+ HttpClientModule,
+ SharedModule,
+ MaterialModule,
+ RouterModule.forChild(DatasetRoutes),
+ ReactiveFormsModule,
+ DynamicFormModule,
- TranslateModule.forRoot({
- loader: {
- provide: TranslateLoader,
- useFactory: HttpLoaderFactory,
- deps: [HttpClient]
- }
- }),
- ],
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useFactory: HttpLoaderFactory,
+ deps: [HttpClient]
+ }
+ }),
+ ],
- declarations: [
- DatasetListingComponent,
- DatasetEditorComponent,
- DatasetWizardComponent,
- DatasetPublicListingComponent,
- DataRepositoryReferencedModelHelperComponent,
- ExternalDatasetReferencedModelHelperComponent,
- ServicesReferencedModelHelperComponent,
- RegistryReferencedModelHelperComponent,
- ],
+ declarations: [
+ DatasetListingComponent,
+ DatasetEditorComponent,
+ DatasetWizardComponent,
+ DatasetPublicListingComponent,
+ DataRepositoryReferencedModelHelperComponent,
+ ExternalDatasetReferencedModelHelperComponent,
+ ServicesReferencedModelHelperComponent,
+ RegistryReferencedModelHelperComponent,
+ ],
- exports: [
- DatasetListingComponent,
- DatasetEditorComponent,
- DatasetWizardComponent,
- DataRepositoryReferencedModelHelperComponent,
- ExternalDatasetReferencedModelHelperComponent,
- ServicesReferencedModelHelperComponent,
- RegistryReferencedModelHelperComponent,
- DatasetPublicListingComponent,
- RouterModule
- ],
- providers: [
- DatasetWizardService,
- ExternalSourcesService,
- ExternalSourcesConfigurationService,
- DataManagementPlanService,
- DatasetService,
- DataRepositoryService,
- ExternalDatasetService,
- ServicesDataService,
- RegistryService
- ],
- entryComponents:[
- DataRepositoryReferencedModelHelperComponent,
- ExternalDatasetReferencedModelHelperComponent,
- ServicesReferencedModelHelperComponent,
- RegistryReferencedModelHelperComponent
- ]
+ exports: [
+ DatasetListingComponent,
+ DatasetEditorComponent,
+ DatasetWizardComponent,
+ DataRepositoryReferencedModelHelperComponent,
+ ExternalDatasetReferencedModelHelperComponent,
+ ServicesReferencedModelHelperComponent,
+ RegistryReferencedModelHelperComponent,
+ DatasetPublicListingComponent,
+ RouterModule
+ ],
+ providers: [
+ DatasetWizardService,
+ ExternalSourcesService,
+ ExternalSourcesConfigurationService,
+ DataManagementPlanService,
+ DatasetService,
+ DataRepositoryService,
+ ExternalDatasetService,
+ ServicesDataService,
+ RegistryService
+ ],
+ entryComponents: [
+ DataRepositoryReferencedModelHelperComponent,
+ ExternalDatasetReferencedModelHelperComponent,
+ ServicesReferencedModelHelperComponent,
+ RegistryReferencedModelHelperComponent
+ ]
})
export class DatasetModule {
- constructor(private translate: TranslateService) {
- translate.setDefaultLang('en');
- translate.use('en');
- }
+ constructor(private translate: TranslateService) {
+ translate.setDefaultLang('en');
+ translate.use('en');
+ }
}
export function HttpLoaderFactory(httpClient: HttpClient) {
- return new TranslateHttpLoader(httpClient, 'assets/lang/', '.json');
+ return new TranslateHttpLoader(httpClient, 'assets/lang/', '.json');
}
diff --git a/dmp-frontend/src/app/datasets/dataset.routes.ts b/dmp-frontend/src/app/datasets/dataset.routes.ts
index abca900b7..dfdd64c29 100644
--- a/dmp-frontend/src/app/datasets/dataset.routes.ts
+++ b/dmp-frontend/src/app/datasets/dataset.routes.ts
@@ -5,58 +5,58 @@ import { AuthGuard } from '../shared/guards/auth.guard';
import { DatasetPublicListingComponent } from './dataset-public/dataset-public-listing.component';
export const DatasetRoutes: Routes = [
- {
- path: "new/:dmpId",
- component: DatasetWizardComponent,
- canActivate: [AuthGuard],
- data: {
- breadcrumb: true
- },
- },
- {
- path: "edit/:id",
- component: DatasetWizardComponent,
- canActivate: [AuthGuard],
- data: {
- breadcrumb: true,
- public: false
- },
- },
- {
- path: "publicEdit/:id",
- component: DatasetWizardComponent,
- //canActivate: [AuthGuard],
- data: {
- public: true
- }
- },
- {
- path: "new",
- component: DatasetWizardComponent,
- canActivate: [AuthGuard],
- data: {
- breadcrumb: true
- },
- },
- {
- path: '',
- component: DatasetListingComponent,
- //canActivate: [AuthGuard],
- data: {
- breadcrumb: true
- },
- },
- {
- path: 'public',
- component: DatasetPublicListingComponent,
- //canActivate: [AuthGuard],
- },
- {
- path: "dmp/:dmpId",
- component: DatasetListingComponent,
- //canActivate: [AuthGuard],
- data: {
- breadcrumb: true
- },
- }
+ {
+ path: 'new/:dmpId',
+ component: DatasetWizardComponent,
+ canActivate: [AuthGuard],
+ data: {
+ breadcrumb: true
+ },
+ },
+ {
+ path: 'edit/:id',
+ component: DatasetWizardComponent,
+ canActivate: [AuthGuard],
+ data: {
+ breadcrumb: true,
+ public: false
+ },
+ },
+ {
+ path: 'publicEdit/:id',
+ component: DatasetWizardComponent,
+ //canActivate: [AuthGuard],
+ data: {
+ public: true
+ }
+ },
+ {
+ path: 'new',
+ component: DatasetWizardComponent,
+ canActivate: [AuthGuard],
+ data: {
+ breadcrumb: true
+ },
+ },
+ {
+ path: '',
+ component: DatasetListingComponent,
+ //canActivate: [AuthGuard],
+ data: {
+ breadcrumb: true
+ },
+ },
+ {
+ path: 'public',
+ component: DatasetPublicListingComponent,
+ //canActivate: [AuthGuard],
+ },
+ {
+ path: 'dmp/:dmpId',
+ component: DatasetListingComponent,
+ //canActivate: [AuthGuard],
+ data: {
+ breadcrumb: true
+ },
+ }
];
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 fbbfa07d5..3b0f74864 100644
--- a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts
+++ b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.ts
@@ -1,127 +1,127 @@
import { AfterViewInit, Component, Input, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
-import { Router, ActivatedRoute, Params } from "@angular/router";
-import { TranslateService } from "@ngx-translate/core";
-import { DataSource } from "@angular/cdk/table";
-import { Observable } from "rxjs/Observable";
-import { JsonSerializer } from "../../utilities/JsonSerializer";
-import { FormGroup } from "@angular/forms";
-import { SnackBarNotificationComponent } from "../../shared/components/notificaiton/snack-bar-notification.component";
-import { BaseErrorModel } from "../../models/error/BaseErrorModel";
-import { DatasetService } from "../../services/dataset/dataset.service";
-import { DatasetModel } from "../../models/datasets/DatasetModel";
-import { ExternalSourcesService } from "../../services/external-sources/external-sources.service";
-import { ExternalSourcesItemModel } from "../../models/external-sources/ExternalSourcesItemModel";
+import { MatPaginator, MatSort, MatSnackBar } from '@angular/material';
+import { Router, ActivatedRoute, Params } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { DataSource } from '@angular/cdk/table';
+import { Observable } from 'rxjs/Observable';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+import { FormGroup } from '@angular/forms';
+import { SnackBarNotificationComponent } from '../../shared/components/notificaiton/snack-bar-notification.component';
+import { BaseErrorModel } from '../../models/error/BaseErrorModel';
+import { DatasetService } from '../../services/dataset/dataset.service';
+import { DatasetModel } from '../../models/datasets/DatasetModel';
+import { ExternalSourcesService } from '../../services/external-sources/external-sources.service';
+import { ExternalSourcesItemModel } from '../../models/external-sources/ExternalSourcesItemModel';
@Component({
- selector: 'app-dataset-editor-component',
- templateUrl: 'dataset-editor.component.html',
- styleUrls: ['./dataset-editor.component.scss'],
- encapsulation: ViewEncapsulation.None
+ selector: 'app-dataset-editor-component',
+ templateUrl: 'dataset-editor.component.html',
+ styleUrls: ['./dataset-editor.component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class DatasetEditorComponent implements AfterViewInit {
- isNew = true;
- dataset: DatasetModel;
- @Input() formGroup: FormGroup = null;
+ isNew = true;
+ dataset: DatasetModel;
+ @Input() formGroup: FormGroup = null;
- // filtereddataRepositoriesAsync: boolean = false;
- // filteredRegistriesAsync: boolean = false;
- // filteredServicesAsync: boolean = false;
+ // filtereddataRepositoriesAsync: boolean = false;
+ // filteredRegistriesAsync: boolean = false;
+ // filteredServicesAsync: boolean = false;
- // filtereddataRepositories: ExternalSourcesItemModel[];
- // filteredRegistries: ExternalSourcesItemModel[];
- // filteredServices: ExternalSourcesItemModel[];
+ // filtereddataRepositories: ExternalSourcesItemModel[];
+ // filteredRegistries: ExternalSourcesItemModel[];
+ // filteredServices: ExternalSourcesItemModel[];
- constructor(
- private datasetService: DatasetService,
- private externalSourcesService: ExternalSourcesService,
- private route: ActivatedRoute,
- public snackBar: MatSnackBar,
- public router: Router,
- public language: TranslateService,
- ) {
+ constructor(
+ private datasetService: DatasetService,
+ private externalSourcesService: ExternalSourcesService,
+ private route: ActivatedRoute,
+ public snackBar: MatSnackBar,
+ public router: Router,
+ public language: TranslateService,
+ ) {
- }
+ }
- ngAfterViewInit() {
- /* this.route.params.subscribe((params: Params) => {
- const itemId = params['id'];
+ ngAfterViewInit() {
+ /* this.route.params.subscribe((params: Params) => {
+ const itemId = params['id'];
- if (itemId != null) {
- this.isNew = false;
- this.datasetService.getSingle(itemId).map(data => data as DatasetModel)
- .subscribe(data => {
- this.dataset = new JsonSerializer().fromJSONObject(data, DatasetModel);
- this.formGroup = this.dataset.buildForm();
- });
- } else {
- this.dataset = new DatasetModel();
- setTimeout(() => {
- this.formGroup = this.dataset.buildForm();
- });
- }
- }); */
- }
+ if (itemId != null) {
+ this.isNew = false;
+ this.datasetService.getSingle(itemId).map(data => data as DatasetModel)
+ .subscribe(data => {
+ this.dataset = new JsonSerializer().fromJSONObject(data, DatasetModel);
+ this.formGroup = this.dataset.buildForm();
+ });
+ } else {
+ this.dataset = new DatasetModel();
+ setTimeout(() => {
+ this.formGroup = this.dataset.buildForm();
+ });
+ }
+ }); */
+ }
- public cancel(): void {
- this.router.navigate(['/datasets']);
- }
+ public cancel(): void {
+ this.router.navigate(['/datasets']);
+ }
- // filterdataRepositories(value: string): void {
+ // filterdataRepositories(value: string): void {
- // this.filtereddataRepositories = undefined;
- // if (value) {
- // this.filtereddataRepositoriesAsync = true;
+ // this.filtereddataRepositories = undefined;
+ // if (value) {
+ // this.filtereddataRepositoriesAsync = true;
- // this.externalSourcesService.searchDMPOrganizations(value).subscribe(items => {
- // this.filtereddataRepositories = items;
- // this.filtereddataRepositoriesAsync = false;
+ // this.externalSourcesService.searchDMPOrganizations(value).subscribe(items => {
+ // this.filtereddataRepositories = items;
+ // this.filtereddataRepositoriesAsync = false;
- // // this.filteredOrganisations = items.filter((filteredObj: any) => {
- // // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
- // // });
+ // // this.filteredOrganisations = items.filter((filteredObj: any) => {
+ // // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
+ // // });
- // });
- // }
- // }
+ // });
+ // }
+ // }
- // filterRegistries(value: string): void {
+ // filterRegistries(value: string): void {
- // this.filteredRegistries = undefined;
- // if (value) {
- // this.filteredRegistriesAsync = true;
+ // this.filteredRegistries = undefined;
+ // if (value) {
+ // this.filteredRegistriesAsync = true;
- // this.externalSourcesService.searchDMPResearchers(value).subscribe(items => {
- // this.filteredRegistries = items;
- // this.filteredRegistriesAsync = false;
+ // this.externalSourcesService.searchDMPResearchers(value).subscribe(items => {
+ // this.filteredRegistries = items;
+ // this.filteredRegistriesAsync = false;
- // // this.filteredOrganisations = items.filter((filteredObj: any) => {
- // // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
- // // });
+ // // this.filteredOrganisations = items.filter((filteredObj: any) => {
+ // // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
+ // // });
- // });
- // }
- // }
+ // });
+ // }
+ // }
- // filterServices(value: string): void {
+ // filterServices(value: string): void {
- // this.filteredServices = undefined;
- // if (value) {
- // this.filteredServicesAsync = true;
+ // this.filteredServices = undefined;
+ // if (value) {
+ // this.filteredServicesAsync = true;
- // this.externalSourcesService.searchDatasetService(value).subscribe(items => {
- // this.filteredServices = items;
- // this.filteredServicesAsync = false;
+ // this.externalSourcesService.searchDatasetService(value).subscribe(items => {
+ // this.filteredServices = items;
+ // this.filteredServicesAsync = false;
- // // this.filteredOrganisations = items.filter((filteredObj: any) => {
- // // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
- // // });
+ // // this.filteredOrganisations = items.filter((filteredObj: any) => {
+ // // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
+ // // });
- // });
- // }
- // }
+ // });
+ // }
+ // }
}
diff --git a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
index 1cadda770..fa1b0264c 100644
--- a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
@@ -3,16 +3,16 @@ import { DataTableRequest } from '../../models/data-table/DataTableRequest';
import { DatasetListingModel } from '../../models/datasets/DatasetListingModel';
import { DatasetCriteria } from '../../models/criteria/dataset/DatasetCriteria';
import { DatasetService } from '../../services/dataset/dataset.service';
-import { Component, ViewChild, OnInit, AfterViewInit } from "@angular/core";
-import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
-import { Router, Params, ActivatedRoute } from "@angular/router";
-import { TranslateService } from "@ngx-translate/core";
-import { DataSource } from "@angular/cdk/table";
+import { Component, ViewChild, OnInit, AfterViewInit } from '@angular/core';
+import { MatPaginator, MatSort, MatSnackBar } from '@angular/material';
+import { Router, Params, ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { DataSource } from '@angular/cdk/table';
-import { Observable } from "rxjs/Observable";
+import { Observable } from 'rxjs/Observable';
import { PageEvent } from '@angular/material';
-import { DataManagementPlanService } from "../../services/data-management-plan/data-management-plan.service";
-import { DataManagementPlanModel } from "../../models/data-managemnt-plans/DataManagementPlanModel";
+import { DataManagementPlanService } from '../../services/data-management-plan/data-management-plan.service';
+import { DataManagementPlanModel } from '../../models/data-managemnt-plans/DataManagementPlanModel';
import { DatasetCriteriaComponent } from '../../shared/components/criteria/datasets/datasets-criteria.component';
import { BreadcrumbItem } from '../../shared/components/breadcrumb/definition/breadcrumb-item';
import { IBreadCrumbComponent } from '../../shared/components/breadcrumb/definition/IBreadCrumbComponent';
@@ -21,148 +21,149 @@ import { JsonSerializer } from '../../utilities/JsonSerializer';
@Component({
- selector: 'app-dataset-listing-component',
- templateUrl: 'dataset-listing.component.html',
- styleUrls: ['./dataset-listing.component.scss'],
- providers:[Utilities]
+ selector: 'app-dataset-listing-component',
+ templateUrl: 'dataset-listing.component.html',
+ styleUrls: ['./dataset-listing.component.scss'],
+ providers: [Utilities]
})
export class DatasetListingComponent implements OnInit, IBreadCrumbComponent {
- @ViewChild(MatPaginator) _paginator: MatPaginator;
- @ViewChild(MatSort) sort: MatSort;
- @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent;
+ @ViewChild(MatPaginator) _paginator: MatPaginator;
+ @ViewChild(MatSort) sort: MatSort;
+ @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent;
- breadCrumbs: Observable;
+ breadCrumbs: Observable;
- dataSource: DatasetDataSource | null;
- displayedColumns: String[] = ['label', 'dmp', 'profile', 'status', 'description', 'created', 'actions'];
- pageEvent: PageEvent;
- titlePrefix: String;
- dmpId: string;
+ dataSource: DatasetDataSource | null;
+ displayedColumns: String[] = ['label', 'dmp', 'profile', 'status', 'description', 'created', 'actions'];
+ pageEvent: PageEvent;
+ titlePrefix: String;
+ dmpId: string;
- statuses = [
- { value: '0', viewValue: 'Active' },
- { value: '1', viewValue: 'Inactive' }
- ];
+ statuses = [
+ { value: '0', viewValue: 'Active' },
+ { value: '1', viewValue: 'Inactive' }
+ ];
- constructor(
- private datasetService: DatasetService,
- private router: Router,
- private languageService: TranslateService,
- public snackBar: MatSnackBar,
- public route: ActivatedRoute,
- public dataManagementPlanService: DataManagementPlanService,
- public utilities: Utilities
- ) {
+ constructor(
+ private datasetService: DatasetService,
+ private router: Router,
+ private languageService: TranslateService,
+ public snackBar: MatSnackBar,
+ public route: ActivatedRoute,
+ public dataManagementPlanService: DataManagementPlanService,
+ public utilities: Utilities
+ ) {
- }
+ }
- ngOnInit() {
+ ngOnInit() {
- this.route.params.subscribe(async (params: Params) => {
- this.dmpId = params['dmpId'];
- this.criteria.setCriteria(this.getDefaultCriteria(this.dmpId));
- this.refresh();
- this.criteria.setRefreshCallback(() => this.refresh());
- if (this.dmpId != null) {
- let dmp = await this.dataManagementPlanService.getSingle(this.dmpId).toPromise()
- this.breadCrumbs = Observable.of([{ parentComponentName: "DataManagementPlanEditorComponent", label: dmp.label, url: "dmps/edit/" + this.dmpId }])
- if (params['dmpLabel'] != undefined)
- this.titlePrefix = "for " + params['dmpLabel'];
- } else {
- this.breadCrumbs = Observable.of([])
- }
- });
- }
+ this.route.params.subscribe(async (params: Params) => {
+ this.dmpId = params['dmpId'];
+ this.criteria.setCriteria(this.getDefaultCriteria(this.dmpId));
+ this.refresh();
+ this.criteria.setRefreshCallback(() => this.refresh());
+ if (this.dmpId != null) {
+ const dmp = await this.dataManagementPlanService.getSingle(this.dmpId).toPromise();
+ this.breadCrumbs = Observable.of([{ parentComponentName: 'DataManagementPlanEditorComponent', label: dmp.label, url: 'dmps/edit/' + this.dmpId }]);
+ if (params['dmpLabel'] !== undefined) {
+ this.titlePrefix = 'for ' + params['dmpLabel'];
+ }
+ } else {
+ this.breadCrumbs = Observable.of([]);
+ }
+ });
+ }
- refresh() {
- this.dataSource = new DatasetDataSource(this.datasetService, this._paginator, this.sort, this.languageService, this.snackBar, this.criteria, this.dmpId);
- }
+ refresh() {
+ this.dataSource = new DatasetDataSource(this.datasetService, this._paginator, this.sort, this.languageService, this.snackBar, this.criteria, this.dmpId);
+ }
- rowClick(rowId: String) {
- this.router.navigate(['/datasets/edit/' + rowId]);
- }
+ rowClick(rowId: String) {
+ this.router.navigate(['/datasets/edit/' + rowId]);
+ }
- getDefaultCriteria(dmpId: String): DatasetCriteria {
- const defaultCriteria = new DatasetCriteria();
- if (dmpId != null) {
- defaultCriteria.dmpIds.push(dmpId);
- }
- return defaultCriteria;
- }
+ getDefaultCriteria(dmpId: String): DatasetCriteria {
+ const defaultCriteria = new DatasetCriteria();
+ if (dmpId != null) {
+ defaultCriteria.dmpIds.push(dmpId);
+ }
+ return defaultCriteria;
+ }
- makeItPublic(id: String) {
- this.datasetService.makeDatasetPublic(id).subscribe();
- }
+ makeItPublic(id: String) {
+ this.datasetService.makeDatasetPublic(id).subscribe();
+ }
}
export class DatasetDataSource extends DataSource {
- totalCount = 0;
- isLoadingResults = false;
- constructor(
- private _service: DatasetService,
- private _paginator: MatPaginator,
- private _sort: MatSort,
- private _languageService: TranslateService,
- private _snackBar: MatSnackBar,
- private _criteria: DatasetCriteriaComponent,
- private dmpId: String
- ) {
- super();
+ totalCount = 0;
+ isLoadingResults = false;
+ constructor(
+ private _service: DatasetService,
+ private _paginator: MatPaginator,
+ private _sort: MatSort,
+ private _languageService: TranslateService,
+ private _snackBar: MatSnackBar,
+ private _criteria: DatasetCriteriaComponent,
+ private dmpId: String
+ ) {
+ super();
- }
+ }
- connect(): Observable {
- const displayDataChanges = [
- this._paginator.page
- //this._sort.matSortChange
- ];
+ connect(): Observable {
+ const displayDataChanges = [
+ this._paginator.page
+ //this._sort.matSortChange
+ ];
- return Observable.merge(...displayDataChanges)
- .startWith(null)
- .switchMap(() => {
- setTimeout(() => {
- this.isLoadingResults = true;
- });
- const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
- let fields: Array = new Array()
- if (this._sort.active) fields = this._sort.direction === "asc" ? ["+" + this._sort.active] : ["-" + this._sort.active];
- const request = new DataTableRequest(startIndex, this._paginator.pageSize, { fields: fields });
- request.criteria = this._criteria.criteria;
- if (this.dmpId) request.criteria.allVersions = true;
- return this._service.getPaged(request);
- })
- /*.catch((error: any) => {
- this._snackBar.openFromComponent(SnackBarNotificationComponent, {
- data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService },
- duration: 3000,
- extraClasses: ['snackbar-warning']
- });
- //this._criteria.criteria.onCallbackError(error);
- return Observable.of(null);
- })*/
- .map(result => {
- result.data = JsonSerializer.fromJSONArray(result.data, DatasetListingModel)
- return result;
- })
- .map(result => {
- setTimeout(() => {
- this.isLoadingResults = false;
- });
- return result;
- })
- .map(result => {
- if (!result) { return []; }
- if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; }
- return result.data;
- });
- }
+ return Observable.merge(...displayDataChanges)
+ .startWith(null)
+ .switchMap(() => {
+ setTimeout(() => {
+ this.isLoadingResults = true;
+ });
+ const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
+ let fields: Array = new Array();
+ if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; }
+ const request = new DataTableRequest(startIndex, this._paginator.pageSize, { fields: fields });
+ request.criteria = this._criteria.criteria;
+ if (this.dmpId) { request.criteria.allVersions = true; }
+ return this._service.getPaged(request);
+ })
+ /*.catch((error: any) => {
+ this._snackBar.openFromComponent(SnackBarNotificationComponent, {
+ data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService },
+ duration: 3000,
+ extraClasses: ['snackbar-warning']
+ });
+ //this._criteria.criteria.onCallbackError(error);
+ return Observable.of(null);
+ })*/
+ .map(result => {
+ result.data = JsonSerializer.fromJSONArray(result.data, DatasetListingModel);
+ return result;
+ })
+ .map(result => {
+ setTimeout(() => {
+ this.isLoadingResults = false;
+ });
+ return result;
+ })
+ .map(result => {
+ if (!result) { return []; }
+ if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; }
+ return result.data;
+ });
+ }
- disconnect() {
- // No-op
- }
+ disconnect() {
+ // No-op
+ }
}
diff --git a/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.html b/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.html
index 9481f8aec..5611767f9 100644
--- a/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.html
+++ b/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.html
@@ -1,63 +1,68 @@
-
-
\ No newline at end of file
+
+
+
+
diff --git a/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.ts b/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.ts
index d8c059fbf..5c95a77c8 100644
--- a/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.ts
+++ b/dmp-frontend/src/app/dmp-profiles/dmp-profile-editor/dmp-profile-editor.component.ts
@@ -1,177 +1,175 @@
-import { Component, ViewChild, OnInit, AfterViewInit, ViewEncapsulation } from "@angular/core";
-import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
-import { Router, ActivatedRoute, Params } from "@angular/router";
-import { TranslateService } from "@ngx-translate/core";
-import { DataSource } from "@angular/cdk/table";
-import { Observable } from "rxjs/Observable";
-import { DataManagementPlanService } from "../../services/data-management-plan/data-management-plan.service";
-import { ProjectModel } from "../../models/projects/ProjectModel";
-import { JsonSerializer } from "../../utilities/JsonSerializer";
-import { FormGroup, AbstractControl, FormControl, FormArray } from "@angular/forms";
-import { SnackBarNotificationComponent } from "../../shared/components/notificaiton/snack-bar-notification.component";
-import { BaseErrorModel } from "../../models/error/BaseErrorModel";
-import { TdDialogService } from "@covalent/core";
-import { HostConfiguration } from "../../app.constants";
-import { DataManagementPlanProfileService } from "../../services/data-management-plan-profile/datamanagement-profile.service";
-import { DataManagementPlanProfileModel } from "../../models/data-management-plan-profile/DataManagementPlanProfileModel";
-import { DMPProfileFieldDataType, DMPProfileType, DataManagementProfileField } from "../../models/data-management-plan-profile/DataManagementProfileField";
-import { Utilities } from "../../utilities/utilities";
-import { DataManagementPlanProfileListingModel } from "../../models/data-management-plan-profile/DataManagementPlanProfileListingModel";
+import { Component, ViewChild, OnInit, AfterViewInit, ViewEncapsulation } from '@angular/core';
+import { MatPaginator, MatSort, MatSnackBar } from '@angular/material';
+import { Router, ActivatedRoute, Params } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { DataSource } from '@angular/cdk/table';
+import { Observable } from 'rxjs/Observable';
+import { DataManagementPlanService } from '../../services/data-management-plan/data-management-plan.service';
+import { ProjectModel } from '../../models/projects/ProjectModel';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+import { FormGroup, AbstractControl, FormControl, FormArray } from '@angular/forms';
+import { SnackBarNotificationComponent } from '../../shared/components/notificaiton/snack-bar-notification.component';
+import { BaseErrorModel } from '../../models/error/BaseErrorModel';
+import { TdDialogService } from '@covalent/core';
+import { HostConfiguration } from '../../app.constants';
+import { DataManagementPlanProfileService } from '../../services/data-management-plan-profile/datamanagement-profile.service';
+import { DataManagementPlanProfileModel } from '../../models/data-management-plan-profile/DataManagementPlanProfileModel';
+import { DMPProfileFieldDataType, DMPProfileType, DataManagementProfileField } from '../../models/data-management-plan-profile/DataManagementProfileField';
+import { Utilities } from '../../utilities/utilities';
+import { DataManagementPlanProfileListingModel } from '../../models/data-management-plan-profile/DataManagementPlanProfileListingModel';
@Component({
- selector: 'app-dmp-profile-editor-component',
- templateUrl: 'dmp-profile-editor.component.html',
- styleUrls: ['./dmp-profile-editor.component.scss'],
- providers: [DataManagementPlanProfileService],
- encapsulation: ViewEncapsulation.None
+ selector: 'app-dmp-profile-editor-component',
+ templateUrl: 'dmp-profile-editor.component.html',
+ styleUrls: ['./dmp-profile-editor.component.scss'],
+ providers: [DataManagementPlanProfileService, Utilities],
+ encapsulation: ViewEncapsulation.None
})
export class DataManagementPlanProfileEditorComponent implements AfterViewInit {
- isNew = true;
- dataManagementPlanProfileModel: DataManagementPlanProfileModel;
- formGroup: FormGroup = null;
- host = HostConfiguration.Server;
- baseErrorModel: BaseErrorModel;
- constructor(
- private dmpProfileService: DataManagementPlanProfileService,
- private route: ActivatedRoute,
- public snackBar: MatSnackBar,
- public router: Router,
- public language: TranslateService,
- private dialogService: TdDialogService,
- private utilities: Utilities
- ) {
- }
+ isNew = true;
+ dataManagementPlanProfileModel: DataManagementPlanProfileModel;
+ formGroup: FormGroup = null;
+ host = HostConfiguration.Server;
+ baseErrorModel: BaseErrorModel;
+ constructor(
+ private dmpProfileService: DataManagementPlanProfileService,
+ private route: ActivatedRoute,
+ public snackBar: MatSnackBar,
+ public router: Router,
+ public language: TranslateService,
+ private dialogService: TdDialogService,
+ private utilities: Utilities
+ ) {
+ }
- ngAfterViewInit() {
- this.route.params.subscribe((params: Params) => {
- const itemId = params['id'];
+ ngAfterViewInit() {
+ this.route.params.subscribe((params: Params) => {
+ const itemId = params['id'];
- if (itemId != null) {
- this.isNew = false;
- this.dmpProfileService.getSingle(itemId).map(data => data as DataManagementPlanProfileModel)
- .subscribe(data => {
- this.dataManagementPlanProfileModel = JsonSerializer.fromJSONObject(data, DataManagementPlanProfileModel);
- this.baseErrorModel = this.dataManagementPlanProfileModel.errorModel;
- this.formGroup = this.dataManagementPlanProfileModel.buildForm();
- });
- } else {
- this.dataManagementPlanProfileModel = new DataManagementPlanProfileModel();
- this.baseErrorModel = this.dataManagementPlanProfileModel.errorModel;
+ if (itemId != null) {
+ this.isNew = false;
+ this.dmpProfileService.getSingle(itemId).map(data => data as DataManagementPlanProfileModel)
+ .subscribe(data => {
+ this.dataManagementPlanProfileModel = JsonSerializer.fromJSONObject(data, DataManagementPlanProfileModel);
+ this.baseErrorModel = this.dataManagementPlanProfileModel.errorModel;
+ this.formGroup = this.dataManagementPlanProfileModel.buildForm();
+ });
+ } else {
+ this.dataManagementPlanProfileModel = new DataManagementPlanProfileModel();
+ this.baseErrorModel = this.dataManagementPlanProfileModel.errorModel;
- setTimeout(() => {
- this.formGroup = this.dataManagementPlanProfileModel.buildForm();
- });
- }
- });
- }
+ setTimeout(() => {
+ this.formGroup = this.dataManagementPlanProfileModel.buildForm();
+ });
+ }
+ });
+ }
- formSubmit(): void {
- this.touchAllFormFields(this.formGroup);
- if (!this.isFormValid()) { return; }
- this.onSubmit();
- }
+ formSubmit(): void {
+ this.touchAllFormFields(this.formGroup);
+ if (!this.isFormValid()) { return; }
+ this.onSubmit();
+ }
- public isFormValid() {
- return this.formGroup.valid;
- }
+ public isFormValid() {
+ return this.formGroup.valid;
+ }
- onSubmit(): void {
- this.dmpProfileService.createDataManagementPlan(this.formGroup.value).subscribe(
- complete => this.onCallbackSuccess(),
- error => this.onCallbackError(error)
- );
- }
+ onSubmit(): void {
+ this.dmpProfileService.createDataManagementPlan(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,
- })
- this.router.navigate(['/dmp-profiles']);
- }
+ 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,
+ });
+ this.router.navigate(['/dmp-profiles']);
+ }
- onCallbackError(errorResponse: any) {
- this.setErrorModel(errorResponse.error);
- this.validateAllFormFields(this.formGroup);
- }
+ onCallbackError(errorResponse: any) {
+ this.setErrorModel(errorResponse.error);
+ this.validateAllFormFields(this.formGroup);
+ }
- public setErrorModel(errorModel: BaseErrorModel) {
- Object.keys(errorModel).forEach(item => {
- (