Merge pull request #168 from qbicsoftware/release/0.12.0

Release 0.12.0

Author: Steffengreiner

.gitignore

@@ -19,7 +19,6 @@ logs
 */webapp/frontend/index.html
 */package.json
 */tsconfig.json
-*/types.d.ts
 */webpack.config.js
 */webpack.generated.js
 
@@ -31,3 +30,11 @@ error-screenshots/
 */webapp/frontend/generated/theme.d.ts
 */package-lock.json
 /logs/
+
+# Ignore Vite generated files created since vaadin 23.2
+/frontend/index.html
+/frontend/generated/index.ts
+/vaadinfrontend/types.d.ts
+/frontend/generated/vaadin.ts
+/frontend/generated/vaadin-featureflags.ts
+/vaadinfrontend/vite.config.ts

README.md

@@ -132,16 +132,31 @@ default configuration.
 service.host.name=${DM_SERVICE_HOST:localhost}
 service.host.protocol=${DM_HOST_PROTOCOL:https}
 service.host.port=${DM_SERVICE_PORT:-1}
-
 # route for mail confirmation consumption
 email-confirmation-endpoint=${EMAIL_CONFIRMATION_ENDPOINT:login}
 email-confirmation-parameter=${EMAIL_CONFIRMATION_PARAMETER:confirm-email}
-
 # route for password reset
 password-reset-endpoint=${PASSWORD_RESET_ENDPOINT:new-password}
 password-reset-parameter=${PASSWORD_RESET_PARAMETER:user-id}
 ```
 
+Since the application will retrieve experimental design values from a list of defined vocabularies
+a connection to the datasource containing this information is necessary:
+
+| environment variable         | description                              |
+|------------------------------|------------------------------------------|
+| `OPENBIS_DATASOURCE_URL`     | The vocabulary database host API address |
+| `OPENBIS_USER_NAME`          | The vocabulary database user name        |
+| `OPENBIS_USER_PASSWORD`      | The vocabulary database password         |
+
+The application properties file could look like the following:
+
+```properties
+openbis.user.name=${OPENBIS_USER_NAME:openbis-username}
+openbis.user.password=${OPENBIS_USER_PASSWORD:openbis-password}
+openbis.datasource.url=${OPENBIS_DATASOURCE_URL:openbis-url}
+```
+
 #### Properties
 
 The environment variables can either be set in the runtime configuration of your IDE or directly in
@@ -162,26 +177,26 @@ spring.datasource.driver-class-name=${USER_DB_DRIVER:com.mysql.cj.jdbc.Driver}
 spring.datasource.username=${USER_DB_USER_NAME:myusername}
 spring.datasource.password=${USER_DB_USER_PW:astrongpassphrase!}
 spring.jpa.hibernate.ddl-auto=update
-
 # mail configuration
 spring.mail.username=${MAIL_USERNAME}
 spring.mail.password=${MAIL_PASSWORD}
 spring.mail.host=${MAIL_HOST:smtp.gmail.com}
 spring.mail.default-encoding=UTF-8
 spring.mail.port=${MAIL_PORT:587}
-
 # global service route configuration for mail interaction requests
 service.host.name=${DM_SERVICE_HOST:localhost}
 service.host.protocol=${DM_HOST_PROTOCOL:https}
 service.host.port=${DM_SERVICE_PORT:-1}
-
 # route for mail confirmation consumption
 email-confirmation-endpoint=${EMAIL_CONFIRMATION_ENDPOINT:login}
 email-confirmation-parameter=${EMAIL_CONFIRMATION_PARAMETER:confirm-email}
-
 # route for password reset
 password-reset-endpoint=${PASSWORD_RESET_ENDPOINT:new-password}
 password-reset-parameter=${PASSWORD_RESET_PARAMETER:user-id}
+# openbis-client credentials
+openbis.user.name=${OPENBIS_USER_NAME:openbis-username}
+openbis.user.password=${OPENBIS_USER_PASSWORD:openbis-password}
+openbis.datasource.url=${OPENBIS_DATASOURCE_URL:openbis-url}
 
 ```
 

mariadb-connector/pom.xml renamed to database-connector/pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>mariadb-connector</artifactId>
+  <artifactId>database-connector</artifactId>
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -26,6 +26,11 @@
       <version>0.11.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>life.qbic</groupId>
+      <artifactId>openbis-client-lib</artifactId>
+      <version>1.5.0</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>

mariadb-connector/src/main/java/life/qbic/authentication/persistence/QbicUserRepo.java renamed to database-connector/src/main/java/life/qbic/authentication/persistence/QbicUserRepo.java

@@ -23,7 +23,7 @@ public class ProjectPreviewJpaRepository implements ProjectPreviewLookup {
 
   private final ProjectPreviewRepository projectPreviewRepository;
 
-  public ProjectPreviewJpaRepository(@Autowired ProjectPreviewRepository projectPreviewRepository) {
+  public ProjectPreviewJpaRepository(ProjectPreviewRepository projectPreviewRepository) {
     Objects.requireNonNull(projectPreviewRepository);
     this.projectPreviewRepository = projectPreviewRepository;
   }