(js) Make use of 'controllerAs' in Contacts module

This commit is contained in:
Francis Lachapelle
2015-05-28 13:48:45 -04:00
parent 11cf483e2c
commit 04b992e1f1
8 changed files with 473 additions and 362 deletions

View File

@@ -40,7 +40,8 @@
$$resource: new Resource(Settings.activeUser.folderURL + 'Contacts', Settings.activeUser),
$Card: Card,
$$Acl: Acl,
activeUser: Settings.activeUser
activeUser: Settings.activeUser,
selectedFolder: null
});
return AddressBook; // return constructor
@@ -156,13 +157,13 @@
* @param {object} data - attributes of addressbook
*/
AddressBook.prototype.init = function(data) {
this.$cards = [];
this.cards = [];
angular.extend(this, data);
// Add 'isOwned' and 'isSubscription' attributes based on active user (TODO: add it server-side?)
this.isOwned = AddressBook.activeUser.isSuperUser || this.owner == AddressBook.activeUser.login;
this.isSubscription = !this.isRemote && this.owner != AddressBook.activeUser.login;
this.$query = undefined;
this.$cards = [];
this.cards = [];
};
/**
@@ -172,9 +173,16 @@
* @returns a promise of the addressbook id
*/
AddressBook.prototype.$id = function() {
return this.$futureAddressBookData.then(function(data) {
return data.id;
});
if (this.id) {
// Object already unwrapped
return AddressBook.$q.when(this.id);
}
else {
// Wait until object is unwrapped
return this.$futureAddressBookData.then(function(addressbook) {
return addressbook.id;
});
}
};
/**
@@ -194,6 +202,46 @@
};
/**
* @function $reload
* @memberof AddressBook.prototype
* @desc Reload list of cards
* @returns a promise of the Cards instances
*/
AddressBook.prototype.$reload = function() {
var _this = this;
return AddressBook.$$resource.fetch(this.id, 'view')
.then(function(response) {
var index, card,
results = response.cards,
cards = _this.cards;
// Add new cards
angular.forEach(results, function(data) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data),
index = _.sortedIndex(cards, card, '$$fullname');
cards.splice(index, 0, card);
}
});
// Remove cards that no longer exist
for (index = cards.length - 1; index >= 0; index--) {
card = cards[index];
if (!_.find(results, function(data) {
return card.id == data.id;
})) {
cards.splice(index, 1);
}
}
return cards;
});
};
/**
* @function $filter
* @memberof AddressBook.prototype
* @desc Search for cards matching some criterias
@@ -203,13 +251,13 @@
*/
AddressBook.prototype.$filter = function(search, excludedCards, options) {
var _this = this,
deferred = AddressBook.$q.defer(),
params = {
search: 'name_or_address',
value: search,
sort: 'c_cn',
asc: 'true'
};
if (options) {
angular.extend(params, options);
@@ -217,65 +265,60 @@
if (!search) {
// No query specified
this.$cards = [];
deferred.resolve(this.$cards);
return deferred.promise;
return AddressBook.$q.when(this.$cards);
}
else if (this.$query == search) {
// Query hasn't changed
deferred.resolve(this.$cards);
return deferred.promise;
return AddressBook.$q.when(this.$cards);
}
}
}
this.$query = search;
this.$id().then(function(addressbookId) {
var futureAddressBookData = AddressBook.$$resource.fetch(addressbookId, 'view', params);
futureAddressBookData.then(function(response) {
var results, cards, card, index;
if (options && options.dry) {
// Don't keep a copy of the resulting cards.
// This is usefull when doing autocompletion.
cards = _this.$cards;
}
else {
cards = _this.cards;
}
if (excludedCards) {
// Remove excluded cards from results
results = _.filter(response.cards, function(data) {
return !_.find(excludedCards, function(card) {
return card.id == data.id;
});
return this.$id().then(function(addressbookId) {
return AddressBook.$$resource.fetch(addressbookId, 'view', params);
}).then(function(response) {
var results, cards, card, index;
if (options && options.dry) {
// Don't keep a copy of the resulting cards.
// This is usefull when doing autocompletion.
cards = _this.$cards;
}
else {
cards = _this.cards;
}
if (excludedCards) {
// Remove excluded cards from results
results = _.filter(response.cards, function(data) {
return !_.find(excludedCards, function(card) {
return card.id == data.id;
});
}
else {
results = response.cards;
}
// Add new cards matching the search query
angular.forEach(results, function(data) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data, search),
index = _.sortedIndex(cards, card, '$$fullname');
cards.splice(index, 0, card);
}
});
// Remove cards that no longer match the search query
for (index = cards.length - 1; index >= 0; index--) {
card = cards[index];
if (!_.find(results, function(data) {
return card.id == data.id;
})) {
cards.splice(index, 1);
}
}
else {
results = response.cards;
}
// Add new cards matching the search query
angular.forEach(results, function(data) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data, search),
index = _.sortedIndex(cards, card, '$$fullname');
cards.splice(index, 0, card);
}
deferred.resolve(cards);
}, deferred.reject);
}, deferred.reject);
return deferred.promise;
});
// Remove cards that no longer match the search query
for (index = cards.length - 1; index >= 0; index--) {
card = cards[index];
if (!_.find(results, function(data) {
return card.id == data.id;
})) {
cards.splice(index, 1);
}
}
return cards;
});
};
/**
@@ -377,21 +420,23 @@
this.$futureAddressBookData = futureAddressBookData;
// Resolve the promise
this.$futureAddressBookData.then(function(data) {
AddressBook.$timeout(function() {
_this.init(data);
// Also extend AddressBook instance from data of addressbooks list.
return AddressBook.$timeout(function() {
// Extend AddressBook instance from data of addressbooks list.
// Will inherit attributes such as isEditable and isRemote.
angular.forEach(AddressBook.$findAll(), function(o, i) {
if (o.id == _this.id) {
if (o.id == data.id) {
angular.extend(_this, o);
}
});
// Extend AddressBook instance with received data
_this.init(data);
// Instanciate Card objects
angular.forEach(_this.cards, function(o, i) {
_this.cards[i] = new AddressBook.$Card(o);
});
// Instanciate Acl object
_this.$acl = new AddressBook.$$Acl('Contacts/' + _this.id);
return _this;
});
}, function(data) {
_this.isError = true;

View File

@@ -8,16 +8,22 @@
*/
AddressBookController.$inject = ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$mdDialog', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'stateAddressbooks', 'stateAddressbook'];
function AddressBookController($state, $scope, $rootScope, $stateParams, $timeout, $mdDialog, focus, Card, AddressBook, Dialog, Settings, stateAddressbooks, stateAddressbook) {
var currentAddressbook;
var vm = this;
$rootScope.currentFolder = stateAddressbook;
$rootScope.card = null;
AddressBook.selectedFolder = stateAddressbook;
vm.selectedFolder = stateAddressbook;
vm.selectCard = selectCard;
vm.newComponent = newComponent;
vm.notSelectedComponent = notSelectedComponent;
vm.unselectCards = unselectCards;
vm.confirmDeleteSelectedCards = confirmDeleteSelectedCards;
$scope.selectCard = function(card) {
function selectCard(card) {
$state.go('app.addressbook.card.view', {addressbookId: stateAddressbook.id, cardId: card.id});
};
}
$scope.newComponent = function(ev) {
function newComponent(ev) {
$mdDialog.show({
parent: angular.element(document.body),
targetEvent: ev,
@@ -39,7 +45,7 @@
].join(''),
locals: {
state: $state,
addressbookId: $scope.currentFolder.id
addressbookId: vm.selectedFolder.id
},
controller: ComponentDialogController
});
@@ -54,27 +60,27 @@
state.go('app.addressbook.new', { addressbookId: addressbookId, contactType: type });
}
}
};
}
$scope.notSelectedComponent = function(currentCard, type) {
function notSelectedComponent(currentCard, type) {
return (currentCard.tag == type && !currentCard.selected);
};
}
$scope.unselectCards = function() {
_.each($rootScope.currentFolder.cards, function(card) { card.selected = false; });
};
function unselectCards() {
_.each(vm.selectedFolder.cards, function(card) { card.selected = false; });
}
$scope.confirmDeleteSelectedCards = function() {
function confirmDeleteSelectedCards() {
Dialog.confirm(l('Warning'),
l('Are you sure you want to delete the selected contacts?'))
.then(function() {
// User confirmed the deletion
var selectedCards = _.filter($rootScope.currentFolder.cards, function(card) { return card.selected });
$rootScope.currentFolder.$deleteCards(selectedCards);
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected });
vm.selectedFolder.$deleteCards(selectedCards);
}, function(data, status) {
// Delete failed
});
};
}
}
angular

