Merge branch 'development' into feature-642/#642-editing-registered-m…

…etadata-to-add-confounding-variables
qbicsoftware · Jan 7, 2025 · b5d2a49 · b5d2a49
2 parents dc77c3e + 01692c7
commit b5d2a49
Show file tree

Hide file tree

Showing 49 changed files with 1,048 additions and 233 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -0,0 +1,47 @@
+cff-version: 1.2.0
+message: "If you use or reference this software, please cite it as below"
+authors:
+  - family-names: Koch
+    given-names: Tobias
+    orcid: https://orcid.org/0000-0002-2141-8460
+  - family-names: Greiner
+    given-names: Steffen
+    orcid: https://orcid.org/0009-0006-0929-9338
+  - family-names: Friedrich
+    given-names: Andreas
+    orcid: https://orcid.org/0000-0001-6843-8680
+  - family-names: Pawar
+    given-names: Shraddha
+    orcid: https://orcid.org/0009-0008-2017-5488
+  - family-names: Bödker
+    given-names: Jennifer
+  - family-names: Barroso-Oquendo
+    given-names: Morgana
+    orcid: https://orcid.org/0000-0003-4221-5723
+  - family-names: Barletta Solari
+    given-names: Francesca
+    orcid: https://orcid.org/0009-0002-1396-2252
+  - family-names: Fillinger
+    given-names: Sven
+    orcid:  https://orcid.org/0000-0001-8835-2219
+  - family-names: Nahnsen
+    given-names: Sven
+    orcid: https://orcid.org/0000-0002-4375-0691
+title: "Data Manager - A data management solution for the life sciences"
+version: 1.0.0
+identifiers:
+  - type: doi
+    value: 10.5281/zenodo.10371779
+doi: 10.5281/zenodo.10371779
+date-released: 2024-06-10
+repository-code: "https://github.com/qbicsoftware/data-manager-app"
+license: MIT
+keywords:
+  - "research data management"
+  - "data management"
+  - "data manager"
+  - "omics"
+  - "life science"
+  - "genomics"
+  - "proteomics"
+  - "raw data"
diff --git a/application-commons/pom.xml b/application-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>application-commons</artifactId>

diff --git a/broadcasting/pom.xml b/broadcasting/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>broadcasting</artifactId>

diff --git a/domain-concept/pom.xml b/domain-concept/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
 
   <artifactId>domain-concept</artifactId>

diff --git a/email-service-provider/pom.xml b/email-service-provider/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
 
   <groupId>life.qbic.infrastructure</groupId>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances-api/pom.xml b/finances-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
 
   <groupId>life.qbic.finances</groupId>

diff --git a/finances-infrastructure/pom.xml b/finances-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
 
   <artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>finances</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances/pom.xml b/finances/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>finances</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-api/pom.xml b/identity-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
 
   <groupId>life.qbic.datamanager</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <artifactId>identity-infrastructure</artifactId>
   <dependencies>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/identity/pom.xml b/identity/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>broadcasting</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>life.qbic</groupId>
   <artifactId>datamanager</artifactId>
   <name>Data Manager</name>
-  <version>1.6.4</version>
+  <version>1.6.6</version>
   <modules>
     <module>user-interface</module>
     <module>identity</module>
@@ -44,7 +44,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.5</version>
+    <version>3.3.6</version>
   </parent>
 
   <repositories>

diff --git a/project-management-infrastructure/pom.xml b/project-management-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
 
   <groupId>life.qbic.identity</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/project-management/pom.xml b/project-management/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.6.4</version>
+    <version>1.6.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>project-management</artifactId>
@@ -37,13 +37,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -77,13 +77,13 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/...-management/src/main/java/life/qbic/projectmanagement/application/AppContextProvider.java b/...-management/src/main/java/life/qbic/projectmanagement/application/AppContextProvider.java
@@ -22,8 +22,9 @@ public interface AppContextProvider {
    * Returns a resolvable URL to the target project's sample page resource in the application.
    *
    * @param projectId the project id
+   * @param experimentId the experiment id
    * @return a fully resolvable URL
    * @since 1.0.0
    */
-  String urlToSamplePage(String projectId);
+  String urlToSamplePage(String projectId, String experimentId);
 }
diff --git a/...t-management/src/main/java/life/qbic/projectmanagement/application/ContactRepository.java b/...t-management/src/main/java/life/qbic/projectmanagement/application/ContactRepository.java