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-21 13:07:24 +03:00
parent a2a3f5000d c8c3f76c36
commit 53287b196c
25 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/web/src/main/resources/config/locale.yml
View File

@ -1,4 +1,4 @@
locale: locale:
timezone: UTC timezone: UTC
language: en language: en
culture: en-001 culture: en

6
dmp-frontend/src/app/core/services/configuration/configuration.service.ts
View File

@ -45,6 +45,11 @@ export class ConfigurationService extends BaseComponent {
return this._defaultTimezone || 'UTC'; return this._defaultTimezone || 'UTC';
} }
private _navLogoExtension: string;
get navLogoExtension(): string {
return this._navLogoExtension || '.svg';
}
private _defaultBlueprintId: Guid; private _defaultBlueprintId: Guid;
get defaultBlueprintId(): Guid { get defaultBlueprintId(): Guid {
return this._defaultBlueprintId; return this._defaultBlueprintId;
@ -230,6 +235,7 @@ export class ConfigurationService extends BaseComponent {
this._logging = Logging.parseValue(config.logging); this._logging = Logging.parseValue(config.logging);
this._lockInterval = config.lockInterval; this._lockInterval = config.lockInterval;
this._guideAssets = config.guideAssets; this._guideAssets = config.guideAssets;
this._navLogoExtension = config.navLogoExtension;
this._allowOrganizationCreator = config.allowOrganizationCreator; this._allowOrganizationCreator = config.allowOrganizationCreator;
this._orcidPath = config.orcidPath; this._orcidPath = config.orcidPath;
if (config.matomo) { if (config.matomo) {

3
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
View File

@ -259,6 +259,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.isActive)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.isActive)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.id)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.id)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.label)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.label)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.hasTemplates)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.id)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.id)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.label)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.label)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.descriptionTemplates), nameof<DescriptionTemplatesInSection>(x => x.descriptionTemplateGroupId)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.descriptionTemplates), nameof<DescriptionTemplatesInSection>(x => x.descriptionTemplateGroupId)].join('.'),
@ -275,6 +276,8 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.dmpDescriptionTemplates), nameof<DmpDescriptionTemplate>(x => x.descriptionTemplateGroupId)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.dmpDescriptionTemplates), nameof<DmpDescriptionTemplate>(x => x.descriptionTemplateGroupId)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.dmpDescriptionTemplates), nameof<DmpDescriptionTemplate>(x => x.isActive)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.dmpDescriptionTemplates), nameof<DmpDescriptionTemplate>(x => x.isActive)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.groupId)].join('.'), [nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.groupId)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.id)].join('.'),
[nameof<RecentActivityItem>(x => x.dmp), nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.sectionId)].join('.'),
]; ];
} }

2
dmp-frontend/src/app/ui/description/editor/description-base-fields-editor/description-base-fields-editor.component.ts
View File

@ -52,8 +52,6 @@ export class DescriptionBaseFieldsEditorComponent extends BaseComponent {
} else { } else {
this.availableDescriptionTemplates.push(this.description.descriptionTemplate); this.availableDescriptionTemplates.push(this.description.descriptionTemplate);
} }
} else {
this.availableDescriptionTemplates.push(this.description.descriptionTemplate);
} }
} }
} }

1
dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
View File

@ -224,6 +224,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit {
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.label)].join('.'), [nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.label)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.status)].join('.'), [nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.status)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.groupId)].join('.'), [nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.groupId)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.sectionId)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.isActive)].join('.'), [nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.isActive)].join('.'),
[nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.id)].join('.'), [nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.id)].join('.'),

3
dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.ts
View File

