diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-overview.ts b/dmp-frontend/src/app/core/model/dataset/dataset-overview.ts
index 34bbe936c..3080a1548 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-overview.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-overview.ts
@@ -1,5 +1,6 @@
import { DatasetProfileModel } from "./dataset-profile";
import { GrantOverviewModel } from '../grant/grant-overview';
+import { DmpOverviewModel } from '../dmp/dmp-overview';
export interface DatasetOverviewModel {
id: string;
@@ -8,7 +9,7 @@ export interface DatasetOverviewModel {
datasetTemplate: DatasetProfileModel;
users: any[];
- dmp: String;
+ dmp: DmpOverviewModel;
grant: GrantOverviewModel;
description: String;
public: boolean;
diff --git a/dmp-frontend/src/app/core/model/researcher/researcher.ts b/dmp-frontend/src/app/core/model/researcher/researcher.ts
index 6c5bf6a98..9d23a8403 100644
--- a/dmp-frontend/src/app/core/model/researcher/researcher.ts
+++ b/dmp-frontend/src/app/core/model/researcher/researcher.ts
@@ -1,5 +1,5 @@
export interface ResearcherModel {
- id: String;
+ id: string;
name: String;
reference: String;
lastName: String;
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index dcd35cc47..a85436ba8 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -8,8 +8,8 @@
-
{{ 'NAV-BAR.DATASET' | translate }}
-
{{ dataset.label }}
+
{{ 'NAV-BAR.DATASET' | translate }}
+
{{ dataset.label }}
@@ -27,20 +27,10 @@
{{'DMP-OVERVIEW.PRIVATE' | translate}}
-
-
+
+ lock_outline
+ {{'DMP-OVERVIEW.LOCKED' | translate}}
+
{{'GENERAL.STATUSES.EDIT' | translate}} :
{{dataset.modified | date:"longDate"}}
@@ -49,10 +39,6 @@
check
{{'TYPES.DATASET-STATUS.FINALISED' | translate}}
-
- create
- {{'TYPES.DATASET-STATUS.DRAFT' | translate}}
-
@@ -71,17 +57,10 @@
matTooltipPosition="above">
delete
-
-
- Grant label
-
+ {{ dataset.grant.label }}
-
+
@@ -109,28 +87,6 @@
-
-
open_in_new
@@ -157,21 +106,6 @@
{{ 'DMP-LISTING.ACTIONS.EXPORT' | translate }}
-
-
-
- public
-
-
{{ 'DMP-LISTING.ACTIONS.MAKE-PUBLIC' | translate }}
-
@@ -213,7 +147,7 @@
class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}
-
group_add
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
index 979463146..6b918f358 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
@@ -139,6 +139,7 @@
.dataset-label {
font-weight: bold;
+ width: auto;
}
.uppercase {
@@ -149,7 +150,7 @@
font-size: 0.875em;
color: #008887;
padding-right: 0.5em;
- align-self: center;
+ align-self: center;;
}
.header {
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 6df5ec3b3..adb861816 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
@@ -25,6 +25,9 @@ import { DatasetWizardEditorModel } from '../dataset-wizard/dataset-wizard-edito
import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
import { FormControl } from '@angular/forms';
import { DatasetCopyDialogueComponent } from '../dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
+import { DmpService } from '@app/core/services/dmp/dmp.service';
+import { ResearcherModel } from '@app/core/model/researcher/researcher';
+import { LockService } from '@app/core/services/lock/lock.service';
@Component({
@@ -44,6 +47,8 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
isUserOwner: boolean;
expand = false;
hasDOIToken = false;
+ researchers: ResearcherModel[];
+ lockStatus: Boolean;
constructor(
private route: ActivatedRoute,
@@ -57,8 +62,10 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
private configurationService: ConfigurationService,
private oauth2DialogService: Oauth2DialogService,
private userService: UserService,
+ private dmpService: DmpService,
private location: Location,
- private datasetWizardService: DatasetWizardService
+ private datasetWizardService: DatasetWizardService,
+ private lockService: LockService
) {
super();
}
@@ -77,11 +84,12 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed))
.subscribe(data => {
this.dataset = data;
+ this.getDmpResearchers();
this.datasetWizardService.getSingle(this.dataset.id).pipe(takeUntil(this._destroyed))
- .subscribe(data => {
- this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
- });
- // this.checkLockStatus(this.dataset.id);
+ .subscribe(data => {
+ this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
+ });
+ this.checkLockStatus(this.dataset.id);
this.setIsUserOwner();
const breadCrumbs = [];
breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: "/datasets" });
@@ -104,11 +112,12 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed))
.subscribe(data => {
this.dataset = data;
+ this.getDmpResearchers();
this.datasetWizardService.getSingle(this.dataset.id).pipe(takeUntil(this._destroyed))
- .subscribe(data => {
- this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
- });
- // this.checkLockStatus(this.dataset.id);
+ .subscribe(data => {
+ this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
+ });
+ this.checkLockStatus(this.dataset.id);
this.setIsUserOwner();
const breadCrumbs = [];
breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" });
@@ -126,255 +135,241 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
});
}
- onFetchingDeletedCallbackError(redirectRoot: string) {
- this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-OVERVIEW.ERROR.DELETED-DATASET'), SnackBarNotificationLevel.Error);
- this.router.navigate([redirectRoot]);
+ checkLockStatus(id: string){
+ this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed))
+ .subscribe(lockStatus => this.lockStatus = lockStatus);
}
- onFetchingForbiddenCallbackError(redirectRoot: string) {
- this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-OVERVIEW.ERROR.FORBIDEN-DATASET'), SnackBarNotificationLevel.Error);
- this.router.navigate([redirectRoot]);
+ onFetchingDeletedCallbackError(redirectRoot: string) {
+ this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-OVERVIEW.ERROR.DELETED-DATASET'), SnackBarNotificationLevel.Error);
+ this.router.navigate([redirectRoot]);
}
-
+
+ onFetchingForbiddenCallbackError(redirectRoot: string) {
+ this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-OVERVIEW.ERROR.FORBIDEN-DATASET'), SnackBarNotificationLevel.Error);
+ this.router.navigate([redirectRoot]);
+ }
+
goBack(): void {
- this.location.back();
- }
+ this.location.back();
+ }
+
+ getDmpResearchers() {
+ this.dmpService.getSingle(this.dataset.dmp.id).pipe(takeUntil(this._destroyed))
+ .subscribe(data => {
+ this.researchers = data.researchers;
+ });
+ }
setIsUserOwner() {
- if (this.dataset) {
- const principal: Principal = this.authentication.current();
- if (principal) this.isUserOwner = principal.id === this.dataset.users.find(x => x.role === Role.Owner).id;
- }
+ if (this.dataset) {
+ const principal: Principal = this.authentication.current();
+ if (principal) this.isUserOwner = principal.id === this.dataset.users.find(x => x.role === Role.Owner).id;
+ }
}
-
+
isUserAuthor(userId: string): boolean {
- const principal: Principal = this.authentication.current();
- return userId === principal.id;
+ const principal: Principal = this.authentication.current();
+ return userId === principal.id;
}
-
+
isUserDatasetRelated() {
- const principal: Principal = this.authentication.current();
- let isRelated: boolean = false;
- if (this.dataset && principal) {
- this.dataset.users.forEach(element => {
- if (element.id === principal.id) {
- isRelated = true;
- }
- })
- }
- return isRelated;
+ const principal: Principal = this.authentication.current();
+ let isRelated: boolean = false;
+ if (this.dataset && principal) {
+ this.dataset.users.forEach(element => {
+ if (element.id === principal.id) {
+ isRelated = true;
+ }
+ })
+ }
+ return isRelated;
}
roleDisplay(value: UserInfoListingModel) {
- if (value.role === Role.Owner) {
- return this.translate.instant('DMP-LISTING.OWNER');
- } else if (value.role === Role.Member) {
- return this.translate.instant('DMP-LISTING.MEMBER');
- } else {
- return this.translate.instant('DMP-LISTING.OWNER');
- }
+ if (value.role === Role.Owner) {
+ return this.translate.instant('DMP-LISTING.OWNER');
+ } else if (value.role === Role.Member) {
+ return this.translate.instant('DMP-LISTING.MEMBER');
+ } else {
+ return this.translate.instant('DMP-LISTING.OWNER');
+ }
}
-
+
roleDisplayFromList(value: UserInfoListingModel[]) {
- const principal: Principal = this.authentication.current();
- let role: number;
- if (principal) {
- value.forEach(element => {
- if (principal.id === element.id) {
- role = element.role;
- }
- });
- }
- if (role === Role.Owner) {
- return this.translate.instant('DMP-LISTING.OWNER');
- } else if (role === Role.Member) {
- return this.translate.instant('DMP-LISTING.MEMBER');
- } else {
- return this.translate.instant('DMP-LISTING.OWNER');
- }
+ const principal: Principal = this.authentication.current();
+ let role: number;
+ if (principal) {
+ value.forEach(element => {
+ if (principal.id === element.id) {
+ role = element.role;
+ }
+ });
+ }
+ if (role === Role.Owner) {
+ return this.translate.instant('DMP-LISTING.OWNER');
+ } else if (role === Role.Member) {
+ return this.translate.instant('DMP-LISTING.MEMBER');
+ } else {
+ return this.translate.instant('DMP-LISTING.OWNER');
+ }
}
openShareDialog(rowId: any, rowName: any) {
- const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
- // height: '250px',
- // width: '700px',
- restoreFocus: false,
- data: {
- dmpId: rowId,
- dmpName: rowName
- }
- });
- }
-
- public isAuthenticated(): boolean {
- return !(!this.authentication.current());
+ const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
+ restoreFocus: false,
+ data: {
+ dmpId: rowId,
+ dmpName: rowName
+ }
+ });
}
-
+
+ public isAuthenticated(): boolean {
+ return !(!this.authentication.current());
+ }
+
isDraftDataset(dataset: DatasetOverviewModel) {
- return dataset.status == DatasetStatus.Draft;
+ return dataset.status == DatasetStatus.Draft;
}
isFinalizedDataset(dataset: DatasetOverviewModel) {
- return dataset.status == DatasetStatus.Finalized;
- }
-
+ return dataset.status == DatasetStatus.Finalized;
+ }
+
editClicked(dataset: DatasetOverviewModel) {
if (dataset.public) {
- this.router.navigate(['/datasets/publicEdit/' + dataset.id]);
- } else {
- this.router.navigate(['/datasets/edit/' + dataset.id]);
- }
+ this.router.navigate(['/datasets/publicEdit/' + dataset.id]);
+ } else {
+ this.router.navigate(['/datasets/edit/' + dataset.id]);
+ }
}
-
+
deleteClicked() {
- const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
- maxWidth: '300px',
- data: {
- message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'),
- confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'),
- cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'),
- isDeleteConfirmation: true
- }
- });
- dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
- if (result) {
- this.datasetService.delete(this.dataset.id)
- .pipe(takeUntil(this._destroyed))
- .subscribe(
- complete => { this.onCallbackSuccess() },
- error => this.onDeleteCallbackError(error)
- );
- }
- });
+ const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
+ maxWidth: '300px',
+ data: {
+ message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'),
+ confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'),
+ cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'),
+ isDeleteConfirmation: true
+ }
+ });
+ dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+ if (result) {
+ this.datasetService.delete(this.dataset.id)
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(
+ complete => { this.onCallbackSuccess() },
+ error => this.onDeleteCallbackError(error)
+ );
+ }
+ });
}
dmpClicked(dmpId: String) {
- this.router.navigate(['/plans/overview/' + dmpId]);
- }
-
- onCallbackSuccess(): void {
- this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
- this.router.navigate(['/datasets']);
- }
-
- onDeleteCallbackError(error) {
- this.uiNotificationService.snackBarNotification(error.error.message ? error.error.message : this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DELETE'), SnackBarNotificationLevel.Error);
+ this.router.navigate(['/plans/overview/' + dmpId]);
}
-
+
+ onCallbackSuccess(): void {
+ this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
+ this.router.navigate(['/datasets']);
+ }
+
+ onDeleteCallbackError(error) {
+ this.uiNotificationService.snackBarNotification(error.error.message ? error.error.message : this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DELETE'), SnackBarNotificationLevel.Error);
+ }
+
public getOrcidPath(): string {
- return this.configurationService.orcidPath;
+ return this.configurationService.orcidPath;
}
downloadPDF(id: string) {
- this.datasetService.downloadPDF(id)
- .pipe(takeUntil(this._destroyed))
- .subscribe(response => {
- const blob = new Blob([response.body], { type: 'application/pdf' });
- const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+ this.datasetService.downloadPDF(id)
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(response => {
+ const blob = new Blob([response.body], { type: 'application/pdf' });
+ const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
- FileSaver.saveAs(blob, filename);
- });
+ FileSaver.saveAs(blob, filename);
+ });
}
downloadDocx(id: string) {
- this.datasetService.downloadDocx(id)
- .pipe(takeUntil(this._destroyed))
- .subscribe(response => {
- const blob = new Blob([response.body], { type: 'application/msword' });
- const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+ this.datasetService.downloadDocx(id)
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(response => {
+ const blob = new Blob([response.body], { type: 'application/msword' });
+ const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
- FileSaver.saveAs(blob, filename);
- });
+ FileSaver.saveAs(blob, filename);
+ });
}
-
+
downloadXml(id: string) {
- this.datasetService.downloadXML(id)
- .pipe(takeUntil(this._destroyed))
- .subscribe(response => {
- const blob = new Blob([response.body], { type: 'application/xml' });
- const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+ this.datasetService.downloadXML(id)
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(response => {
+ const blob = new Blob([response.body], { type: 'application/xml' });
+ const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
- FileSaver.saveAs(blob, filename);
- });
+ FileSaver.saveAs(blob, filename);
+ });
}
-
+
downloadJson(id: string) {
- this.datasetService.downloadJson(id)
- .pipe(takeUntil(this._destroyed))
- .subscribe(response => {
- const blob = new Blob([response.body], { type: 'application/json' });
- 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;
- }
-
- showPublishButton(dataset: DatasetOverviewModel) {
- return this.isFinalizedDataset(dataset) && !dataset.public && this.hasPublishButton;
+ this.datasetService.downloadJson(id)
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(response => {
+ const blob = new Blob([response.body], { type: 'application/json' });
+ const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+ FileSaver.saveAs(blob, filename);
+ })
}
-
- publish(datasetId: String) {
- const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
- maxWidth: '500px',
- restoreFocus: false,
- data: {
- message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'),
- privacyPolicyNames: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PRIVACY-POLICY-NAMES'),
- confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'),
- cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'),
- isDeleteConfirmation: false
- }
- });
- dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
- if (result) {
- this.datasetService.publish(datasetId)
- .pipe(takeUntil(this._destroyed))
- .subscribe(() => { this.hasPublishButton = false });
- }
- });
+
+ 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;
}
openDmpSearchDialogue() {
- const formControl = new FormControl();
- const dialogRef = this.dialog.open(DatasetCopyDialogueComponent, {
- width: '500px',
- restoreFocus: false,
- data: {
- formControl: formControl,
- datasetId: this.dataset.id,
- datasetProfileId: this.datasetWizardModel.profile,
- datasetProfileExist: false,
- confirmButton: this.language.instant('DATASET-WIZARD.DIALOGUE.COPY'),
- cancelButton: this.language.instant('DATASET-WIZARD.DIALOGUE.CANCEL')
- }
- });
+ const formControl = new FormControl();
+ const dialogRef = this.dialog.open(DatasetCopyDialogueComponent, {
+ width: '500px',
+ restoreFocus: false,
+ data: {
+ formControl: formControl,
+ datasetId: this.dataset.id,
+ datasetProfileId: this.datasetWizardModel.profile,
+ datasetProfileExist: false,
+ confirmButton: this.language.instant('DATASET-WIZARD.DIALOGUE.COPY'),
+ cancelButton: this.language.instant('DATASET-WIZARD.DIALOGUE.CANCEL')
+ }
+ });
+
+ dialogRef.afterClosed().pipe(takeUntil(this._destroyed))
+ .subscribe(result => {
+ if (result && result.datasetProfileExist) {
+ const newDmpId = result.formControl.value.id
+ this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
+ }
+ });
+ }
+
- dialogRef.afterClosed().pipe(takeUntil(this._destroyed))
- .subscribe(result => {
- if (result && result.datasetProfileExist) {
- const newDmpId = result.formControl.value.id
- this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
- }
- });
- }
-
}
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 5ee16de2b..e69f6c004 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
@@ -26,15 +26,9 @@
{{'DMP-OVERVIEW.PRIVATE' | translate}}
-
-
- lock_outline
- {{'DMP-OVERVIEW.LOCKED' | translate}}
-
-
- lock_open
- {{'DMP-OVERVIEW.UNLOCKED' | translate}}
-
+
+ lock_outline
+ {{'DMP-OVERVIEW.LOCKED' | translate}}
@@ -48,10 +42,6 @@
check
{{'TYPES.DMP.FINALISED' | translate}}
-
- create
- {{'TYPES.DMP.DRAFT' | translate}}
-
@@ -60,22 +50,16 @@
matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
content_copy
-
create
-
delete
-
- lock_outline
-
-
{{ dmp.grant.label }}
@@ -145,7 +129,7 @@
-
+
check
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 14f877006..d29c8be25 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
@@ -52,7 +52,6 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
isUserOwner: boolean;
expand = false;
hasDOIToken = false;
- lock: LockModel;
lockStatus: Boolean;
textMessage: any;
@@ -610,24 +609,6 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
return this.dmp.users.find(x => x.id === principal.id);
}
}
-
- createOrUpdate(id: string): void {
- if (!this.lockStatus) {
- this.lock = new LockModel(id, this.getUserFromDMP());
-
- this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
- this.lock.id = Guid.parse(result);
- this.checkLockStatus(id);
- // interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
- });
- }
- }
-
- // private pumpLock() {
- // this.lock.touchedAt = new Date();
- // this.lockStatus = true;
- // this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => this.lock.id = Guid.parse(result));
- // }
// advancedClicked() {