jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add mailinglist ui in the mail view

Browse Source
This commit is contained in:
Johannes Zellner
2018-04-01 21:58:12 +02:00
parent 963b1d60b5
commit 10b8e93713
3 changed files with 99 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dashboard/src/js/client.js
View File

@@ -1306,6 +1306,13 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
}).error(defaultErrorHandler(callback));
};
Client.prototype.listMailingLists = function (domain, callback) {
get('/api/v1/mail/' + domain + '/lists').success(function(data, status) {
if (status !== 200) return callback(new ClientError(status, data));
callback(null, data.lists);
}).error(defaultErrorHandler(callback));
};
Client.prototype.getMailingList = function (domain, groupId, callback) {
get('/api/v1/mail/' + domain + '/lists/' + groupId).success(function(data, status) {
if (status !== 200) return callback(new ClientError(status, data));

19
dashboard/src/views/email.html
View File

@@ -149,6 +149,25 @@
</div>
</div>
<div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
<h3>Mailinglists</h3>
</div>
<div class="card" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
<div class="row">
<div class="col-md-12">
Mailinglists or forwarders are bound to user groups. Each user in a group will receive the mails sent to this group's email address.
</div>
</div>
<br/>
<div class="row">
<div class="col-md-6">
<multiselect ng-model="mailinglists.groups" options="name for name in mailinglists.availableGroups" data-multiple="true"></multiselect>
<button class="btn btn-outline btn-primary" ng-disabled="mailinglists.busy" ng-click="mailinglists.submit()"><i class="fa fa-circle-o-notch fa-spin" ng-show="mailinglists.busy"></i> Save</button>
</div>
</div>
</div>
<div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
<h3>Catch-all</h3>
</div>

73
dashboard/src/views/email.js
View File

@@ -42,6 +42,23 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
return $scope.mailRelay.relay.provider === provider;
};
// poor man's async
function asyncForEach(items, handler, callback) {
var cur = 0;
if (items.length === 0) return callback();
(function iterator() {
handler(items[cur], function (error) {
if (error) return callback(error);
if (cur >= items.length-1) return callback();
++cur;
iterator();
});
})();
}
$scope.catchall = {
addresses: [],
availableAddresses: [],
@@ -58,6 +75,47 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
}
};
$scope.mailinglists = {
busy: false,
groups: [], // current model in the ui by name
availableGroups: [], // all available groups by name
availableGroupsFull: [], // all available groups full objects
currentGroups: [], // currently set groups in the backend for new/removed detection
submit: function () {
$scope.mailinglists.busy = true;
var removedGroups = $scope.mailinglists.currentGroups.filter(function (g) { return $scope.mailinglists.groups.indexOf(g) === -1; })
.map(function (groupName) {
return $scope.mailinglists.availableGroupsFull.find(function (g) { return g.name === groupName; });
});
var newGroups = $scope.mailinglists.groups.filter(function (g) { return $scope.mailinglists.currentGroups.indexOf(g) === -1; })
.map(function (groupName) {
return $scope.mailinglists.availableGroupsFull.find(function (g) { return g.name === groupName; });
});
asyncForEach(removedGroups, function (group, callback) {
if (!group) return callback();
Client.removeMailingList($scope.selectedDomain.domain, group.id, callback);
}, function (error) {
if (error) console.error('Unable to remove mailinglists.', error);
asyncForEach(newGroups, function (group, callback) {
if (!group) return callback();
Client.addMailingList($scope.selectedDomain.domain, group.id, callback);
}, function (error) {
if (error) console.error('Unable to remove mailinglists.', error);
// reset the state
$scope.mailinglists.currentGroups = $scope.mailinglists.groups.slice();
$scope.mailinglists.busy = false;
});
});
}
};
$scope.toggleEmailEnabled = function () {
if ($scope.selectedDomain.mailConfig.enabled) {
$scope.disableEmail();
@@ -339,6 +397,21 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
});
});
// mailinglists/groups
Client.getGroups(function (error, groups) {
if (error) return console.error(error);
$scope.mailinglists.availableGroupsFull = groups.slice();
$scope.mailinglists.availableGroups = groups.map(function (u) { return u.name; });
Client.listMailingLists($scope.selectedDomain.domain, function (error, lists) {
if (error) return console.error(error);
$scope.mailinglists.groups = lists.map(function (u) { return u.name; });
$scope.mailinglists.currentGroups = lists.map(function (u) { return u.name; });
});
});
// we will fetch the status without blocking the ui
Client.getMailStatusForDomain($scope.selectedDomain.domain, function (error, mailStatus) {
$scope.refreshBusy = false;