Test also inflection, wildcard, exact, compounded words

.eslintrc.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const projectRootPath = __dirname;
+
+let coreLocation;
+if (fs.existsSync(`${projectRootPath}/core`))
+  coreLocation = `${projectRootPath}/core`;
+else if (fs.existsSync(`${projectRootPath}/../../core`))
+  coreLocation = `${projectRootPath}/../../core`;
+
+module.exports = {
+  extends: `${coreLocation}/packages/volto/.eslintrc`,
+  rules: {
+    'import/no-unresolved': 1,
+  },
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@plone/volto', `${coreLocation}/packages/volto/src`],
+          [
+            '@plone/volto-slate',
+            `${coreLocation}/core/packages/volto-slate/src`,
+          ],
+          ['@plone/registry', `${coreLocation}/packages/registry/src`],
+          ['@rohberg/volto-searchkit-block', './src'],
+        ],
+        extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
+      },
+    },
+  },
+};

.github/workflows/acceptance.yml

@@ -2,19 +2,18 @@ name: Acceptance tests
 on: [push]
 
 env:
-  ADDON_NAME: "@rohberg/volto-searchkit-block"
+  ADDON_NAME: '@rohberg/volto-searchkit-block'
   ADDON_PATH: volto-searchkit-block
-  VOLTO_VERSION: 17
   PLONE_VERSION: 6.0
 
   INDEX_SERVER: opensearch:9200
   INDEX_OPENSEARCH: 1
   INDEX_USE_SSL: 0
   INDEX_LOGIN: admin
-  INDEX_PASSWORD: "oxczBG).3xWyapLn"
+  INDEX_PASSWORD: 'oxczBG).3xWyapLn'
 
   CELERY_BROKER: redis://redis:6379/0
-  CELERY_LOG_LEVEL: info
+  CELERY_LOGLEVEL: info
 
   PLONE_SERVICE: http://backend-acceptance:55001
   PLONE_SITE_PREFIX_PATH: plone
@@ -26,11 +25,13 @@ env:
   PREPROCESSINGS_FILE: /configuration/preprocessings.json
 
 jobs:
-  acceptance:
+  acceptance-monolingual:
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    timeout-minutes: 46
     strategy:
       fail-fast: false
+      matrix:
+        volto-version: [17]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -43,16 +44,21 @@ jobs:
           cd acceptance
           yarn
 
-      - name: "Cypress: Acceptance tests"
+      - name: 'Cypress: Acceptance tests - monolingual'
         uses: cypress-io/github-action@v6
         env:
+          VOLTO_VERSION: ${{ matrix.volto-version }}
           BABEL_ENV: production
-          CYPRESS_RETRIES: 2
+          CYPRESS_RETRIES: 3
+          # Recommended: pass the GitHub token lets this action correctly
+          # determine the unique run id necessary to re-run the checks
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          config: pageLoadTimeout=100000,defaultCommandTimeout=8000
           parallel: false
           browser: chrome
           working-directory: acceptance
