From a114b8a12c3778798b91565fdb88fff815a06c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 14:06:38 +0200
Subject: [PATCH 01/21] Give the chat plus button a function and show hide the
 user search

---
 webapp/components/Chat/Chat.vue            | 11 ++++++++---
 webapp/components/Group/AddGroupMember.vue |  1 +
 webapp/pages/chat.vue                      | 17 +++++++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..c02165248 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -19,12 +19,13 @@
         show-audio="false"
         :styles="JSON.stringify(computedChatStyle)"
         :show-footer="true"
-        @send-message="sendMessage($event.detail[0])"
-        @fetch-messages="fetchMessages($event.detail[0])"
-        @fetch-more-rooms="fetchRooms"
         :responsive-breakpoint="responsiveBreakpoint"
         :single-room="singleRoom"
         show-reaction-emojis="false"
+        @send-message="sendMessage($event.detail[0])"
+        @fetch-messages="fetchMessages($event.detail[0])"
+        @fetch-more-rooms="fetchRooms"
+        @add-room="addRoom"
         @show-demo-options="showDemoOptions = $event"
       >
         <div slot="menu-icon" @click.prevent.stop="$emit('close-single-room', true)">
@@ -361,6 +362,10 @@ export default {
       if (!fullname) return
       return fullname.match(/\b\w/g).join('').substring(0, 3).toUpperCase()
     },
+
+    addRoom() {
+      this.$emit('open-user-search')
+    }
   },
 }
 </script>
diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index ff049ca4d..8e66c7be2 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -49,6 +49,7 @@
     </ds-space>
   </div>
 </template>
+
 <script>
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 import { searchUsers } from '~/graphql/Search.js'
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 920cbabe9..f28d3a880 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,16 +1,29 @@
 <template>
   <div>
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
-    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" />
+    <add-group-member
+      v-if="showUserSearch"
+      :groupId="0"
+      :groupMembers="[]"
+      @loadGroupMembers="null"
+    />
+    <ds-space margin-bottom="small" />
+    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" @open-user-search="showUserSearch = !showUserSearch" />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
+import AddGroupMember from '~/components/Group/AddGroupMember'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
-  components: { Chat },
+  components: { AddGroupMember, Chat },
+  data() {
+    return {
+      showUserSearch: false,
+    }
+  },
   mounted() {
     this.showChat({ showChat: false, roomID: null })
   },

From ffe51a0743cb9a586ba5b07a09f932ba89411f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 15:48:05 +0200
Subject: [PATCH 02/21] Separate 'ds-select' of 'AddGroupMember' into separate
 component 'SelectUserSearch'

---
 webapp/components/Chat/Chat.vue               |   2 +-
 webapp/components/Group/AddGroupMember.vue    |  94 ++-------------
 .../SelectUserSearch/SelectUserSearch.vue     | 109 ++++++++++++++++++
 webapp/pages/chat.vue                         |  10 +-
 4 files changed, 128 insertions(+), 87 deletions(-)
 create mode 100644 webapp/components/generic/SelectUserSearch/SelectUserSearch.vue

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index c02165248..fccaee5b8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -365,7 +365,7 @@ export default {
 
     addRoom() {
       this.$emit('open-user-search')
-    }
+    },
   },
 }
 </script>
diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index 8e66c7be2..2cb71f011 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -3,33 +3,7 @@
     <h2 class="title">{{ $t('group.addUser') }}</h2>
     <ds-space margin-bottom="small" />
     <ds-space>
-      <ds-select
-        type="search"
-        icon="search"
-        label-prop="id"
-        v-model="query"
-        :id="id"
-        :icon-right="null"
-        :options="users"
-        :loading="$apollo.queries.searchUsers.loading"
-        :filter="(item) => item"
-        :no-options-available="$t('group.addUserNoOptions')"
-        :auto-reset-search="true"
-        :placeholder="$t('group.addUserPlaceholder')"
-        @focus.capture.native="onFocus"
-        @input.native="handleInput"
-        @keyup.enter.native="onEnter"
-        @keyup.delete.native="onDelete"
-        @keyup.esc.native="clear"
-        @blur.capture.native="onBlur"
-        @input.exact="onSelect"
-      >
-        <template #option="{ option }">
-          <p>
-            <user-teaser :user="option" :showPopover="false" :linkToProfile="false" />
-          </p>
-        </template>
-      </ds-select>
+      <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
       <ds-modal
         v-if="isOpen"
         force
@@ -52,14 +26,14 @@
 
 <script>
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
-import { searchUsers } from '~/graphql/Search.js'
+import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
 import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
