Merge branch 'master' into dependabot/npm_and_yarn/backend/babel/preset-env-7.22.20

.nvmrc

@@ -1 +1 @@
-v19.4.0
+v20.7.0

backend/.nvmrc

@@ -1 +1 @@
-v20.2.0
+v20.7.0

backend/Dockerfile

@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
-FROM node:20.6.0-alpine3.17 as base
+FROM node:20.7.0-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

backend/package.json

@@ -26,7 +26,7 @@
     "@babel/cli": "~7.8.4",
     "@babel/core": "~7.9.0",
     "@babel/node": "~7.8.7",
-    "@babel/plugin-proposal-throw-expressions": "^7.8.3",
+    "@babel/plugin-proposal-throw-expressions": "^7.22.5",
     "@babel/preset-env": "~7.22.20",
     "@babel/register": "^7.9.0",
     "@sentry/node": "^5.15.4",
@@ -61,7 +61,6 @@
     "lodash": "~4.17.14",
     "merge-graphql-schemas": "^1.7.8",
     "metascraper": "^5.33.5",
-    "metascraper-audio": "^5.34.4",
     "metascraper-author": "^5.33.5",
     "metascraper-date": "^5.33.5",
     "metascraper-description": "^5.33.5",

backend/src/schema/resolvers/searches.ts

