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-04-12 18:11:01 +03:00
parent 05a063a0a5 254a289e2a
commit b570a6f0fa
8 changed files with 20 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dmp-backend/web/src/main/resources/config/actuator-devel.yml
View File

@ -1,3 +0,0 @@
endpoints:
prometheus:
sensitive: false

25
dmp-backend/web/src/main/resources/config/actuator.yml
View File

@ -1,25 +0,0 @@
management:
endpoint:
metrics:
enabled: true
prometheus:
enabled: true
health:
show-details: always
metrics:
enable:
http: true
jvm: true
jdbc: true
tomcat: true
logback: true
hikaricp: true
cache: true
export:
prometheus:
enabled: true
endpoints:
web:
base-path: /
exposure:
include: prometheus,health,metrics

7
dmp-backend/web/src/main/resources/config/email-devel.yml
View File

@ -1,7 +0,0 @@
email:
invite: classpath:templates/email/email.html
confirmation: classpath:templates/email/emailConfirmation.html
merge: classpath:templates/email/emailMergeConfirmation.html
unlink: classpath:templates/email/emailUnlinkConfirmation.html
dataset:
template: classpath:templates/email/emailAdmin.html

53
dmp-backend/web/src/main/resources/config/email.yml
View File

@ -1,53 +0,0 @@
spring:
mail:
default-encoding: UTF-8
host: hermes.local.cite.gr
port: 25
protocol: smtp
test-connection: false
properties:
mail:
smtp:
auth: false
starttls:
enable: false
mail:
subject: "Invitation to DMP Plan {dmpname}"
from: opendmp-dev@cite.gr
admin:
mail:
subject: "You have been invited to the Dataset Template {templateName}"
email:
invite: file:templates/email/email.html
confirmation: file:templates/email/emailConfirmation.html
merge: file:templates/email/emailMergeConfirmation.html
unlink: classpath:templates/email/emailUnlinkConfirmation.html
dataset:
template: file:templates/email/emailAdmin.html
conf_email:
expiration_time_seconds: 14400
subject: "OpenDMP email confirmation"
contact_email:
mail: ${CONTACT_EMAIL:}
notification:
finalised:
subject: "[OpenDMP] The {name} has been finalised"
template: classpath:templates/notifications/finalisedNotification.html
modified_finalised:
template: classpath:templates/notifications/modifiedFinalisedNotification.html
modified:
subject: "[OpenDMP] The {name} has been modified"
template: classpath:templates/notifications/modifiedNotification.html
publish:
subject: "[OpenDMP] The {name} has been published"
template: classpath:templates/notifications/publishNotification.html
rateInterval: 30000
maxRetries: 10
modifiedFinalised:
subject: "[OpenDMP] The {name} has been modified and finalised"

10
dmp-backend/web/src/main/resources/config/metrics-devel.yml Normal file
View File

@ -0,0 +1,10 @@
metrics:
task:
referenceTypes:
funderIds: ["538928bb-c7c6-452e-b66d-08e539f5f082"]
grantIds: ["5b9c284f-f041-4995-96cc-fad7ad13289c"]
projectIds: ["3d372db5-a456-45e6-a845-e41e1a8311f8"]
researcherIds: ["5a2112e7-ea99-4cfe-98a1-68665e26726e"]
endpoints:
prometheus:
sensitive: false

11
dmp-backend/web/src/main/resources/config/metrics.yml
View File

@ -4,10 +4,10 @@ metrics:
intervalSeconds: 600
nexusDate: "2021-01-01T00:00:00.00Z"
referenceTypes:
funderIds: ["538928bb-c7c6-452e-b66d-08e539f5f082"]
grantIds: ["5b9c284f-f041-4995-96cc-fad7ad13289c"]
projectIds: ["3d372db5-a456-45e6-a845-e41e1a8311f8"]
researcherIds: ["5a2112e7-ea99-4cfe-98a1-68665e26726e"]
funderIds: []
grantIds: []
projectIds: []
researcherIds: []
management:
endpoint:
metrics:
@ -16,10 +16,11 @@ management:
enabled: true
health:
show-details: always
endpoints:
web:
base-path: /
exposure:
include: ["prometheus","health","metrics"]
include: prometheus,health,metrics
metrics:
enabled: true

1
dmp-frontend/src/app/core/services/storage-file/storage-file.service.ts
View File

@ -33,7 +33,6 @@ export class StorageFileService {
download(id: Guid ): Observable<HttpResponse<Blob>> {
const url = `${this.apiBase}/download/${id}`;
return this.http.get(url, { responseType: 'blob', observe: 'response' });
}

6
dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
View File

@ -98,8 +98,10 @@ export class SidebarComponent implements OnInit {
title: 'SIDE-BAR.PUBLIC',
routes: [],
}
this.publicItems.routes.push({ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-DMPS', icon: 'library_books' });
this.publicItems.routes.push({ path: '/explore-descriptions', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'dns' });
if (!this.isAuthenticated()) {
this.publicItems.routes.push({ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-DMPS', icon: 'library_books' });
this.publicItems.routes.push({ path: '/explore-descriptions', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'dns' });
}
this.groupMenuItems.push(this.publicItems);
this.adminItems = {