Merge pull request #1277 from taigaio/live-notifications

Working on live-notifications
stable
Alex Hermida 2018-04-11 16:57:40 +02:00 committed by GitHub
commit b7cbfcf542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 228 additions and 2 deletions

View File

@ -451,6 +451,8 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
{templateUrl: "user/user-change-password.html"}) {templateUrl: "user/user-change-password.html"})
$routeProvider.when("/user-settings/mail-notifications", $routeProvider.when("/user-settings/mail-notifications",
{templateUrl: "user/mail-notifications.html"}) {templateUrl: "user/mail-notifications.html"})
$routeProvider.when("/user-settings/live-notifications",
{templateUrl: "user/live-notifications.html"})
$routeProvider.when("/change-email/:email_token", $routeProvider.when("/change-email/:email_token",
{templateUrl: "user/change-email.html"}) {templateUrl: "user/change-email.html"})
$routeProvider.when("/cancel-account/:cancel_token", $routeProvider.when("/cancel-account/:cancel_token",

View File

@ -124,6 +124,7 @@ urls = {
"user-settings-user-change-password": "/user-settings/user-change-password" "user-settings-user-change-password": "/user-settings/user-change-password"
"user-settings-user-avatar": "/user-settings/user-avatar" "user-settings-user-avatar": "/user-settings/user-avatar"
"user-settings-mail-notifications": "/user-settings/mail-notifications" "user-settings-mail-notifications": "/user-settings/mail-notifications"
"user-settings-live-notifications": "/user-settings/live-notifications"
"user-settings-contrib": "/user-settings/contrib/:plugin" "user-settings-contrib": "/user-settings/contrib/:plugin"
} }

View File

@ -87,6 +87,35 @@ class EventsService
@liveAnnouncementService.show(data.title, data.desc) @liveAnnouncementService.show(data.title, data.desc)
@rootScope.$digest() @rootScope.$digest()
liveNotifications: ->
userId = @.auth.userData.get('id')
subscribe = () =>
@.subscribe null, "live_notifications.#{userId}", (data) =>
notification = new Notification(data.title, {
icon: "/#{window._version}/images/favicon.png",
body: data.body,
tag: data.id
})
notification.onshow = () =>
if data.timeout and data.timeout > 0
setTimeout =>
notification.close()
,
data.timeout
if data.url
notification.onclick = () =>
window.open data.url
if !Notification
console.log("This browser does not support desktop notification")
else if Notification.permission == "granted"
subscribe()
else if Notification.permission != 'denied'
Notification.requestPermission (permission) =>
if (permission == "granted")
subscribe()
########################################### ###########################################
# Heartbeat (Ping - Pong) # Heartbeat (Ping - Pong)
########################################### ###########################################
@ -216,6 +245,7 @@ class EventsService
@.sendMessage(message) @.sendMessage(message)
@.startHeartBeatMessages() @.startHeartBeatMessages()
@.notifications() @.notifications()
@.liveNotifications()
onMessage: (event) -> onMessage: (event) ->
@.log.debug "WebSocket message received: #{event.data}" @.log.debug "WebSocket message received: #{event.data}"

View File

@ -0,0 +1,155 @@
###
# Copyright (C) 2014-2017 Andrey Antukh <niwi@niwi.nz>
# Copyright (C) 2014-2017 Jesús Espino Garcia <jespinog@gmail.com>
# Copyright (C) 2014-2017 David Barragán Merino <bameda@dbarragan.com>
# Copyright (C) 2014-2017 Alejandro Alonso <alejandro.alonso@kaleidos.net>
# Copyright (C) 2014-2017 Juan Francisco Alcántara <juanfran.alcantara@kaleidos.net>
# Copyright (C) 2014-2017 Xavi Julian <xavier.julian@kaleidos.net>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# File: modules/user-settings/live-notifications.coffee
###
taiga = @.taiga
mixOf = @.taiga.mixOf
bindOnce = @.taiga.bindOnce
module = angular.module("taigaUserSettings")
#############################################################################
## User settings Controller
#############################################################################
class UserLiveNotificationsController extends mixOf(taiga.Controller, taiga.PageMixin)
@.$inject = [
"$scope",
"$rootScope",
"$tgRepo",
"$tgConfirm",
"$tgResources",
"$routeParams",
"$q",
"$tgLocation",
"$tgNavUrls",
"$tgAuth",
"tgErrorHandlingService"
]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @navUrls, @auth, @errorHandlingService) ->
@scope.sectionName = "USER_SETTINGS.NOTIFICATIONS.LIVE_SECTION_NAME"
@scope.user = @auth.getUser()
promise = @.loadInitialData()
promise.then null, @.onInitialDataError.bind(@)
loadInitialData: ->
return @rs.notifyPolicies.list().then (notifyPolicies) =>
@scope.notifyPolicies = notifyPolicies
return notifyPolicies
module.controller("UserLiveNotificationsController", UserLiveNotificationsController)
#############################################################################
## User Notifications Directive
#############################################################################
UserLiveNotificationsDirective = () ->
link = ($scope, $el, $attrs) ->
$scope.$on "$destroy", ->
$el.off()
return {link:link}
module.directive("tgUserLiveNotifications", UserLiveNotificationsDirective)
#############################################################################
## User Notifications List Directive
#############################################################################
UserLiveNotificationsListDirective = ($repo, $confirm, $compile) ->
template = _.template("""
<% _.each(notifyPolicies, function (notifyPolicy, index) { %>
<div class="policy-table-row" data-index="<%- index %>">
<div class="policy-table-project"><span><%- notifyPolicy.project_name %></span></div>
<div class="policy-table-all">
<fieldset>
<input type="radio"
name="policy-<%- notifyPolicy.id %>" id="policy-all-<%- notifyPolicy.id %>"
value="2" <% if (notifyPolicy.live_notify_level == 2) { %>checked="checked"<% } %>/>
<label for="policy-all-<%- notifyPolicy.id %>"
translate="USER_SETTINGS.NOTIFICATIONS.OPTION_ALL"></label>
</fieldset>
</div>
<div class="policy-table-involved">
<fieldset>
<input type="radio"
name="policy-<%- notifyPolicy.id %>" id="policy-involved-<%- notifyPolicy.id %>"
value="1" <% if (notifyPolicy.live_notify_level == 1) { %>checked="checked"<% } %> />
<label for="policy-involved-<%- notifyPolicy.id %>"
translate="USER_SETTINGS.NOTIFICATIONS.OPTION_INVOLVED"></label>
</fieldset>
</div>
<div class="policy-table-none">
<fieldset>
<input type="radio"
name="policy-<%- notifyPolicy.id %>" id="policy-none-<%- notifyPolicy.id %>"
value="3" <% if (notifyPolicy.live_notify_level == 3) { %>checked="checked"<% } %> />
<label for="policy-none-<%- notifyPolicy.id %>"
translate="USER_SETTINGS.NOTIFICATIONS.OPTION_NONE"></label>
</fieldset>
</div>
</div>
<% }) %>
""")
link = ($scope, $el, $attrs) ->
render = ->
$el.off()
ctx = {notifyPolicies: $scope.notifyPolicies}
html = template(ctx)
$el.html($compile(html)($scope))
$el.on "change", "input[type=radio]", (event) ->
target = angular.element(event.currentTarget)
policyIndex = target.parents(".policy-table-row").data('index')
policy = $scope.notifyPolicies[policyIndex]
prev_level = policy.live_notify_level
policy.live_notify_level = parseInt(target.val(), 10)
onSuccess = ->
$confirm.notify("success")
onError = ->
$confirm.notify("error")
target.parents(".policy-table-row")
.find("input[value=#{prev_level}]")
.prop("checked", true)
$repo.save(policy).then(onSuccess, onError)
$scope.$on "$destroy", ->
$el.off()
bindOnce($scope, $attrs.ngModel, render)
return {link:link}
module.directive("tgUserLiveNotificationsList", ["$tgRepo", "$tgConfirm", "$compile",
UserLiveNotificationsListDirective])

