Merge branch 'development' into feature/cachable-request

Author: KochTobi

project-management/src/main/java/life/qbic/projectmanagement/application/api/AsyncProjectService.java

@@ -23,7 +23,7 @@
 public interface AsyncProjectService {
 
   /**
-   * Submits a project update request and returns a reactive {@link Mono<ProjectUpdateResponse>}
+   * Submits a project update request and returns a reactive {@link Mono< ProjectUpdateResponse >}
    * object immediately.
    * <p>
    * The method is non-blocking.
@@ -46,13 +46,18 @@ Mono<ProjectUpdateResponse> update(
       ProjectUpdateRequest request)
       throws UnknownRequestException, RequestFailedException, AccessDeniedException;
 
+
+  Mono<ProjectCreationResponse> create(ProjectCreationRequest request)
+      throws UnknownRequestException, RequestFailedException, AccessDeniedException;
+
+
   /**
    * Container of an update request for a service call and part of the
    * {@link ProjectUpdateRequest}.
    *
    * @since 1.9.0
    */
-  sealed interface UpdateRequestBody permits ProjectDesign {
+  sealed interface UpdateRequestBody permits FundingInformation, ProjectContacts, ProjectDesign {
 
   }
 
@@ -62,7 +67,7 @@ sealed interface UpdateRequestBody permits ProjectDesign {
    *
    * @since 1.9.0
    */
-  sealed interface UpdateResponseBody permits ProjectDesign {
+  sealed interface UpdateResponseBody permits FundingInformation, ProjectContacts, ProjectDesign {
 
   }
 
@@ -97,6 +102,68 @@ record ProjectDesign(String title, String objective) implements UpdateRequestBod
 
   }
 
+  /**
+   * Container for passing information about the different project contacts.
+   *
+   * @param investigator the principal investigator
+   * @param manager      the project manager
+   * @param responsible  the responsible person
+   * @since 1.9.0
+   */
+  record ProjectContacts(ProjectContact investigator, ProjectContact manager,
+                         ProjectContact responsible) implements UpdateRequestBody,
+      UpdateResponseBody {
+
+  }
+
+  /**
+   * A project contact.
+   *
+   * @param fullName the full name of the person
+   * @param email    a valid email address for contact
+   * @since 1.9.0
+   */
+  record ProjectContact(String fullName, String email) {
+
+  }
+
+  /**
+   * Container for funding information of a project.
+   *
+   * @param grant   the grant name
+   * @param grantId the grant ID
+   * @since 1.9.0
+   */
+  record FundingInformation(String grant, String grantId) implements UpdateRequestBody,
+      UpdateResponseBody {
+
+  }
+
+  /**
+   * A service request to create a project.
+   *
+   * @param design   the title and objective of a project
+   * @param contacts the different contact persons of a project
+   * @param funding  some funding information
+   * @since 1.9.0
+   */
+  record ProjectCreationRequest(ProjectDesign design, ProjectContacts contacts,
+                                FundingInformation funding) {
+
+  }
+
+
+  /**
+   * A service response from a project creation request
+   *
+   * @param projectId
+   * @since 1.9, 0
+   */
+  record ProjectCreationResponse(String projectId) {
+
+  }
+
+
   /**
    * A service request to update project information.
    *

project-management/src/main/java/life/qbic/projectmanagement/application/api/AsyncProjectServiceImpl.java

@@ -48,6 +48,12 @@ public Mono<ProjectUpdateResponse> update(@NonNull ProjectUpdateRequest request)
     }
   }
 
+  @Override
+  public Mono<ProjectCreationResponse> create(ProjectCreationRequest request)
+      throws UnknownRequestException, RequestFailedException, AccessDeniedException {
+    throw new RuntimeException("not implemented");
+  }
+
   /*
   Configures and writes the provided security context for a supplier of type Mono<ProjectUpdateResponse>. Without
   the context written to the reactive stream, services that have access control methods will fail.

user-interface/src/main/java/life/qbic/datamanager/views/demo/ComponentDemo.java

@@ -220,6 +220,39 @@ public UserInput userInput() {
     return steps;
   }
 
+  private static Div dialogWithOneButton(AppDialog dialog, String dialogType) {
+    Div content = new Div();
+    Button showDialog = new Button("Show Dialog");
+    // Dialog set-up
+    DialogHeader.withIcon(dialog, dialogType, IconFactory.warningIcon());
+    DialogFooter.withConfirmOnly(dialog, "Close");
+    ExampleUserInput userInput = new ExampleUserInput("Expelliarmus");
+    DialogBody.with(dialog, userInput, userInput);
+
+    Div confirmBox = new Div("Click the button and press 'Cancel' or 'Save'");
+    showDialog.addClickListener(e -> {
+      dialog.open();
+      confirmBox.setText("Cancelled the dialog.");
+    });
+
+    dialog.registerCancelAction(() -> {
+      dialog.close();
+      if (dialog.hasChanges()) {
+        confirmBox.setText("Cancelled the dialog although there where changes made!");
+      } else {
+        confirmBox.setText("Cancelled the dialog. No changes.");
+      }
+    });
+    dialog.registerConfirmAction(() -> {
+      dialog.close();
+      confirmBox.setText("Confirmed the dialog.");
+    });
+
+    content.add(showDialog, confirmBox);
+    content.addClassNames(FLEX_VERTICAL, GAP_04);
+    return content;
+  }
+
   private static Div dialogShowCase(AppDialog dialog, String dialogType) {
     Div content = new Div();
     Button showDialog = new Button("Show Dialog");
@@ -368,6 +401,8 @@ private static Div dialogShowCase() {
     container.add(dialogSectionShowCase());
     container.add(createHeading3("Three steps example"));
     container.add(stepperDialogShowCase(threeSteps(), "Three steps example"));
+    container.add(createHeading3("Dialog with one button"));
+    container.add(dialogWithOneButton(AppDialog.small(), "Dialog with one button"));
 
     return container;
   }

user-interface/src/main/java/life/qbic/datamanager/views/general/dialog/DialogFooter.java

@@ -19,19 +19,39 @@ private DialogFooter(AppDialog dialog, String abortText, String confirmText) {
     addClassNames("flex-horizontal", "gap-04", "footer");
     var buttonFactory = new ButtonFactory();
     var confirmButton = buttonFactory.createConfirmButton(confirmText);
-    var cancelButton = buttonFactory.createCancelButton(abortText);
-    add(cancelButton, confirmButton);
+    if (abortText != null) {
+      var cancelButton = buttonFactory.createCancelButton(abortText);
+      add(cancelButton, confirmButton);
+      cancelButton.addClickListener(e -> dialog.cancel());
+    } else {
+      add(confirmButton);
+    }
     dialog.setFooter(this);
     confirmButton.addClickListener(e -> dialog.confirm());
-    cancelButton.addClickListener(e -> dialog.cancel());
+  }
+
+  private DialogFooter() {
+    dialog = null;
   }
 
   public static DialogFooter with(AppDialog dialog, String abortText, String confirmText) {
     return new DialogFooter(dialog, abortText, confirmText);
   }
 
-  private DialogFooter() {
-    dialog = null;
+  /**
+   * Creates a footer with only one button, a confirm button that also triggers the
+   * {@link AppDialog#confirm()} action when clicked.
+   * <p>
+   * This footer can be used for dialogs that are for display purposes only and do not have any user
+   * input fields.
+   *
+   * @param dialog      the dialog to bind to
+   * @param confirmText the button text to display for the confirmation
+   * @return A dialog footer bound to the provided dialog with only one button
+   * @since 1.9.0
+   */
+  public static DialogFooter withConfirmOnly(AppDialog dialog, String confirmText) {
+    return new DialogFooter(dialog, null, confirmText);
   }
 
   public AppDialog getDialog() {

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java

@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import life.qbic.application.commons.ApplicationException;
 import life.qbic.datamanager.RequestCache;
@@ -85,6 +86,7 @@
 import life.qbic.projectmanagement.domain.model.project.Project;
 import life.qbic.projectmanagement.domain.model.project.ProjectId;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
 
 /**
  * <b>Project Summary Component</b>
@@ -548,7 +550,6 @@ private void submitRequest(ProjectUpdateRequest request) {
         .subscribe(this::handleSuccess);
   }
 
-
   /*
   Handler for successful project updates
    */