MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-06-13 16:48:29 +03:00
parent b72fde6aa5 b986c52d3b
commit dfa2b7cb35
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
View File

@ -234,12 +234,12 @@
</div>
</div>
<div *ngIf="canSave || isNew" class="col-12 col-xl-auto">
<button mat-icon-button class="action-list-icon" matTooltip="{{'DMP-EDITOR.ACTIONS.SEARCH-CONTACT' | translate}}" (click)="searchContact(contactIndex, field)" [disabled]="formGroup.disabled || !this.canSave">
<button mat-icon-button class="action-list-icon" matTooltip="{{'DMP-EDITOR.ACTIONS.SEARCH-CONTACT' | translate}}" (click)="searchContact(contactIndex, field)" [disabled]="formGroup.disabled || (!isNew && !this.canSave)">
<mat-icon>search</mat-icon>
</button>
</div>
<div *ngIf="canSave || isNew" class="col-12 col-xl-auto">
<button mat-icon-button class="action-list-icon" matTooltip="{{'DMP-EDITOR.ACTIONS.REMOVE-CONTACT' | translate}}" (click)="removeContact(contactIndex)" [disabled]="formGroup.disabled || !this.canSave">
<button mat-icon-button class="action-list-icon" matTooltip="{{'DMP-EDITOR.ACTIONS.REMOVE-CONTACT' | translate}}" (click)="removeContact(contactIndex)" [disabled]="formGroup.disabled || (!isNew && !this.canSave)">
<mat-icon>delete</mat-icon>
</button>
</div>

2
dmp-frontend/src/assets/i18n/en.json
View File

@ -1982,8 +1982,10 @@
"DMP-INVITATION-EXISTING-USER": "Plan Invitation Existing User",
"DMP-MODIFIED": "Plan Modified",
"DMP-FINALISED": "Plan Finalised",
"DESCRIPTION-CREATED": "Description Created",
"DESCRIPTION-MODIFIED": "Description Modified",
"DESCRIPTION-FINALISED": "Description Finalised",
"DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created",
"MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation",
"REMOVE-CREDENTIAL-CONFIRMATION": "Remove Credential Confirmation",
"DMP-DEPOSIT": "Plan Deposit",

2
dmp-frontend/src/notification-service/core/enum/notification-type.enum.ts
View File

@ -1,8 +1,10 @@
export enum NotificationType {
dmpInvitationExternalUserType = '065deecd-21bb-44af-9983-e660fdf24bc4',
dmpInvitationExistingUserType = '4904dea2-5079-46d3-83be-3a19c9ab45dc',
descriptionCreatedType = '8965b1d5-99a6-4acf-9016-c0d0ce341364',
dmpModifiedType = '4542262a-22f8-4baa-9db6-1c8e70ac1dbb',
dmpFinalisedType = '90db0b46-42de-bd89-aebf-6f27efeb256e',
descriptionAnnotationCreated = 'db1e99d2-a240-4e75-9bb2-ef25b234c1f0',
descriptionModifiedType = '4fdbfa80-7a71-4a69-b854-67cbb70648f1',
descriptionFinalisedType = '33790bad-94d4-488a-8ee2-7f6295ca18ea',
mergeAccountConfirmationType = 'bfe68845-cb05-4c5a-a03d-29161a7c9660',

2
dmp-frontend/src/notification-service/core/formatting/enum-utils.service.ts
View File

@ -32,8 +32,10 @@ export class NotificationServiceEnumUtils extends BaseEnumUtilsService {
case NotificationType.dmpInvitationExistingUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DMP-INVITATION-EXISTING-USER');
case NotificationType.dmpModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DMP-MODIFIED');
case NotificationType.dmpFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DMP-FINALISED');
case NotificationType.descriptionCreatedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-CREATED');
case NotificationType.descriptionModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-MODIFIED');
case NotificationType.descriptionFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-FINALISED');
case NotificationType.descriptionAnnotationCreated: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-ANNOTATION-CREATED');
case NotificationType.mergeAccountConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.MERGE-ACCOUNT-CONFIRMATION');
case NotificationType.removeCredentialConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.REMOVE-CREDENTIAL-CONFIRMATION');
case NotificationType.dmpDepositType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DMP-DEPOSIT');