feat: sort addressbooks

Signed-off-by: Grigory Vodyanov <[email protected]>

Author: GVodyanov

src/components/AppNavigation/RootNavigation.vue

@@ -274,6 +274,12 @@ export default {
 			return this.$store.getters.getCircles
 		},
 		contacts() {
+			const contacts = this.$store.getters.getContacts
+			if (contacts.undefined) {
+				contacts[this.selectedContact] = contacts.undefined
+				delete contacts.undefined
+			}
+
 			return this.$store.getters.getContacts
 		},
 		groups() {
@@ -285,7 +291,7 @@ export default {
 
 		// list all the contacts that doesn't have a group
 		ungroupedContacts() {
-			return this.sortedContacts.filter(contact => this.contacts[contact.key].groups && this.contacts[contact.key].groups.length === 0)
+			return this.sortedContacts.filter(contact => this.contacts[contact.key]?.groups && this.contacts[contact.key]?.groups?.length === 0)
 		},
 
 		// check if any contact has manager, if not then is no need for organization chart menu

src/components/ContactDetails.vue

@@ -400,12 +400,12 @@ import PropertySelect from './Properties/PropertySelect.vue'
 import { generateUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
 import isTalkEnabled from '../services/isTalkEnabled.js'
-import { reactive, toRaw } from 'vue'
+import { reactive, toRaw, defineComponent } from 'vue'
 import IsMobileMixin from '../mixins/IsMobileMixin.ts'
 
 const { profileEnabled } = loadState('user_status', 'profileEnabled', false)
 
-export default {
+export default defineComponent({
 	name: 'ContactDetails',
 
 	components: {
@@ -1051,10 +1051,12 @@ export default {
 				})
 				await this.updateContact()
 				if (this.newAddressBook && this.newAddressBook !== this.contact.addressbook.id) {
+					this.updateAddressBookAccesses(this.newAddressBook)
 					this.moveContactToAddressbook(this.newAddressBook)
 					this.newAddressBook = null
 				}
 				this.editMode = false
+				await this.$store.commit('resortAddressbooks')
 			} catch (error) {
 				this.logger.error('error while saving contact', { error })
 				showError(t('contacts', 'Unable to update contact'))
@@ -1065,8 +1067,15 @@ export default {
 				})
 			}
 		},
+
+		updateAddressBookAccesses(newAddressBook) {
+			const accesses = JSON.parse(localStorage.getItem('addressbook-accesses') || '{}')
+			accesses[newAddressBook] = new Date()
+
+			localStorage.setItem('addressbook-accesses', JSON.stringify(accesses))
+		},
 	},
-}
+})
 </script>
 
 <style lang="scss" scoped>

src/components/ContactsList.vue

@@ -160,12 +160,16 @@ export default {
 
 	computed: {
 		filteredList() {
-			const contactsList = this.list
+			let contactsList = this.list
 				.filter(item => this.matchSearch(this.contacts[item.key]))
 				.map(item => this.contacts[item.key])
 
+			contactsList = contactsList.filter(item => item !== undefined)
+
 			contactsList.forEach((contact, index) => {
-				contact.isMultiSelected = this.multiSelectedContacts.has(index)
+				if (contact !== undefined) {
+					contact.isMultiSelected = this.multiSelectedContacts.has(index)
+				}
 			})
 
 			return contactsList

src/store/addressbooks.js

@@ -70,6 +70,71 @@ export function mapDavShareeToSharee(sharee) {
 	}
 }
 
+/**
+ * Sorts addressbooks by rules:
+ *  1. First group: Default personal addressbook ("contacts")
+ *  2. Second group: Recently used (based on lastUsedAddressBooks) go second, ordered from newest to oldest
+ *  3. Third group: Writeable enabled contacts, sorted by the amount of contacts they have, from more to less
+ *  4. Fourth group: Read-only enabled contacts, sorted by the amount of contacts
+ *  5. Fifth group: Disabled contacts, sorted by the amount of contacts
+ *
+ * @param {Array} addressbooks
+ * @return {Array}
+ */
+export function sortAddressbooks(addressbooks) {
+	const lastUsed = lastUsedAddressBooks(addressbooks)
+
+	return addressbooks
+		.slice()
+		.sort((a, b) => {
+			const getContactCount = (ab) => Object.keys(ab.contacts || {}).length
+
+			const getPriorityGroup = (ab) => {
+				if (ab.id === 'contacts') return 0
+				if (ab.enabled === false) return 4
+				if (lastUsed.includes(ab.id)) return 1
+				if (ab.readOnly) return 3
+				return 2
+			};
+
+			const groupA = getPriorityGroup(a)
+			const groupB = getPriorityGroup(b)
+
+			// First, sort by priority group
+			if (groupA !== groupB) {
+				return groupA - groupB
+			}
+
+			// Within the same group, apply specific sorting rules
+			if (groupA === 0) {
+				return 0
+			}
+			else if (groupA === 1) {
+				// Sort by position in lastUsed array (newest first)
+				return lastUsed.indexOf(a.id) - lastUsed.indexOf(b.id)
+			}
+			else { // Groups 2, 3, 4 - sort by contact count (descending)
+				const countA = getContactCount(a)
+				const countB = getContactCount(b)
+
+				if (countA !== countB) {
+					return countB - countA
+				}
+
+				// If contact counts are equal, sort alphabetically by ID as tiebreaker
+				return a.id.localeCompare(b.id)
+			}
+	})
+}
+
+function lastUsedAddressBooks() {
+	const accesses = JSON.parse(localStorage.getItem('addressbook-accesses') || '{}')
+
+	return Object.entries(accesses)
+		.sort(([, a], [, b]) => new Date(b) - new Date(a))
+		.map(([id]) => id)
+}
+
 const mutations = {
 
 	/**
@@ -218,6 +283,14 @@ const mutations = {
 		sharee.writeable = !sharee.writeable
 	},
 
+	/**
+	 * Needed to track indirect state changes for addressbook sorting
+	 *
+	 * @param state
+	 */
+	resortAddressbooks(state) {
+		state.addressbooks = sortAddressbooks(state.addressbooks)
+	},
 }
 
 const getters = {
@@ -246,6 +319,8 @@ const actions = {
 			context.commit('addAddressbook', addressbook)
 		})
 
+		context.commit('resortAddressbooks')
+
 		return addressbooks
 	},