Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map

.github/workflows/test-webapp.yml

@@ -23,7 +23,7 @@ jobs:
 
   prepare:
     name: Prepare
-    if: needs.files-changed.outputs.webapp
+    if: needs.files-changed.outputs.webapp == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
     steps:
@@ -37,7 +37,7 @@ jobs:
           
   build_test_webapp:
     name: Docker Build Test - Webapp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
     needs: [files-changed, prepare]
     runs-on: ubuntu-latest
     steps:
@@ -57,7 +57,7 @@ jobs:
 
   lint_webapp:
     name: Lint Webapp
-    if: needs.files-changed.outputs.webapp
+    if: needs.files-changed.outputs.webapp == 'true'
     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.webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
     needs: [files-changed, build_test_webapp]
     runs-on: ubuntu-latest
     permissions: 

backend/src/schema/resolvers/rooms.spec.ts

@@ -92,6 +92,21 @@ describe('Room', () => {
         })
       })
 
+      describe('user id is self', () => {
+        it('throws error', async () => {
+          await expect(
+            mutate({
+              mutation: createRoomMutation(),
+              variables: {
+                userId: 'chatting-user',
+              },
+            }),
+          ).resolves.toMatchObject({
+            errors: [{ message: 'Cannot create a room with self' }],
+          })
+        })
+      })
+
       describe('user id exists', () => {
         it('returns the id of the room', async () => {
           const result = await mutate({

backend/src/schema/resolvers/rooms.ts

@@ -32,6 +32,9 @@ export default {
       const {
         user: { id: currentUserId },
       } = context
+      if (userId === currentUserId) {
+        throw new Error('Cannot create a room with self')
+      }
       const session = context.driver.session()
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createRoomCypher = `

cypress/cypress.config.js

@@ -42,10 +42,7 @@ module.exports = defineConfig({
     baseUrl: "http://localhost:3000",
     specPattern: "cypress/e2e/**/*.feature",
     supportFile: "cypress/support/e2e.js",
-    retries: {
-      runMode: 2,
-      openMode: 0,
-    },
+    retries:  0,
     video: false,
     setupNodeEvents,
   },

deployment/TODO-next-update.md

@@ -2,6 +2,10 @@
 
 When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings:
 
+## Version >= 2.7.0 with 'ocelotDockerVersionTag' 2.7.0-470
+
+- You have to rename all `.js` files  to `.ts` in `branding/constants`
+
 ## Version >= 2.4.0 with 'ocelotDockerVersionTag' 2.4.0-298
 
 - You have to set `SHOW_CONTENT_FILTER_HEADER_MENU` and `SHOW_CONTENT_FILTER_MASONRY_GRID` in `branding/constants/filter.js` originally in main code file `webapp/constants/filter.js` to your preferred value.

webapp/layouts/default.spec.js

@@ -37,7 +37,7 @@ describe('default.vue', () => {
       getters: {
         'auth/isLoggedIn': () => true,
         'chat/showChat': () => {
-          return { showChat: false, roomID: 'u0' }
+          return { showChat: false, roomID: null }
         },
       },
     })

webapp/layouts/default.vue

@@ -16,7 +16,7 @@
     <div v-if="$store.getters['chat/showChat'].showChat" class="chat-modul">
       <ds-text align="right" class="close">
         RoomID: {{ $store.getters['chat/showChat'].roomID }}
-        <ds-button @click="$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: 'u0' })">
+        <ds-button @click="$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: null })">
           x
         </ds-button>
       </ds-text>
@@ -41,6 +41,9 @@ export default {
     ChatModule,
   },
   mixins: [seo, mobile()],
+  beforeCreate() {
+    this.$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: null })
+  },
 }
 </script>
 

webapp/locales/de.json

@@ -580,7 +580,7 @@
     "moreInfo": "Was ist {APPLICATION_NAME}?",
     "moreInfoHint": "zur Präsentationsseite",
     "no-account": "Du hast noch kein Nutzerkonto?",
-    "no-cookie": "Es kann kein Cookie angelegt werden. Du must Cookies akzeptieren.",
+    "no-cookie": "Es kann kein Cookie angelegt werden. Du musst Cookies akzeptieren.",
     "password": "Dein Passwort",
     "register": "Nutzerkonto erstellen",
     "success": "Du bist eingeloggt!"
@@ -761,9 +761,9 @@
     "viewEvent": {
       "eventEnd": "Ende",
       "eventIsOnline": "Online",
-      "eventLocationName": "Stadt",
+      "eventLocationName": "Stadt - z.B. Musterstraße 1, 12345 Musterstadt",
       "eventStart": "Beginn",
-      "eventVenue": "Veranstaltungsort",
+      "eventVenue": "Veranstaltungsort - z.B. Hinterhof, 1. OG, ...",
       "title": "Veranstaltung"
     },
     "viewPost": {

webapp/locales/en.json

@@ -761,9 +761,9 @@
     "viewEvent": {
       "eventEnd": "End",
       "eventIsOnline": "Online",
-      "eventLocationName": "City",
+      "eventLocationName": "City - e.g. Example street 1, 12345 City",
       "eventStart": "Start",
-      "eventVenue": "Venue",
+      "eventVenue": "Venue - e.g. Backyard, 1st Floor, ...",
       "title": "Event"
     },
     "viewPost": {

webapp/store/chat.js

@@ -1,14 +1,14 @@
 export const state = () => {
   return {
     showChat: false,
-    roomID: 'u0',
+    roomID: null,
   }
 }
 
 export const mutations = {
   SET_OPEN_CHAT(state, ctx) {
     state.showChat = ctx.showChat || false
-    state.roomID = ctx.roomID || 'u0'
+    state.roomID = ctx.roomID || null
   },
 }