View File

@@ -8,17 +8,27 @@
*/
AddressBooksController.$inject = ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$q', '$mdDialog', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'User', 'stateAddressbooks'];
function AddressBooksController($state, $scope, $rootScope, $stateParams, $timeout, $q, $mdDialog, focus, Card, AddressBook, Dialog, Settings, User, stateAddressbooks) {
var currentAddressbook;
var vm = this;
$scope.activeUser = Settings.activeUser;
$scope.service = AddressBook;
vm.activeUser = Settings.activeUser;
vm.service = AddressBook;
vm.select = select;
vm.newAddressbook = newAddressbook;
vm.edit = edit;
vm.revertEditing = revertEditing;
vm.save = save;
vm.confirmDelete = confirmDelete;
vm.importCards = importCards;
vm.exportCards = exportCards;
vm.share = share;
vm.subscribeToFolder = subscribeToFolder;
// $scope functions
$scope.select = function(folder) {
$scope.editMode = false;
function select(folder) {
vm.editMode = false;
$state.go('app.addressbook', {addressbookId: folder.id});
};
$scope.newAddressbook = function() {
}
function newAddressbook() {
Dialog.prompt(l('New addressbook'),
l('Name of new addressbook'))
.then(function(name) {
@@ -32,105 +42,133 @@
);
AddressBook.$add(addressbook);
});
};
$scope.edit = function(index, folder) {
}
function edit(folder) {
if (!folder.isRemote) {
$scope.editMode = folder.id;
$scope.originalAddressbook = angular.extend({}, folder.$omit());
vm.editMode = folder.id;
vm.originalAddressbook = angular.extend({}, folder.$omit());
focus('addressBookName_' + folder.id);
}
};
$scope.revertEditing = function(folder) {
folder.name = $scope.originalAddressbook.name;
$scope.editMode = false;
};
$scope.save = function(folder) {
}
function revertEditing(folder) {
folder.name = vm.originalAddressbook.name;
vm.editMode = false;
}
function save(folder) {
var name = folder.name;
if (name && name.length > 0 && name != $scope.originalAddressbook.name) {
if (name && name.length > 0 && name != vm.originalAddressbook.name) {
folder.$rename(name)
.then(function(data) {
$scope.editMode = false;
vm.editMode = false;
}, function(data, status) {
Dialog.alert(l('Warning'), data);
});
}
};
$scope.confirmDelete = function() {
if ($scope.currentFolder.isSubscription) {
}
function confirmDelete() {
if (vm.service.selectedFolder.isSubscription) {
// Unsubscribe without confirmation
$rootScope.currentFolder.$delete()
vm.service.selectedFolder.$delete()
.then(function() {
$rootScope.currentFolder = null;
vm.service.selectedFolder = null;
$state.go('app.addressbook', { addressbookId: 'personal' });
}, function(data, status) {
Dialog.alert(l('An error occured while deleting the addressbook "%{0}".',
$rootScope.currentFolder.name),
vm.service.selectedFolder.name),
l(data.error));
});
}
else {
Dialog.confirm(l('Warning'), l('Are you sure you want to delete the addressbook <em>%{0}</em>?',
$scope.currentFolder.name))
vm.service.selectedFolder.name))
.then(function() {
$rootScope.currentFolder.$delete()
.then(function() {
$rootScope.currentFolder = null;
}, function(data, status) {
Dialog.alert(l('An error occured while deleting the addressbook "%{0}".',
$rootScope.currentFolder.name),
l(data.error));
});
return vm.service.selectedFolder.$delete();
})
.then(function() {
vm.service.selectedFolder = null;
return true;
})
.catch(function(data, status) {
Dialog.alert(l('An error occured while deleting the addressbook "%{0}".',
vm.service.selectedFolder.name),
l(data.error));
});
}
};
$scope.importCards = function() {
}
};
$scope.exportCards = function() {
window.location.href = ApplicationBaseURL + '/' + $scope.currentFolder.id + '/exportFolder';
};
$scope.share = function(folder) {
if (folder.id != $scope.currentFolder.id) {
function importCards() {
}
function exportCards() {
window.location.href = ApplicationBaseURL + '/' + vm.service.selectedFolder.id + '/exportFolder';
}
function share(addressbook) {
if (addressbook.id != vm.service.selectedFolder.id) {
// Counter the possibility to click on the "hidden" secondary button
$scope.select(folder);
select(addressbook);
return;
}
$mdDialog.show({
templateUrl: $scope.currentFolder.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
controller: AddressBookACLController,
clickOutsideToClose: true,
escapeToClose: true,
locals: {
usersWithACL: $scope.currentFolder.$acl.$users(),
User: User,
stateAddressbook: $scope.currentFolder,
$q: $q
}
// Fetch list of ACL users
addressbook.$acl.$users().then(function() {
// Show ACL editor
$mdDialog.show({
templateUrl: addressbook.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
controller: AddressBookACLController,
controllerAs: 'acl',
clickOutsideToClose: true,
escapeToClose: true,
locals: {
usersWithACL: addressbook.$acl.users,
User: User,
folder: addressbook,
$q: $q
}
});
});
/**
* @ngInject
*/
AddressBookACLController.$inject = ['$scope', '$mdDialog', 'usersWithACL', 'User', 'stateAddressbook', '$q'];
function AddressBookACLController($scope, $mdDialog, usersWithACL, User, stateAddressbook, $q) {
$scope.users = usersWithACL; // ACL users
$scope.stateAddressbook = stateAddressbook;
$scope.userToAdd = '';
$scope.searchText = '';
$scope.userFilter = function($query) {
return User.$filter($query);
};
$scope.closeModal = function() {
stateAddressbook.$acl.$resetUsersRights(); // cancel changes
AddressBookACLController.$inject = ['$scope', '$mdDialog', 'usersWithACL', 'User', 'folder', '$q'];
function AddressBookACLController($scope, $mdDialog, usersWithACL, User, folder, $q) {
var vm = this;
vm.users = usersWithACL; // ACL users
vm.folder = folder;
vm.userToAdd = '';
vm.searchText = '';
vm.userFilter = userFilter;
vm.closeModal = closeModal;
vm.saveModal = saveModal;
vm.confirmChange = confirmChange;
vm.removeUser = removeUser;
vm.addUser = addUser;
vm.selectUser = selectUser;
function userFilter($query) {
return User.$filter($query, folder.$acl.users);
}
function closeModal() {
folder.$acl.$resetUsersRights(); // cancel changes
$mdDialog.hide();
};
$scope.saveModal = function() {
stateAddressbook.$acl.$saveUsersRights().then(function() {
}
function saveModal() {
folder.$acl.$saveUsersRights().then(function() {
$mdDialog.hide();
}, function(data, status) {
Dialog.alert(l('Warning'), l('An error occured please try again.'));
});
};
$scope.confirmChange = function(user) {
}
function confirmChange(user) {
var confirmation = user.$confirmRights();
if (confirmation) {
Dialog.confirm(l('Warning'), confirmation).then(function(res) {
@@ -138,48 +176,51 @@
user.$resetRights(true);
});
}
};
$scope.removeUser = function(user) {
stateAddressbook.$acl.$removeUser(user.uid).then(function() {
if (user.uid == $scope.selectedUser.uid) {
$scope.selectedUser = null;
}
function removeUser(user) {
folder.$acl.$removeUser(user.uid).then(function() {
if (user.uid == vm.selectedUser.uid) {
vm.selectedUser = null;
}
}, function(data, status) {
Dialog.alert(l('Warning'), l('An error occured please try again.'))
});
};
$scope.addUser = function(data) {
}
function addUser(data) {
if (data) {
stateAddressbook.$acl.$addUser(data).then(function() {
$scope.userToAdd = '';
$scope.searchText = '';
folder.$acl.$addUser(data).then(function() {
vm.userToAdd = '';
vm.searchText = '';
}, function(error) {
Dialog.alert(l('Warning'), error);
});
}
};
$scope.selectUser = function(user) {
}
function selectUser(user) {
// Check if it is a different user
if ($scope.selectedUser != user) {
$scope.selectedUser = user;
$scope.selectedUser.$rights();
if (vm.selectedUser != user) {
vm.selectedUser = user;
vm.selectedUser.$rights();
}
};
};
};
}
}
}
/**
* subscribeToFolder - Callback of sgSubscribe directive
*/
$scope.subscribeToFolder = function(addressbookData) {
function subscribeToFolder(addressbookData) {
console.debug('subscribeToFolder ' + addressbookData.owner + addressbookData.name);
AddressBook.$subscribe(addressbookData.owner, addressbookData.name).catch(function(data) {
Dialog.alert(l('Warning'), l('An error occured please try again.'));
});
};
}
}
angular
.module('SOGo.ContactsUI')
.controller('AddressBooksController', AddressBooksController);
.module('SOGo.ContactsUI')
.controller('AddressBooksController', AddressBooksController);
})();

View File

@@ -7,80 +7,95 @@
* Controller to view and edit a card
* @ngInject
*/
CardController.$inject = ['$scope', '$rootScope', '$timeout', 'AddressBook', 'Card', 'Dialog', 'sgFocus', '$state', '$stateParams', 'stateCard'];
function CardController($scope, $rootScope, $timeout, AddressBook, Card, Dialog, focus, $state, $stateParams, stateCard) {
$rootScope.card = stateCard;
CardController.$inject = ['$scope', '$timeout', 'AddressBook', 'Card', 'Dialog', 'sgFocus', '$state', '$stateParams', 'stateCard'];
function CardController($scope, $timeout, AddressBook, Card, Dialog, focus, $state, $stateParams, stateCard) {
var vm = this;
$scope.allEmailTypes = Card.$EMAIL_TYPES;
$scope.allTelTypes = Card.$TEL_TYPES;
$scope.allUrlTypes = Card.$URL_TYPES;
$scope.allAddressTypes = Card.$ADDRESS_TYPES;
$scope.categories = {};
$scope.userFilterResults = [];
vm.card = stateCard;
$scope.addOrgUnit = function() {
var i = $scope.card.$addOrgUnit('');
vm.currentFolder = AddressBook.selectedFolder;
vm.allEmailTypes = Card.$EMAIL_TYPES;
vm.allTelTypes = Card.$TEL_TYPES;
vm.allUrlTypes = Card.$URL_TYPES;
vm.allAddressTypes = Card.$ADDRESS_TYPES;
vm.categories = {};
vm.userFilterResults = [];
vm.addOrgUnit = addOrgUnit;
vm.addEmail = addEmail;
vm.addPhone = addPhone;
vm.addUrl = addUrl;
vm.addAddress = addAddress;
vm.addMember = addMember;
vm.userFilter = userFilter;
vm.save = save;
vm.reset = reset;
vm.cancel = cancel;
vm.confirmDelete = confirmDelete;
function addOrgUnit() {
var i = vm.card.$addOrgUnit('');
focus('orgUnit_' + i);
};
$scope.addEmail = function() {
var i = $scope.card.$addEmail('');
function addEmail() {
var i = vm.card.$addEmail('');
focus('email_' + i);
};
$scope.addPhone = function() {
var i = $scope.card.$addPhone('');
function addPhone() {
var i = vm.card.$addPhone('');
focus('phone_' + i);
};
$scope.addUrl = function() {
var i = $scope.card.$addUrl('', '');
function addUrl() {
var i = vm.card.$addUrl('', '');
focus('url_' + i);
};
$scope.addAddress = function() {
var i = $scope.card.$addAddress('', '', '', '', '', '', '', '');
function addAddress() {
var i = vm.card.$addAddress('', '', '', '', '', '', '', '');
focus('address_' + i);
};
$scope.addMember = function() {
var i = $scope.card.$addMember('');
function addMember() {
var i = vm.card.$addMember('');
focus('ref_' + i);
};
$scope.userFilter = function($query, excludedCards) {
$scope.currentFolder.$filter($query, excludedCards, {dry: true, excludeLists: true});
return $scope.currentFolder.$cards;
function userFilter($query, excludedCards) {
AddressBook.selectedFolder.$filter($query, excludedCards, {dry: true, excludeLists: true});
return AddressBook.selectedFolder.$cards;
};
$scope.save = function(form) {
function save(form) {
if (form.$valid) {
$scope.card.$save()
vm.card.$save()
.then(function(data) {
var i = _.indexOf(_.pluck($scope.currentFolder.cards, 'id'), $scope.card.id);
var i = _.indexOf(_.pluck(AddressBook.selectedFolder.cards, 'id'), vm.card.id);
if (i < 0) {
// New card; reload contacts list and show addressbook in which the card has been created
$rootScope.currentFolder = AddressBook.$find(data.pid);
AddressBook.selectedFolder.$reload();
}
else {
// Update contacts list with new version of the Card object
$rootScope.currentFolder.cards[i] = angular.copy($scope.card);
AddressBook.selectedFolder.cards[i] = angular.copy(vm.card);
}
$state.go('app.addressbook.card.view', { cardId: $scope.card.id });
}, function(data, status) {
console.debug('failed');
$state.go('app.addressbook.card.view', { cardId: vm.card.id });
})
.catch(function(err) {
console.log(err);
});
}
};
$scope.reset = function() {
$scope.card.$reset();
function reset() {
vm.card.$reset();
};
$scope.cancel = function() {
$scope.card.$reset();
if ($scope.card.isNew) {
function cancel() {
vm.card.$reset();
if (vm.card.isNew) {
// Cancelling the creation of a card
$rootScope.card = null;
$state.go('app.addressbook', { addressbookId: $scope.currentFolder.id });
vm.card = null;
$state.go('app.addressbook', { addressbookId: AddressBook.selectedFolder.id });
}
else {
// Cancelling the edition of an existing card
$state.go('app.addressbook.card.view', { cardId: $scope.card.id });
$state.go('app.addressbook.card.view', { cardId: vm.card.id });
}
};
$scope.confirmDelete = function(card) {
function confirmDelete(card) {
Dialog.confirm(l('Warning'),
l('Are you sure you want to delete the card of %{0}?', card.$fullname()))
.then(function() {
@@ -88,12 +103,12 @@
card.$delete()
.then(function() {
// Remove card from list of addressbook
$rootScope.currentFolder.cards = _.reject($rootScope.currentFolder.cards, function(o) {
AddressBook.selectedFolder.cards = _.reject(AddressBook.selectedFolder.cards, function(o) {
return o.id == card.id;
});
// Remove card object from scope
$rootScope.card = null;
$state.go('app.addressbook', { addressbookId: $scope.currentFolder.id });
vm.card = null;
$state.go('app.addressbook', { addressbookId: AddressBook.selectedFolder.id });
}, function(data, status) {
Dialog.alert(l('Warning'), l('An error occured while deleting the card "%{0}".',
card.$fullname()));