-import { isEmpty } from 'lodash'
 
 export default {
   name: 'AddGroupMember',
   components: {
     UserTeaser,
+    SelectUserSearch,
   },
   props: {
     groupId: {
@@ -73,62 +47,34 @@ export default {
   },
   data() {
     return {
-      users: [],
       id: 'search-user-to-add-to-group',
-      query: '',
       user: {},
       isOpen: false,
     }
   },
-  computed: {
-    startSearch() {
-      return this.query && this.query.length > 3
-    },
-  },
   methods: {
     cancelModal() {
-      this.clear()
+      this.$refs.selectUserSearch.clear()
       this.isOpen = false
     },
     closeModal() {
-      this.clear()
+      this.$refs.selectUserSearch.clear()
       this.isOpen = false
     },
     confirmModal() {
       this.addMemberToGroup()
       this.isOpen = false
-      this.clear()
+      this.$refs.selectUserSearch.clear()
     },
-    onFocus() {},
-    onBlur() {
-      this.query = ''
-    },
-    handleInput(event) {
-      this.query = event.target ? event.target.value.trim() : ''
-    },
-    onDelete(event) {
-      const value = event.target ? event.target.value.trim() : ''
-      if (isEmpty(value)) {
-        this.clear()
-      } else {
-        this.handleInput(event)
-      }
-    },
-    clear() {
-      this.query = ''
-      this.user = {}
-      this.users = []
-    },
-    onSelect(item) {
-      this.user = item
+    selectUser(user) {
+      this.user = user
       if (this.groupMembers.find((member) => member.id === this.user.id)) {
         this.$toast.error(this.$t('group.errors.userAlreadyMember', { name: this.user.name }))
-        this.clear()
+        this.$refs.selectUserSearch.clear()
         return
       }
       this.isOpen = true
     },
-    onEnter() {},
     async addMemberToGroup() {
       const newRole = 'usual'
       const username = this.user.name
@@ -149,29 +95,9 @@ export default {
       }
     },
   },
-  apollo: {
-    searchUsers: {
-      query() {
-        return searchUsers
-      },
-      variables() {
-        return {
-          query: this.query,
-          firstUsers: 5,
-          usersOffset: 0,
-        }
-      },
-      skip() {
-        return !this.startSearch
-      },
-      update({ searchUsers }) {
-        this.users = searchUsers.users
-      },
-      fetchPolicy: 'cache-and-network',
-    },
-  },
 }
 </script>
+
 <style lang="scss">
 .add-group-member {
   background-color: white;
diff --git a/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue b/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
new file mode 100644
index 000000000..effa185f3
--- /dev/null
+++ b/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
@@ -0,0 +1,109 @@
+<template>
+  <ds-select
+    class="select-user-search"
+    type="search"
+    icon="search"
+    label-prop="id"
+    v-model="query"
+    :id="id"
+    :icon-right="null"
+    :options="users"
+    :loading="$apollo.queries.searchUsers.loading"
+    :filter="(item) => item"
+    :no-options-available="$t('group.addUserNoOptions')"
+    :auto-reset-search="true"
+    :placeholder="$t('group.addUserPlaceholder')"
+    @focus.capture.native="onFocus"
+    @input.native="handleInput"
+    @keyup.enter.native="onEnter"
+    @keyup.delete.native="onDelete"
+    @keyup.esc.native="clear"
+    @blur.capture.native="onBlur"
+    @input.exact="onSelect"
+  >
+    <template #option="{ option }">
+      <p>
+        <user-teaser :user="option" :showPopover="false" :linkToProfile="false" />
+      </p>
+    </template>
+  </ds-select>
+</template>
+
+<script>
+import { isEmpty } from 'lodash'
+import { searchUsers } from '~/graphql/Search.js'
+import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
+
+export default {
+  name: 'SelectUserSearch',
+  components: {
+    UserTeaser,
+  },
+  props: {
+    id: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      users: [],
+      query: '',
+      user: {},
+    }
+  },
+  computed: {
+    startSearch() {
+      return this.query && this.query.length > 3
+    },
+  },
+  methods: {
+    onFocus() {},
+    onBlur() {
+      this.query = ''
+    },
+    handleInput(event) {
+      this.query = event.target ? event.target.value.trim() : ''
+    },
+    onDelete(event) {
+      const value = event.target ? event.target.value.trim() : ''
+      if (isEmpty(value)) {
+        this.clear()
+      } else {
+        this.handleInput(event)
+      }
+    },
+    clear() {
+      this.query = ''
+      this.user = {}
+      this.users = []
+    },
+    onSelect(item) {
+      this.user = item
+      this.$emit('select-user', this.user)
+    },
+    onEnter() {},
+  },
+  apollo: {
+    searchUsers: {
+      query() {
+        return searchUsers
+      },
+      variables() {
+        return {
+          query: this.query,
+          firstUsers: 5,
+          usersOffset: 0,
+        }
+      },
+      skip() {
+        return !this.startSearch
+      },
+      update({ searchUsers }) {
+        this.users = searchUsers.users
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
+}
+</script>
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index f28d3a880..8d9d55e46 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -8,7 +8,10 @@
       @loadGroupMembers="null"
     />
     <ds-space margin-bottom="small" />
-    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" @open-user-search="showUserSearch = !showUserSearch" />
+    <chat
+      :roomId="getShowChat.showChat ? getShowChat.roomID : null"
+      @open-user-search="showUserSearch = !showUserSearch"
+    />
   </div>
 </template>
 
@@ -18,7 +21,10 @@ import AddGroupMember from '~/components/Group/AddGroupMember'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
-  components: { AddGroupMember, Chat },
+  components: {
+    AddGroupMember,
+    Chat,
+  },
   data() {
     return {
       showUserSearch: false,

From 26282c67b7bd6d44be3334342d6269068471bf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 16:41:23 +0200
Subject: [PATCH 03/21] =?UTF-8?q?Make=20user=20search=20in=20chats=20funct?=
 =?UTF-8?q?ion=20=E2=80=93=20second=20step?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Chat/AddChatRoomByUserSearch.vue          | 110 ++++++++++++++++++
 webapp/components/Chat/Chat.vue               |   2 +-
 webapp/pages/chat.vue                         |  18 +--
 3 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 webapp/components/Chat/AddChatRoomByUserSearch.vue

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
new file mode 100644
index 000000000..b5cf0fd4c
--- /dev/null
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="add-chat-room-by-user-search">
+    <!-- Wolle -->
+    <h2 class="title">{{ $t('group.addUser') }}</h2>
+    <ds-space margin-bottom="small" />
+    <ds-space>
+      <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
+      <!-- <ds-modal
+        v-if="isOpen"
+        force
+        extended
+        :confirm-label="$t('group.modal.confirm')"
+        :cancel-label="$t('group.modal.cancel')"
+        :title="$t('group.modal.confirmAddGroupMemberTitle')"
+        v-model="isOpen"
+        @close="closeModal"
+        @confirm="confirmModal"
+        @cancel="cancelModal"
+      >
+        <ds-text size="large">
+          {{ $t('group.modal.confirmAddGroupMemberText', { name: user.name }) }}
+        </ds-text>
+      </ds-modal> -->
+    </ds-space>
+  </div>
+</template>
+
+<script>
+// import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
+import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
+import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
+
+export default {
+  name: 'AddChatRoomByUserSearch',
+  components: {
+    UserTeaser,
+    SelectUserSearch,
+  },
+  props: {
+    // groupId: {
+    //   type: String,
+    //   required: true,
+    // },
+    // chatRooms: {
+    //   type: Array,
+    //   default: [],
+    // },
+  },
+  data() {
+    return {
+      id: 'search-user-to-add-to-group',
+      user: {},
+      // isOpen: false,
+    }
+  },
+  methods: {
+    // cancelModal() {
+    //   this.$refs.selectUserSearch.clear()
+    //   // this.isOpen = false
+    // },
+    // closeModal() {
+    //   this.$refs.selectUserSearch.clear()
+    //   // this.isOpen = false
+    // },
+    // confirmModal() {
+    //   this.addChatRoom()
+    //   // this.isOpen = false
+    //   this.$refs.selectUserSearch.clear()
+    // },
+    selectUser(user) {
+      this.user = user
+      // if (this.groupMembers.find((member) => member.id === this.user.id)) {
+      //   this.$toast.error(this.$t('group.errors.userAlreadyMember', { name: this.user.name }))
+      //   this.$refs.selectUserSearch.clear()
+      //   return
+      // }
+      this.$refs.selectUserSearch.clear()
+      this.$emit('close-user-search')
+      this.addChatRoom()
+    },
+    async addChatRoom() {
+      this.$emit('load-chat-rooms', 'XXX') // Wolle
+      // const newRole = 'usual'
+      // const username = this.user.name
+      // try {
+      //   await this.$apollo.mutate({
+      //     mutation: changeGroupMemberRoleMutation(),
+      //     variables: { groupId: this.groupId, userId: this.user.id, roleInGroup: newRole },
+      //   })
+      //   this.$toast.success(
+      //     this.$t('group.addMemberToGroupSuccess', {
+      //       role: this.$t(`group.roles.${newRole}`),
+      //       name: username,
+      //     }),
+      //   )
+      //   this.$emit('loadGroupMembers')
+      // } catch (error) {
+      //   this.$toast.error(error.message)
+      // }
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.add-chat-room-by-user-search {
+  background-color: white;
+  padding: $space-base;
+}
+</style>
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fccaee5b8..68abfe657 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -364,7 +364,7 @@ export default {
     },
 
     addRoom() {
-      this.$emit('open-user-search')
+      this.$emit('open-close-user-search')
     },
   },
 }
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 8d9d55e46..bdc2a1ee2 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,33 +1,34 @@
 <template>
   <div>
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
-    <add-group-member
+    <add-chat-room-by-user-search
       v-if="showUserSearch"
-      :groupId="0"
-      :groupMembers="[]"
-      @loadGroupMembers="null"
+      @load-chat-rooms="loadChatRooms"
+      @close-user-search="showUserSearch = false"
     />
+    <!-- Wolle :chatRooms="chatRooms" -->
     <ds-space margin-bottom="small" />
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
-      @open-user-search="showUserSearch = !showUserSearch"
+      @open-close-user-search="showUserSearch = !showUserSearch"
     />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import AddGroupMember from '~/components/Group/AddGroupMember'
+import AddChatRoomByUserSearch from '~/components/Chat/AddChatRoomByUserSearch'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
   components: {
-    AddGroupMember,
+    AddChatRoomByUserSearch,
     Chat,
   },
   data() {
     return {
       showUserSearch: false,
+      // chatRooms: [] // Wolle
     }
   },
   mounted() {
@@ -42,6 +43,9 @@ export default {
     ...mapMutations({
       showChat: 'chat/SET_OPEN_CHAT',
     }),
+    loadChatRooms(newChatRoomID) {
+      console.log('loadChatRooms !!! newChatRoomID: ', newChatRoomID)
+    },
   },
 }
 </script>

From 3d9a9cd5a096d4b1fbbf82b7597db53a03542b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 17:47:56 +0200
Subject: [PATCH 04/21] Create the chat room on user search in chats function

---
 .../Chat/AddChatRoomByUserSearch.vue          | 58 +------------------
 webapp/components/Chat/Chat.vue               | 36 +++++++-----
 webapp/pages/chat.vue                         |  8 ++-
 3 files changed, 28 insertions(+), 74 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index b5cf0fd4c..a9a2a5bf6 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -5,28 +5,11 @@
     <ds-space margin-bottom="small" />
     <ds-space>
       <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
-      <!-- <ds-modal
-        v-if="isOpen"
-        force
-        extended
-        :confirm-label="$t('group.modal.confirm')"
-        :cancel-label="$t('group.modal.cancel')"
-        :title="$t('group.modal.confirmAddGroupMemberTitle')"
-        v-model="isOpen"
-        @close="closeModal"
-        @confirm="confirmModal"
-        @cancel="cancelModal"
-      >
-        <ds-text size="large">
-          {{ $t('group.modal.confirmAddGroupMemberText', { name: user.name }) }}
-        </ds-text>
-      </ds-modal> -->
     </ds-space>
   </div>
 </template>
 
 <script>
-// import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
 import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
@@ -37,10 +20,6 @@ export default {
     SelectUserSearch,
   },
   props: {
-    // groupId: {
-    //   type: String,
-    //   required: true,
-    // },
     // chatRooms: {
     //   type: Array,
     //   default: [],
@@ -50,23 +29,9 @@ export default {
     return {
       id: 'search-user-to-add-to-group',
       user: {},
-      // isOpen: false,
     }
   },
   methods: {
-    // cancelModal() {
-    //   this.$refs.selectUserSearch.clear()
-    //   // this.isOpen = false
-    // },
-    // closeModal() {
-    //   this.$refs.selectUserSearch.clear()
-    //   // this.isOpen = false
-    // },
-    // confirmModal() {
-    //   this.addChatRoom()
-    //   // this.isOpen = false
-    //   this.$refs.selectUserSearch.clear()
-    // },
     selectUser(user) {
       this.user = user
       // if (this.groupMembers.find((member) => member.id === this.user.id)) {
@@ -76,27 +41,10 @@ export default {
       // }
       this.$refs.selectUserSearch.clear()
       this.$emit('close-user-search')
-      this.addChatRoom()
+      this.addChatRoom(this.user?.id)
     },
-    async addChatRoom() {
-      this.$emit('load-chat-rooms', 'XXX') // Wolle
-      // const newRole = 'usual'
-      // const username = this.user.name
-      // try {
-      //   await this.$apollo.mutate({
-      //     mutation: changeGroupMemberRoleMutation(),
-      //     variables: { groupId: this.groupId, userId: this.user.id, roleInGroup: newRole },
-      //   })
-      //   this.$toast.success(
-      //     this.$t('group.addMemberToGroupSuccess', {
-      //       role: this.$t(`group.roles.${newRole}`),
-      //       name: username,
-      //     }),
-      //   )
-      //   this.$emit('loadGroupMembers')
-      // } catch (error) {
-      //   this.$toast.error(error.message)
-      // }
+    async addChatRoom(userId) {
+      this.$emit('add-chat-room', userId)
     },
   },
 }
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 68abfe657..21843e498 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -160,22 +160,7 @@ export default {
   },
   mounted() {
     if (this.singleRoom) {
-      this.$apollo
-        .mutate({
-          mutation: createRoom(),
-          variables: {
-            userId: this.roomId,
-          },
-        })
-        .then(({ data: { CreateRoom } }) => {
-          this.fetchRooms({ room: CreateRoom })
-        })
-        .catch((error) => {
-          this.$toast.error(error)
-        })
-        .finally(() => {
-          // this.loading = false
-        })
+      this.newRoom(this.roomId)
     } else {
       this.fetchRooms()
     }
@@ -366,6 +351,25 @@ export default {
     addRoom() {
       this.$emit('open-close-user-search')
     },
+
+    newRoom(userId) {
+      this.$apollo
+        .mutate({
+          mutation: createRoom(),
+          variables: {
+            userId,
+          },
+        })
+        .then(({ data: { CreateRoom } }) => {
+          this.fetchRooms({ room: CreateRoom })
+        })
+        .catch((error) => {
+          this.$toast.error(error)
+        })
+        .finally(() => {
+          // this.loading = false
+        })
+    },
   },
 }
 </script>
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index bdc2a1ee2..a16fca5c5 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -3,13 +3,14 @@
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
     <add-chat-room-by-user-search
       v-if="showUserSearch"
-      @load-chat-rooms="loadChatRooms"
+      @add-chat-room="addChatRoom"
       @close-user-search="showUserSearch = false"
     />
     <!-- Wolle :chatRooms="chatRooms" -->
     <ds-space margin-bottom="small" />
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
+      ref="chat"
       @open-close-user-search="showUserSearch = !showUserSearch"
     />
   </div>
@@ -43,8 +44,9 @@ export default {
     ...mapMutations({
       showChat: 'chat/SET_OPEN_CHAT',
     }),
-    loadChatRooms(newChatRoomID) {
-      console.log('loadChatRooms !!! newChatRoomID: ', newChatRoomID)
+    addChatRoom(userID) {
+      console.log('addChatRoom !!! newChatRoomID: ', userID)
+      this.$refs.chat.newRoom(userID)
     },
   },
 }

From 419261229346941f99f92dbc487b36795721c290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 17:51:05 +0200
Subject: [PATCH 05/21] Fix linting

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 2 --
 webapp/components/Group/AddGroupMember.vue         | 2 --
 webapp/pages/chat.vue                              | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index a9a2a5bf6..0e7b243d8 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -11,12 +11,10 @@
 
 <script>
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
-import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
 export default {
   name: 'AddChatRoomByUserSearch',
   components: {
-    UserTeaser,
     SelectUserSearch,
   },
   props: {
diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index 2cb71f011..cc3e3b1e8 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -27,12 +27,10 @@
 <script>
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
-import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
 export default {
   name: 'AddGroupMember',
   components: {
-    UserTeaser,
     SelectUserSearch,
   },
   props: {
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index a16fca5c5..c988493c5 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -29,7 +29,7 @@ export default {
   data() {
     return {
       showUserSearch: false,
-      // chatRooms: [] // Wolle
+      // excludeUsers: [] // Wolle
     }
   },
   mounted() {
@@ -45,7 +45,6 @@ export default {
       showChat: 'chat/SET_OPEN_CHAT',
     }),
     addChatRoom(userID) {
-      console.log('addChatRoom !!! newChatRoomID: ', userID)
       this.$refs.chat.newRoom(userID)
     },
   },

From 20e6fb51222cc421ff3b6685c61fb64bb28474c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 17:59:20 +0200
Subject: [PATCH 06/21] Change headline for search user for new chat on chat
 page

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 2 +-
 webapp/locales/de.json                             | 1 +
 webapp/locales/en.json                             | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index 0e7b243d8..b5cf5a063 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="add-chat-room-by-user-search">
     <!-- Wolle -->
-    <h2 class="title">{{ $t('group.addUser') }}</h2>
+    <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
     <ds-space margin-bottom="small" />
     <ds-space>
       <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cafa030ff..372703214 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -78,6 +78,7 @@
     }
   },
   "chat": {
+    "addRoomHeadline": "Suche Nutzer für neuen Chat",
     "cancelSelectMessage": "Abbrechen",
     "conversationStarted": "Unterhaltung startete am:",
     "isOnline": "online",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 29df284bd..7e914612e 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -78,6 +78,7 @@
     }
   },
   "chat": {
+    "addRoomHeadline": "Search User for new Chat",
     "cancelSelectMessage": "Cancel",
     "conversationStarted": "Conversation started on:",
     "isOnline": "is online",
@@ -475,7 +476,7 @@
     "addMemberToGroupSuccess": "“{name}” was added to the group with the role “{role}”!",
     "addUser": "Add User",
     "addUserNoOptions": "No users found!",
-    "addUserPlaceholder": " Username",
+    "addUserPlaceholder": " User name",
     "allGroups": "All Groups",
     "button": {
       "tooltip": "Show groups"

From 6659238fa1a29f97a8bf4e0b109df1ebfae9d16f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 10:15:15 +0200
Subject: [PATCH 07/21] Add fetchRooms option & check null on content.

---
 webapp/components/Chat/Chat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index abaaf8f0c..2480b487c 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -261,7 +261,7 @@ export default {
               index: r.lastMessage?.date,
               lastMessage: {
                 ...r.lastMessage,
-                content: r.lastMessage?.content.trim().substring(0, 30),
+                content: r.lastMessage?.content?.trim().substring(0, 30),
               },
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
@@ -415,7 +415,7 @@ export default {
           },
         })
         .then(({ data: { CreateRoom } }) => {
-          this.fetchRooms({ room: CreateRoom })
+          this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
         })
         .catch((error) => {
           this.$toast.error(error)

From 858e3fdee8a2ca6de0f590bc2d052a9116c5e6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 10:40:04 +0200
Subject: [PATCH 08/21] Rename 'addRoom' to 'toggleUserSearch' in chat
 component

---
 webapp/components/Chat/Chat.vue | 13 +++++++------
 webapp/locales/en.json          |  2 +-
 webapp/pages/chat.vue           |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2480b487c..d1a60a87d 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -25,7 +25,7 @@
         @send-message="sendMessage($event.detail[0])"
         @fetch-messages="fetchMessages($event.detail[0])"
         @fetch-more-rooms="fetchRooms"
-        @add-room="addRoom"
+        @add-room="toggleUserSearch"
         @show-demo-options="showDemoOptions = $event"
       >
         <div
@@ -236,9 +236,10 @@ export default {
       commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
       commitRoomIdFromSingleRoom: 'chat/UPDATE_ROOM_ID',
     }),
-    async fetchRooms({ room, options = {} } = {}) {
-      this.roomsLoaded = options.refetch ? this.roomsLoaded : false
-      const offset = (options.refetch ? 0 : this.roomPage) * this.roomPageSize
+
+    async fetchRooms({ room } = {}) {
+      this.roomsLoaded = false
+      const offset = this.roomPage * this.roomPageSize
       try {
         const {
           data: { Room },
@@ -402,8 +403,8 @@ export default {
       return fullname.match(/\b\w/g).join('').substring(0, 3).toUpperCase()
     },
 
-    addRoom() {
-      this.$emit('open-close-user-search')
+    toggleUserSearch() {
+      this.$emit('toggle-user-search')
     },
 
     newRoom(userId) {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 7e914612e..e5bdee4fc 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -476,7 +476,7 @@
     "addMemberToGroupSuccess": "“{name}” was added to the group with the role “{role}”!",
     "addUser": "Add User",
     "addUserNoOptions": "No users found!",
-    "addUserPlaceholder": " User name",
+    "addUserPlaceholder": "User name",
     "allGroups": "All Groups",
     "button": {
       "tooltip": "Show groups"
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index c988493c5..acb186f4e 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -11,7 +11,7 @@
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
       ref="chat"
-      @open-close-user-search="showUserSearch = !showUserSearch"
+      @toggle-user-search="showUserSearch = !showUserSearch"
     />
   </div>
 </template>

From b76802f59fc4cd4339e5a4372e5d8660eb65c7a8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 11:01:18 +0200
Subject: [PATCH 09/21] Add close button and style the headline of the
 UserSearch.

---
 .../components/Chat/AddChatRoomByUserSearch.vue  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index b5cf5a063..f88b4f1e6 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="add-chat-room-by-user-search">
     <!-- Wolle -->
-    <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
+    <ds-flex class="headline">
+      <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
+      <base-button class="close-button" icon="close" circle @click="closeUserSearch"/>
+    </ds-flex>
     <ds-space margin-bottom="small" />
     <ds-space>
       <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
@@ -15,7 +18,7 @@ import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSe
 export default {
   name: 'AddChatRoomByUserSearch',
   components: {
-    SelectUserSearch,
+    SelectUserSearch
   },
   props: {
     // chatRooms: {
@@ -44,6 +47,9 @@ export default {
     async addChatRoom(userId) {
       this.$emit('add-chat-room', userId)
     },
+    closeUserSearch() {
+      this.$emit('close-user-search')
+    },
   },
 }
 </script>
@@ -53,4 +59,10 @@ export default {
   background-color: white;
   padding: $space-base;
 }
+.ds-flex.headline {
+  justify-content: space-between;
+}
+.ds-flex.headline .close-button {
+  margin-top: -6px;
+}
 </style>

From a82d245f636230be4030f1b75a5703ece532fa3f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 11:03:20 +0200
Subject: [PATCH 10/21] Change toast error to error.message.

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d1a60a87d..39dd465e2 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -419,7 +419,7 @@ export default {
           this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
         })
         .catch((error) => {
-          this.$toast.error(error)
+          this.$toast.error(error.message)
         })
         .finally(() => {
           // this.loading = false

From 13da3ba3f46482c1488fab85300d1075c183255e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 11:35:06 +0200
Subject: [PATCH 11/21] Add returned properties to the CreateRoom mutation, add
 emit to change the roomID.

---
 webapp/components/Chat/Chat.vue |  2 ++
 webapp/graphql/Rooms.js         | 12 ++++++++++++
 webapp/pages/chat.vue           |  4 ++++
 3 files changed, 18 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 39dd465e2..0cc9bc28b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -417,6 +417,8 @@ export default {
         })
         .then(({ data: { CreateRoom } }) => {
           this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
+          this.roomId = CreateRoom.id
+          this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
           this.$toast.error(error.message)
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 757a6cfa4..3433a84a7 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -5,6 +5,18 @@ export const createRoom = () => gql`
     CreateRoom(userId: $userId) {
       id
       roomId
+      roomName
+      lastMessageAt
+      unreadCount
+      #avatar
+      users {
+        _id
+        id
+        name
+        avatar {
+          url
+        }
+      }
     }
   }
 `
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index acb186f4e..96df8cc6b 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -12,6 +12,7 @@
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
       ref="chat"
       @toggle-user-search="showUserSearch = !showUserSearch"
+      :show-room="showRoom"
     />
   </div>
 </template>
@@ -47,6 +48,9 @@ export default {
     addChatRoom(userID) {
       this.$refs.chat.newRoom(userID)
     },
+    showRoom(roomId) {
+      this.showChat({ showChat: true, roomID: roomId })
+    }
   },
 }
 </script>

From dee77df5f60da57449faa72645985447d44ba6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 12:02:24 +0200
Subject: [PATCH 12/21] Cleanup

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 1 -
 webapp/pages/chat.vue                              | 2 --
 2 files changed, 3 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index f88b4f1e6..10a4d2bc4 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="add-chat-room-by-user-search">
-    <!-- Wolle -->
     <ds-flex class="headline">
       <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
       <base-button class="close-button" icon="close" circle @click="closeUserSearch"/>
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 96df8cc6b..7524bc0ad 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -6,7 +6,6 @@
       @add-chat-room="addChatRoom"
       @close-user-search="showUserSearch = false"
     />
-    <!-- Wolle :chatRooms="chatRooms" -->
     <ds-space margin-bottom="small" />
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
@@ -30,7 +29,6 @@ export default {
   data() {
     return {
       showUserSearch: false,
-      // excludeUsers: [] // Wolle
     }
   },
   mounted() {

From 883d7d89ab58f78e5524a63a071c3e826530f31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 12:04:37 +0200
Subject: [PATCH 13/21] Fix linting

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 4 ++--
 webapp/pages/chat.vue                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index 10a4d2bc4..b48120603 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -2,7 +2,7 @@
   <div class="add-chat-room-by-user-search">
     <ds-flex class="headline">
       <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
-      <base-button class="close-button" icon="close" circle @click="closeUserSearch"/>
+      <base-button class="close-button" icon="close" circle @click="closeUserSearch" />
     </ds-flex>
     <ds-space margin-bottom="small" />
     <ds-space>
@@ -17,7 +17,7 @@ import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSe
 export default {
   name: 'AddChatRoomByUserSearch',
   components: {
-    SelectUserSearch
+    SelectUserSearch,
   },
   props: {
     // chatRooms: {
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 7524bc0ad..9f93fabcb 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -48,7 +48,7 @@ export default {
     },
     showRoom(roomId) {
       this.showChat({ showChat: true, roomID: roomId })
-    }
+    },
   },
 }
 </script>

From 0b64fce5aa5dcc8043e9f694d38879490fc88cf1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 12:19:32 +0200
Subject: [PATCH 14/21] Add selectedRoom equaling the createdRoom

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 0cc9bc28b..a0c7deedd 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -417,7 +417,7 @@ export default {
         })
         .then(({ data: { CreateRoom } }) => {
           this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
-          this.roomId = CreateRoom.id
+          this.selectedRoom = CreateRoom
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {

From 624f379677623969deae1a3efe4c96fe7adc40e0 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 12:57:18 +0200
Subject: [PATCH 15/21] fix new room mechanic

---
 webapp/components/Chat/Chat.vue | 23 +++++++++++++++++++----
 webapp/graphql/Rooms.js         |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index a0c7deedd..59f3eefc3 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -260,10 +260,10 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage?.date,
-              lastMessage: {
+              lastMessage: r.lastMessage ? {
                 ...r.lastMessage,
                 content: r.lastMessage?.content?.trim().substring(0, 30),
-              },
+              }: null,
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -416,8 +416,23 @@ export default {
           },
         })
         .then(({ data: { CreateRoom } }) => {
-          this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
-          this.selectedRoom = CreateRoom
+          const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
+          const room = {...CreateRoom, index: CreateRoom.lastMessage?.date, lastMessage: CreateRoom.lastMessage ? {
+                ...CreateRoom.lastMessage,
+                content: CreateRoom.lastMessage?.content?.trim().substring(0, 30),
+              }: null,
+              users: CreateRoom.users.map((u) => {
+                return { ...u, username: u.name, avatar: u.avatar?.url }
+              })
+            }
+
+          // as long as we cannot query avatar on CreateRoom
+          room.avatar = room.users.find((u) => u.id === this.currentUser.id).avatar
+
+          if(roomIndex === -1){
+            this.rooms = [room, ...this.rooms]
+          }
+          this.fetchMessages({room, options: { refetch: true }})
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 3433a84a7..34c1b2fd6 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -23,7 +23,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: lastMessageAt_desc) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc createdAt_desc] ) {
       id
       roomId
       roomName

From 01fb28da3cae4b5050c50bcafc5a76c28918621f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:09:38 +0200
Subject: [PATCH 16/21] unify function to fix room result, propose order
 fix(not 100%)

---
 webapp/components/Chat/Chat.vue | 48 ++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 59f3eefc3..9b2c28fe5 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,17 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.push({
-              ...r,
-              index: r.lastMessage?.date,
-              lastMessage: r.lastMessage ? {
-                ...r.lastMessage,
-                content: r.lastMessage?.content?.trim().substring(0, 30),
-              }: null,
-              users: r.users.map((u) => {
-                return { ...u, username: u.name, avatar: u.avatar?.url }
-              }),
-            })
+            rms.push(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
@@ -388,6 +378,10 @@ export default {
         const changedRoom = { ...this.rooms[roomIndex] }
         changedRoom.lastMessage = createdMessage
         changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
+        // move current room to top (not 100% working)
+        // const rooms = [...this.rooms]
+        // rooms.splice(roomIndex,1)
+        // this.rooms = [changedRoom, ...rooms]
         this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)
@@ -407,6 +401,26 @@ export default {
       this.$emit('toggle-user-search')
     },
 
+    fixRoomObject(room){
+      // This fixes the room object which arrives from the backend
+      const fixedRoom = {
+        ...room,
+        index: room.lastMessage?.date,
+        lastMessage: room.lastMessage ? {
+          ...room.lastMessage,
+          content: room.lastMessage?.content?.trim().substring(0, 30),
+        }: null,
+        users: room.users.map((u) => {
+          return { ...u, username: u.name, avatar: u.avatar?.url }
+        })
+      }
+      if(!fixedRoom.avatar){
+        // as long as we cannot query avatar on CreateRoom
+        fixedRoom.avatar = fixedRoom.users.find((u) => u.id !== this.currentUser.id).avatar
+      }
+      return fixedRoom
+    },
+
     newRoom(userId) {
       this.$apollo
         .mutate({
@@ -417,17 +431,7 @@ export default {
         })
         .then(({ data: { CreateRoom } }) => {
           const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
-          const room = {...CreateRoom, index: CreateRoom.lastMessage?.date, lastMessage: CreateRoom.lastMessage ? {
-                ...CreateRoom.lastMessage,
-                content: CreateRoom.lastMessage?.content?.trim().substring(0, 30),
-              }: null,
-              users: CreateRoom.users.map((u) => {
-                return { ...u, username: u.name, avatar: u.avatar?.url }
-              })
-            }
-
-          // as long as we cannot query avatar on CreateRoom
-          room.avatar = room.users.find((u) => u.id === this.currentUser.id).avatar
+          const room = this.fixRoomObject(CreateRoom)
 
           if(roomIndex === -1){
             this.rooms = [room, ...this.rooms]

From 70a1c521650c84ef4c5e64cdf12051f311faaa93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:10:25 +0200
Subject: [PATCH 17/21] lint fixes

---
 webapp/components/Chat/Chat.vue | 20 +++++++++++---------
 webapp/graphql/Rooms.js         |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 9b2c28fe5..fedaeedba 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -401,20 +401,22 @@ export default {
       this.$emit('toggle-user-search')
     },
 
-    fixRoomObject(room){
+    fixRoomObject(room) {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
         index: room.lastMessage?.date,
-        lastMessage: room.lastMessage ? {
-          ...room.lastMessage,
-          content: room.lastMessage?.content?.trim().substring(0, 30),
-        }: null,
+        lastMessage: room.lastMessage
+          ? {
+              ...room.lastMessage,
+              content: room.lastMessage?.content?.trim().substring(0, 30),
+            }
+          : null,
         users: room.users.map((u) => {
           return { ...u, username: u.name, avatar: u.avatar?.url }
-        })
+        }),
       }
-      if(!fixedRoom.avatar){
+      if (!fixedRoom.avatar) {
         // as long as we cannot query avatar on CreateRoom
         fixedRoom.avatar = fixedRoom.users.find((u) => u.id !== this.currentUser.id).avatar
       }
@@ -433,10 +435,10 @@ export default {
           const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
           const room = this.fixRoomObject(CreateRoom)
 
-          if(roomIndex === -1){
+          if (roomIndex === -1) {
             this.rooms = [room, ...this.rooms]
           }
-          this.fetchMessages({room, options: { refetch: true }})
+          this.fetchMessages({ room, options: { refetch: true } })
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 34c1b2fd6..077d73f9a 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -23,7 +23,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc createdAt_desc] ) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc, createdAt_desc]) {
       id
       roomId
       roomName

From e2c23ad4a2fc054dab4181af80587c57f7ff86d3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:10:32 +0200
Subject: [PATCH 18/21] more lint fixes

---
 backend/src/schema/types/type/Room.gql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 0cf5b22c8..d758808bb 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -8,6 +8,7 @@
 # TODO change this to last message date
 enum _RoomOrdering {
   lastMessageAt_desc
+  createdAt_desc
 }
 
 type Room {

From 21124bcd71d925654212229783101c1867ddc8b1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 14:18:25 +0200
Subject: [PATCH 19/21] Fix: Order of rooms.

---
 webapp/components/Chat/Chat.vue | 4 ++--
 webapp/graphql/Rooms.js         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fedaeedba..dd724d200 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,7 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.push(this.fixRoomObject(r))
+            rms.unshift(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
@@ -405,7 +405,7 @@ export default {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
-        index: room.lastMessage?.date,
+        index: room.lastMessage? room.lastMessage.date : room.createdAt,
         lastMessage: room.lastMessage
           ? {
               ...room.lastMessage,
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 077d73f9a..4e9cd0209 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -7,6 +7,7 @@ export const createRoom = () => gql`
       roomId
       roomName
       lastMessageAt
+      createdAt
       unreadCount
       #avatar
       users {
@@ -29,6 +30,7 @@ export const roomQuery = () => gql`
       roomName
       avatar
       lastMessageAt
+      createdAt
       unreadCount
       lastMessage {
         _id

From 074711dd907fc216d386f78dfc9d9a1423e36664 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 14:31:57 +0200
Subject: [PATCH 20/21] Fix: order createdAt_desc & lastMessageAt_desc

---
 webapp/components/Chat/Chat.vue | 2 +-
 webapp/graphql/Rooms.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dd724d200..fd14ced6e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,7 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.unshift(this.fixRoomObject(r))
+            rms.push(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 4e9cd0209..46f089e36 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -24,7 +24,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc, createdAt_desc]) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [createdAt_desc, lastMessageAt_desc]) {
       id
       roomId
       roomName

From b26e4545629a29b2c718fbbdb031afe35c727199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 15:42:40 +0200
Subject: [PATCH 21/21] Fix linting

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fd14ced6e..c18c12a58 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -405,7 +405,7 @@ export default {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
-        index: room.lastMessage? room.lastMessage.date : room.createdAt,
+        index: room.lastMessage ? room.lastMessage.date : room.createdAt,
         lastMessage: room.lastMessage
           ? {
               ...room.lastMessage,