View File

@ -1370,6 +1370,7 @@
"SAVED": "Our Oompa Loompas saved all your changes!", "SAVED": "Our Oompa Loompas saved all your changes!",
"CLOSE": "Close notification", "CLOSE": "Close notification",
"MAIL": "Notifications By Mail", "MAIL": "Notifications By Mail",
"DESKTOP": "Messages by desktop notifications",
"ASK_DELETE": "Are you sure you want to delete?" "ASK_DELETE": "Are you sure you want to delete?"
}, },
"CANCEL_ACCOUNT": { "CANCEL_ACCOUNT": {
@ -1485,9 +1486,11 @@
"SECTION_TITLE": "User Settings", "SECTION_TITLE": "User Settings",
"USER_PROFILE": "User profile", "USER_PROFILE": "User profile",
"CHANGE_PASSWORD": "Change password", "CHANGE_PASSWORD": "Change password",
"EMAIL_NOTIFICATIONS": "Email notifications" "EMAIL_NOTIFICATIONS": "Email notifications",
"DESKTOP_NOTIFICATIONS": "Desktop notifications"
}, },
"NOTIFICATIONS": { "NOTIFICATIONS": {
"LIVE_SECTION_NAME": "Desktop Notifications",
"SECTION_NAME": "Email Notifications", "SECTION_NAME": "Email Notifications",
"COLUMN_PROJECT": "Project", "COLUMN_PROJECT": "Project",
"COLUMN_RECEIVE_ALL": "Receive All", "COLUMN_RECEIVE_ALL": "Receive All",

View File

@ -122,6 +122,7 @@ Resource = (urlsService, http, paginateResponseService) ->
service.watchProject = (projectId, notifyLevel) -> service.watchProject = (projectId, notifyLevel) ->
data = { data = {
notify_level: notifyLevel notify_level: notifyLevel
live_notify_level: notifyLevel
} }
url = urlsService.resolve("project-watch", projectId) url = urlsService.resolve("project-watch", projectId)
return http.post(url, data) return http.post(url, data)

View File

@ -10,6 +10,9 @@ section.admin-menu
li#usersettingsmenu-mail-notifications li#usersettingsmenu-mail-notifications
a(href="", tg-nav="user-settings-mail-notifications", title="{{ 'USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS' | translate }}") a(href="", tg-nav="user-settings-mail-notifications", title="{{ 'USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS' | translate }}")
span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS") span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS")
li#usersettingsmenu-live-notifications
a(href="", tg-nav="user-settings-live-notifications", title="{{ 'USER_SETTINGS.MENU.DESKTOP_NOTIFICATIONS' | translate }}")
span.title(translate="USER_SETTINGS.MENU.DESKTOP_NOTIFICATIONS")
li#usersettings-contrib(ng-repeat="plugin in userSettingsPlugins") li#usersettings-contrib(ng-repeat="plugin in userSettingsPlugins")
a( a(
href="" href=""

View File

@ -0,0 +1,12 @@
section.policy-table
div.policy-table-header
div.policy-table-row
div.policy-table-project
span(translate="USER_SETTINGS.NOTIFICATIONS.COLUMN_PROJECT")
div.policy-table-all
span(translate="USER_SETTINGS.NOTIFICATIONS.COLUMN_RECEIVE_ALL")
div.policy-table-involved
span(translate="USER_SETTINGS.NOTIFICATIONS.COLUMN_ONLY_INVOLVED")
div.policy-table-none
span(translate="USER_SETTINGS.NOTIFICATIONS.COLUMN_NO_NOTIFICATIONS")
div.policy-table-body(tg-user-live-notifications-list, ng-model="notifyPolicies")

View File

@ -0,0 +1,19 @@
doctype html
div.wrapper(
tg-user-live-notifications
ng-controller="UserLiveNotificationsController as ctrl",
ng-init="section='live-notifications'"
)
sidebar.menu-secondary.sidebar.settings-nav(tg-user-settings-navigation="live-notifications")
include ../includes/modules/user-settings-menu
section.main.admin-common
header
h1
span.green {{sectionName | translate}}
p.total(translate="NOTIFICATION.DESKTOP")
include ../includes/modules/user-settings/live-notifications-table