+
-
-
-
+
+
+
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 711414023..c5b7516fe 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
@@ -31,7 +31,7 @@ import { ValidationErrorModel } from '@common/forms/validation/error-model/valid
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
import { TranslateService } from '@ngx-translate/core';
import * as FileSaver from 'file-saver';
-import { Observable, of as observableOf, interval, Subscription } from 'rxjs';
+import { Observable, of as observableOf, interval} from 'rxjs';
import { catchError, debounceTime, map, takeUntil } from 'rxjs/operators';
import { LockService } from '@app/core/services/lock/lock.service';
import { Location } from '@angular/common';
@@ -39,14 +39,13 @@ import { LockModel } from '@app/core/model/lock/lock.model';
import { Guid } from '@common/types/guid';
import { isNullOrUndefined } from 'util';
import { AuthService } from '@app/core/services/auth/auth.service';
-import { environment } from 'environments/environment';
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
import { SaveType } from '@app/core/common/enum/save-type';
import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
import { HttpClient } from '@angular/common/http';
-import { ToCEntry, ToCEntryType } from '@app/ui/misc/dataset-description-form/dataset-description.component';
import { VisibilityRulesService } from '@app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service';
+import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
@Component({
selector: 'app-dataset-wizard-component',
@@ -193,6 +192,13 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
// if (this.viewOnly) { this.formGroup.disable(); } // For future use, to make Dataset edit like DMP.
this.loadDatasetProfiles();
this.registerFormListeners();
+
+ if(lockStatus){
+ this.dialog.open(PopupNotificationDialogComponent,{data:{
+ title:this.language.instant('DATASET-WIZARD.LOCKED.TITLE'),
+ message:this.language.instant('DATASET-WIZARD.LOCKED.MESSAGE')
+ }, maxWidth:'30em'});
+ }
// this.availableProfiles = this.datasetWizardModel.dmp.profiles;
})
},
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
index 3ce790c8d..3d5b72096 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
@@ -33,6 +33,7 @@ import { DmpStatus } from '@app/core/common/enum/dmp-status';
import { DmpOverviewModel } from '@app/core/model/dmp/dmp-overview';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
import { HttpClient } from '@angular/common/http';
+import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
@Component({
@@ -139,7 +140,15 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
checkLockStatus(id: string) {
this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed))
- .subscribe(lockStatus => this.lockStatus = lockStatus);
+ .subscribe(lockStatus => {
+ this.lockStatus = lockStatus
+ if(lockStatus){
+ this.dialog.open(PopupNotificationDialogComponent,{data:{
+ title:this.language.instant('DATASET-OVERVIEW.LOCKED.TITLE'),
+ message:this.language.instant('DATASET-OVERVIEW.LOCKED.MESSAGE')
+ }, maxWidth:'30em'});
+ }
+ });
}
onFetchingDeletedCallbackError(redirectRoot: string) {
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index 9d5773803..cd8c9d6b0 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -1,11 +1,11 @@
-import { Component, OnInit, SimpleChanges } from '@angular/core';
-import { FormGroup, AbstractControl, FormControl, FormArray, FormBuilder } from '@angular/forms';
+import { Component, OnInit} from '@angular/core';
+import { FormGroup, AbstractControl, FormControl, FormArray} from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Params, Router } from '@angular/router';
import { DmpStatus } from '@app/core/common/enum/dmp-status';
import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
-import { DmpProfileDefinition, DmpProfile } from '@app/core/model/dmp-profile/dmp-profile';
+import { DmpProfileDefinition } from '@app/core/model/dmp-profile/dmp-profile';
import { DmpProfileListing } from '@app/core/model/dmp-profile/dmp-profile-listing';
import { DmpModel } from '@app/core/model/dmp/dmp';
import { UserModel } from '@app/core/model/user/user';
@@ -33,7 +33,7 @@ import { ValidationErrorModel } from '@common/forms/validation/error-model/valid
import { TranslateService } from '@ngx-translate/core';
import * as FileSaver from 'file-saver';
import { Observable, of as observableOf, interval } from 'rxjs';
-import { catchError, delay, map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs/operators';
import { Principal } from "@app/core/model/auth/principal";
import { Role } from "@app/core/common/enum/role";
import { LockService } from '@app/core/services/lock/lock.service';
@@ -42,13 +42,7 @@ import { Guid } from '@common/types/guid';
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
import { ExtraPropertiesFormModel } from './general-tab/extra-properties-form.model';
import { DatasetWizardEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model';
-import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
-import { DmpListingModel } from '@app/core/model/dmp/dmp-listing';
-import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria';
-import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model';
import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
-import { CloneDialogComponent } from '../clone/clone-dialog/clone-dialog.component';
-import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard';
import { DatasetService } from '@app/core/services/dataset/dataset.service';
import { DmpToDatasetDialogComponent } from '../dmp-to-dataset/dmp-to-dataset-dialog.component';
import { GrantEditorModel } from '@app/ui/grant/editor/grant-editor.model';
@@ -117,7 +111,6 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
private formService: FormService,
private lockService: LockService,
private configurationService: ConfigurationService,
- private httpClient: HttpClient,
private matomoService: MatomoService
) {
super();
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 1517c084e..5ca21021a 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -103,7 +103,7 @@
horizontal_rule