wip

Author: KochTobi

project-management/src/main/java/life/qbic/projectmanagement/application/confounding/ConfoundingVariableService.java

@@ -164,10 +164,11 @@ ConfoundingVariableLevel setVariableLevelForSample(String projectId,
    * <p>
    * Overwrites an existing level of set sample in the variable, if present.
    *
-   * @param projectId       the identifier of the project
-   * @param experiment      the experiment containing the variable
-   * @param sampleReference the sample for which to set the level
-   * @param levels          the variable levels to set
+   * @param projectId         the identifier of the project
+   * @param experiment        the experiment containing the variable
+   * @param sampleReference   the sample for which to set the level
+   * @param variableReference the variable for which to set the level
+   * @param level             the value of the level
    * @return the created confounding variable level
    */
   @PreAuthorize("hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'WRITE')")

user-interface/pom.xml

@@ -131,11 +131,6 @@
       <groupId>com.mysql</groupId>
       <artifactId>mysql-connector-j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>[8.0.33,)</version>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/samples/registration/batch/RegisterSampleBatchDialog.java

@@ -146,6 +146,7 @@ private void onUploadSucceeded(SampleValidationService sampleValidationService,
     var validationTasks = CompletableFuture
         //allOf makes sure exceptional state is transferred to outer completable future.
         .allOf(validations.toArray(new CompletableFuture[0]))
+        .orTimeout(5, TimeUnit.MINUTES)
         .thenApply(v -> validations.stream()
             .map(CompletableFuture::join)
             .toList())