From bf60c418054a695c322b4737352c424539503caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 28 Sep 2022 07:22:56 +0200 Subject: [PATCH 1/8] Overtake 'GroupContentMenu' from branch '5344-add-group-members-management' --- .../components/Group/GroupContentMenu.spec.js | 35 +++++++ webapp/components/Group/GroupContentMenu.vue | 99 +++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 webapp/components/Group/GroupContentMenu.spec.js create mode 100644 webapp/components/Group/GroupContentMenu.vue diff --git a/webapp/components/Group/GroupContentMenu.spec.js b/webapp/components/Group/GroupContentMenu.spec.js new file mode 100644 index 000000000..69c13e6f0 --- /dev/null +++ b/webapp/components/Group/GroupContentMenu.spec.js @@ -0,0 +1,35 @@ +import { mount } from '@vue/test-utils' +import GroupContentMenu from './GroupContentMenu.vue' + +const localVue = global.localVue + +const propsData = { + resource: {}, + group: {}, + resourceType: 'group', +} + +describe('GroupContentMenu', () => { + let wrapper + let mocks + + beforeEach(() => { + mocks = { + $t: jest.fn(), + } + }) + + describe('mount', () => { + const Wrapper = () => { + return mount(GroupContentMenu, { propsData, mocks, localVue }) + } + + beforeEach(() => { + wrapper = Wrapper() + }) + + it('renders', () => { + expect(wrapper.findAll('.group-menu')).toHaveLength(1) + }) + }) +}) diff --git a/webapp/components/Group/GroupContentMenu.vue b/webapp/components/Group/GroupContentMenu.vue new file mode 100644 index 000000000..cfebe65a4 --- /dev/null +++ b/webapp/components/Group/GroupContentMenu.vue @@ -0,0 +1,99 @@ + + + + + From a5021486ebe4867cb6783b2415c44a058ce0f2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 28 Sep 2022 12:01:27 +0200 Subject: [PATCH 2/8] Remove 'gost' property from 'ContentMenu' button --- webapp/components/ContentMenu/ContentMenu.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue index 88d83d059..60bcccf43 100644 --- a/webapp/components/ContentMenu/ContentMenu.vue +++ b/webapp/components/ContentMenu/ContentMenu.vue @@ -7,7 +7,6 @@ icon="ellipsis-v" size="small" circle - ghost @click.prevent="toggleMenu()" /> From 1e01ccfa7184a866fb21cd2f1f19242bfae130b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 28 Sep 2022 12:02:41 +0200 Subject: [PATCH 3/8] Add 'GroupContentMenu' on group profile page --- webapp/components/Group/GroupContentMenu.vue | 9 ++++--- webapp/pages/group/_id/_slug.vue | 28 ++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/webapp/components/Group/GroupContentMenu.vue b/webapp/components/Group/GroupContentMenu.vue index cfebe65a4..97a884698 100644 --- a/webapp/components/Group/GroupContentMenu.vue +++ b/webapp/components/Group/GroupContentMenu.vue @@ -1,5 +1,5 @@