From 3533a36cdc811c0e1dae218fbc2184f7c4bc3951 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 16 Mar 2023 15:07:07 +0100
Subject: [PATCH 01/33] separate test workflows

---
 .github/workflows/test-backend.yml | 106 +++++++++
 .github/workflows/test-e2e.yml     |  41 ++++
 .github/workflows/test-webapp.yml  |  86 ++++++++
 .github/workflows/test.yml         | 344 -----------------------------
 4 files changed, 233 insertions(+), 344 deletions(-)
 create mode 100644 .github/workflows/test-backend.yml
 create mode 100644 .github/workflows/test-e2e.yml
 create mode 100644 .github/workflows/test-webapp.yml
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
new file mode 100644
index 000000000..608c16f27
--- /dev/null
+++ b/.github/workflows/test-backend.yml
@@ -0,0 +1,106 @@
+name: ocelot.social test CI
+
+
+on: [push]
+
+jobs:
+  build_test_neo4j:
+    name: Docker Build Test - Neo4J
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Neo4J | Build 'community' image
+        run: |
+          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: docker-neo4j-image
+          path: /tmp/neo4j.tar
+
+  build_test_backend:
+    name: Docker Build Test - Backend
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: backend | Build 'test' image
+        run: |
+          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: docker-backend-test
+          path: /tmp/backend.tar
+
+  lint_backend:
+    name: Lint backend
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: backend | Lint
+        run: cd backend && yarn && yarn run lint
+
+  unit_test_backend:
+    name: Unit tests - backend
+    runs-on: ubuntu-latest
+    needs: [build_test_neo4j,build_test_backend]
+    permissions: 
+      checks: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Docker Image (Neo4J)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-neo4j-image
+          path: /tmp
+
+      - name: Load Docker Image
+        run: docker load < /tmp/neo4j.tar
+
+      - name: Download Docker Image (Backend)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-backend-test
+          path: /tmp
+
+      - name: Load Docker Image
+        run: docker load < /tmp/backend.tar
+
+      # - name: backend | copy env files webapp
+      #   run: cp webapp/.env.template webapp/.env
+
+      - name: backend | copy env files backend
+        run: cp backend/.env.template backend/.env
+
+      - name: backend | docker-compose
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend
+
+      - name: backend | Initialize Database
+        run: docker-compose exec -T backend yarn db:migrate init
+
+      - name: backend | Migrate Database Up
+        run: docker-compose exec -T backend yarn db:migrate up
+
+      - name: backend | Unit test
+        run: docker-compose exec -T backend yarn test
+
+      - name: backend | Coverage check
+        uses: webcraftmedia/coverage-check-action@master
+        with:
+          report_name: Coverage Backend
+          type: lcov
+          result_path: ./coverage/lcov.info
+          min_coverage: 57
+          token: ${{ github.token }}
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
new file mode 100644
index 000000000..d76ab129f
--- /dev/null
+++ b/.github/workflows/test-e2e.yml
@@ -0,0 +1,41 @@
+name: ocelot.social end-to-end test CI
+on: push
+
+jobs:
+  fullstack_tests:
+    name: Fullstack tests
+    runs-on: ubuntu-latest
+    env:
+      jobs: 8
+    strategy:
+      matrix:
+        # run copies of the current job in parallel
+        job: [1, 2, 3, 4, 5, 6, 7, 8]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: webapp | copy env file
+        run: cp webapp/.env.template webapp/.env
+
+      - name: backend | copy env file
+        run: cp backend/.env.template backend/.env
+
+      - name: boot up test system | docker-compose
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+
+      - name: cypress | Fullstack tests
+        id: e2e-tests
+        run: |
+          yarn install
+          yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
+
+      ##########################################################################
+      # UPLOAD SCREENSHOTS - IF TESTS FAIL #####################################
+      ##########################################################################
+      - name: Full stack tests | if any test failed, upload screenshots
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-screenshots
+          path: cypress/screenshots/
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
new file mode 100644
index 000000000..644544c06
--- /dev/null
+++ b/.github/workflows/test-webapp.yml
@@ -0,0 +1,86 @@
+name: ocelot.social webapp test CI
+
+
+on: [push]
+
+jobs:
+  prepare:
+    name: Prepare
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Check translation files
+        run: |
+          scripts/translations/sort.sh
+          scripts/translations/missing-keys.sh
+          
+  build_test_webapp:
+    name: Docker Build Test - WebApp
+    runs-on: ubuntu-latest
+    needs: [prepare]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: webapp | Build 'test' image
+        run: |
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: docker-webapp-test
+          path: /tmp/webapp.tar
+
+  lint_webapp:
+    name: Lint webapp
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: webapp | Lint
+        run: cd webapp && yarn && yarn run lint
+
+  unit_test_webapp:
+    name: Unit tests - webapp
+    runs-on: ubuntu-latest
+    needs: [build_test_webapp]
+    permissions: 
+      checks: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Docker Image (Webapp)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-webapp-test
+          path: /tmp
+
+      - name: Load Docker Image
+        run: docker load < /tmp/webapp.tar
+
+      - name: backend | copy env files webapp
+        run: cp webapp/.env.template webapp/.env
+
+      - name: backend | copy env files backend
+        run: cp backend/.env.template backend/.env
+
+      - name: backend | docker-compose
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
+
+      - name: webapp | Unit tests
+        run: docker-compose exec -T webapp yarn test
+
+      - name: webapp | Coverage check
+        uses: webcraftmedia/coverage-check-action@master
+        with:
+          report_name: Coverage Webapp
+          type: lcov
+          result_path: ./coverage/lcov.info
+          min_coverage: 83
+          token: ${{ github.token }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 1740c09fe..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,344 +0,0 @@
-name: ocelot.social test CI
-
-
-on: [push]
-
-jobs:
-  ##############################################################################
-  # JOB: PREPARE #####################################################
-  ##############################################################################
-  prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    # needs: [nothing]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # TODO: DO STUFF ??? #####################################################
-      ##########################################################################
-      - name: Check translation files
-        run: |
-          scripts/translations/sort.sh
-          scripts/translations/missing-keys.sh
-
-  ##############################################################################
-  # JOB: DOCKER BUILD TEST NEO4J ###############################################
-  ##############################################################################
-  build_test_neo4j:
-    name: Docker Build Test - Neo4J
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # NEO4J ##################################################################
-      ##########################################################################
-      - name: Neo4J | Build `community` image
-        run: |
-          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
-          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: docker-neo4j-image
-          path: /tmp/neo4j.tar
-
-  ##############################################################################
-  # JOB: DOCKER BUILD TEST BACKEND #############################################
-  ##############################################################################
-  build_test_backend:
-    name: Docker Build Test - Backend
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # BUILD BACKEND DOCKER IMAGE (build) #####################################
-      ##########################################################################
-      - name: backend | Build `test` image
-        run: |
-          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp/backend.tar
-
-  ##############################################################################
-  # JOB: DOCKER BUILD TEST WEBAPP ##############################################
-  ##############################################################################
-  build_test_webapp:
-    name: Docker Build Test - WebApp
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # BUILD WEBAPP DOCKER IMAGE (build) ######################################
-      ##########################################################################
-      - name: webapp | Build `test` image
-        run: |
-          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-          docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: docker-webapp-test
-          path: /tmp/webapp.tar
-
-  ##############################################################################
-  # JOB: LINT BACKEND ##########################################################
-  ##############################################################################
-  lint_backend:
-    name: Lint backend
-    runs-on: ubuntu-latest
-    needs: [build_test_backend]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # DOWNLOAD DOCKER IMAGE ##################################################
-      ##########################################################################
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/backend.tar
-      ##########################################################################
-      # LINT BACKEND ###########################################################
-      ##########################################################################
-      - name: backend | Lint
-        run: docker run --rm ocelotsocialnetwork/backend:test yarn run lint
-
-  ##############################################################################
-  # JOB: LINT WEBAPP ###########################################################
-  ##############################################################################
-  lint_webapp:
-    name: Lint webapp
-    runs-on: ubuntu-latest
-    needs: [build_test_webapp]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # DOWNLOAD DOCKER IMAGE ##################################################
-      ##########################################################################
-      - name: Download Docker Image (Webapp)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-webapp-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/webapp.tar
-      ##########################################################################
-      # LINT WEBAPP ############################################################
-      ##########################################################################
-      - name: webapp | Lint
-        run: docker run --rm ocelotsocialnetwork/webapp:test yarn run lint
-
-  ##############################################################################
-  # JOB: UNIT TEST BACKEND #####################################################
-  ##############################################################################
-  unit_test_backend:
-    name: Unit tests - backend
-    runs-on: ubuntu-latest
-    needs: [build_test_neo4j,build_test_backend]
-    permissions: 
-      checks: write
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # DOWNLOAD DOCKER IMAGES #################################################
-      ##########################################################################
-      - name: Download Docker Image (Neo4J)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-neo4j-image
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/neo4j.tar
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/backend.tar
-      ##########################################################################
-      # UNIT TESTS BACKEND #####################################################
-      ##########################################################################
-      - name: backend | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
-      - name: backend | docker-compose
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend
-      - name: backend | Initialize Database
-        run: docker-compose exec -T backend yarn db:migrate init
-      - name: backend | Migrate Database Up
-        run: docker-compose exec -T backend yarn db:migrate up
-      - name: backend | Unit test
-        run: docker-compose exec -T backend yarn test
-      ##########################################################################
-      # COVERAGE CHECK BACKEND #################################################
-      ##########################################################################
-      - name: backend | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Backend
-          type: lcov
-          result_path: ./coverage/lcov.info
-          min_coverage: 57
-          token: ${{ github.token }}
-
-  ##############################################################################
-  # JOB: UNIT TEST WEBAPP ######################################################
-  ##############################################################################
-  unit_test_webapp:
-    name: Unit tests - webapp
-    runs-on: ubuntu-latest
-    needs: [build_test_webapp]
-    permissions: 
-      checks: write
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # DOWNLOAD DOCKER IMAGES #################################################
-      ##########################################################################
-      - name: Download Docker Image (Webapp)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-webapp-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/webapp.tar
-      ##########################################################################
-      # UNIT TESTS WEBAPP ######################################################
-      ##########################################################################
-      - name: backend | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
-      - name: backend | docker-compose
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
-      - name: webapp | Unit tests
-        run: docker-compose exec -T webapp yarn test
-      ##########################################################################
-      # COVERAGE REPORT FRONTEND ################################################
-      ##########################################################################
-      #- name: frontend | Coverage report
-      #  uses: romeovs/lcov-reporter-action@v0.2.21
-      #  with:
-      #    github-token: ${{ secrets.GITHUB_TOKEN }}
-      #    lcov-file: ./coverage/lcov.info
-      ##########################################################################
-      # COVERAGE CHECK WEBAPP ##################################################
-      ##########################################################################
-      - name: webapp | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Webapp
-          type: lcov
-          result_path: ./coverage/lcov.info
-          min_coverage: 83
-          token: ${{ github.token }}
-
-  ##############################################################################
-  # JOB: FULLSTACK TESTS #######################################################
-  ##############################################################################
-  fullstack_tests:
-    name: Fullstack tests
-    runs-on: ubuntu-latest
-    needs: [build_test_webapp, build_test_backend, build_test_neo4j]
-    env:
-      jobs: 8
-    strategy:
-      matrix:
-        # run copies of the current job in parallel
-        job: [1, 2, 3, 4, 5, 6, 7, 8]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # DOWNLOAD DOCKER IMAGES #################################################
-      ##########################################################################
-      - name: Download Docker Image (Neo4J)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-neo4j-image
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/neo4j.tar
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/backend.tar
-      - name: Download Docker Image (Webapp)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-webapp-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/webapp.tar
-      ##########################################################################
-      # FULLSTACK TESTS CYPRESS ################################################
-      ##########################################################################
-      - name: webapp | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
-      - name: backend | docker-compose
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
-      - name: cypress | Fullstack tests
-        id: e2e-tests
-        run: |
-          yarn install
-          yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
-      ##########################################################################
-      # UPLOAD SCREENSHOTS - IF TESTS FAIL #####################################
-      ##########################################################################
-      - name: Full stack tests | if any test failed, upload screenshots
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-screenshots
-          path: cypress/screenshots/

From 556c63a86405f15bfc32838b9c31ba528b2d1165 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 16 Mar 2023 17:23:56 +0100
Subject: [PATCH 02/33] set jest coverage check for webapp workflow

---
 .github/workflows/test-webapp.yml | 10 +---------
 webapp/jest.config.js             |  6 +++++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 644544c06..8f84fc34c 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -73,14 +73,6 @@ jobs:
       - name: backend | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
 
-      - name: webapp | Unit tests
+      - name: webapp | Unit tests incl. coverage check
         run: docker-compose exec -T webapp yarn test
 
-      - name: webapp | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Webapp
-          type: lcov
-          result_path: ./coverage/lcov.info
-          min_coverage: 83
-          token: ${{ github.token }}
diff --git a/webapp/jest.config.js b/webapp/jest.config.js
index 538f72bc7..6b0f5e461 100644
--- a/webapp/jest.config.js
+++ b/webapp/jest.config.js
@@ -15,7 +15,11 @@ module.exports = {
     '!**/.prettierrc.js',
     '!**/nuxt.config.js',
   ],
-  coverageReporters: ['lcov', 'text'],
+  coverageThreshold: {
+    global: {
+      lines: 83,
+    },
+  },
   setupFiles: ['<rootDir>/test/registerContext.js', '<rootDir>/test/testSetup.js'],
   transform: {
     '.*\\.(vue)$': 'vue-jest',

From 9c7fb3ae6067753394121a8bda6ec28973cfefaa Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 16 Mar 2023 17:48:28 +0100
Subject: [PATCH 03/33] set jest coverage check for backend workflow

---
 .github/workflows/test-backend.yml | 14 +-------------
 backend/jest.config.js             |  6 +++++-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 608c16f27..2f30aa812 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -78,9 +78,6 @@ jobs:
       - name: Load Docker Image
         run: docker load < /tmp/backend.tar
 
-      # - name: backend | copy env files webapp
-      #   run: cp webapp/.env.template webapp/.env
-
       - name: backend | copy env files backend
         run: cp backend/.env.template backend/.env
 
@@ -93,14 +90,5 @@ jobs:
       - name: backend | Migrate Database Up
         run: docker-compose exec -T backend yarn db:migrate up
 
-      - name: backend | Unit test
+      - name: backend | Unit test incl. coverage check
         run: docker-compose exec -T backend yarn test
-
-      - name: backend | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Backend
-          type: lcov
-          result_path: ./coverage/lcov.info
-          min_coverage: 57
-          token: ${{ github.token }}
diff --git a/backend/jest.config.js b/backend/jest.config.js
index aabb59083..0f8017fb1 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -8,7 +8,11 @@ module.exports = {
     '!**/dist/**',
     '!**/src/**/?(*.)+(spec|test).js?(x)'
   ],
-  coverageReporters: ['lcov', 'text'],
+  coverageThreshold: {
+    global: {
+      lines: 57,
+    },
+  },
   testMatch: ['**/src/**/?(*.)+(spec|test).js?(x)'],
   setupFilesAfterEnv: ['<rootDir>/test/setup.js']
 }

From 85b9750e004a73a23faa973c70292713d338d815 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 16 Mar 2023 17:52:01 +0100
Subject: [PATCH 04/33] set name for backend test workflow

---
 .github/workflows/test-backend.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 2f30aa812..6c98063d1 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,4 +1,4 @@
-name: ocelot.social test CI
+name: ocelot.social backend test CI
 
 
 on: [push]

From e3fba4f0a80ad4e8733bcb13cd7d1b602b722f45 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 11:52:09 +0100
Subject: [PATCH 05/33] reintroduce webapp env copytobackend unit test job

---
 .github/workflows/test-backend.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 6c98063d1..a65e23469 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -78,6 +78,8 @@ jobs:
       - name: Load Docker Image
         run: docker load < /tmp/backend.tar
 
+      - name: backend | copy env files webapp
+        run: cp webapp/.env.template webapp/.env
       - name: backend | copy env files backend
         run: cp backend/.env.template backend/.env
 

From bcae47f1405da4162acbe8d63626b668c2b20910 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 13:29:02 +0100
Subject: [PATCH 06/33] add file filters for test workflows

---
 .github/file-filters.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .github/file-filters.yml

diff --git a/.github/file-filters.yml b/.github/file-filters.yml
new file mode 100644
index 000000000..d7f9cb6c0
--- /dev/null
+++ b/.github/file-filters.yml
@@ -0,0 +1,9 @@
+backend: &backend
+  - 'backend/**/*'
+  - 'neo4j/**/*'
+
+docker: &docker
+  - 'docker-compose.*'
+
+webapp: &webapp
+  - 'webapp/**/*'

From d7fce771ac4944f0a3615ba44e9498cb929b4c65 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 13:30:31 +0100
Subject: [PATCH 07/33] utilize file filters in backend test workflows

---
 .github/workflows/test-backend.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index a65e23469..885e69f78 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -4,8 +4,27 @@ name: ocelot.social backend test CI
 on: [push]
 
 jobs:
+  files-changed:
+    name: Detect File Changes - Backend
+    runs-on: ubuntu-latest
+    outputs:
+      backend: ${{ steps.changes.outputs.backend }}
+      docker: ${{ steps.changes.outputs.docker }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+
   build_test_neo4j:
     name: Docker Build Test - Neo4J
+    if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -24,6 +43,8 @@ jobs:
 
   build_test_backend:
     name: Docker Build Test - Backend
+    if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -42,6 +63,8 @@ jobs:
 
   lint_backend:
     name: Lint backend
+    if: needs.files-changed.outputs.backend == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -52,6 +75,8 @@ jobs:
 
   unit_test_backend:
     name: Unit tests - backend
+    if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     needs: [build_test_neo4j,build_test_backend]
     permissions: 

From 9c59c604890224cade6381d14cb9dda781f24890 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 13:30:31 +0100
Subject: [PATCH 08/33] utilize file filters in backend test workflows

---
 .github/workflows/test-backend.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 885e69f78..e5e3dd418 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -21,6 +21,23 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
+  files-changed:
+    name: Detect File Changes - Backend
+    runs-on: ubuntu-latest
+    outputs:
+      backend: ${{ steps.changes.outputs.backend }}
+      docker: ${{ steps.changes.outputs.docker }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+
   build_test_neo4j:
     name: Docker Build Test - Neo4J
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
@@ -76,9 +93,8 @@ jobs:
   unit_test_backend:
     name: Unit tests - backend
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
-    needs: files-changed
+    needs: [files-changed, build_test_neo4j, build_test_backend]
     runs-on: ubuntu-latest
-    needs: [build_test_neo4j,build_test_backend]
     permissions: 
       checks: write
     steps:

From f9c1315ab3246c8d526109f8c9690ebbc301b7fd Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 13:43:24 +0100
Subject: [PATCH 09/33] clean up backend test workflow

---
 .github/workflows/test-backend.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e5e3dd418..ae15775e0 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -21,23 +21,6 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
-  files-changed:
-    name: Detect File Changes - Backend
-    runs-on: ubuntu-latest
-    outputs:
-      backend: ${{ steps.changes.outputs.backend }}
-      docker: ${{ steps.changes.outputs.docker }}
-    steps:
-      - uses: actions/checkout@v3.3.0
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@v2.11.1
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
   build_test_neo4j:
     name: Docker Build Test - Neo4J
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'

From 70d75600ee8ad6a42cd550fb3d0c6f47cbec6bb9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 13:57:49 +0100
Subject: [PATCH 10/33] utilize file filters in webapp test workflows

---
 .github/workflows/test-webapp.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 8f84fc34c..bdb75f222 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -4,8 +4,27 @@ name: ocelot.social webapp test CI
 on: [push]
 
 jobs:
+  files-changed:
+    name: Detect File Changes - Backend
+    runs-on: ubuntu-latest
+    outputs:
+      docker: ${{ steps.changes.outputs.docker }}
+      webbapp: ${{ steps.changes.outputs.webbapp }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+
   prepare:
     name: Prepare
+    if: needs.files-changed.outputs.webbapp
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -18,8 +37,9 @@ jobs:
           
   build_test_webapp:
     name: Docker Build Test - WebApp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webbapp
+    needs: [files-changed, prepare]
     runs-on: ubuntu-latest
-    needs: [prepare]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -37,6 +57,8 @@ jobs:
 
   lint_webapp:
     name: Lint webapp
+    if: needs.files-changed.outputs.webbapp
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -47,8 +69,9 @@ jobs:
 
   unit_test_webapp:
     name: Unit tests - webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webbapp
+    needs: [files-changed, build_test_webapp]
     runs-on: ubuntu-latest
-    needs: [build_test_webapp]
     permissions: 
       checks: write
     steps:

From 717a9f9fc7787802e3b543768473f6fd962d19c9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 13:57:49 +0100
Subject: [PATCH 11/33] utilize file filters in webapp test workflows

---
 .github/workflows/test-webapp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index bdb75f222..2eaa40670 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -5,7 +5,7 @@ on: [push]
 
 jobs:
   files-changed:
-    name: Detect File Changes - Backend
+    name: Detect File Changes - Wepapp
     runs-on: ubuntu-latest
     outputs:
       docker: ${{ steps.changes.outputs.docker }}

From 511007795d6adf555f8ba88d7e6f63059a3d9a55 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 14:20:20 +0100
Subject: [PATCH 12/33] fix typos

---
 .github/workflows/test-webapp.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 2eaa40670..31e640092 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -5,11 +5,11 @@ on: [push]
 
 jobs:
   files-changed:
-    name: Detect File Changes - Wepapp
+    name: Detect File Changes - Webapp
     runs-on: ubuntu-latest
     outputs:
       docker: ${{ steps.changes.outputs.docker }}
-      webbapp: ${{ steps.changes.outputs.webbapp }}
+      webapp: ${{ steps.changes.outputs.webapp }}
     steps:
       - uses: actions/checkout@v3.3.0
 
@@ -23,7 +23,7 @@ jobs:
 
   prepare:
     name: Prepare
-    if: needs.files-changed.outputs.webbapp
+    if: needs.files-changed.outputs.webapp
     needs: files-changed
     runs-on: ubuntu-latest
     steps:
@@ -36,8 +36,8 @@ jobs:
           scripts/translations/missing-keys.sh
           
   build_test_webapp:
-    name: Docker Build Test - WebApp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webbapp
+    name: Docker Build Test - Webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp
     needs: [files-changed, prepare]
     runs-on: ubuntu-latest
     steps:
@@ -57,7 +57,7 @@ jobs:
 
   lint_webapp:
     name: Lint webapp
-    if: needs.files-changed.outputs.webbapp
+    if: needs.files-changed.outputs.webapp
     needs: files-changed
     runs-on: ubuntu-latest
     steps:
@@ -69,7 +69,7 @@ jobs:
 
   unit_test_webapp:
     name: Unit tests - webapp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webbapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp
     needs: [files-changed, build_test_webapp]
     runs-on: ubuntu-latest
     permissions: 

From aaa932302cc0b1ae63d9cb7195ad25fbd5f6e56e Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 17 Mar 2023 14:28:34 +0100
Subject: [PATCH 13/33] correct job names

---
 .github/workflows/test-backend.yml | 4 ++--
 .github/workflows/test-webapp.yml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index ae15775e0..84d87c770 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -62,7 +62,7 @@ jobs:
           path: /tmp/backend.tar
 
   lint_backend:
-    name: Lint backend
+    name: Lint Backend
     if: needs.files-changed.outputs.backend == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
@@ -74,7 +74,7 @@ jobs:
         run: cd backend && yarn && yarn run lint
 
   unit_test_backend:
-    name: Unit tests - backend
+    name: Unit tests - Backend
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
     needs: [files-changed, build_test_neo4j, build_test_backend]
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 31e640092..9ca3023cc 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -56,7 +56,7 @@ jobs:
           path: /tmp/webapp.tar
 
   lint_webapp:
-    name: Lint webapp
+    name: Lint Webapp
     if: needs.files-changed.outputs.webapp
     needs: files-changed
     runs-on: ubuntu-latest
@@ -68,7 +68,7 @@ jobs:
         run: cd webapp && yarn && yarn run lint
 
   unit_test_webapp:
-    name: Unit tests - webapp
+    name: Unit Tests - Webapp
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp
     needs: [files-changed, build_test_webapp]
     runs-on: ubuntu-latest

From 5e089ddb0dafa980a72174c09afd688d3077b268 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Apr 2023 12:31:29 +0200
Subject: [PATCH 14/33] removed some artifact from branded-images.build script

---
 deployment/scripts/branded-images.build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deployment/scripts/branded-images.build.sh b/deployment/scripts/branded-images.build.sh
index e33c9a546..fa9da67d1 100755
--- a/deployment/scripts/branded-images.build.sh
+++ b/deployment/scripts/branded-images.build.sh
@@ -25,7 +25,6 @@ echo "Using DOCKERHUB_BRAND_VARRIANT=${DOCKERHUB_BRAND_VARRIANT}"
 
 # configuration
 DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
-=${DOCKERHUB_BRAND_VARRIANT:-"stage-ocelot-social"}
 OCELOT_VERSION=${OCELOT_VERSION:-$(node -p -e "require('${SCRIPT_DIR}/../../package.json').version")}
 OCELOT_GITHUB_RUN_NUMBER=${OCELOT_GITHUB_RUN_NUMBER:-master}
 OCELOT_VERSION_BUILD=${OCELOT_VERSION_BUILD:-${OCELOT_VERSION}-${OCELOT_GITHUB_RUN_NUMBER}}

From c1bd50e3b55f08e1348e5293d4fd8b319afab378 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Apr 2023 12:32:02 +0200
Subject: [PATCH 15/33] updated stage occelot reference

---
 deployment/configurations/stage.ocelot.social | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
index 69885510c..be3ac7ad2 160000
--- a/deployment/configurations/stage.ocelot.social
+++ b/deployment/configurations/stage.ocelot.social
@@ -1 +1 @@
-Subproject commit 69885510ce32dc12f4ce581287e5aecdaa948ecc
+Subproject commit be3ac7ad29f37d6a00fb3203db302cd91cebb9fa

From af19e31178a339f47097c77869a9127d6e45ade4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 20 Apr 2023 14:32:30 +0200
Subject: [PATCH 16/33] fix(backend): posts in groups cannot be pinned

---
 backend/src/schema/resolvers/posts.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index d806f3803..063b2210d 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -310,6 +310,7 @@ export default {
             `
             MATCH (user:User {id: $userId}) WHERE user.role = 'admin'
             MATCH (post:Post {id: $params.id})
+            WHERE NOT((post)-[:IN]->(:Group))
             MERGE (user)-[pinned:PINNED {createdAt: toString(datetime())}]->(post)
             SET post.pinned = true
             RETURN post, pinned.createdAt as pinnedAt
@@ -322,10 +323,12 @@ export default {
           }))
         })
         const [transactionResult] = await writeTxResultPromise
-        const { pinnedPost, pinnedAt } = transactionResult
-        pinnedPostWithNestedAttributes = {
-          ...pinnedPost,
-          pinnedAt,
+        if (transactionResult) {
+          const { pinnedPost, pinnedAt } = transactionResult
+          pinnedPostWithNestedAttributes = {
+            ...pinnedPost,
+            pinnedAt,
+          }
         }
       } finally {
         session.close()

From b672b62e0df42804d6c72bd363eb52800590132a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 20 Apr 2023 14:33:51 +0200
Subject: [PATCH 17/33] no pin post button for posts in group

---
 webapp/components/ContentMenu/ContentMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 60bcccf43..d723a9667 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -80,7 +80,7 @@ export default {
           })
         }
 
-        if (this.isAdmin) {
+        if (this.isAdmin && !this.resource.group) {
           if (!this.resource.pinnedBy) {
             routes.push({
               label: this.$t(`post.menu.pin`),

From aceb422e7635f95d8e9202de96cb164698143678 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:23:06 +0000
Subject: [PATCH 18/33] Bump metascraper-soundcloud from 5.33.5 to 5.34.2 in
 /backend

Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-soundcloud) from 5.33.5 to 5.34.2.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-soundcloud/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.2/packages/metascraper-soundcloud)

---
updated-dependencies:
- dependency-name: metascraper-soundcloud
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 13681df2b..f32881357 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -76,7 +76,7 @@
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.33.5",
     "metascraper-publisher": "^5.33.5",
-    "metascraper-soundcloud": "^5.33.5",
+    "metascraper-soundcloud": "^5.34.2",
     "metascraper-title": "^5.33.5",
     "metascraper-url": "^5.34.2",
     "metascraper-video": "^5.33.5",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 461682a29..293e189dc 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -7614,12 +7614,12 @@ metascraper-publisher@^5.33.5:
   dependencies:
     "@metascraper/helpers" "^5.33.5"
 
-metascraper-soundcloud@^5.33.5:
-  version "5.33.5"
-  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.33.5.tgz#9cd39e7ff432e715f8ecdca5256e7ea67f485557"
-  integrity sha512-hkDhRfTKEUugIN9Gxh/l9HuWlkNAOKEBXov/9fYKbIMgaj7e2UU7bkNYjaDOXzMikCRWEIrrGP3UzwwIcs6Gjg==
+metascraper-soundcloud@^5.34.2:
+  version "5.34.2"
+  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.34.2.tgz#ee1077b4836321ccfb22bcab4bfae7360dd571a3"
+  integrity sha512-1VafeFnlzJaYUlq8XbppQauz0i9xM8QycJU8k4ONftZwRtikQBIjRe5BMXr/s5n32831vBooRz8ksz0CXkjVlQ==
   dependencies:
-    "@metascraper/helpers" "^5.33.5"
+    "@metascraper/helpers" "^5.34.2"
 
 metascraper-title@^5.33.5:
   version "5.33.5"

From a10916fc1415d8f8d6c6ab4fd5c12f9b18cccf38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:15:16 +0200
Subject: [PATCH 19/33] remove falsy values, but do not limit characters

---
 backend/src/schema/resolvers/searches/queryString.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 5ef84cdce..0045f1c22 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -33,7 +33,7 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 const matchBeginningOfWords = (str) => {
   return str
     .split(' ')
-    .filter((s) => s.length > 3)
+    .filter((s) => s) // remove falsy values
     .map((s) => s + '*')
     .join(' ')
 }

From ca24cf44050342415baef54da3fe86ab9f7ea0e4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:19:15 +0200
Subject: [PATCH 20/33] simplyfy logic, use language ahortcuts

---
 backend/src/schema/resolvers/searches.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 3fdf22da3..3001a28b3 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -223,8 +223,7 @@ export default {
     },
     searchResults: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
-      let userId = null
-      if (context.user) userId = context.user.id
+      let userId = context.user?.id || null 
 
       const searchType = query.replace(/^([!@#&]?).*$/, '$1')
       const searchString = query.replace(/^([!@#&])/, '')

From 6025706b4b2c2bfc8cbb51658f2b40d081698222 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:19:50 +0200
Subject: [PATCH 21/33] fix searchableInput field component to properly
 retrigger search on delete, clear properly etc

---
 .../generic/SearchableInput/SearchableInput.vue | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 2149732c5..8397cccbf 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -14,9 +14,8 @@
       :auto-reset-search="!searchValue"
       :placeholder="$t('search.placeholder')"
       @focus.capture.native="onFocus"
-      @input.native="handleInput"
+      @input.native="onInput"
       @keyup.enter.native="onEnter"
-      @keyup.delete.native="onDelete"
       @keyup.esc.native="clear"
       @blur.capture.native="onBlur"
       @input.exact="onSelect"
@@ -103,11 +102,14 @@ export default {
     onFocus(event) {
       clearTimeout(this.searchProcess)
     },
-    handleInput(event) {
+    onInput(event) {
+      console.log('input', event)
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
+      console.log('input', this.value)
       this.unprocessedSearchInput = this.value
       if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
+        this.clear()
         return
       }
       this.searchProcess = setTimeout(() => {
@@ -122,15 +124,6 @@ export default {
       })
       this.$emit('clearSearch')
     },
-    onDelete(event) {
-      clearTimeout(this.searchProcess)
-      const value = event.target ? event.target.value.trim() : ''
-      if (isEmpty(value)) {
-        this.clear()
-      } else {
-        this.handleInput(event)
-      }
-    },
     clear() {
       this.unprocessedSearchInput = ''
       this.previousSearchTerm = ''

From 33d5758686722128d411450680cefa6af52a5a67 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:35:43 +0200
Subject: [PATCH 22/33] removed comments

---
 webapp/components/generic/SearchableInput/SearchableInput.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 8397cccbf..45ea33bab 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -103,10 +103,8 @@ export default {
       clearTimeout(this.searchProcess)
     },
     onInput(event) {
-      console.log('input', event)
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
-      console.log('input', this.value)
       this.unprocessedSearchInput = this.value
       if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
         this.clear()

From c7fbe9beef8c1dca3549b673e4111dccaa7d9fb5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:36:01 +0200
Subject: [PATCH 23/33] removed test for onDelete event

---
 .../generic/SearchableInput/SearchableInput.spec.js        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.spec.js b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
index cda9150b8..223ee6186 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.spec.js
+++ b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
@@ -63,13 +63,6 @@ describe('SearchableInput.vue', () => {
       expect(select.element.value).toBe('abcd')
     })
 
-    it('calls onDelete when the delete key is pressed', () => {
-      const spy = jest.spyOn(wrapper.vm, 'onDelete')
-      select.trigger('input')
-      select.trigger('keyup.delete')
-      expect(spy).toHaveBeenCalledTimes(1)
-    })
-
     describe('navigating to resource', () => {
       beforeEach(() => {
         propsData = { options: searchResults }

From 4a5c56203b877d166f5667c5e5f9e8ddc488727c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:44:46 +0200
Subject: [PATCH 24/33] simplified searchableInput further - fixed on Enter

---
 .../components/generic/SearchableInput/SearchableInput.vue   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 45ea33bab..bc349c9f6 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -78,7 +78,6 @@ export default {
     return {
       searchValue: '',
       value: '',
-      unprocessedSearchInput: '',
       searchProcess: null,
       previousSearchTerm: '',
       delay: 300,
@@ -105,7 +104,6 @@ export default {
     onInput(event) {
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
-      this.unprocessedSearchInput = this.value
       if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
         this.clear()
         return
@@ -118,12 +116,11 @@ export default {
     onEnter(event) {
       this.$router.push({
         path: '/search/search-results',
-        query: { search: this.unprocessedSearchInput },
+        query: { search: this.value },
       })
       this.$emit('clearSearch')
     },
     clear() {
-      this.unprocessedSearchInput = ''
       this.previousSearchTerm = ''
       this.searchValue = ''
       this.$emit('clearSearch')

From 536ef92132fba043d1add9225e56a81cf7765b3b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 03:44:51 +0200
Subject: [PATCH 25/33] more simplifications

---
 .../SearchableInput/SearchableInput.vue       | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index bc349c9f6..c27b16b66 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="searchable-input" aria-label="search" role="search">
     <ds-select
+      ref="select"
       type="search"
       icon="search"
-      v-model="searchValue"
+      v-model="value"
       :id="id"
       label-prop="id"
       :icon-right="null"
@@ -11,7 +12,7 @@
       :loading="loading"
       :filter="(item) => item"
       :no-options-available="emptyText"
-      :auto-reset-search="!searchValue"
+      :auto-reset-search="!value"
       :placeholder="$t('search.placeholder')"
       @focus.capture.native="onFocus"
       @input.native="onInput"
@@ -76,10 +77,8 @@ export default {
   },
   data() {
     return {
-      searchValue: '',
       value: '',
       searchProcess: null,
-      previousSearchTerm: '',
       delay: 300,
     }
   },
@@ -88,7 +87,7 @@ export default {
       return this.isActive && !this.loading ? this.$t('search.failed') : this.$t('search.hint')
     },
     isActive() {
-      return !isEmpty(this.previousSearchTerm)
+      return !isEmpty(this.value)
     },
   },
   methods: {
@@ -109,7 +108,6 @@ export default {
         return
       }
       this.searchProcess = setTimeout(() => {
-        this.previousSearchTerm = this.value
         this.$emit('query', this.value)
       }, this.delay)
     },
@@ -118,22 +116,21 @@ export default {
         path: '/search/search-results',
         query: { search: this.value },
       })
-      this.$emit('clearSearch')
+      this.$refs.select.close()
     },
     clear() {
-      this.previousSearchTerm = ''
-      this.searchValue = ''
+      this.value = ''
+      this.valueBackup = ''
       this.$emit('clearSearch')
       clearTimeout(this.searchProcess)
     },
     onBlur(event) {
-      this.searchValue = this.previousSearchTerm
       clearTimeout(this.searchProcess)
     },
     onSelect(item) {
       this.goToResource(item)
       this.$nextTick(() => {
-        this.searchValue = this.previousSearchTerm
+        this.value = this.$refs.select.$data.searchString
       })
     },
     getRouteName(item) {

From 5c23815a36f3bb969ce604d683c22e815173b77e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 03:50:06 +0200
Subject: [PATCH 26/33] lint fixes

---
 backend/src/schema/resolvers/searches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 3001a28b3..63d195863 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -223,7 +223,7 @@ export default {
     },
     searchResults: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
-      let userId = context.user?.id || null 
+      const userId = context.user?.id || null 
 
       const searchType = query.replace(/^([!@#&]?).*$/, '$1')
       const searchString = query.replace(/^([!@#&])/, '')

From 6102ce2fffaac45c91c902eacf3891c5bdc55b94 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:05:43 +0200
Subject: [PATCH 27/33] more lint fix

---
 backend/src/schema/resolvers/searches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 63d195863..a67abe90d 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -223,7 +223,7 @@ export default {
     },
     searchResults: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
-      const userId = context.user?.id || null 
+      const userId = context.user?.id || null
 
       const searchType = query.replace(/^([!@#&]?).*$/, '$1')
       const searchString = query.replace(/^([!@#&])/, '')

From efff3625a9ca30e9dba75b18cb6bcdf1a87374f7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:07:26 +0200
Subject: [PATCH 28/33] properly diferentiate between clearbale search and text
 hints

---
 .../generic/SearchableInput/SearchableInput.vue        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index c27b16b66..987fd596b 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -84,13 +84,16 @@ export default {
   },
   computed: {
     emptyText() {
-      return this.isActive && !this.loading ? this.$t('search.failed') : this.$t('search.hint')
+      return !this.loading && this.isSearchable() ? this.$t('search.failed') : this.$t('search.hint')
     },
     isActive() {
       return !isEmpty(this.value)
     },
   },
   methods: {
+    isSearchable(){
+      return !isEmpty(this.value) && typeof this.value === 'string' && this.value.replace(/\s+/g, '').length >= 3
+    },
     isFirstOfType(option) {
       return (
         this.options.findIndex((o) => o === option) ===
@@ -103,8 +106,8 @@ export default {
     onInput(event) {
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
-      if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
-        this.clear()
+      if (!this.isSearchable()) {
+        this.$emit('clearSearch')
         return
       }
       this.searchProcess = setTimeout(() => {
@@ -120,7 +123,6 @@ export default {
     },
     clear() {
       this.value = ''
-      this.valueBackup = ''
       this.$emit('clearSearch')
       clearTimeout(this.searchProcess)
     },

From e228b42cc4413b9ac8ff60333cd0d2e0a01a063c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:16:19 +0200
Subject: [PATCH 29/33] lint

---
 .../components/generic/SearchableInput/SearchableInput.vue  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 987fd596b..7bd0e7985 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -92,7 +92,11 @@ export default {
   },
   methods: {
     isSearchable(){
-      return !isEmpty(this.value) && typeof this.value === 'string' && this.value.replace(/\s+/g, '').length >= 3
+      return (
+        !isEmpty(this.value) &&
+        typeof this.value === 'string' &&
+        this.value.replace(/\s+/g, '').length >= 3
+      )
     },
     isFirstOfType(option) {
       return (

From 23588c02ecda09ffce7bcada0620153eced3669a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:24:34 +0200
Subject: [PATCH 30/33] more lint fixes

---
 .../components/generic/SearchableInput/SearchableInput.vue  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 7bd0e7985..a43c266a3 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -84,14 +84,16 @@ export default {
   },
   computed: {
     emptyText() {
-      return !this.loading && this.isSearchable() ? this.$t('search.failed') : this.$t('search.hint')
+      return !this.loading && this.isSearchable() 
+        ? this.$t('search.failed')
+        : this.$t('search.hint')
     },
     isActive() {
       return !isEmpty(this.value)
     },
   },
   methods: {
-    isSearchable(){
+    isSearchable() {
       return (
         !isEmpty(this.value) &&
         typeof this.value === 'string' &&

From c88cbdc9d85f440c37969dca025afd0368432dec Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:41:43 +0200
Subject: [PATCH 31/33] last lint

---
 webapp/components/generic/SearchableInput/SearchableInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index a43c266a3..b0e813b45 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -84,7 +84,7 @@ export default {
   },
   computed: {
     emptyText() {
-      return !this.loading && this.isSearchable() 
+      return !this.loading && this.isSearchable()
         ? this.$t('search.failed')
         : this.$t('search.hint')
     },

From 9198ec9a129ae3adc81c226b51423b935ec05c3f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 11:47:30 +0200
Subject: [PATCH 32/33] ensure 3 characters minimum

---
 backend/src/schema/resolvers/searches/queryString.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 0045f1c22..ad1ba59fa 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -33,7 +33,7 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 const matchBeginningOfWords = (str) => {
   return str
     .split(' ')
-    .filter((s) => s) // remove falsy values
+    .filter((s) => s.length >= 3)
     .map((s) => s + '*')
     .join(' ')
 }

From c2828a31debcb6058f91599c29c665be9e785056 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 12:01:10 +0200
Subject: [PATCH 33/33] word length limitation set to minimum 2

---
 backend/src/schema/resolvers/searches/queryString.js      | 2 +-
 backend/src/schema/resolvers/searches/queryString.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index ad1ba59fa..8f415c5e6 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -33,7 +33,7 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 const matchBeginningOfWords = (str) => {
   return str
     .split(' ')
-    .filter((s) => s.length >= 3)
+    .filter((s) => s.length >= 2)
     .map((s) => s + '*')
     .join(' ')
 }
diff --git a/backend/src/schema/resolvers/searches/queryString.spec.js b/backend/src/schema/resolvers/searches/queryString.spec.js
index 23a746be1..fe3c91d3c 100644
--- a/backend/src/schema/resolvers/searches/queryString.spec.js
+++ b/backend/src/schema/resolvers/searches/queryString.spec.js
@@ -37,7 +37,7 @@ describe('queryString', () => {
 
   describe('globbing for longer words', () => {
     it('globs words with more than three characters', () => {
-      expect(queryString('a couple of words')).toContain('couple* words*')
+      expect(queryString('a couple of words')).toContain('couple* of* words*')
     })
   })
 })