Merge pull request #361 from qbicsoftware/development

Release 0.24.0

Author: KochTobi

.gitignore

@@ -39,3 +39,6 @@ error-screenshots/
 /frontend/generated/vaadin-featureflags.ts
 /vaadinfrontend/vite.config.ts
 /vaadinfrontend/src/main/dev-bundle/
+
+# Empty file that is created when changing css?
+/vaadinfrontend/frontend/themes/datamanager/theme-editor.css

vaadinfrontend/frontend/themes/datamanager/components/button.css

@@ -30,6 +30,12 @@ vaadin-button.primary .button:hover::before {
   opacity: 0.05;
 }
 
+vaadin-button.tertiary {
+  padding: 0 calc(var(--lumo-button-size) / 6);
+  background-color: transparent !important;
+  min-width: 0;
+}
+
 vaadin-button {
   cursor: pointer;
 }

vaadinfrontend/frontend/themes/datamanager/components/custom.css

@@ -9,3 +9,4 @@
 @import "page-area.css";
 @import "span.css";
 @import "vaadin-custom.css";
+

vaadinfrontend/frontend/themes/datamanager/components/dialog.css

@@ -18,6 +18,66 @@ vaadin-dialog-overlay::part(title) {
   margin-inline-start: 0;
 }
 
+/* set the width of the notification */
+.notification-dialog::part(overlay) {
+  width: 36.75rem;
+}
+
+.notification-dialog .content {
+  width: 100%;
+}
+
+/* notification dialog header */
+.notification-dialog > [slot="header"] {
+  display: flex;
+  align-items: center;
+  justify-items: flex-start;
+  gap: var(--lumo-space-s);
+}
+
+.notification-dialog .title {
+  font-family: var(--lumo-font-family);
+  line-height: var(--lumo-line-height-m);
+  font-size: var(--lumo-font-size-xl);
+  margin: 0;
+}
+
+/* icon in header */
+.notification-dialog > [slot="header"] vaadin-icon {
+  width: 1.83rem;
+  height: 1.83rem;
+  margin: 0.46rem;
+  margin-inline-start: calc(var(--lumo-space-l) - var(--lumo-space-m));
+}
+
+.notification-dialog .error-icon {
+  fill: var(--lumo-error-color);
+}
+
+.notification-dialog .warning-icon {
+  fill: var(--lumo-warning-color);
+}
+
+.notification-dialog .info-icon {
+  fill: var(--lumo-primary-color);
+}
+
+/* experimental groups exist dialog on variable edit */
+.existing-groups-prevent-variable-edit .content .experimental-group-count {
+  font-weight: bold;
+}
+
+/* samples exist on variable edit */
+.existing-samples-prevent-variable-edit .content .sample-count {
+  font-weight: bold;
+}
+
+/* samples exist on group edit */
+.existing-samples-prevent-group-edit .content .sample-count {
+  font-weight: bold;
+}
+
+
 .add-user-to-project-dialog::part(overlay) {
   height: 100%;
   min-width: 66vw;
@@ -27,8 +87,14 @@ vaadin-dialog-overlay::part(title) {
   height: 100%
 }
 
+.batch-registration-dialog vaadin-tabsheet {
+  height: 100%;
+  width: 100%;
+}
+
 .batch-registration-dialog::part(overlay) {
   min-width: 66vw;
+  height: 100%;
 }
 
 .batch-registration-dialog .stepper vaadin-tabs {
@@ -54,7 +120,6 @@ vaadin-dialog-overlay::part(title) {
 
 .batch-registration-dialog .batch-content .data-type-information {
   display: flex;
-  height: inherit;
   flex-direction: column;
 }
 
@@ -86,10 +151,14 @@ vaadin-dialog-overlay::part(title) {
   gap: var(--lumo-space-s);
 }
 
+.batch-registration-dialog .sample-spreadsheet-container {
+  width: 100%;
+  height: 100%;
+}
+
 .batch-registration-dialog .sample-spreadsheet {
-  /*Todo Find solution on how to let spreadsheet set its size*/
   width: 100%;
-  height: 60vh;
+  height: 100%;
 }
 
 .create-project-dialog .content {

vaadinfrontend/frontend/themes/datamanager/components/div.css

@@ -7,7 +7,6 @@
 .disclaimer {
   display: flex;
   justify-content: center;
-  padding: var(--lumo-space-s);
   width: 100%;
   height: 100%;
 }

vaadinfrontend/frontend/themes/datamanager/components/main.css

@@ -5,10 +5,11 @@
 
 .main.experiment {
   grid-template-columns: minmax(min-content, 80%) minmax(min-content, 20%);
-  grid-template-rows: minmax(130px, 5%) minmax(max-content, 90%);
+  grid-template-rows: minmax(130px, auto) 1fr;
   grid-template-areas:
     "navbar support"
     "content support";
+  height: 100%;
 }
 
 .main.experiment .content {
@@ -21,14 +22,16 @@
 
 .main.project {
   grid-template-columns: minmax(min-content, 80%) minmax(min-content, 20%);
-  grid-template-rows: minmax(130px, 5%) minmax(min-content, 90%);
+  grid-template-rows: minmax(130px, auto) 1fr;
   grid-template-areas:
     "navbar support"
     "content support";
+  height: 100%;
 }
 
 .main.project .content {
   grid-area: content;
+  height: 100%;
 }
 
 .main.project .support {
@@ -37,10 +40,11 @@
 
 .main.sample {
   grid-template-columns: minmax(max-content, 100%) minmax(min-content, 20%);
-  grid-template-rows: minmax(130px, 5%) minmax(min-content, 90%);
+  grid-template-rows: minmax(130px, auto) 1fr;
   grid-template-areas:
     "navbar support"
     "content content";
+  height: 100%;
 }
 
 .main.sample .content {

vaadinfrontend/frontend/themes/datamanager/components/page-area.css

@@ -25,6 +25,7 @@
   flex-direction: column;
   display: flex;
   gap: var(--lumo-space-m);
+  height: 100%;
 }
 
 .page-area.attachments-area .delete-button {
@@ -42,24 +43,78 @@
   gap: var(--lumo-space-xs);
 }
 
+.page-area.experiment-details-component {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.page-area.experiment-details-component .sample-source-display {
+  flex-direction: row;
+  display: flex;
+}
+
+.page-area.experiment-details-component .sample-source-display .icon-with-list {
+  flex-direction: row;
+  flex-grow: 0.2;
+  display: flex;
+}
+
+.page-area.experiment-details-component .sample-source-display .icon-with-list .taglist {
+  flex-direction: column;
+  display: flex;
+  line-height: 1.3em;
+}
+
+.page-area.experiment-details-component .sample-source-display .icon-with-list .taglist .title {
+  font-size: small;
+}
+
+.page-area.experiment-details-component .sample-source-display .icon-with-list vaadin-icon {
+  color: var(--lumo-primary-color);
+  margin-right: 1em;
+  margin-top: 0.5em;
+}
+
 .page-area.experiment-details-component .header {
   display: flex;
   justify-content: space-between;
   align-items: baseline;
 }
 
-.page-area.experiment-details-component .content {
+.page-area.experiment-details-component .details-content {
   padding: var(--lumo-space-m);
   display: flex;
   flex-direction: column;
+  flex-grow: 1;
   gap: var(--lumo-space-m);
   font-size: var(--lumo-font-size-s);
+  height: 100%;
+}
+
+.page-area.experiment-details-component vaadin-tabsheet {
+  height: 100%;
+  width: 100%;
+}
+
+.page-area.experiment-details-component .details-content .experimental-groups-container {
+  height: 100%;
+  width: 100%;
+}
+
+.page-area.experiment-details-component .details-content .experimental-variables-container {
+  height: 100%;
+  width: 100%;
 }
 
 .page-area.experiment-details-component .sample-registration-possible {
   margin-bottom: var(--lumo-space-m);
 }
 
+.page-area.experiment-list-component {
+  height: 100%;
+}
+
 .page-area.project-access-component {
   width: 100%;
   height: 100%;
@@ -85,6 +140,10 @@
   align-items: baseline;
 }
 
+.page-area.project-details-component {
+  height: 100%;
+}
+
 .page-area.project-details-component .details-content {
   padding: var(--lumo-space-m);
   display: flex;
@@ -111,10 +170,17 @@
   color: var(--lumo-secondary-text-color);
 }
 
-.page-area.sample-details-component .content {
+.page-area.sample-details-component {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.page-area.sample-details-component .sample-details-content {
   display: flex;
   flex-direction: column;
   margin-bottom: var(--lumo-space-m);
+  height: 100%;
 }
 
 .page-area.sample-details-component .button-and-search-bar {
@@ -135,3 +201,13 @@
   display: inline-flex;
   align-items: end;
 }
+
+.page-area.sample-details-component .sample-grid {
+  height: 100%;
+  width: 100%;
+}
+
+.page-area.sample-details-component .sample-tab-content {
+  height: 100%;
+  width: 100%;
+}

vaadinfrontend/src/main/java/life/qbic/datamanager/views/general/DialogWindow.java

@@ -19,6 +19,7 @@ public class DialogWindow extends Dialog {
   protected DialogWindow() {
     this.addClassName("dialog-window");
     confirmButton.addClassName("primary");
+    cancelButton.setThemeName("tertiary");
     setCloseOnOutsideClick(false);
     setCloseOnEsc(false);
   }
@@ -38,26 +39,4 @@ public void setConfirmButtonLabel(String confirmLabel){
   public void setCancelButtonLabel(String cancelLabel){
     cancelButton.setText(cancelLabel);
   }
-
-  protected static class Container<T> {
-
-    private T value;
-
-    /**
-     * Returns the value stored in this container
-     * @return
-     */
-    public T value() {
-      return this.value;
-    }
-
-    /**
-     * Sets the value stored in this container
-     * @return
-     */
-    public void setValue(T newValue) {
-      this.value = newValue;
-    }
-
-  }
 }