Experimental variables and groups are shown as cards with proper scrolling and size

identity-api/src/main/java/life/qbic/identity/api/UserInfo.java

@@ -10,6 +10,6 @@
  * @since 1.0.0
  */
 public record UserInfo(String id, String fullName, String emailAddress, String platformUserName,
-                       boolean isActive) implements Serializable {
+                       boolean isActive, String oidcId, String oidcIssuer) implements Serializable {
 
 }

identity-api/src/main/java/life/qbic/identity/api/UserInformationService.java

@@ -55,5 +55,6 @@ public interface UserInformationService {
 
   Optional<UserInfo> findByOidc(String oidcId, String oidcIssuer);
 
-  List<UserInfo> findAllActive(String filter, int offset, int limit, List<SortOrder> sortOrders);
+  List<UserInfo> queryActiveUsersWithFilter(String filter, int offset, int limit,
+      List<SortOrder> sortOrders);
 }

identity-infrastructure/src/main/java/life/qbic/identity/infrastructure/QbicUserRepo.java

@@ -8,6 +8,7 @@
 import life.qbic.identity.domain.model.UserId;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 
 /**
@@ -21,7 +22,8 @@
  *
  * @since 1.0.0
  */
-public interface QbicUserRepo extends JpaRepository<User, UserId> {
+public interface QbicUserRepo extends JpaRepository<User, UserId>,
+    JpaSpecificationExecutor<User> {
 
   /**
    * Find users by mail address in the persistent data storage

identity-infrastructure/src/main/java/life/qbic/identity/infrastructure/UserJpaRepository.java

@@ -8,6 +8,7 @@
 import life.qbic.identity.domain.repository.UserDataStorage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
 
 
@@ -60,13 +61,70 @@ public Optional<User> findUserByUserName(String userName) {
   }
 
   @Override
-  public List<User> findByUserNameContainingIgnoreCaseAndActiveTrue(String userName,
-      Pageable pageable) {
-    return userRepo.findAllByUserNameContainingIgnoreCaseAndActiveTrue(userName, pageable);
+  public List<User> queryActiveUsersWithFilter(String filter, Pageable pageable) {
+    Specification<User> userSpecification = generateUserFilterSpecification(filter);
+    return userRepo.findAll(userSpecification, pageable).getContent();
   }
 
   @Override
   public Optional<User> findByOidcIdEqualsAndOidcIssuerEquals(String oidcId, String oidcIssuer) {
     return userRepo.findByOidcIdEqualsAndOidcIssuerEquals(oidcId, oidcIssuer);
   }
+
+  private Specification<User> generateUserFilterSpecification(String filter) {
+    Specification<User> isBlankSpec = UserSpec.isBlank(filter);
+    Specification<User> isFullName = UserSpec.isFullName(filter);
+    Specification<User> isUserNameSpec = UserSpec.isUserName(filter);
+    Specification<User> isOidc = UserSpec.isOidc(filter);
+    Specification<User> isOidcIssuer = UserSpec.isOidcIssuer(filter);
+    Specification<User> isActiveSpec = UserSpec.isActive();
+    Specification<User> filterSpecification =
+        Specification.anyOf(isFullName,
+            isUserNameSpec,
+            isOidc,
+            isOidcIssuer
+        );
+    return Specification.where(isBlankSpec)
+        .and(filterSpecification)
+        .and(isActiveSpec);
+  }
+
+  private static class UserSpec {
+
+    //If no filter was provided return all Users
+    public static Specification<User> isBlank(String filter) {
+      return (root, query, builder) -> {
+        if (filter != null && filter.isBlank()) {
+          return builder.conjunction();
+        }
+        return null;
+      };
+    }
+
+    public static Specification<User> isUserName(String filter) {
+      return (root, query, builder) ->
+          builder.like(root.get("userName"), "%" + filter + "%");
+    }
+
+    public static Specification<User> isFullName(String filter) {
+      return (root, query, builder) ->
+          builder.like(root.get("fullName"), "%" + filter + "%");
+    }
+
+    // Should be extended if additional oidc providers are included, for now we only work with orcid
+    public static Specification<User> isOidc(String filter) {
+      return (root, query, builder) ->
+          builder.like(root.get("oidcId"), "%" + filter + "%");
+    }
+
+    public static Specification<User> isOidcIssuer(String filter) {
+      return (root, query, builder) ->
+          builder.like(root.get("oidcIssuer"), "%" + filter + "%");
+    }
+
+    public static Specification<User> isActive() {
+      return (root, query, builder) ->
+          builder.isTrue(root.get("active"));
+    }
+  }
 }

identity/src/main/java/life/qbic/identity/application/service/BasicUserInformationService.java

@@ -82,7 +82,7 @@ public boolean isEmailAvailable(String email) {
   }
 
   @Override
-  public List<UserInfo> findAllActive(String filter, int offset, int limit,
+  public List<UserInfo> queryActiveUsersWithFilter(String filter, int offset, int limit,
       List<SortOrder> sortOrders) {
     List<Order> orders = sortOrders.stream().map(it -> {
       Order order;
@@ -93,18 +93,19 @@ public List<UserInfo> findAllActive(String filter, int offset, int limit,
       }
       return order;
     }).toList();
-    return userRepository.findByUserNameContainingIgnoreCaseAndActiveTrue(
+    return userRepository.queryActiveUsersWithFilter(
             filter, new OffsetBasedRequest(offset, limit, Sort.by(orders)))
         .stream()
         .map(user -> new UserInfo(user.id().get(), user.fullName().get(), user.emailAddress().get(),
-            user.userName(), user.isActive()))
+            user.userName(), user.isActive(), user.getOidcId().orElse(null),
+            user.getOidcIssuer().orElse(null)))
         .toList();
   }
 
   private UserInfo convert(User user) {
     return new UserInfo(user.id().get(), user.fullName().get(), user.emailAddress().get(),
         user.userName(),
-        user.isActive());
+        user.isActive(), user.getOidcId().orElse(null), user.getOidcIssuer().orElse(null));
   }
 
   @Override

identity/src/main/java/life/qbic/identity/domain/repository/UserDataStorage.java

@@ -58,7 +58,7 @@ public interface UserDataStorage {
 
   Optional<User> findUserByUserName(String userName);
 
-  List<User> findByUserNameContainingIgnoreCaseAndActiveTrue(String username, Pageable pageable);
+  List<User> queryActiveUsersWithFilter(String filter, Pageable pageable);
 
   Optional<User> findByOidcIdEqualsAndOidcIssuerEquals(String oidcId, String oidcIssuer);
 }

identity/src/main/java/life/qbic/identity/domain/repository/UserRepository.java

@@ -110,9 +110,9 @@ public void addUser(User user) throws UserStorageException {
     saveUser(user);
   }
 
-  public List<User> findByUserNameContainingIgnoreCaseAndActiveTrue(String userName,
+  public List<User> queryActiveUsersWithFilter(String filter,
       Pageable pageable) {
-    return dataStorage.findByUserNameContainingIgnoreCaseAndActiveTrue(userName, pageable);
+    return dataStorage.queryActiveUsersWithFilter(filter, pageable);
   }
 
   public Optional<User> findByOidc(String oidcId, String oidcIssuer) {

project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/SamplePreviewJpaRepository.java

@@ -68,6 +68,7 @@ private Specification<SamplePreview> generateExperimentIdandFilterSpecification(
     Specification<SamplePreview> isBlankSpec = SamplePreviewSpecs.isBlank(filter);
     Specification<SamplePreview> experimentIdSpec = SamplePreviewSpecs.experimentIdEquals(
         experimentId);
+    Specification<SamplePreview> organismIdSpec = SamplePreviewSpecs.organismIdContains(filter);
     Specification<SamplePreview> sampleCodeSpec = SamplePreviewSpecs.sampleCodeContains(filter);
     Specification<SamplePreview> sampleLabelSpec = SamplePreviewSpecs.sampleLabelContains(filter);
     Specification<SamplePreview> batchLabelSpec = SamplePreviewSpecs.batchLabelContains(filter);
@@ -79,7 +80,7 @@ private Specification<SamplePreview> generateExperimentIdandFilterSpecification(
         filter);
     Specification<SamplePreview> commentSpec = SamplePreviewSpecs.commentContains(filter);
     Specification<SamplePreview> containsFilterSpec = Specification.anyOf(sampleCodeSpec,
-        sampleLabelSpec, batchLabelSpec, conditionSpec, speciesSpec,
+        sampleLabelSpec, organismIdSpec, batchLabelSpec, conditionSpec, speciesSpec,
         specimenSpec, analyteSpec, analysisMethodContains, commentSpec);
     Specification<SamplePreview> isDistinctSpec = SamplePreviewSpecs.isDistinct();
     return Specification.where(experimentIdSpec).and(isBlankSpec)
@@ -157,6 +158,11 @@ private static Specification<SamplePreview> ontologyColumnContains(String col, S
       };
     }
 
+    public static Specification<SamplePreview> organismIdContains(String filter) {
+      return (root, query, builder) ->
+          builder.like(root.get("organismId"), "%" + filter + "%");
+    }
+
     public static Specification<SamplePreview> speciesContains(String filter) {
       return ontologyColumnContains("species", filter);
     }

project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/MeasurementNGSValidator.java

@@ -118,7 +118,7 @@ public ValidationResult validateUpdate(NGSMeasurementMetadata metadata, ProjectI
 
   public enum NGS_PROPERTY {
     QBIC_SAMPLE_ID("qbic sample id"),
-    SAMPLE_LABEL("sample label"),
+    SAMPLE_LABEL("sample name"),
     ORGANISATION_ID("organisation id"),
     FACILITY("facility"),
     INSTRUMENT("instrument"),

project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/MeasurementProteomicsValidator.java

@@ -129,7 +129,7 @@ public ValidationResult validateUpdate(ProteomicsMeasurementMetadata metadata,
 
   public enum PROTEOMICS_PROPERTY {
     QBIC_SAMPLE_ID("qbic sample id"),
-    SAMPLE_LABEL("sample label"),
+    SAMPLE_LABEL("sample name"),
     ORGANISATION_ID("organisation id"),
     FACILITY("facility"),
     INSTRUMENT("instrument"),

project-management/src/test/groovy/life/qbic/projectmanagement/application/measurement/validation/MeasurementProteomicsValidatorSpec.groovy

@@ -47,7 +47,7 @@ class MeasurementMeasurementProteomicsValidatorSpec extends Specification {
 
     final ProjectInformationService projectInformationService = Mock(ProjectInformationService.class)
 
-    final static List<String> validPXPProperties = Collections.unmodifiableList(["qbic sample id", "sample label", "organisation id", "facility", "instrument",
+    final static List<String> validPXPProperties = Collections.unmodifiableList(["qbic sample id", "sample name", "organisation id", "facility", "instrument",
                                                     "sample pool group", "cycle/fraction name", "digestion method", "digestion enzyme",
                                                     "enrichment method", "injection volume (uL)", "lc column",
                                                     "lcms method", "labeling type", "label", "comment"])

user-interface/frontend/themes/datamanager/components/card.css

@@ -48,22 +48,20 @@
   opacity: 0.05;
 }
 
-.experimental-group {
-  display: flex;
-  flex-direction: column;
-  flex: auto;
-  font-size: var(--lumo-font-size-s);
-  padding: var(--lumo-space-l);
-  max-width: 300px;
-}
-
 .card-collection {
   display: flex;
   align-content: space-evenly;
   flex-flow: column;
   gap: 1rem;
-  margin-left: 1.5rem;
-  margin-top: 1.5rem;
+  padding-left: 1.5rem;
+  padding-top: 1.5rem;
+}
+
+.card-collection .experimental-group {
+  display: flex;
+  flex-direction: column;
+  font-size: var(--lumo-font-size-s);
+  padding: var(--lumo-space-l);
 }
 
 .card-collection .collection-title {
@@ -79,11 +77,10 @@
 }
 
 .card-collection .collection-content {
-  display: flex;
-  align-content: space-evenly;
-  flex-flow: row wrap;
-  gap: 1rem;
-  flex-direction: row;
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-auto-rows: auto;
+  grid-gap: 1rem;
 }
 
 .card-collection .collection-controls {
@@ -93,29 +90,29 @@
   gap: 0.5rem;
 }
 
-.experimental-group .header {
+.card-collection .experimental-group .header {
   display: flex;
   justify-content: space-between;
   align-items: baseline;
   margin-bottom: var(--lumo-space-m);
 }
 
-.experimental-group .card-title {
+.card-collection .experimental-group .card-title {
   color: var(--lumo-secondary-text-color);
   font-size: var(--lumo-font-size-m);
   font-weight: bold;
-  white-space: nowrap;
   margin-bottom: 0.5rem;
 }
 
-.experimental-group .content {
-  display: inline-flex;
+.card-collection .experimental-group .content {
+  display: flex;
   flex-wrap: wrap;
   gap: var(--lumo-space-m);
   margin-bottom: var(--lumo-space-m);
+  flex-direction: column;
 }
 
-.experimental-group vaadin-icon {
+.card-collection .experimental-group vaadin-icon {
   cursor: pointer;
   width: 1em;
   color: darkgrey;

user-interface/frontend/themes/datamanager/components/dialog.css

@@ -100,8 +100,8 @@ Since we want to remove the spacing between the cancel and confirm button we rep
 }
 
 .add-user-to-project-dialog::part(overlay) {
-  height: fit-content;
-  min-width: fit-content;
+  height: clamp(700px, 100%, 700px);
+  width: clamp(700px, 100%, 700px);
 }
 
 .add-user-to-project-dialog::part(content) {

user-interface/frontend/themes/datamanager/components/div.css

@@ -4,6 +4,38 @@
   flex-flow: row wrap;
 }
 
+.user-info-component {
+  display: flex;
+  align-items: center;
+  gap: var(--lumo-space-l);
+  margin: var(--lumo-space-s);
+}
+
+.user-info-component .avatar {
+  width: var(--lumo-icon-size-l);
+  height: var(--lumo-icon-size-l);
+}
+
+.user-info-component .user-info {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap;
+  gap: var(--lumo-space-s);
+}
+
+.user-info-component .user-info .oidc {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--lumo-space-s);
+  white-space: nowrap;
+}
+
+.user-info-component .user-info .user-name-and-full-name {
+  display: flex;
+  gap: var(--lumo-space-s);
+  align-items: baseline;
+}
+
 .disclaimer {
   display: flex;
   justify-content: center;

user-interface/frontend/themes/datamanager/components/image.css

@@ -1,3 +1,14 @@
 img.clickable {
   cursor: pointer;
 }
+
+/*Default height and width for the oidc logo */
+.oidc-logo {
+  width: var(--lumo-icon-size-m);
+  height: var(--lumo-icon-size-m);
+}
+
+.size-small {
+  width: var(--lumo-icon-size-s);
+  height: var(--lumo-icon-size-s);
+}