@ -1,7 +1,7 @@
import { Component, Inject } from '@angular/core'; import { Component, Inject } from '@angular/core';
import { AbstractControl, FormArray, UntypedFormGroup } from '@angular/forms'; import { AbstractControl, FormArray, UntypedFormGroup } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Dmp, NewVersionDmpDescriptionPersist, NewVersionDmpPersist } from '@app/core/model/dmp/dmp'; import { Dmp, DmpDescriptionTemplate, NewVersionDmpDescriptionPersist, NewVersionDmpPersist } from '@app/core/model/dmp/dmp';
import { DmpService } from '@app/core/services/dmp/dmp.service'; import { DmpService } from '@app/core/services/dmp/dmp.service';
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service'; import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
import { BaseComponent } from '@common/base/base.component'; import { BaseComponent } from '@common/base/base.component';
@ -23,6 +23,7 @@ import { FormService } from '@common/forms/form-service';
import { MatSelectionListChange } from '@angular/material/list'; import { MatSelectionListChange } from '@angular/material/list';
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service'; import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
import { Description } from '@app/core/model/description/description';
@Component({ @Component({
selector: 'app-dmp-new-version-dialog', selector: 'app-dmp-new-version-dialog',

3
dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.editor.model.ts
View File

@ -34,8 +34,7 @@ export class DmpNewVersionDialogEditorModel implements NewVersionDmpPersist {
if (item.dmpDescriptionTemplates?.length > 0 && blueprint.id === item.blueprint.id) { // dmp's first blueprint if (item.dmpDescriptionTemplates?.length > 0 && blueprint.id === item.blueprint.id) { // dmp's first blueprint
item.descriptions.forEach(description => { item.descriptions.forEach(description => {
const matchingSection = item.dmpDescriptionTemplates.find(dmpDescriptionTemplate => dmpDescriptionTemplate.descriptionTemplateGroupId === description.descriptionTemplate.groupId) || null; this.descriptions.push(new NewVersionDmpDescriptionEditorModel(this.validationErrorModel).fromModel(description.id, description.dmpDescriptionTemplate.sectionId));
this.descriptions.push(new NewVersionDmpDescriptionEditorModel(this.validationErrorModel).fromModel(description.id, matchingSection != null ? matchingSection.sectionId : null));
}) })
} else { // in case the user changes the blueprint from the dropdown and the new blueprint has prefilled templates } else { // in case the user changes the blueprint from the dropdown and the new blueprint has prefilled templates
const selectedBlueprintSections = blueprint.definition?.sections?.filter(x => x.hasTemplates) || null; const selectedBlueprintSections = blueprint.definition?.sections?.filter(x => x.hasTemplates) || null;

2
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
View File

@ -645,6 +645,8 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
[nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.label)].join('.'), [nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.label)].join('.'),
[nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.hasTemplates)].join('.'), [nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.hasTemplates)].join('.'),
[nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.descriptionTemplates), nameof<DescriptionTemplatesInSection>(x => x.descriptionTemplateGroupId)].join('.'), [nameof<Dmp>(x => x.blueprint), nameof<DmpBlueprint>(x => x.definition), nameof<DmpBlueprintDefinition>(x => x.sections), nameof<DmpBlueprintDefinitionSection>(x => x.descriptionTemplates), nameof<DescriptionTemplatesInSection>(x => x.descriptionTemplateGroupId)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.id)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.sectionId)].join('.'),
[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.groupId)].join('.'), [nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.groupId)].join('.'),
[nameof<Dmp>(x => x.otherDmpVersions), nameof<Dmp>(x => x.id)].join('.'), [nameof<Dmp>(x => x.otherDmpVersions), nameof<Dmp>(x => x.id)].join('.'),

2
dmp-frontend/src/app/ui/navbar/navbar.component.html
View File

