From ac9be9e2a3fd74f5a02fa194273491f8b9ba67db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 28 Sep 2022 16:38:56 +0200
Subject: [PATCH] Refactor 'GroupContentMenu' component

---
 webapp/components/Group/GroupContentMenu.vue | 27 ++++++++------------
 webapp/components/Group/GroupTeaser.vue      |  7 +----
 webapp/pages/group/_id/_slug.vue             |  4 +--
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/webapp/components/Group/GroupContentMenu.vue b/webapp/components/Group/GroupContentMenu.vue
index 929232bfe..7a7737320 100644
--- a/webapp/components/Group/GroupContentMenu.vue
+++ b/webapp/components/Group/GroupContentMenu.vue
@@ -47,34 +47,27 @@ export default {
         return value.match(/(groupTeaser|groupProfile)/)
       },
     },
-    resource: { type: Object, required: true },
-    resourceType: {
-      type: String,
-      required: true,
-      validator: (value) => {
-        return value.match(/(group)/)
-      },
-    },
+    group: { type: Object, required: true },
     placement: { type: String, default: 'bottom-end' },
   },
   computed: {
     routes() {
       const routes = []
 
-      if (this.resourceType === 'group') {
+      if (this.usage !== 'groupProfile') {
         routes.push({
           label: this.$t('group.contentMenu.visitGroupPage'),
           icon: 'home',
           name: 'group-id-slug',
-          params: { id: this.resource.id, slug: this.resource.slug },
+          params: { id: this.group.id, slug: this.group.slug },
+        })
+      }
+      if (this.group.myRole === 'owner') {
+        routes.push({
+          label: this.$t('admin.settings.name'),
+          path: `/group/edit/${this.group.id}`,
+          icon: 'edit',
         })
-        if (this.resource.myRole === 'owner') {
-          routes.push({
-            label: this.$t('admin.settings.name'),
-            path: `/group/edit/${this.resource.id}`,
-            icon: 'edit',
-          })
-        }
       }
 
       return routes
diff --git a/webapp/components/Group/GroupTeaser.vue b/webapp/components/Group/GroupTeaser.vue
index 1b9ede71e..4d50c1181 100644
--- a/webapp/components/Group/GroupTeaser.vue
+++ b/webapp/components/Group/GroupTeaser.vue
@@ -58,12 +58,7 @@
         <div v-else class="categories-placeholder"></div>
         <!-- group context menu -->
         <client-only>
-          <group-content-menu
-            :usage="'groupProfile'"
-            :resourceType="'group'"
-            :resource="group"
-            :group="group"
-          />
+          <group-content-menu :usage="'groupTeaser'" :group="group || {}" placement="bottom-end" />
         </client-only>
       </footer>
       <footer class="footer">
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 6ec506e2e..22ecda4c9 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -18,10 +18,10 @@
           <!-- Menu -->
           <client-only>
             <group-content-menu
+              v-if="isGroupOwner"
               class="group-content-menu"
               :usage="'groupProfile'"
-              :resourceType="'group'"
-              :resource="group || {}"
+              :group="group || {}"
               placement="bottom-end"
             />
             <!-- TODO: implement later on -->