diff --git a/README.md b/README.md index 66b00dc497..61fc9faab3 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,14 @@ that enables FAIR-compliant data access. ![language](https://img.shields.io/badge/language-groovy,%20java-blue.svg) [![DOI](https://zenodo.org/badge/468238683.svg)](https://zenodo.org/doi/10.5281/zenodo.10371779) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) +[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) +[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=bugs)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) +[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=duplicated_lines_density)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=qbicsoftware_data-manager-app&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=qbicsoftware_data-manager-app) + ## Overview: diff --git a/application-commons/pom.xml b/application-commons/pom.xml index 9e68f00b9a..8f9a7fc664 100644 --- a/application-commons/pom.xml +++ b/application-commons/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 application-commons diff --git a/broadcasting/pom.xml b/broadcasting/pom.xml index 0acc22f031..e29395a630 100644 --- a/broadcasting/pom.xml +++ b/broadcasting/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 broadcasting diff --git a/domain-concept/pom.xml b/domain-concept/pom.xml index a35b4b12d4..c315d79ad1 100644 --- a/domain-concept/pom.xml +++ b/domain-concept/pom.xml @@ -6,7 +6,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 domain-concept @@ -27,7 +27,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.18.0 + 2.18.1 diff --git a/email-service-provider/pom.xml b/email-service-provider/pom.xml index d960a1d1ad..9993a31327 100644 --- a/email-service-provider/pom.xml +++ b/email-service-provider/pom.xml @@ -6,7 +6,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 life.qbic.infrastructure @@ -21,13 +21,13 @@ life.qbic identity - 1.5.0 + 1.6.0 compile life.qbic project-management - 1.5.0 + 1.6.0 compile diff --git a/finances-api/pom.xml b/finances-api/pom.xml index de24678cbe..94867df95a 100644 --- a/finances-api/pom.xml +++ b/finances-api/pom.xml @@ -6,7 +6,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 life.qbic.finances diff --git a/finances-infrastructure/pom.xml b/finances-infrastructure/pom.xml index e1c21e9eef..658b2c0165 100644 --- a/finances-infrastructure/pom.xml +++ b/finances-infrastructure/pom.xml @@ -6,7 +6,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 finances-infrastructure @@ -20,7 +20,7 @@ life.qbic finances - 1.5.0 + 1.6.0 compile diff --git a/finances/pom.xml b/finances/pom.xml index 9314785bb7..cd06344b05 100644 --- a/finances/pom.xml +++ b/finances/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 finances @@ -38,7 +38,7 @@ life.qbic.finances finances-api - 1.5.0 + 1.6.0 compile diff --git a/identity-api/pom.xml b/identity-api/pom.xml index 0f06fb4740..94e25c139c 100644 --- a/identity-api/pom.xml +++ b/identity-api/pom.xml @@ -6,7 +6,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 life.qbic.datamanager @@ -21,7 +21,7 @@ life.qbic application-commons - 1.5.0 + 1.6.0 compile diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml index 2d3b01f8c8..908b6a15e9 100644 --- a/identity-infrastructure/pom.xml +++ b/identity-infrastructure/pom.xml @@ -6,14 +6,14 @@ life.qbic datamanager - 1.5.0 + 1.6.0 identity-infrastructure life.qbic identity - 1.5.0 + 1.6.0 compile diff --git a/identity/pom.xml b/identity/pom.xml index 9297a56fa5..3f430e0485 100644 --- a/identity/pom.xml +++ b/identity/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 @@ -45,25 +45,25 @@ life.qbic broadcasting - 1.5.0 + 1.6.0 compile life.qbic application-commons - 1.5.0 + 1.6.0 compile life.qbic logging - 1.5.0 + 1.6.0 compile life.qbic domain-concept - 1.5.0 + 1.6.0 compile @@ -86,7 +86,7 @@ life.qbic.datamanager identity-api - 1.5.0 + 1.6.0 compile diff --git a/logging/pom.xml b/logging/pom.xml index 843ac90505..3797447252 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 logging @@ -26,7 +26,7 @@ ch.qos.logback logback-classic - 1.5.11 + 1.5.12 ch.qos.logback @@ -53,7 +53,7 @@ life.qbic.logging subscription-api - 1.5.0 + 1.6.0 compile diff --git a/pom.xml b/pom.xml index 69c5b06fbd..5fa1d3cfb8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ life.qbic datamanager Data Manager - 1.5.0 + 1.6.0 user-interface identity @@ -35,13 +35,13 @@ 17 3.2.0 UTF-8 - 2.18.0 + 2.18.1 org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.5 diff --git a/project-management-infrastructure/pom.xml b/project-management-infrastructure/pom.xml index bdd2ff0a8f..d3de804199 100644 --- a/project-management-infrastructure/pom.xml +++ b/project-management-infrastructure/pom.xml @@ -6,7 +6,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 life.qbic.identity @@ -29,7 +29,7 @@ life.qbic project-management - 1.5.0 + 1.6.0 compile diff --git a/project-management/pom.xml b/project-management/pom.xml index 8cbf26fedb..55522304a6 100644 --- a/project-management/pom.xml +++ b/project-management/pom.xml @@ -4,7 +4,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 project-management @@ -37,13 +37,13 @@ life.qbic application-commons - 1.5.0 + 1.6.0 compile life.qbic logging - 1.5.0 + 1.6.0 compile @@ -54,7 +54,7 @@ life.qbic domain-concept - 1.5.0 + 1.6.0 compile @@ -77,13 +77,13 @@ life.qbic.datamanager identity-api - 1.5.0 + 1.6.0 compile life.qbic.finances finances-api - 1.5.0 + 1.6.0 compile diff --git a/subscription-api/pom.xml b/subscription-api/pom.xml index c2de1a24d7..ed4b3dac02 100644 --- a/subscription-api/pom.xml +++ b/subscription-api/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 life.qbic.logging diff --git a/subscription-provider/pom.xml b/subscription-provider/pom.xml index bd7696ddaf..f867a76745 100644 --- a/subscription-provider/pom.xml +++ b/subscription-provider/pom.xml @@ -5,7 +5,7 @@ datamanager life.qbic - 1.5.0 + 1.6.0 4.0.0 life.qbic.logging @@ -14,7 +14,7 @@ life.qbic.logging subscription-api - 1.5.0 + 1.6.0 compile diff --git a/user-interface/frontend/themes/datamanager/components/all.css b/user-interface/frontend/themes/datamanager/components/all.css index 6e94c8d77c..5459a0ef94 100644 --- a/user-interface/frontend/themes/datamanager/components/all.css +++ b/user-interface/frontend/themes/datamanager/components/all.css @@ -234,3 +234,6 @@ border-radius: var(--lumo-space-s); } +.overflow-auto { + overflow: auto; +} diff --git a/user-interface/pom.xml b/user-interface/pom.xml index 7bfe775727..6e368acb8d 100644 --- a/user-interface/pom.xml +++ b/user-interface/pom.xml @@ -11,7 +11,7 @@ life.qbic datamanager - 1.5.0 + 1.6.0 @@ -244,31 +244,31 @@ life.qbic identity - 1.5.0 + 1.6.0 compile life.qbic identity-infrastructure - 1.5.0 + 1.6.0 compile life.qbic broadcasting - 1.5.0 + 1.6.0 compile life.qbic application-commons - 1.5.0 + 1.6.0 compile life.qbic logging - 1.5.0 + 1.6.0 compile @@ -278,24 +278,24 @@ life.qbic project-management - 1.5.0 + 1.6.0 compile life.qbic.logging subscription-provider - 1.5.0 + 1.6.0 life.qbic domain-concept - 1.5.0 + 1.6.0 compile life.qbic finances-infrastructure - 1.5.0 + 1.6.0 compile @@ -305,13 +305,13 @@ life.qbic.identity project-management-infrastructure - 1.5.0 + 1.6.0 compile life.qbic.infrastructure email-service-provider - 1.5.0 + 1.6.0 compile diff --git a/user-interface/src/main/java/life/qbic/datamanager/templates/measurement/ProteomicsMeasurementRegisterTemplate.java b/user-interface/src/main/java/life/qbic/datamanager/templates/measurement/ProteomicsMeasurementRegisterTemplate.java index 5c3c4faa10..7517e20a36 100644 --- a/user-interface/src/main/java/life/qbic/datamanager/templates/measurement/ProteomicsMeasurementRegisterTemplate.java +++ b/user-interface/src/main/java/life/qbic/datamanager/templates/measurement/ProteomicsMeasurementRegisterTemplate.java @@ -148,6 +148,7 @@ public byte[] getContent() { } setAutoWidth(sheet); + workbook.setActiveSheet(0); lockSheet(hiddenSheet); diff --git a/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java b/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java index cf4019f843..d1ffd6ff7e 100644 --- a/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java +++ b/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java @@ -95,10 +95,10 @@ @SpringComponent public class ProjectSummaryComponent extends PageArea { + private static final String DATE_TIME_PATTERN = "dd.MM.yyyy HH:mm"; public static final String FIXED_MEDIUM_WIDTH_CSS = "fixed-medium-width"; public static final String PROJECT_EDIT_CANCEL_CONFIRMATION_MESSAGE = "project.edit.cancel-confirmation.message"; public static final String PROJECT_UPDATED_SUCCESS = "project.updated.success"; - private static final String DATE_TIME_PATTERN = "dd.MM.yyyy HH:mm"; private final transient ProjectInformationService projectInformationService; private final transient ROCreateBuilder roCrateBuilder; private final transient TempDirectory tempDirectory; @@ -502,6 +502,12 @@ private void buildDesignSection(ProjectOverview projectInformation, Project proj projectDesignSection.setContent(content); } + private static SimpleParagraph buildObjectiveParagraph(String objective) { + var paragraph = new SimpleParagraph(objective); + paragraph.addClassNames("max-height-10rem", "overflow-auto"); + return paragraph; + } + private void updateProjectDesign(ProjectId projectId, ProjectInformation projectInformation) { projectInformationService.updateTitle(projectId, projectInformation.getProjectTitle()); projectInformationService.updateObjective(projectId, projectInformation.getProjectObjective()); @@ -612,7 +618,7 @@ public AvatarGroup createAvatarGroup(Collection userInfo) { private Div createTags(ProjectOverview projectOverview) { var tags = new Div(); - tags.addClassNames("tag-list", "gap-large"); + tags.addClassNames("tag-list", "gap-small"); buildTags(projectOverview).forEach(tags::add); return tags; }