Merge pull request #114 from hifis-net/112-update_v1.17.0

Update v1.17.1

Author: cmeessen

.github/workflows/e2e_tests_ubuntu.yml

@@ -1,4 +1,5 @@
-# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+# SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all)
+# SPDX-FileCopyrightText: 2022 - 2023 dv4all
 # SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) (dv4all)
 # SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
 # SPDX-FileCopyrightText: 2022 Netherlands eScience Center
@@ -24,22 +25,34 @@ jobs:
         node-version: 18.5
         cache: 'npm'
         cache-dependency-path: e2e/package-lock.json
+    - name: get playwright version
+      id: playwright-version
+      working-directory: e2e
+      run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package-lock.json').dependencies['@playwright/test'].version)")" >> $GITHUB_ENV
+    - name: cache playwright binaries
+      uses: actions/cache@v3
+      id: playwright-cache
+      with:
+        path: |
+          ~/.cache/ms-playwright
+        key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
     - name: install dependencies
       working-directory: e2e
       run: npm ci
     - name: install browsers
       working-directory: e2e
       run: npx playwright install chromium chrome firefox --with-deps
+      if: steps.playwright-cache.outputs.cache-hit != 'true'
     - name: build rsd
       working-directory: .
       run: |
         cp e2e/.env.e2e .env
-        docker-compose build --parallel database backend auth frontend nginx swagger
+        docker-compose build --parallel database backend auth frontend nginx
     - name: start rsd
       working-directory: .
       run: |
-        docker-compose up --detach database backend auth frontend nginx swagger
-        sleep 10
+        docker-compose up --detach database backend auth frontend nginx
+        sleep 5
     - name: run e2e tests
       working-directory: e2e
       run: npm run e2e:ubuntu

CITATION.cff

@@ -51,7 +51,7 @@ references:
       - name: "Netherlands eScience Center"
     title: "Research Software Directory (as a service)"
     doi: 10.5281/zenodo.6379973
-    version: v1.16.0
+    version: v1.17.1
     repository-code: https://github.com/research-software-directory/RSD-as-a-service
 keywords:
   - Research Software
@@ -62,5 +62,5 @@ keywords:
 license:
   - EUPL-1.2
   - Apache-2.0
-version: hifis-1.5.0
-date-released: '2023-02-14'
+version: hifis-1.6.0
+date-released: '2023-02-27'

Makefile

@@ -1,10 +1,10 @@
+# SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all)
+# SPDX-FileCopyrightText: 2022 - 2023 dv4all
 # SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) <[email protected]>
-# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
 # SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
 # SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
 # SPDX-FileCopyrightText: 2022 Jesús García Gonzalez (Netherlands eScience Center) <[email protected]>
 # SPDX-FileCopyrightText: 2022 Netherlands eScience Center
-# SPDX-FileCopyrightText: 2022 dv4all
 #
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: EUPL-1.2
@@ -83,8 +83,8 @@ dev-frontend: frontend/.env.local
 # run end-to-end test locally
 e2e-tests:
 	docker-compose down --volumes
-	docker-compose build --parallel database backend auth frontend nginx swagger
-	docker-compose up --detach database backend auth frontend nginx swagger
+	docker-compose build --parallel database backend auth frontend nginx
+	docker-compose up --detach database backend auth frontend nginx
 	sleep 10
 	docker-compose --file e2e/docker-compose.yml build
 	docker-compose --file e2e/docker-compose.yml up

data-generation/Dockerfile

@@ -1,9 +1,9 @@
-# SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
-# SPDX-FileCopyrightText: 2022 Netherlands eScience Center
+# SPDX-FileCopyrightText: 2022 - 2023 Ewan Cahen (Netherlands eScience Center) <[email protected]>
+# SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM node:18.8.0-bullseye-slim
+FROM node:18.14.0-bullseye-slim
 WORKDIR /usr/app
 COPY ./package.json /usr/app
 RUN npm install

data-generation/main.js

@@ -140,8 +140,9 @@ async function generateSofware(amount=50) {
 
 	const brandNames = [];
 	for (let index = 0; index < amount; index++) {
+		const maxWords = faker.helpers.maybe(() => 5, {probability: 0.8}) ?? 31;
 		const brandName = faker.helpers.unique(() =>
-			('Software: ' + faker.random.words(faker.mersenne.rand(31, 1))).substring(0, 200)
+			('Software: ' + faker.random.words(faker.mersenne.rand(maxWords, 1))).substring(0, 200)
 		);
 		brandNames.push(brandName);
 	}
@@ -331,8 +332,9 @@ async function generateProjects(amount=50) {
 	const projectStatuses = ['finished', 'running', 'starting'];
 
 	for (let index = 0; index < amount; index++) {
+		const maxWords = faker.helpers.maybe(() => 5, {probability: 0.8}) ?? 31;
 		const title = faker.helpers.unique(() =>
-			('Project: ' + faker.random.words(faker.mersenne.rand(31, 1))).substring(0, 200)
+			('Project: ' + faker.random.words(faker.mersenne.rand(maxWords, 1))).substring(0, 200)
 		);
 
 		const status = faker.helpers.arrayElement(projectStatuses);
@@ -463,8 +465,9 @@ async function generateOrganisations(amount=50) {
 
 	const names = [];
 	for (let index = 0; index < amount; index++) {
+		const maxWords = faker.helpers.maybe(() => 5, {probability: 0.8}) ?? 31;
 		const name = faker.helpers.unique(() =>
-			('Organisation: ' + faker.random.words(faker.mersenne.rand(31, 1))).substring(0, 200)
+			('Organisation: ' + faker.random.words(faker.mersenne.rand(maxWords, 1))).substring(0, 200)
 		);
 		names.push(name);
 	}