-          spec: cypress/tests/*.cy.js
+          spec: cypress/tests/*.monolingual.cy.js
           install: false
           start: |
             docker compose -f ci.yml --profile prod up
@@ -71,3 +77,56 @@ jobs:
         with:
           name: cypress-videos-acceptance
           path: acceptance/cypress/videos
+
+  acceptance-multilingual:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    strategy:
+      fail-fast: false
+      matrix:
+        volto-version: [17]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install Cypress
+        run: |
+          cd acceptance
+          yarn
+
+      - name: 'Cypress: Acceptance tests - multilingual'
+        uses: cypress-io/github-action@v6
+        env:
+          VOLTO_VERSION: ${{ matrix.volto-version }}
+          BABEL_ENV: production
+          CYPRESS_RETRIES: 3
+          # Recommended: pass the GitHub token lets this action correctly
+          # determine the unique run id necessary to re-run the checks
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          config: pageLoadTimeout=100000,defaultCommandTimeout=8000
+          parallel: false
+          browser: chrome
+          working-directory: acceptance
+          spec: cypress/tests/*.multilingual.cy.js
+          install: false
+          start: |
+            docker compose -f ci.yml --profile multilingual up
+          wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone http://localhost:3000 http://localhost:9200'
+
+      # Upload Cypress screenshots
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots-acceptance
+          path: acceptance/cypress/screenshots
+
+      # Upload Cypress videos
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-videos-acceptance
+          path: acceptance/cypress/videos

.github/workflows/code.yml

@@ -1,5 +1,30 @@
 name: Code analysis checks
 on: [push]
+
+env:
+  ADDON_NAME: '@rohberg/volto-searchkit-block'
+  ADDON_PATH: volto-searchkit-block
+  VOLTO_VERSION: 17
+  PLONE_VERSION: 6.0
+
+  INDEX_SERVER: opensearch:9200
+  INDEX_OPENSEARCH: 1
+  INDEX_USE_SSL: 0
+  INDEX_LOGIN: admin
+  INDEX_PASSWORD: 'oxczBG).3xWyapLn'
+
+  CELERY_BROKER: redis://redis:6379/0
+  CELERY_LOGLEVEL: info
+
+  PLONE_SERVICE: http://backend-acceptance:55001
+  PLONE_SITE_PREFIX_PATH: plone
+  PLONE_USER: admin
+  PLONE_PASSWORD: secret
+
+  MAPPINGS_FILE: /configuration/mappings.json
+  ANALYSIS_FILE: /configuration/analysis.json
+  PREPROCESSINGS_FILE: /configuration/preprocessings.json
+
 jobs:
   codeanalysis:
     runs-on: ubuntu-latest

.github/workflows/unit.yml

@@ -1,15 +1,43 @@
 name: Unit Tests
 on: [push]
+
+env:
+  ADDON_NAME: '@rohberg/volto-searchkit-block'
+  ADDON_PATH: volto-searchkit-block
+  VOLTO_VERSION: 17
+  PLONE_VERSION: 6.0
+
+  INDEX_SERVER: opensearch:9200
+  INDEX_OPENSEARCH: 1
+  INDEX_USE_SSL: 0
+  INDEX_LOGIN: admin
+  INDEX_PASSWORD: 'oxczBG).3xWyapLn'
+
+  CELERY_BROKER: redis://redis:6379/0
+  CELERY_LOGLEVEL: info
+
+  PLONE_SERVICE: http://backend-acceptance:55001
+  PLONE_SITE_PREFIX_PATH: plone
+  PLONE_USER: admin
+  PLONE_PASSWORD: secret
+
+  MAPPINGS_FILE: /configuration/mappings.json
+  ANALYSIS_FILE: /configuration/analysis.json
+  PREPROCESSINGS_FILE: /configuration/preprocessings.json
+
 jobs:
   unit:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [20.x]
+        volto-version: [17]
 
     steps:
       - name: Main checkout
         uses: actions/checkout@v4
 
       - name: Unit tests
+        # TODO do 'docker compose with ' env:  VOLTO_VERSION: ${{ matrix.volto-version }}
+        # TODO Remove matrix option node-version
         run: make test-ci

.gitignore

@@ -117,9 +117,10 @@ api/constraints-mxdev.txt
 api/requirements-mxdev.txt
 development-searchkitblock/celery/venv/
 development-searchkitblock/celery/sources/
+acceptance/cypress/screenshots/
 build/
 .yarn/
 yarn.lock
 
-!docker-opensearch/.env
+!dockerfiles/opensearch/.env
 !acceptance/.env

DEVELOPMENT.md

@@ -1,47 +1,40 @@
-# Development
+# Development and demo
 
-## Backend
+> TODO Update to new Makefile
 
-    make dev-start-backend
 
-## Elasticsearch
+## Index server OpenSearch
 
-Run with Docker.
+    make dev-opensearch
 
-Change directory to ./development-searchkitblock/mac/ or ./development-searchkitblock/linux/ and run:
+## Backend and frontend
 
-    docker compose up
+    make dev
 
-Inspect with 
 
-    docker exec -it <container-id> bash
 
-## Redis
 
-Start with
 
-    redis-server /usr/local/etc/redis.conf
+> OUTDATED OLD STUFF BELOW
 
-## Celery
+## Backend
 
-Change directory to ./development-searchkitblock/celery and install:
+    make dev-start-backend
 
-Install with:
 
-    python -m venv venv
-    source venv/bin/activate
-    pip install -U pip wheel mxdev
-    mxdev -c mx.ini
+## OUTDATED Elasticsearch
 
-    pip install -r requirements-mxdev.txt
+Run with Docker.
+
+Change directory to ./development-searchkitblock/mac/ or ./development-searchkitblock/linux/ and run:
+
+    docker compose up
+
+Inspect with 
 
-Run with:
+    docker exec -it <container-id> bash
 
-    source .env
-    venv/bin/celery -A collective.elastic.ingest.celery.app worker -l info
 
-    # or with more info:
-    venv/bin/celery -A collective.elastic.ingest.celery.app worker -l debug
 
 
 ## Frontend