From fb9cf7559ea4e5f50f771e3fc268781b7b823d60 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 8 Sep 2022 11:59:54 +0200
Subject: [PATCH] fix updateGroup function

---
 webapp/components/Group/GroupForm.vue |  8 ++++++--
 webapp/components/Group/GroupList.vue |  1 -
 webapp/pages/group/_id.vue            |  1 -
 webapp/pages/group/edit/_id.vue       | 22 +++-------------------
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index be475a3ee..c5d997920 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -2,6 +2,8 @@
   <div>
     <ds-container>
       update: {{ update }}
+    <br />
+      this group: {{this.group}}
       <ds-form
         class="group-form"
         ref="groupForm"
@@ -89,6 +91,7 @@ export default {
     },
   },
   data() {
+    console.log('GroupForm group', this.group)
     const { name, groupType, about, description, actionRadius, categories } = this.group
     return {
       categoriesActive: this.$env.CATEGORIES_ACTIVE,
@@ -123,9 +126,10 @@ export default {
 
   methods: {
     submit() {
-      console.log('submit', this.formData)
+      console.log('submit', this.formData) 
+      const { name, about, description, actionRadius, categoryIds } = this.formData
       this.update
-        ? this.$emit('updateGroup', this.formData)
+        ? this.$emit('updateGroup', { name, about, description, actionRadius, categoryIds, id: this.group.id })
         : this.$emit('createGroup', this.formData)
     },
     reset() {
diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 0473d979e..37b365b86 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -55,7 +55,6 @@ export default {
   },
   methods: {
     editGroup(formData) {
-      console.log('GroupListedit group', formData)
       this.$router.push({ path: `/group/edit/${formData.id}` })
     },
     deleteGroup() {
diff --git a/webapp/pages/group/_id.vue b/webapp/pages/group/_id.vue
index 6e8eed4b4..77bc3adb8 100644
--- a/webapp/pages/group/_id.vue
+++ b/webapp/pages/group/_id.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     _id groupe page
-    <div>{{ $route.params }}</div>
     <nuxt-link :to="{ name: 'group-create' }">
       bearbeiten
       <ds-icon name="ellipsis-v"></ds-icon>
diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue
index 308267f13..852aaf3ba 100644
--- a/webapp/pages/group/edit/_id.vue
+++ b/webapp/pages/group/edit/_id.vue
@@ -1,11 +1,9 @@
 <template>
   <ds-flex gutter="small">
-    {{ $router }}
     <ds-flex-item :width="{ base: '100%', md: '200px' }">
       <ds-menu :routes="routes" :is-exact="() => true" />
     </ds-flex-item>
     <ds-flex-item :width="{ base: '100%', md: 1 }">
-      {{ group }}
       <transition name="slide-up" appear>
         <group-form @updateGroup="updateGroup" :group="group" :update="true" />
       </transition>
@@ -47,9 +45,6 @@ export default {
       user: 'auth/user',
     }),
   },
-  data() {
-    return {}
-  },
   async asyncData(context) {
     console.log('asyncData start')
     const {
@@ -75,23 +70,12 @@ export default {
     return { group }
   },
   methods: {
-    async updateGroup(form, context) {
-      const {
-        params: { id },
-      } = context
+    async updateGroup(value) {
+        console.log('updateGroup form', value)
       try {
         await this.$apollo.mutate({
           mutation: updateGroupMutation,
-          variables: {
-            id: id,
-            name: form.name,
-            about: form.about,
-            description: form.description,
-            // groupType: form.groupType,
-            actionRadius: form.actionRadius,
-            categoryIds: form.categoryIds,
-            // locationName: ''
-          },
+          variables: value,
           update: (_, { data: { updateGroupData } }) => {
             // const { sendNotificationEmails } = createGroup
             // this.setCreateGroup({