Add the selected contacts to a group #2763
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -26,27 +26,65 @@ | |||||
| <div class="search-contacts-field"> | ||||||
| <input v-model="query" type="text" :placeholder="t('contacts', 'Search contacts …')"> | ||||||
| </div> | ||||||
| <Actions | ||||||
| class="merge-button" | ||||||
| menu-align="right"> | ||||||
| <template v-if="selected.length >= 1"> | ||||||
| <ActionButton v-if="showAddToGroup" | ||||||
| icon="icon-clone" | ||||||
| @click="OpenMultiselect"> | ||||||
| {{ t('contacts', 'Add to group') }} | ||||||
| </ActionButton> | ||||||
| <Multiselect v-if="showSelectGroup" | ||||||
| :options="groups" | ||||||
| :taggable="true" | ||||||
| @input="addSelectedContactsToGroup" | ||||||
| @tag="addSelectedContactsToGroup" | ||||||
| @close="closeMultiselect" /> | ||||||
| </template> | ||||||
| <ActionButton v-if="selected.length >= 2" | ||||||
| :close-after-click="true" | ||||||
| icon="icon-clone" | ||||||
|
|
||||||
| @click="mergeContact"> | ||||||
| {{ t('contacts', 'Merge') }} | ||||||
| </ActionButton> | ||||||
| <ActionButton v-if="selected.length >= 1" | ||||||
| :close-after-click="true" | ||||||
| icon="icon-delete" | ||||||
|
|
||||||
| @click="deleteMultipleContact"> | ||||||
| {{ t('contacts', 'Delete') }} | ||||||
| </ActionButton> | ||||||
| </Actions> | ||||||
| </div> | ||||||
| <VirtualList ref="scroller" | ||||||
| class="contacts-list" | ||||||
| data-key="key" | ||||||
| :data-sources="filteredList" | ||||||
| :data-component="ContactsListItem" | ||||||
| :estimate-size="68" | ||||||
| :extra-props={selected} | ||||||
|
|
||||||
| @update-check-selected="selectionChanged" /> | ||||||
| </AppContentList> | ||||||
| </template> | ||||||
|
|
||||||
| <script> | ||||||
| import AppContentList from '@nextcloud/vue/dist/Components/NcAppContentList' | ||||||
| import ContactsListItem from './ContactsList/ContactsListItem' | ||||||
| import VirtualList from 'vue-virtual-scroll-list' | ||||||
| import Actions from '@nextcloud/vue/dist/Components/NcActions' | ||||||
| import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton' | ||||||
| import naturalCompare from 'string-natural-compare' | ||||||
| import Multiselect from '@nextcloud/vue/dist/Components/NcMultiselect' | ||||||
|
|
||||||
| export default { | ||||||
| name: 'ContactsList', | ||||||
|
|
||||||
| components: { | ||||||
| AppContentList, | ||||||
| VirtualList, | ||||||
| Actions, | ||||||
| ActionButton, | ||||||
| Multiselect | ||||||
|
|
||||||
| }, | ||||||
|
|
||||||
| props: { | ||||||
|
|
@@ -68,10 +106,18 @@ export default { | |||||
| return { | ||||||
| ContactsListItem, | ||||||
| query: '', | ||||||
| selected: [], | ||||||
| showGroups: false, | ||||||
| showAddToGroup: true, | ||||||
| showSelectGroup: false, | ||||||
| } | ||||||
| }, | ||||||
|
|
||||||
| computed: { | ||||||
| groups() { | ||||||
| return this.$store.getters.getGroups.slice(0).map(group => group.name) | ||||||
| .sort((a, b) => naturalCompare(a, b, { caseInsensitive: true })) | ||||||
| }, | ||||||
| selectedContact() { | ||||||
| return this.$route.params.selectedContact | ||||||
| }, | ||||||
|
|
@@ -157,6 +203,112 @@ export default { | |||||
| } | ||||||
| return true | ||||||
| }, | ||||||
| selectionChanged(newValue) { | ||||||
| if (this.selected.includes(newValue)) { | ||||||
| this.selected.splice(this.selected.indexOf(newValue), 1) | ||||||
| } else { | ||||||
| this.selected.push(newValue) | ||||||
| } | ||||||
| }, | ||||||
| deleteMultipleContact() { | ||||||
| const temp = [] | ||||||
| this.selected.forEach(element => { | ||||||
| if (this.contacts[element]) { | ||||||
| // delete contact | ||||||
| this.$store.dispatch('deleteContact', { contact: this.contacts[element] }) | ||||||
|
There was a problem hiding this comment. dispatch is async. you have to await the result and handle any possible error. |
||||||
| temp.push(this.selected.indexOf(element), 1) | ||||||
| } | ||||||
| }) | ||||||
| // delete the uid in selected of the contact deleted | ||||||
| temp.forEach(el => { | ||||||
| this.selected.splice(temp, 1) | ||||||
| }) | ||||||
| }, | ||||||
| cleanContactValue(contact, value) { | ||||||
| contact.jCal[1].forEach(element => { | ||||||
| if (element[0] === value[0] && element[3] === '' && !Array.isArray(element[3])) { | ||||||
|
There was a problem hiding this comment. where are those magic numbers from? what is the 0th element, 0th value and 3rd element? |
||||||
| contact.jCal[1].splice(contact.jCal[1].indexOf(element), 1) | ||||||
| } else if (element[0] === value[0] && Array.isArray(element[3])) { | ||||||
| let isempty = true | ||||||
| value[3].forEach(arr => { | ||||||
| if (arr !== '') { | ||||||
| isempty = false | ||||||
| } | ||||||
| }) | ||||||
|
Comment on lines
+232
to
+237
There was a problem hiding this comment. can be expressed using https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some |
||||||
| if (isempty === false) { | ||||||
| contact.jCal[1].splice(contact.jCal[1].indexOf(element), 1) | ||||||
| } | ||||||
| } | ||||||
| }) | ||||||
| }, | ||||||
| addValue(contact, jcalvalue) { | ||||||
| jcalvalue.filter(element => { | ||||||
| // exclude the unique field we don't want to add | ||||||
| return !['uid', 'version', 'fn', 'prodid', 'gender', 'rev'].includes(element[0]) | ||||||
| }).forEach(value => { | ||||||
| if (Array.isArray(value[3])) { | ||||||
| let isempty = true | ||||||
| value[3].forEach(arr => { | ||||||
|
|
||||||
| if (arr !== '') { | ||||||
| isempty = false | ||||||
| } | ||||||
| }) | ||||||
|
Comment on lines
+250
to
+255
|
||||||
| if (isempty === false) { | ||||||
| // delete blank field of the same type and push the new field | ||||||
| this.cleanContactValue(contact, value) | ||||||
| contact.jCal[1].push(value) | ||||||
| } | ||||||
| } else if (value[3] !== '') { | ||||||
|
|
||||||
| let include = false | ||||||
| contact.jCal[1].forEach(element => { | ||||||
| if (element[0] === value[0] && element[3] === value[3]) { | ||||||
| include = true | ||||||
| } | ||||||
| }) | ||||||
| if (!include) { | ||||||
| // delete blank field of the same type and push the new field | ||||||
| this.cleanContactValue(contact, value) | ||||||
| contact.jCal[1].push(value) | ||||||
| } | ||||||
| } | ||||||
| }) | ||||||
| return contact | ||||||
| }, | ||||||
| mergeContact() { | ||||||
| const firstContact = this.contacts[this.selected[0]] | ||||||
| this.selected.slice(1).forEach((element) => { | ||||||
| if (this.contacts[element]) { | ||||||
| const contactjcal = this.contacts[element].jCal[1] | ||||||
| this.addValue(firstContact, contactjcal) | ||||||
| // delete the contact merged and the uid in the selected | ||||||
| this.$store.dispatch('deleteContact', { contact: this.contacts[element] }) && this.selected.splice(this.selected.indexOf(element), 1) | ||||||
|
|
||||||
| } | ||||||
| }) | ||||||
| this.$store.dispatch('updateContact', firstContact) | ||||||
| }, | ||||||
| OpenMultiselect() { | ||||||
|
There was a problem hiding this comment.
Suggested change
camel case for methods |
||||||
| this.showAddToGroup = false | ||||||
| this.showSelectGroup = true | ||||||
| }, | ||||||
| closeMultiselect() { | ||||||
| this.showAddToGroup = true | ||||||
| this.showSelectGroup = false | ||||||
| }, | ||||||
| addSelectedContactsToGroup(value) { | ||||||
| this.selected.forEach(element => { | ||||||
| const selectedContact = this.contacts[element] | ||||||
| const data = selectedContact.groups | ||||||
| if (!data.includes(value)) { | ||||||
| this.$store.dispatch('addContactToGroup', { | ||||||
|
|
||||||
| contact: selectedContact, | ||||||
| groupName: value, | ||||||
| }) | ||||||
| data.push(value) | ||||||
| selectedContact.groups = data | ||||||
| this.$store.dispatch('updateContact', selectedContact) | ||||||
| } | ||||||
| }) | ||||||
| }, | ||||||
| }, | ||||||
| } | ||||||
| </script> | ||||||
|
|
@@ -187,4 +339,7 @@ export default { | |||||
| padding: 0 4px; | ||||||
| } | ||||||
|
|
||||||
| .merge-button { | ||||||
| float: right; | ||||||
| } | ||||||
| </style> | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
icon classes have been deprecated. please use a material icon.