diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts index fe68bd513..5da7ca431 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts @@ -19,6 +19,7 @@ import { DatasetProfileEnum } from '../../../../core/common/enum/dataset-profile import * as FileSaver from 'file-saver'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; import { Observable } from 'rxjs'; +import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; //import * as data from 'src/assets/resources/skipDisable.json'; const skipDisable: any[] = require('../../../../../assets/resources/skipDisable.json'); @@ -197,7 +198,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn error => this.onCallbackErrorNewVersion(error) ); } else { - this.form.get('status').setValue(0); + this.form.get('status').setValue(DatasetStatus.Draft); data = this.form.value; this.datasetProfileService.createForm(data) .pipe(takeUntil(this._destroyed)) diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts index d8e331173..cf24263a8 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts @@ -6,6 +6,7 @@ import { DatasetListingModel } from '../../../core/model/dataset/dataset-listing import { AuthService } from '../../../core/services/auth/auth.service'; import { RecentActivityType } from '../../../core/common/enum/recent-activity-type'; import { Router} from '@angular/router'; +import { DmpStatus } from '../../../core/common/enum/dmp-status'; @Component({ selector: 'app-drafts', @@ -28,7 +29,7 @@ export class DraftsComponent implements OnInit { const fields: Array = []; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 2, { fields: fields }); dmpDataTableRequest.criteria = new DatasetCriteria(); - dmpDataTableRequest.criteria.status = 0; + dmpDataTableRequest.criteria.status = DmpStatus.Draft; this.datasetService.getPaged(dmpDataTableRequest).subscribe(response => { this.datasetDrafts = response.data; }); diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts index 6182d6254..82e8961d0 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts @@ -11,8 +11,8 @@ import { takeUntil } from 'rxjs/operators'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { SnackBarNotificationLevel, UiNotificationService } from '../../core/services/notification/ui-notification-service'; import { TranslateService } from '@ngx-translate/core'; -import { ConfirmationDialogComponent } from '../../library/confirmation-dialog/confirmation-dialog.component'; import { DatasetEditorWizardComponent } from '../quick-wizard/dataset-editor/dataset-editor-wizard.component'; +import { DatasetStatus } from '../../core/common/enum/dataset-status'; @Component({ selector: 'dataset-create-wizard.component', @@ -59,7 +59,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread save() { if (this.formGroup.get('datasets') && this.formGroup.get('datasets').get('datasetsList') && (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0) { for (let control of (this.formGroup.get('datasets').get('datasetsList') as FormArray).controls) { - control.get('status').setValue('0'); + control.get('status').setValue(DatasetStatus.Draft); } // this.onSubmitSave(); const dmpId = this.formGroup.get('dmpMeta').get('dmp').value.id; @@ -77,7 +77,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread if (!this.isFormValid()) { return; } if (this.formGroup.get('datasets') && this.formGroup.get('datasets').get('datasetsList') && (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0) { for (let control of (this.formGroup.get('datasets').get('datasetsList') as FormArray).controls) { - control.get('status').setValue('1'); + control.get('status').setValue(DatasetStatus.Finalized); } this.onSubmitSaveAndFinalize(); } else { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index c28b59b93..adb68762d 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -152,7 +152,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }]); this.formGroup = this.datasetWizardModel.buildForm(); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; - if (this.datasetWizardModel.status === 1) { + if (this.datasetWizardModel.status === DatasetStatus.Finalized) { this.formGroup.disable(); this.viewOnly = true; } @@ -179,7 +179,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardModel.dmp = data; this.formGroup = this.datasetWizardModel.buildForm(); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; - if (this.datasetWizardModel.status === 1) { + if (this.datasetWizardModel.status === DatasetStatus.Finalized) { this.formGroup.disable(); this.viewOnly = true; } @@ -251,7 +251,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }); }); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; - if (this.datasetWizardModel.status === 1) { + if (this.datasetWizardModel.status === DatasetStatus.Finalized) { this.formGroup.disable(); this.viewOnly = true; } @@ -272,7 +272,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.formGroup = this.datasetWizardModel.buildForm(); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; - if (this.datasetWizardModel.status === 1) { + if (this.datasetWizardModel.status === DatasetStatus.Finalized) { this.formGroup.disable(); this.viewOnly = true; } @@ -311,7 +311,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }]); this.formGroup = this.datasetWizardModel.buildForm(); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; - if (this.datasetWizardModel.status === 1) { + if (this.datasetWizardModel.status === DatasetStatus.Finalized) { this.formGroup.disable(); this.viewOnly = true; } @@ -322,7 +322,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardModel = new DatasetWizardEditorModel(); this.formGroup = this.datasetWizardModel.buildForm(); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; - if (this.datasetWizardModel.status === 1) { + if (this.datasetWizardModel.status === DatasetStatus.Finalized) { this.formGroup.disable(); this.viewOnly = true; } @@ -449,13 +449,13 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr save() { //if (!this.isFormValid()) { return; } - this.formGroup.get('status').setValue('0'); + this.formGroup.get('status').setValue(DatasetStatus.Draft); this.submit(); } saveFinalize() { if (!this.isFormValid()) { return; } - this.formGroup.get('status').setValue('1'); + this.formGroup.get('status').setValue(DatasetStatus.Finalized); this.submit(); } @@ -626,7 +626,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr } needsUpdate() { - if (this.datasetWizardModel.isProfileLatestVersion || (this.datasetWizardModel.status === 1) + if (this.datasetWizardModel.isProfileLatestVersion || (this.datasetWizardModel.status === DatasetStatus.Finalized) || (this.datasetWizardModel.isProfileLatestVersion == undefined && this.datasetWizardModel.status == undefined)) { return false; } diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index b763d19a1..6402ebb52 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -13,6 +13,7 @@ import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; import { DatasetCriteriaComponent } from './criteria/dataset-criteria.component'; import { TranslateService } from '@ngx-translate/core'; +import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @Component({ selector: 'app-dataset-listing-component', @@ -78,7 +79,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB }]); } - if (this.status != null && this.status == 0) { + if (this.status != null && this.status == DatasetStatus.Draft) { this.criteria.setCriteria(this.getDraftCriteria()); this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); @@ -147,7 +148,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB getDraftCriteria(): DatasetCriteria { const draftCriteria = new DatasetCriteria(); - draftCriteria.status = 0; + draftCriteria.status = DatasetStatus.Draft; return draftCriteria; } diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts index 1f2a44bc5..981aa5332 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { DatasetListingModel } from '../../../../core/model/dataset/dataset-listing'; import { Router } from '@angular/router'; +import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; @Component({ selector: 'app-dataset-listing-item-component', @@ -18,7 +19,7 @@ export class DatasetListingItemComponent implements OnInit { constructor(private router: Router) { } ngOnInit() { - if (this.dataset.status == 0) { this.isDraft = true } + if (this.dataset.status == DatasetStatus.Draft) { this.isDraft = true } else { this.isDraft = false } } diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts index 53673c295..f30ab4992 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { DmpEditorModel } from '../dmp-editor.model'; import { Router } from '@angular/router'; import { DatasetOverviewModel } from '../../../../core/model/dataset/dataset-overview'; +import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; @Component({ selector: 'app-datasets-tab', @@ -29,7 +30,7 @@ export class DatasetsTabComponent implements OnInit { } isDraft(dataset: DatasetOverviewModel) { - if (dataset.status == 0) { return true } + if (dataset.status == DatasetStatus.Draft) { return true } else { return false } } diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts index d8a76581b..87de2e531 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts @@ -122,7 +122,7 @@ export class DmpFinalizeDialogComponent extends BaseComponent implements OnInit } isDraft(dataset: DatasetOverviewModel) { - if (dataset.status == 0) { return true } + if (dataset.status == DatasetStatus.Draft) { return true } else { return false } } diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts index 9154c0629..f07a612ed 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts @@ -14,6 +14,7 @@ import { DataTableRequest } from '../../../../core/model/data-table/data-table-r import { AuthService } from '../../../../core/services/auth/auth.service'; import { Principal } from '../../../../core/model/auth/Principal'; import { TranslateService } from '@ngx-translate/core'; +import { DmpStatus } from '../../../../core/common/enum/dmp-status'; @Component({ selector: 'app-dmp-listing-item-component', @@ -37,7 +38,7 @@ export class DmpListingItemComponent implements OnInit { private translate: TranslateService) { } ngOnInit() { - if (this.dmp.status == 0) { this.isDraft = true } + if (this.dmp.status == DmpStatus.Draft) { this.isDraft = true } else { this.isDraft = false } } diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index c5c08e8ce..72f32c640 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -16,6 +16,7 @@ import * as FileSaver from 'file-saver'; import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { Observable } from 'rxjs'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; +import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @Component({ selector: 'app-dmp-overview', @@ -241,7 +242,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } isDraft(dataset: DatasetOverviewModel) { - if (dataset.status == 0) { return true } + if (dataset.status == DatasetStatus.Draft) { return true } else { return false } } } diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts index 4f2ddfbd4..4779e63b6 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.ts @@ -1,5 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DatasetListingModel } from '../../../core/model/dataset/dataset-listing'; +import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @Component({ selector: 'app-explore-dataset-listing-item-component', @@ -17,7 +18,7 @@ export class ExploreDatasetListingItemComponent implements OnInit { constructor() { } ngOnInit() { - if (this.dataset.status == 0) { this.isDraft = true } + if (this.dataset.status == DatasetStatus.Draft) { this.isDraft = true } else { this.isDraft = false } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index 63f8b7bf2..f6c8c3607 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -17,6 +17,7 @@ import { DatasetEditorWizardComponent } from '../dataset-editor/dataset-editor-w import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; import { DmpFinalizeDialogComponent } from '../../dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component'; import { DmpStatus } from '../../../core/common/enum/dmp-status'; +import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @Component({ @@ -71,7 +72,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, this.touchAllFormFields(this.formGroup); if (this.formGroup.get('datasets') && this.formGroup.get('datasets').get('datasetsList') && (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0) { for (let control of (this.formGroup.get('datasets').get('datasetsList') as FormArray).controls) { - control.get('status').setValue('0'); + control.get('status').setValue(DatasetStatus.Draft); } this.onSubmitSave(); } else { @@ -92,7 +93,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, if (!this.isFormValid()) { return; } if (this.formGroup.get('datasets') && this.formGroup.get('datasets').get('datasetsList') && (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0) { for (let control of (this.formGroup.get('datasets').get('datasetsList') as FormArray).controls) { - control.get('status').setValue(DmpStatus.Finalized); + control.get('status').setValue(DatasetStatus.Finalized); } this.formGroup.get('dmp').get('status').setValue(DmpStatus.Finalized); this.onSubminSaveAndFinalize();