Merge branch 'dev' into 717-test-production-mode-in-integration-test

.github/workflows/main.yml

@@ -35,16 +35,17 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       - name: Cache
         uses: actions/cache@v3
         with:
           path: |
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-java-${{ hashFiles('**/build.gradle', '**/gradle.properties', '**/yarn.lock', '.yarnrc.yml') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/build.gradle', '**/gradle.properties', '**/yarn.lock', '.yarnrc.yml') }}
           restore-keys: |
-            ${{ runner.os }}-java-
+            ${{ runner.os }}-node-
 
       - name: Install Yarn dependencies
         run: yarn install

.github/workflows/pre-release.yml

@@ -33,16 +33,18 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       - name: Cache
         uses: actions/cache@v3
         with:
           path: |
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-java-${{ hashFiles('**/build.gradle', '**/gradle.properties', '**/yarn.lock') }}
+          key: ${{ runner.os }}-rc-node-${{ hashFiles('**/build.gradle', '**/gradle.properties', '**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-java-
+            ${{ runner.os }}-rc-node-
+            ${{ runner.os }}-node-
 
       # Compile the code
       - name: Install dependencies

.github/workflows/release.yml

@@ -23,32 +23,22 @@ jobs:
         with:
           node-version: 16
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUT
-
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
 
-      - name: Cache
-        uses: actions/cache@v3
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
         with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-java-${{ hashFiles('**/build.gradle', '**/gradle.properties', '**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-java-
+          cache-disabled: true
 
       - name: Compile code
         run: ./gradlew assemble
 
       # Upload it to GitHub
       - name: Upload to GitHub
-        uses: AButler/[email protected]
+        uses: AButler/[email protected].2
         with:
           files: '*/build/libs/*'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.yarnrc.yml

@@ -1,4 +1,7 @@
-cacheFolder: "./.yarn/cache"
+cacheFolder: ./.yarn/cache
+
+enableImmutableInstalls: false
+
 nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-3.1.0.cjs
-enableImmutableInstalls: true
+
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

build.gradle

@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -33,7 +32,7 @@ apply plugin: 'io.spring.dependency-management'
 
 allprojects {
     group 'org.radarbase'
-    version '2.0.1-SNAPSHOT' // project version
+    version '2.1.1-SNAPSHOT' // project version
 
     // The comment on the previous line is only there to identify the project version line easily
     // with a sed command, to auto-update the version number with the prepare-release-branch.sh
@@ -68,9 +67,6 @@ allprojects {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
 description = 'MangementPortal application to manage studies and participants'
 
 defaultTasks 'bootRun'
@@ -105,6 +101,11 @@ bootRun {
     sourceResources sourceSets.main
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 tasks.withType(KotlinCompile).configureEach {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_17
@@ -156,7 +157,7 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-databind"
     implementation "com.hazelcast:hazelcast:${hazelcast_version}"
     implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}"
-    runtimeOnly "com.hazelcast:hazelcast-hibernate53"
+    runtimeOnly "com.hazelcast:hazelcast-hibernate53:${hazelcast_hibernate_version}"
     runtimeOnly("com.zaxxer:HikariCP:${hikaricp_version}")
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugAnnotationVersion
     implementation("org.liquibase:liquibase-core:${liquibase_version}")
@@ -181,13 +182,15 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web") {
         exclude module: 'spring-boot-starter-tomcat'
     }
-    implementation ("org.springframework.boot:spring-boot-starter-undertow") {
-        // Fix vulnerabilities
-        implementation("io.undertow:undertow-websockets-jsr:2.2.24.Final")
-        implementation("io.undertow:undertow-servlet:2.2.24.Final")
-        implementation("io.undertow:undertow-core:2.2.24.Final")
-    }
+    implementation ("org.springframework.boot:spring-boot-starter-undertow")
+    // Fix vulnerabilities
+    runtimeOnly("io.undertow:undertow-websockets-jsr:2.2.25.Final")
+    runtimeOnly("io.undertow:undertow-servlet:2.2.25.Final")
+    runtimeOnly("io.undertow:undertow-core:2.2.25.Final")
+
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
+    runtimeOnly("org.thymeleaf:thymeleaf-spring5:${thymeleaf_version}")
+    runtimeOnly("org.thymeleaf:thymeleaf:${thymeleaf_version}")
     implementation("org.springframework:spring-context-support")
     implementation("org.springframework.session:spring-session-hazelcast")
 
@@ -255,7 +258,7 @@ tasks.register('ghPagesJavadoc', Copy) {
 }
 
 tasks.register('ghPagesOpenApiSpec', Copy) {
-    from file("$buildDir/swagger-spec")
+    from file(layout.buildDirectory.dir("swagger-spec"))
     into file("$rootDir/public/apidoc")
 }
 

gradle.properties

@@ -2,7 +2,8 @@ rootProject.name=management-portal
 profile=dev
 assertj_version=3.23.1
 jhipster_server_version=7.9.3
-hazelcast_version=5.2.0
+hazelcast_version=5.2.4
+hazelcast_hibernate_version=5.1.0
 hikaricp_version=5.0.1
 liquibase_slf4j_version=4.1.0
 liquibase_version=4.22.0
@@ -11,6 +12,7 @@ springdoc_version=1.6.15
 spring_boot_version=2.7.15
 spring_framework_version=5.3.27
 spring_data_version=2021.2.5
+thymeleaf_version=3.1.2.RELEASE
 spring_session_version=2021.2.0
 gatling_version=3.8.4
 mapstruct_version=1.5.5.Final

package.json

@@ -1,6 +1,6 @@
 {
   "name": "management-portal",
-  "version": "2.0",
+  "version": "2.1.1",
   "description": "Description for ManagementPortal",
   "private": true,
   "cacheDirectories": [
@@ -71,5 +71,5 @@
     "e2e-prod": "yarn run wait-for-managementportal && ng e2e --configuration production",
     "wait-for-managementportal": "wait-port -t 240000 http://localhost:8080/managementportal/management/health"
   },
-  "packageManager": "yarn@3.1.0"
+  "packageManager": "yarn@3.6.4"
 }

src/main/java/org/radarbase/management/repository/CustomAuditEventRepository.java

@@ -1,5 +1,10 @@
 package org.radarbase.management.repository;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
+
 import ch.qos.logback.classic.pattern.TargetLengthBasedClassNameAbbreviator;
 import org.radarbase.management.config.audit.AuditEventConverter;
 import org.radarbase.management.domain.PersistentAuditEvent;
@@ -13,11 +18,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.List;
-
 /**
  * An implementation of Spring Boot's AuditEventRepository.
  */
@@ -61,12 +61,9 @@ public void add(AuditEvent event) {
         }
         if (eventType != null && eventType.endsWith("_FAILURE")) {
             Object typeObj = event.getData().get("type");
-            String errorType;
-            if (typeObj instanceof String) {
-                errorType = TYPE_ABBREVIATOR.abbreviate((String) typeObj);
-            } else {
-                errorType = null;
-            }
+            String errorType = typeObj instanceof String
+                    ? TYPE_ABBREVIATOR.abbreviate((String) typeObj)
+                    : null;
             logger.warn("{}: principal={}, error={}, message=\"{}\", details={}",
                     eventType,
                     event.getPrincipal(),

src/main/webapp/app/app.constants.ts

@@ -1,9 +0,0 @@
-// DO NOT EDIT THIS FILE, EDIT THE WEBPACK COMMON CONFIG INSTEAD, WHICH WILL MODIFY THIS FILE
-/* tslint:disable */
-let _VERSION = '0.0.0'; // This value will be overwritten by webpack
-let _DEBUG_INFO_ENABLED = true; // This value will be overwritten by webpack
-/* @toreplace VERSION */
-/* @toreplace DEBUG_INFO_ENABLED */
-/* tslint:enable */
-export const VERSION = _VERSION;
-export const DEBUG_INFO_ENABLED = _DEBUG_INFO_ENABLED;

src/main/webapp/app/layouts/main/main.component.html

@@ -1,12 +1,14 @@
+<div class="print">
+    <router-outlet name="popup"></router-outlet>
+</div>
 <div [ngClass]="(this.isPrintLocked$ | async) ? 'not-print' : ''">
-<jhi-page-ribbon></jhi-page-ribbon>
+    <jhi-page-ribbon></jhi-page-ribbon>
     <div>
         <router-outlet name="navbar"></router-outlet>
     </div>
     <div class="container-fluid">
         <div class="card jh-card">
             <router-outlet></router-outlet>
-            <router-outlet name="popup"></router-outlet>
         </div>
         <jhi-footer></jhi-footer>
     </div>

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -2,7 +2,6 @@
     <a class="navbar-brand" routerLink="/" (click)="collapseNavbar()">
         <span class="logo-img"></span>
         <span [translate]="'global.title'" class="navbar-title"></span>
-        <span class="navbar-version">{{version}}</span>
     </a>
     <button class="navbar-toggler" type="button" (click)="toggleNavbar()">
         <span class="navbar-toggler-icon"></span>

src/main/webapp/app/layouts/navbar/navbar.component.ts

@@ -3,7 +3,6 @@ import { Router } from '@angular/router';
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 
-import { DEBUG_INFO_ENABLED, VERSION } from '../../app.constants';
 import {
     JhiLanguageHelper,
     LoginModalService,
@@ -29,7 +28,6 @@ import { ProfileService } from '../profiles/profile.service';
 export class NavbarComponent {
     isNavbarCollapsed: boolean;
     modalRef: NgbModalRef;
-    version: string;
 
     projects: Project[];
     organizations: Organization[];
@@ -46,7 +44,6 @@ export class NavbarComponent {
         public projectService: ProjectService,
         public organizationService: OrganizationService,
     ) {
-        this.version = DEBUG_INFO_ENABLED ? 'v' + VERSION : '';
         this.isNavbarCollapsed = true;
     }
 

src/main/webapp/app/layouts/navbar/navbar.scss

@@ -2,11 +2,6 @@
 /* ==========================================================================
 Navbar
 ========================================================================== */
-.navbar-version {
-    font-size: 10px;
-    color: #ccc
-}
-
 .navbar {
     background-color: #353d47;
     padding: .2em 1em;

src/main/webapp/app/layouts/profiles/page-ribbon.component.ts

@@ -1,18 +1,33 @@
 import { Component, OnInit } from '@angular/core';
 import { ProfileInfo } from './profile-info.model';
 import { ProfileService } from './profile.service';
+import { Observable, of } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+import { catchError, filter, switchMap } from 'rxjs/operators';
 
 @Component({
     selector: 'jhi-page-ribbon',
     template: `
-        <div class="ribbon" *ngIf="profileService.profileInfo$ | async as profileInfo">
-            <a href="" [translate]="'global.ribbon.' + profileInfo.ribbonEnv"></a>
+        <div class="ribbon" *ngIf="ribbon$ | async as ribbon">
+            <a href="">{{ ribbon }}</a>
         </div>`,
     styleUrls: [
         'page-ribbon.scss',
     ],
 })
 export class PageRibbonComponent {
-    constructor(public profileService: ProfileService) {
+    ribbon$: Observable<string | null>
+    constructor(
+        public profileService: ProfileService,
+        translateService: TranslateService,
+    ) {
+        this.ribbon$ = profileService.profileInfo$.pipe(
+            switchMap(profileInfo => {
+                const key = 'global.ribbon.' + profileInfo.ribbonEnv
+                return translateService.stream(key).pipe(
+                    filter(t => t !== key),
+                )
+            }),
+        )
     }
 }

src/main/webapp/content/scss/_print.scss

@@ -8,7 +8,16 @@
         display: none !important;
     }
 
+    .print {
+        position: static;
+        height: 100%;
+    }
+
     .modal-backdrop {
         display: none !important;
     }
+
+    html, body {
+        height:100%
+    }
 }

src/main/webapp/index.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <title>ManagementPortal</title>
     <meta name="description" content="">
-    <meta name="google" value="notranslate">
+    <meta name="google" content="notranslate">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
 </head>