feat(MembersModal): Remove ties to Contacts app

We have our own membership management in Collectives now. Also show collective action to leave a collective to admins. Fixes: #779 Signed-off-by: Jonas <[email protected]>
nextcloud · Jul 25, 2023 · 162bb32 · 162bb32
1 parent f363ec3
commit 162bb32
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 66 deletions.
diff --git a/cypress/e2e/apps.spec.js b/cypress/e2e/apps.spec.js
@@ -21,16 +21,6 @@
  */
 
 describe('The apps', function() {
-	describe('Circles', function() {
-
-		it('shows circles in the contacts app', function() {
-			cy.login('jane', { route: '/apps/contacts' })
-			cy.get('.app-navigation')
-				.should('contain', 'Circles')
-		})
-
-	})
-
 	describe('Collectives', function() {
 
 		it('allows creating a new collective', function() {
@@ -65,5 +55,4 @@ describe('The apps', function() {
 		})
 
 	})
-
 })
diff --git a/src/Collectives.vue b/src/Collectives.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { showInfo, showError } from '@nextcloud/dialogs'
+import { showInfo } from '@nextcloud/dialogs'
 import { mapActions, mapGetters, mapState } from 'vuex'
 import { GET_COLLECTIVES_FOLDER, GET_COLLECTIVES, GET_TRASH_COLLECTIVES } from './store/actions.js'
 import displayError from './util/displayError.js'
@@ -66,11 +66,6 @@ export default {
 			this.getCollectivesFolder()
 			this.getTrashCollectives()
 		}
-
-		if (!this.isPublic && !('contacts' in this.OC.appswebroots)) {
-			console.error('The contacts app is required to manage members')
-			showError(t('collectives', 'The contacts app is required to manage members'))
-		}
 	},
 
 	methods: {

diff --git a/src/components/Collective/CollectiveActions.vue b/src/components/Collective/CollectiveActions.vue
@@ -8,14 +8,7 @@
 			</template>
 			{{ t('collectives', 'Manage members') }}
 		</NcActionButton>
-		<NcActionLink v-if="showManageMembers"
-			:href="circleLink">
-			<template #icon>
-				<CirclesIcon :size="20" />
-			</template>
-			{{ t('collectives', 'Manage members') }}
-		</NcActionLink>
-		<NcActionSeparator v-if="showManageMembers" />
+		<NcActionSeparator v-if="isCollectiveAdmin(collective)" />
 		<NcActionButton v-if="collectiveCanShare(collective)"
 			v-show="!isShared"
 			:close-after-click="false"
@@ -71,8 +64,7 @@
 			</template>
 			{{ t('collectives', 'Settings') }}
 		</NcActionButton>
-		<NcActionButton v-if="!isCollectiveAdmin(collective)"
-			:close-after-click="true"
+		<NcActionButton :close-after-click="true"
 			@click="leaveCollectiveWithUndo(collective)">
 			{{ t('collectives', 'Leave collective') }}
 			<template #icon>
@@ -89,7 +81,6 @@ import { showError, showUndo } from '@nextcloud/dialogs'
 import { generateUrl } from '@nextcloud/router'
 import AccountMultipleIcon from 'vue-material-design-icons/AccountMultiple.vue'
 import CheckIcon from 'vue-material-design-icons/Check.vue'
-import CirclesIcon from '../Icon/CirclesIcon.vue'
 import CogIcon from 'vue-material-design-icons/Cog.vue'
 import ContentPasteIcon from 'vue-material-design-icons/ContentPaste.vue'
 import DownloadIcon from 'vue-material-design-icons/Download.vue'
@@ -111,7 +102,6 @@ export default {
 
 	components: {
 		AccountMultipleIcon,
-		CirclesIcon,
 		CheckIcon,
 		CogIcon,
 		ContentPasteIcon,
@@ -154,14 +144,6 @@ export default {
 			'loading',
 		]),
 
-		isContactsInstalled() {
-			return 'contacts' in this.OC.appswebroots
-		},
-
-		showManageMembers() {
-			return this.isCollectiveAdmin(this.collective) && this.isContactsInstalled
-		},
-
 		circleLink() {
 			return generateUrl('/apps/contacts/direct/circle/' + this.collective.circleId)
 		},

diff --git a/src/components/Nav/CollectiveSettings.vue b/src/components/Nav/CollectiveSettings.vue
@@ -120,20 +120,6 @@
 			</div>
 		</NcAppSettingsSection>
 
-		<NcAppSettingsSection id="members" :title="t('collectives', 'Members')">
-			<div class="section-description">
-				{{ t('collectives', 'Members can be managed via the connected circle in the Contacts app.') }}
-			</div>
-			<div>
-				<NcButton v-tooltip="membersDisabledTooltip"
-					:aria-label="t('collectives', 'Open circle in Contacts')"
-					:disabled="!isContactsInstalled"
-					@click="openCircleLink">
-					{{ t('collectives', 'Open circle in Contacts') }}
-				</NcButton>
-			</div>
-		</NcAppSettingsSection>
-
 		<NcAppSettingsSection id="danger-zone" :title="t('collectives', 'Danger zone')">
 			<div>
 				<NcButton type="error" :aria-label="t('collectives', 'Delete collective')" @click="trashCollective()">
@@ -152,7 +138,6 @@ import { NcAppSettingsDialog, NcAppSettingsSection, NcButton, NcCheckboxRadioSwi
 import AlertCircleOutlineIcon from 'vue-material-design-icons/AlertCircleOutline.vue'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline.vue'
-import { generateUrl } from '@nextcloud/router'
 import {
 	RENAME_CIRCLE,
 	UPDATE_COLLECTIVE,
@@ -198,7 +183,6 @@ export default {
 
 	computed: {
 		...mapState({
-			circles: (state) => state.circles.circles,
 			pages: (state) => state.pages.pages,
 		}),
 
@@ -219,15 +203,6 @@ export default {
 				: t('collectives', 'Renaming is limited to owners of the circle')
 		},
 
-		membersDisabledTooltip() {
-			return !this.isContactsInstalled
-				&& t('collectives', 'The contacts app is required to manage members')
-		},
-
-		isContactsInstalled() {
-			return 'contacts' in this.OC.appswebroots
-		},
-
 		isNameTooShort() {
 			return !!this.newCollectiveName && this.newCollectiveName.length < 3
 		},
@@ -361,10 +336,6 @@ export default {
 			this.done('renameCollective')
 		},
 
-		openCircleLink() {
-			window.open(generateUrl('/apps/contacts/direct/circle/' + this.collective.circleId), '_blank')
-		},
-
 		/**
 		 * Trash a collective with the given name
 		 */