@ -7,7 +7,7 @@
<div class="icon-bar2"></div> <div class="icon-bar2"></div>
<div class="icon-bar3"></div> <div class="icon-bar3"></div>
</div> </div>
<a class="logo" [routerLink]="routerUtils.generateUrl(['home'])"><img class="logo-image" src="../../../assets/images/nav-logo.png"></a> <a class="logo" [routerLink]="routerUtils.generateUrl(['home'])"><img class="logo-image" [src]="'../../../assets/images/nav-logo' + configurationService.navLogoExtension"></a>
<ng-container> <ng-container>
<a class="extra-logo" [routerLink]="routerUtils.generateUrl(['home'])"><img class="extra-logo-image" [src]="extraImageURL"></a> <a class="extra-logo" [routerLink]="routerUtils.generateUrl(['home'])"><img class="extra-logo-image" [src]="extraImageURL"></a>
</ng-container> </ng-container>

2
dmp-frontend/src/app/ui/navbar/navbar.component.ts
View File

@ -62,7 +62,7 @@ export class NavbarComponent extends BaseComponent implements OnInit {
private sidenavService: SideNavService, private sidenavService: SideNavService,
private tenantConfigurationService: TenantConfigurationService, private tenantConfigurationService: TenantConfigurationService,
private inappNotificationService: InAppNotificationService, private inappNotificationService: InAppNotificationService,
private configurationService: ConfigurationService, public configurationService: ConfigurationService,
private storageFileService: StorageFileService, private storageFileService: StorageFileService,
private sanitizer: DomSanitizer, private sanitizer: DomSanitizer,
private analyticsService: AnalyticsService, private analyticsService: AnalyticsService,

4
dmp-frontend/src/assets/i18n/baq.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/de.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

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

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/es.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/gr.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/hr.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/pl.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/pt.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/sk.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/sr.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

4
dmp-frontend/src/assets/i18n/tr.json
View File

@ -1944,7 +1944,9 @@
"DMP-DEPOSIT": "Plan Deposit", "DMP-DEPOSIT": "Plan Deposit",
"DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation", "DESCRIPTION-TEMPLATE-INVITATION": "Description Template Invitation",
"CONTACT-SUPPORT": "Contact Support", "CONTACT-SUPPORT": "Contact Support",
"PUBLIC-CONTACT-SUPPORT": "Public Contact Support" "PUBLIC-CONTACT-SUPPORT": "Public Contact Support",
"TENANT-SPECIFIC-INVITATION-EXTERNAL-USER": "Invitation External User",
"TENANT-SPECIFIC-INVITATION-EXISTING-USER": "Invitation Existing User"
}, },
"NOTIFICATION-INAPP-TRACKING": { "NOTIFICATION-INAPP-TRACKING": {
"STORED": "Unread", "STORED": "Unread",

BIN
dmp-frontend/src/assets/images/nav-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

25
dmp-frontend/src/assets/images/nav-logo.svg Normal file
View File

@ -0,0 +1,25 @@
<svg width="705" height="183" viewBox="0 0 705 183" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M659.922 102.93V126.25H646.073V58.3271H674.79C682.597 58.3271 688.707 60.1262 693.12 63.7243C697.532 67.3224 699.739 72.7875 699.739 80.1195C699.739 87.4515 697.532 93.0863 693.12 97.0238C688.707 100.961 682.597 102.93 674.79 102.93H659.922ZM659.922 91.8303H673.058C675.367 91.8303 677.302 91.5588 678.863 91.0157C680.424 90.4047 681.646 89.59 682.529 88.5717C683.412 87.4854 684.023 86.2974 684.362 85.0075C684.769 83.7176 684.973 82.3259 684.973 80.8323C684.973 79.2709 684.769 77.8113 684.362 76.4535C684.023 75.0957 683.412 73.8737 682.529 72.7875C681.646 71.7013 680.424 70.8866 678.863 70.3435C677.302 69.7325 675.367 69.427 673.058 69.427H659.922V91.8303Z" fill="#266EDB"/>
<path d="M561.742 126.25V58.3271H575.999L599.828 92.5432L591.986 93.1542L616.936 58.3271H630.785V126.25H617.037V69.3252L620.194 72.9912L595.652 106.291L571.823 72.8893L575.082 70.038V126.25H561.742Z" fill="#266EDB"/>
<path d="M490.638 126.25V58.3271H516.198C527.467 58.3271 535.784 61.1785 541.147 66.8812C546.578 72.5838 549.294 81.036 549.294 92.2377C549.294 103.439 546.578 111.925 541.147 117.696C535.784 123.399 527.467 126.25 516.198 126.25H490.638ZM504.487 115.15H514.67C521.527 115.15 526.653 113.351 530.047 109.753C533.442 106.087 535.139 100.249 535.139 92.2377C535.139 84.2947 533.442 78.4902 530.047 74.8242C526.653 71.1582 521.527 69.3252 514.67 69.3252H504.487V115.15Z" fill="#266EDB"/>
<path d="M456.325 127.37C445.598 127.37 437.451 124.519 431.885 118.816C426.318 113.046 423.534 104.186 423.534 92.2378C423.534 80.6288 426.25 71.8711 431.681 65.9648C437.112 59.9905 445.327 57.0034 456.325 57.0034C459.923 57.0034 463.521 57.4447 467.119 58.3272C470.785 59.2098 474.315 60.4318 477.71 61.9932V74.2132C474.247 72.0408 470.887 70.4794 467.628 69.5289C464.369 68.5785 461.213 68.1032 458.158 68.1032C453.677 68.1032 449.909 68.9179 446.854 70.5472C443.867 72.1087 441.593 74.6545 440.031 78.1847C438.538 81.715 437.791 86.4333 437.791 92.3396C437.791 98.178 438.572 102.862 440.133 106.393C441.694 109.923 444.003 112.469 447.058 114.03C450.181 115.592 454.05 116.372 458.667 116.372C461.45 116.372 464.437 115.897 467.628 114.947C470.887 113.996 474.247 112.469 477.71 110.364V122.584C475.741 123.535 473.534 124.383 471.09 125.13C468.714 125.877 466.27 126.42 463.758 126.759C461.246 127.167 458.769 127.37 456.325 127.37Z" fill="#266EDB"/>
<path d="M373.398 79.5084C375.027 78.6937 376.691 77.9809 378.388 77.3699C380.153 76.691 381.918 76.1479 383.683 75.7406C385.516 75.3332 387.349 75.0277 389.182 74.8241C391.083 74.6204 392.984 74.5186 394.885 74.5186C399.841 74.5186 403.778 75.2653 406.698 76.7589C409.617 78.1846 411.721 80.2891 413.011 83.0726C414.369 85.856 415.048 89.2165 415.048 93.1541V126.25H407.716V93.1541C407.716 91.9321 407.546 90.6422 407.207 89.2844C406.935 87.9266 406.358 86.6367 405.476 85.4147C404.593 84.1248 403.235 83.1065 401.402 82.3597C399.569 81.5451 397.125 81.1377 394.07 81.1377C391.966 81.1377 389.793 81.3074 387.553 81.6469C385.313 81.9863 383.038 82.4955 380.73 83.1744V126.25H373.398V79.5084Z" fill="#272727"/>
<path d="M342.759 127.777C337.939 127.777 333.764 126.793 330.233 124.824C326.703 122.788 323.988 119.767 322.087 115.761C320.186 111.756 319.235 106.766 319.235 100.792C319.235 92.0339 321.204 85.4826 325.142 81.1377C329.147 76.7249 334.612 74.5186 341.537 74.5186C346.968 74.5186 351.313 75.7406 354.572 78.1846C357.898 80.6286 360.274 83.9212 361.7 88.0624C363.126 92.2036 363.804 96.8879 363.737 102.115H322.901L323.411 95.3944H358.95L356.099 96.4127C355.895 91.3211 354.605 87.5193 352.229 85.0074C349.921 82.4955 346.357 81.2396 341.537 81.2396C338.21 81.2396 335.427 81.8506 333.187 83.0726C331.014 84.2946 329.385 86.4331 328.299 89.4881C327.212 92.4752 326.669 96.6843 326.669 102.115C326.669 108.293 328.095 113.012 330.946 116.27C333.865 119.461 337.939 121.056 343.166 121.056C345.678 121.056 347.986 120.887 350.091 120.547C352.195 120.14 354.13 119.597 355.895 118.918C357.66 118.239 359.222 117.492 360.58 116.678V124.213C358.136 125.367 355.42 126.25 352.433 126.861C349.514 127.472 346.289 127.777 342.759 127.777Z" fill="#272727"/>
<path d="M287.837 127.676C286.343 127.676 284.646 127.472 282.745 127.065C280.912 126.657 279.113 126.148 277.348 125.537C275.583 124.926 274.021 124.281 272.663 123.602L275.209 121.056V148.348H267.877V84.6001C267.877 82.4955 268.522 80.7983 269.812 79.5084C271.17 78.2185 272.901 77.2341 275.006 76.5552C277.11 75.8084 279.35 75.2993 281.727 75.0277C284.103 74.6883 286.343 74.5186 288.448 74.5186C292.521 74.5186 296.357 75.3672 299.955 77.0644C303.553 78.7616 306.472 81.6469 308.712 85.7202C310.953 89.7257 312.073 95.1907 312.073 102.115C312.073 107.343 311.122 111.891 309.222 115.761C307.389 119.563 304.673 122.516 301.075 124.621C297.477 126.657 293.064 127.676 287.837 127.676ZM287.837 120.955C291.57 120.955 294.625 120.174 297.002 118.612C299.446 116.983 301.279 114.743 302.501 111.891C303.723 109.04 304.334 105.781 304.334 102.115C304.334 98.4494 303.926 95.021 303.112 91.8302C302.297 88.6394 300.735 86.0936 298.427 84.1927C296.119 82.2239 292.758 81.2396 288.346 81.2396C284.815 81.2396 281.727 81.6469 279.079 82.4616C276.499 83.2762 275.209 84.4303 275.209 85.9239V117.39C277.314 118.612 279.418 119.529 281.523 120.14C283.627 120.683 285.732 120.955 287.837 120.955Z" fill="#272727"/>
<path d="M227.169 127.268C220.448 127.268 214.814 125.978 210.265 123.399C205.784 120.751 202.39 116.847 200.082 111.688C197.841 106.528 196.721 100.079 196.721 92.3395C196.721 80.7984 199.267 72.1086 204.359 66.2701C209.518 60.3638 217.122 57.4106 227.169 57.4106C233.958 57.4106 239.593 58.7345 244.074 61.3821C248.622 63.9619 252.017 67.8316 254.257 72.9911C256.565 78.1507 257.719 84.6002 257.719 92.3395C257.719 103.881 255.14 112.604 249.98 118.511C244.888 124.349 237.285 127.268 227.169 127.268ZM227.169 120.344C232.533 120.344 236.911 119.359 240.306 117.39C243.7 115.422 246.178 112.367 247.74 108.225C249.369 104.084 250.184 98.7889 250.184 92.3395C250.184 85.89 249.369 80.6286 247.74 76.5553C246.178 72.4141 243.7 69.3591 240.306 67.3903C236.911 65.3536 232.533 64.3353 227.169 64.3353C221.874 64.3353 217.529 65.3536 214.135 67.3903C210.74 69.3591 208.228 72.4141 206.599 76.5553C205.038 80.6286 204.257 85.89 204.257 92.3395C204.257 98.7889 205.038 104.084 206.599 108.225C208.228 112.367 210.74 115.422 214.135 117.39C217.529 119.359 221.874 120.344 227.169 120.344Z" fill="#272727"/>
<path d="M24.2525 24.5234V67.4394L0 78.1684V24.5234C0.64962 6.89721 14.9413 0 24.2525 0H131.44C150.149 0 155.981 15.6191 156.558 23.4286V24.5234H119.855H24.2525Z" fill="#1F4783"/>
<path d="M24.2525 97.2182L0 78.1687V133.018C1.19097 141.448 2.1654 146.265 13.4255 153.929L65.3951 179.985C68.5349 182.722 80.3363 184.583 87.9152 179.985L142.267 154.148C152.552 149.111 156.667 140.134 156.667 133.237V23.5384C156.667 23.5384 156.52 20.3004 155.151 16.5317L132.306 49.704V131.595L76.6552 158.198L24.2525 131.923V97.2182Z" fill="url(#paint0_linear_963_2836)"/>
<path d="M132.306 49.7037L155.157 16.5853C155.086 16.386 155.234 16.7868 155.157 16.5853C153.641 12.644 151.903 10.291 151.903 10.291L120.18 24.5234L111.924 36.4566L69.2928 98.86L24.2525 67.4393L0 78.1683L24.2525 97.3273L58.0327 120.756C66.3287 127.728 76.5545 128.088 83.3757 120.863L91.8507 108.551L132.306 49.7037Z" fill="url(#paint1_linear_963_2836)"/>
<defs>
<linearGradient id="paint0_linear_963_2836" x1="-13.5303" y1="155.986" x2="165.124" y2="192.379" gradientUnits="userSpaceOnUse">
<stop offset="0.305" stop-color="#267CFF"/>
<stop offset="0.67" stop-color="#265BAB"/>
<stop offset="1" stop-color="#264A7F"/>
</linearGradient>
<linearGradient id="paint1_linear_963_2836" x1="-66.3695" y1="126.12" x2="130.5" y2="68.3492" gradientUnits="userSpaceOnUse">
<stop stop-color="#267CFF"/>
<stop offset="0.545" stop-color="#225FBB"/>
<stop offset="1" stop-color="#1F4783"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

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

@ -12,5 +12,7 @@ export enum NotificationType {
dmpDepositType = '55736f7a-83ab-4190-af43-9d031a6f9612', dmpDepositType = '55736f7a-83ab-4190-af43-9d031a6f9612',
descriptionTemplateInvitationType = '223bb607-efa1-4ce7-99ec-4beabfef9a8b', descriptionTemplateInvitationType = '223bb607-efa1-4ce7-99ec-4beabfef9a8b',
contactSupportType = '5b1d6c52-88f9-418b-9b8a-6f1f963d9ead', contactSupportType = '5b1d6c52-88f9-418b-9b8a-6f1f963d9ead',
publicContactSupportType = 'b542b606-acc6-4629-adef-4d8ee2f01222' publicContactSupportType = 'b542b606-acc6-4629-adef-4d8ee2f01222',
tenantSpecificInvitationExternalUserType = '497dada5-eccc-4bc0-9e0b-63e22b4eb0be',
tenantSpecificInvitationExistingUserType = 'b3809c17-d1e4-420a-919c-828564114191'
} }

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

@ -42,6 +42,8 @@ export class NotificationServiceEnumUtils extends BaseEnumUtilsService {
case NotificationType.descriptionTemplateInvitationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-TEMPLATE-INVITATION'); case NotificationType.descriptionTemplateInvitationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-TEMPLATE-INVITATION');
case NotificationType.contactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.CONTACT-SUPPORT'); case NotificationType.contactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.CONTACT-SUPPORT');
case NotificationType.publicContactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PUBLIC-CONTACT-SUPPORT'); case NotificationType.publicContactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PUBLIC-CONTACT-SUPPORT');
case NotificationType.tenantSpecificInvitationExternalUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.TENANT-SPECIFIC-INVITATION-EXTERNAL-USER');
case NotificationType.tenantSpecificInvitationExistingUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.TENANT-SPECIFIC-INVITATION-EXISTING-USER');
default: return ''; default: return '';
} }
} }