@@ -110,7 +110,13 @@ const searchResultPromise = async (session, setup, params) => {
 }
 
 const searchResultCallback = (result) => {
-  return result.records.map((r) => r.get('result'))
+  const response = result.records.map((r) => r.get('result'))
+  if (Array.isArray(response) && response.length && response[0].__typename === 'Post') {
+    response.forEach((post) => {
+      post.postType = [post.postType]
+    })
+  }
+  return response
 }
 
 const countResultCallback = (result) => {

backend/yarn.lock

@@ -600,13 +600,13 @@
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-throw-expressions@^7.8.3":
+"@babel/plugin-proposal-throw-expressions@^7.22.5":
-  version "7.8.3"
+  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.8.3.tgz#155f36ae40c2a88ae685c35e3220f8a0d426cf24"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.22.5.tgz#2c0613f208214051bed7bff6302216aa9697e1c0"
-  integrity sha512-tH40s9JnoR+r45ZXKWW+PC5xzPQfVJix3pR1D8Ty5l9sn5NnrbZUzw8MtnNxu/Bz7p0imyeSYj9FQVccEymOEg==
+  integrity sha512-34kY5YjNKDhjXbj2oNDkxl0xNl2+yQTEsWu8Ia6kCTb6wz76bBCd4DzmeZokfr6g68yneu3eg8qAyYgKbyesFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-throw-expressions" "^7.8.3"
+    "@babel/plugin-syntax-throw-expressions" "^7.22.5"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -727,12 +727,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-throw-expressions@^7.8.3":
+"@babel/plugin-syntax-throw-expressions@^7.22.5":
-  version "7.8.3"
+  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.8.3.tgz#c763bcf26d202ddb65f1299a29d63aad312adb54"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.22.5.tgz#9ab803c17e25bbfedf8375acbbb0aa9f51c55496"
-  integrity sha512-Mv3shY1i7ZssY4OY+eLZJAmNCwqTcpv2qOKO9x6irELSygfKWVSMXk0igJsA9UhU4hOdw0qMGkjj9TAk4MqzwQ==
+  integrity sha512-oCyfA7rDVcQIydA7ZOmnHCQTzz5JvG9arY++Z+ASL/q5q+mJLblaRNHoK6ggV54X2c14wCK/lQi7z1DujmEmZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
@@ -1803,13 +1803,6 @@
   dependencies:
     json-buffer "~3.0.1"
 
-"@keyvhq/core@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@keyvhq/core/-/core-2.0.0.tgz#518311a59dbc4d6b6fd56852c15f483edb9fc7c9"
-  integrity sha512-fi3+F7GNImn1j4r6UFhsHRwN8a05uhUlrbNWZgnkX0h1NzcBEPNNqqMOE4KSASJwH2e9Eh/jm+bEfto58csNgg==
-  dependencies:
-    json-buffer "~3.0.1"
-
 "@keyvhq/memoize@~1.6.14":
   version "1.6.14"
   resolved "https://registry.yarnpkg.com/@keyvhq/memoize/-/memoize-1.6.14.tgz#6a347b81e9be7040c678f8fc4b9046186484b6fc"
@@ -1818,14 +1811,6 @@
     "@keyvhq/core" "^1.6.14"
     mimic-fn "~3.0.0"
 
-"@keyvhq/memoize@~2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@keyvhq/memoize/-/memoize-2.0.0.tgz#58b1118c2972b631aede81040eab6daefce8f5e8"
-  integrity sha512-0vibPmDh7nCWsbdS4A1IJX1G89PyT+nJEDGj1tUYsLPQ5BLnpLwneCudmXIvxD6cUUvMYqmhxKyjpvHd8DpPkA==
-  dependencies:
-    "@keyvhq/core" "^2.0.0"
-    mimic-fn "~3.0.0"
-
 "@metascraper/helpers@^4.10.2":
   version "4.10.2"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-4.10.2.tgz#864e49c71468548441f3a1ab68fdb2913855821b"
@@ -6169,7 +6154,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-got@~11.8.0, got@~11.8.5, got@~11.8.6:
+got@~11.8.0, got@~11.8.5:
   version "11.8.6"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
   integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
@@ -8411,16 +8396,6 @@ merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-metascraper-audio@^5.34.4:
-  version "5.34.4"
-  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.34.4.tgz#84437c3962a9186cda69510229f6b68e6a25563a"
-  integrity sha512-Z/BzT0KLq8H6Zc0wm4PqKlSeI7O54ZsD2QhV9GgkJNz5jGj0Rs4P3OOvoa+FEtDyRKGfIzYuldAuhQMVmo1WMA==
-  dependencies:
-    "@keyvhq/memoize" "~2.0.0"
-    "@metascraper/helpers" "^5.34.4"
-    got "~11.8.6"
-    p-reflect "~2.1.0"
-
 metascraper-author@^5.33.5:
   version "5.33.5"
   resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.33.5.tgz#ae6fd41c8f9a355e48b851e67308673e1f2fe89c"

cypress/support/step_definitions/Post.Comment/I_comment_the_following.js

@@ -1,6 +1,6 @@
 import { When } from "@badeball/cypress-cucumber-preprocessor";
 
-When("I comment the following:", async text => {
+When("I comment the following:", text => {
   const comment = text.replace("\n", " ")
   cy.task('pushValue', { name: 'lastComment', value: comment })
   cy.get(".editor .ProseMirror").type(comment);

cypress/support/step_definitions/Post.Create/I_choose_{string}_as_the_title.js

@@ -1,6 +1,6 @@
 import { When } from "@badeball/cypress-cucumber-preprocessor";
 
-When("I choose {string} as the title", async title => {
+When("I choose {string} as the title", title => {
   const lastPost = {}
   lastPost.title = title.replace("\n", " ");
   cy.task('pushValue', { name: 'lastPost', value: lastPost })

cypress/support/step_definitions/Post.Create/the_post_was_saved_successfully.js

@@ -1,6 +1,6 @@
 import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
-Then("the post was saved successfully", async () => {
+Then("the post was saved successfully", () => {
   cy.task('getValue', 'lastPost').then(lastPost => {
     cy.get(".base-card > .title").should("contain", lastPost.title);
     cy.get(".content").should("contain", lastPost.content);

cypress/support/step_definitions/common/I_choose_the_following_text_as_content.js

@@ -1,6 +1,6 @@
 import { When } from "@badeball/cypress-cucumber-preprocessor";
 
-When("I choose the following text as content:", async text => {
+When("I choose the following text as content:", text => {
   cy.task('getValue', 'lastPost').then(lastPost => {
     lastPost.content = text.replace("\n", " ");
     cy.task('pushValue', { name: 'lastPost', value: lastPost })

docker-compose.yml

@@ -117,6 +117,8 @@ services:
       # TODO: clarify if that is the only thing needed to unlock the Enterprise version
       # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
       # TODO: Remove the playground from production
+    # bring the database in offline mode to export or load dumps
+    # command: ["tail", "-f", "/dev/null"]
 
 networks:
   external-net:

neo4j/README.md

@@ -51,6 +51,18 @@ in `backend/.env`.
 
 Start Neo4J and confirm the database is running at [http://localhost:7474](http://localhost:7474).
 
+## Operations on Neo4j
+
+### Import Neo4j Dump Locally in Docker
+
+To import a dump into Neo4j running in a Docker container:
+
+- we need to set `command: ["tail", "-f", "/dev/null"]` in the Neo4j block of `docker-compose.yml` on top level so the Neo4j database is in maintenance mode
+- copy the dump into the running Docker container: `docker cp /path/to/dump <docker-image>:/existing-directory-in-docker/`
+- connect to the Docker containers Neo4j terminal: `docker exec -it neo4j bash`
+- to load the dump into the database we need the following command in this terminal: `neo4j-admin load --expand-commands --database=graph.db --from /backups/neo4j-dump --force`
+- leave the terminal by entering: `exit`
+
 ## Commands
 
 Here we describe some rarely used Cypher commands for Neo4j that are needed from time to time:

package.json

@@ -36,15 +36,15 @@
   "devDependencies": {
     "@babel/core": "^7.22.9",
     "@babel/preset-env": "^7.22.9",
-    "@babel/register": "^7.12.10",
+    "@babel/register": "^7.22.15",
-    "@badeball/cypress-cucumber-preprocessor": "^15.1.4",
+    "@badeball/cypress-cucumber-preprocessor": "^18.0.6",
     "@cypress/browserify-preprocessor": "^3.0.2",
-    "@faker-js/faker": "8.0.2",
+    "@faker-js/faker": "8.1.0",
     "auto-changelog": "^2.3.0",
     "bcryptjs": "^2.4.3",
     "cross-env": "^7.0.3",
     "cucumber": "^6.0.5",
-    "cypress": "^12.17.0",
+    "cypress": "^13.2.0",
     "cypress-network-idle": "^1.14.2",
     "date-fns": "^2.25.0",
     "dotenv": "^16.3.1",

webapp/.nvmrc

@@ -1 +1 @@
-v20.2.0
+v20.7.0

webapp/Dockerfile

@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
-FROM node:20.6.0-alpine3.17 as base
+FROM node:20.7.0-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

webapp/Dockerfile.maintenance

@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE ###########################################################################
 ##################################################################################
-FROM node:20.6.0-alpine3.17 as base
+FROM node:20.7.0-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

webapp/components/_new/generic/CounterIcon/CounterIcon.vue

@@ -1,7 +1,7 @@
 <template>
   <span class="counter-icon">
     <base-icon :name="icon" />
-    <span :class="counterClass">{{ cappedCount }}</span>
+    <span v-if="count > 0" :class="counterClass">{{ cappedCount }}</span>
   </span>
 </template>
 

webapp/graphql/Search.js

@@ -53,6 +53,16 @@ export const searchPosts = gql`
         shoutedCount
         clickedCount
         viewedTeaserCount
+        postType
+        eventStart
+        eventEnd
+        eventVenue
+        eventLocationName
+        eventLocation {
+          lng
+          lat
+        }
+        eventIsOnline
         author {
           ...user
         }