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

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

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

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

@@ -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

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

@@ -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

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

@@ -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"

dmp-backend/web/src/main/resources/config/metrics-devel.yml

@@ -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

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

@@ -4,10 +4,10 @@ metrics:
     intervalSeconds: 600
     nexusDate: "2021-01-01T00:00:00.00Z"
     referenceTypes:
-      funderIds: ["538928bb-c7c6-452e-b66d-08e539f5f082"]
+      funderIds: []
-      grantIds: ["5b9c284f-f041-4995-96cc-fad7ad13289c"]
+      grantIds: []
-      projectIds: ["3d372db5-a456-45e6-a845-e41e1a8311f8"]
+      projectIds: []
-      researcherIds: ["5a2112e7-ea99-4cfe-98a1-68665e26726e"]
+      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

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

@@ -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' });
 	}
 

dmp-frontend/src/app/ui/sidebar/sidebar.component.ts

@@ -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' });
+		if (!this.isAuthenticated()) {
-		this.publicItems.routes.push({ path: '/explore-descriptions', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'dns' });
+			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 = {