From c2f760491827f2c7bce8a336fedcf07f20b0bfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 18 Sep 2022 19:44:40 +0200
Subject: [PATCH] Fix 'groupQuery' GQL on group edit page

- Fix links 'group/my-groups' to 'my-groups'.
- Fix 'createGroupMutation' to be used as a function on group create page.
---
 webapp/components/Group/GroupForm.vue | 2 +-
 webapp/graphql/groups.js              | 2 +-
 webapp/pages/group/create.vue         | 2 +-
 webapp/pages/group/edit/_id.vue       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index d79349fda..8a9638b1a 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -60,7 +60,7 @@
         </ds-space>
       </ds-form>
       <ds-space centered v-show="!update">
-        <nuxt-link to="/group/my-groups">zurück</nuxt-link>
+        <nuxt-link to="/my-groups">zurück</nuxt-link>
       </ds-space>
     </ds-container>
   </div>
diff --git a/webapp/graphql/groups.js b/webapp/graphql/groups.js
index 5a1a2622c..5ee5869ce 100644
--- a/webapp/graphql/groups.js
+++ b/webapp/graphql/groups.js
@@ -143,7 +143,7 @@ export const changeGroupMemberRoleMutation = () => {
 // ------ queries
 
 export const groupQuery = (i18n) => {
-  const lang = i18n.locale().toUpperCase()
+  const lang = i18n ? i18n.locale().toUpperCase() : 'EN'
   return gql`
     query ($isMember: Boolean, $id: ID, $slug: String) {
       Group(isMember: $isMember, id: $id, slug: $slug) {
diff --git a/webapp/pages/group/create.vue b/webapp/pages/group/create.vue
index 1c95fffbc..b7bde3b3d 100644
--- a/webapp/pages/group/create.vue
+++ b/webapp/pages/group/create.vue
@@ -33,7 +33,7 @@ export default {
       const variables = { name, about, description, groupType, actionRadius, categoryIds }
       try {
         await this.$apollo.mutate({
-          mutation: createGroupMutation,
+          mutation: createGroupMutation(),
           variables,
         })
         this.$toast.success(this.$t('group.group-created'))
diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue
index 325788302..3bea8e6c3 100644
--- a/webapp/pages/group/edit/_id.vue
+++ b/webapp/pages/group/edit/_id.vue
@@ -12,7 +12,7 @@
       </ds-flex-item>
     </ds-flex>
     <ds-space centered>
-      <nuxt-link to="/group/my-groups">zurück</nuxt-link>
+      <nuxt-link to="/my-groups">zurück</nuxt-link>
     </ds-space>
   </div>
 </template>
@@ -51,7 +51,7 @@ export default {
         Group: [group],
       },
     } = await client.query({
-      query: groupQuery(this.$i18n),
+      query: groupQuery(), // "this.$i18n" is undefined here, so we use default lang
       variables: { id },
     })
     if (group.myRole !== 'owner') {