Skip to content

[stable7.3] Improve filtering contacts, especially for phone numbers #4840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hamza221 merged 4 commits into from
Nov 4, 2025
Merged

[stable7.3] Improve filtering contacts, especially for phone numbers #4840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
139df7a
fix(contact): include phone numbers when getting contacts for address…
mejo- Nov 1, 2025
899d512
fix(contact): don't add metadata properties and property names to sea…
mejo- Nov 1, 2025
4bfddd2
fix(contact): Add normalized phone numbers to searchData
mejo- Nov 1, 2025
9cb45fb
fix(ContactsList): don't choke when filtering for `+`
mejo- Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/components/ContactsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
RouterMixin,
],

components: {

Check warning on line 99 in src/components/ContactsList.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

The "components" property should be above the "mixins" property on line 95
AppContentList,
NcNoteCard,
VirtualList,
Expand Down Expand Up @@ -262,12 +262,19 @@
/**
* Is this matching the current search ?
*
* @param {Contact} contact the contact to search

Check warning on line 265 in src/components/ContactsList.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

The type 'Contact' is undefined
* @return {boolean}
*/
matchSearch(contact) {
if (this.query.trim() !== '') {
return contact.searchData.toString().toLowerCase().search(this.query.trim().toLowerCase()) !== -1
try {
return contact.searchData.toString().toLowerCase().search(this.query.trim().toLowerCase()) !== -1
} catch (e) {
if (e instanceof SyntaxError) {
// this.query likely is an invalid regex (i.e. just `+`)
return contact.searchData.toString().toLowerCase().includes(this.query.trim().toLowerCase())
}
}
}
return true
},
Expand Down
18 changes: 16 additions & 2 deletions src/models/contact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const isEmpty = value => {
export const ContactKindProperties = ['KIND', 'X-ADDRESSBOOKSERVER-KIND']

export const MinimalContactProperties = [
'EMAIL', 'UID', 'CATEGORIES', 'FN', 'ORG', 'N', 'X-PHONETIC-FIRST-NAME', 'X-PHONETIC-LAST-NAME', 'X-MANAGERSNAME', 'TITLE', 'NOTE', 'RELATED',
'EMAIL', 'UID', 'TEL', 'CATEGORIES', 'FN', 'ORG', 'N', 'X-PHONETIC-FIRST-NAME', 'X-PHONETIC-LAST-NAME', 'X-MANAGERSNAME', 'TITLE', 'NOTE', 'RELATED',
].concat(ContactKindProperties)

export default class Contact {
Expand Down Expand Up @@ -580,7 +580,21 @@ export default class Contact {
* @return {string[]}
*/
get searchData() {
return this.jCal[1].map(x => x[0] + ':' + x[3])
const MinimalContactPropertiesLower = MinimalContactProperties.map((prop) => prop.toLowerCase())
const filtered = this.jCal[1]
.filter((x) => MinimalContactPropertiesLower.includes(x[0].toLowerCase()))
.map((x) => {
if (x[0].toLowerCase() === 'tel') {
return this.normalizedTels(x[3])
}
return x[3].toString()
})
return filtered
}

// support numbers in weird formats for searching e.g. +49 (0) 123 456-789
normalizedTels(number) {
return number.replace(/[^0-9+#]/g, '')
}

/**
Expand Down
Loading