186 umlaute

.dockerignore

@@ -13,5 +13,4 @@ test/
 eslint*
 .prettier*
 cypress.config.js
-jest*
 config.yaml

.github/workflows/main.yml

@@ -3,7 +3,6 @@ name: Build
 on: push
 
 env:
-  REGISTRY: 
   IMAGE_NAME: ${{ github.repository }}
   TEST_TAG: user/app:test
 
@@ -117,4 +116,4 @@ jobs:
         with:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

README.md

@@ -220,7 +220,7 @@ So if your commit errors, make sure to check the output and fix accordingly.
 We use unit, integration and E2E tests, but don't distinguish too hard between unit and integration tests, since the distinction between these are a bit blurry in component development (see [React Testing Overview](https://reactjs.org/docs/testing.html)).
 In general a behaviour driven development is favoured and for every new feature an appropriate test should be added.
 The unit and integration tests can be found in the `test` folder.
-We use [Jest](https://jestjs.io/) and [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/) for testing.
+We use [Vitest](https://vitest.dev/) and [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/) for testing.
 
 To run these tests use `npm run test` or `npm run test:coverage` to see coverage reports.
 

gatsby-node.js

@@ -10,7 +10,7 @@ const { DataFactory } = n3
 const { namedNode } = DataFactory
 const path = require("path")
 const fs = require("fs-extra")
-const flexsearch = require("flexsearch")
+const { Index } = require("flexsearch")
 const omitEmpty = require("omit-empty")
 const { i18n, getFilePath, parseLanguages } = require("./src/common")
 const context = require("./src/context")
@@ -71,6 +71,30 @@ const getTurtleFiles = function (dirPath, arrayOfFiles) {
   return arrayOfFiles
 }
 
+/**
+ * Exports an index and saves it
+ * @param {object} index
+ * @param {object} conceptScheme
+ * @param {string} language
+ *
+ **/
+const exportIndex = (index, conceptScheme, language) => {
+  index.export(function (key, data) {
+    const path = getFilePath(
+      conceptScheme.id + `/search/${language}/${key}`,
+      `json`
+    )
+    createData({
+      path,
+      data: data !== undefined ? data : "",
+    })
+    // fs.writeFileSync(
+    //   `${searchIndexPath}${key}.json`,
+    //   data !== undefined ? (data) : ""
+    // );
+  })
+}
+
 exports.onPreBootstrap = async ({ createContentDigest, actions, getNode }) => {
   const { createNode, createNodeField } = actions
   const ttlFiles = getTurtleFiles("./data", [])
@@ -213,7 +237,7 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
       languages.forEach((language) =>
         createPage({
           path: getFilePath(collection.id, `${language}.html`),
-          component: path.resolve(`./src/components/Collection.js`),
+          component: path.resolve(`./src/components/Collection.jsx`),
           context: {
             language,
             node: collection,
@@ -248,13 +272,9 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
         const languagesOfCS = languagesByCS[conceptScheme.id]
         const indexes = Object.fromEntries(
           [...languagesOfCS].map((l) => {
-            const index = flexsearch.create({
+            const index = new Index({
               tokenize: tokenizer,
-            })
-            index.addMatcher({
-              "[Ää]": "a", // replaces all 'ä' to 'a'
-              "[Öö]": "o",
-              "[Üü]": "u",
+              charset: "latin",
             })
             return [l, index]
           })
@@ -283,7 +303,7 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
             languagesOfCS.forEach((language) =>
               createPage({
                 path: getFilePath(concept.id, `${language}.html`),
-                component: path.resolve(`./src/components/Concept.js`),
+                component: path.resolve(`./src/components/Concept.jsx`),
                 context: {
                   language,
                   node: concept,
@@ -307,14 +327,10 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
           )
         })
 
-        languagesOfCS.forEach((l) => {
-          console.log(`Built index for language "${l}"`, indexes[l].info())
-        })
-
         languagesOfCS.forEach((language) =>
           createPage({
             path: getFilePath(conceptScheme.id, `${language}.html`),
-            component: path.resolve(`./src/components/ConceptScheme.js`),
+            component: path.resolve(`./src/components/ConceptScheme.jsx`),
             context: {
               language,
               node: conceptScheme,
@@ -336,10 +352,7 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
         })
         // create index files
         languagesOfCS.forEach((language) =>
-          createData({
-            path: getFilePath(conceptScheme.id, `${language}.index`),
-            data: JSON.stringify(indexes[language].export(), null, 2),
-          })
+          exportIndex(indexes[language], conceptScheme, language)
         )
       }
     )
@@ -349,7 +362,7 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
   languages.forEach((language) =>
     createPage({
       path: `/index.${language}.html`,
-      component: path.resolve(`./src/components/index.js`),
+      component: path.resolve(`./src/components/index.jsx`),
       context: {
         language,
         conceptSchemes: conceptSchemes.data.allConceptScheme.edges.map(