Merge pull request #4236 from nextcloud/fix/circlesRouting

Add proper routing for circles, removing the import button when not needed
nextcloud · Jan 20, 2025 · baae7ad · baae7ad
2 parents 84abda7 + a0a80c9
commit baae7ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/models/circle.ts b/src/models/circle.ts
@@ -6,7 +6,7 @@
 import Vue from 'vue'
 import Member from './member'
 
-import { CircleConfigs, MemberLevels } from './constants'
+import { CircleConfigs, MemberLevels, ROUTE_CIRCLE } from './constants'
 
 type MemberList = Record<string, Member>
 
@@ -303,7 +303,7 @@ export default class Circle {
 	get router() {
 		return {
 			name: 'circle',
-			params: { selectedCircle: this.id },
+			params: { selectedCircle: this.id, selectedGroup: ROUTE_CIRCLE },
 		}
 	}
 

diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
@@ -11,7 +11,7 @@
 			:selected-group="selectedGroup"
 			:selected-contact="selectedContact">
 			<div class="import-and-new-contact-buttons">
-				<SettingsImportContacts v-if="!loadingContacts && isEmptyGroup && !isChartView" />
+				<SettingsImportContacts v-if="!loadingContacts && isEmptyGroup && !isChartView && !isCirclesView" />
 				<!-- new-contact-button -->
 				<Button v-if="!loadingContacts"
 					type="secondary"
@@ -146,6 +146,9 @@ export default {
 		groups() {
 			return this.$store.getters.getGroups
 		},
+		circles() {
+			return this.$store.getters.getCircles
+		},
 		orderKey() {
 			return this.$store.getters.getOrderKey
 		},
@@ -193,6 +196,8 @@ export default {
 				return this.sortedContacts
 			} else if (this.selectedGroup === GROUP_NO_GROUP_CONTACTS) {
 				return this.ungroupedContacts.map(contact => this.sortedContacts.find(item => item.key === contact.key))
+			} else if (this.selectedGroup === ROUTE_CIRCLE) {
+				return []
 			}
 			const group = this.groups.filter(group => group.name === this.selectedGroup)[0]
 			if (group) {
@@ -201,6 +206,10 @@ export default {
 			return []
 		},
 
+		isCirclesView() {
+			return this.selectedGroup === ROUTE_CIRCLE
+		},
+
 		ungroupedContacts() {
 			return this.sortedContacts.filter(contact => this.contacts[contact.key].groups && this.contacts[contact.key].groups.length === 0)
 		},