secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Suppressing broadcasts; New releases featured intro

Browse Source
This commit is contained in:
James Barnsley
2017-05-30 09:06:59 +12:00
parent 1f4d8a7c72
commit 7a97221d6f
6 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/services/ui/middleware.js
View File

@ -326,7 +326,7 @@ const UIMiddleware = (function(){
action.index = index
// If a broadcast, add to suppressed_broadcasts
if (notifications[index].type == 'broadcast'){
if (index > -1 && typeof(notifications[index]) !== 'undefined' && notifications[index].type == 'broadcast'){
store.dispatch({
type: 'SUPPRESS_BROADCAST',
key: notifications[index].key
@ -345,15 +345,17 @@ const UIMiddleware = (function(){
for (var i = 0; i < action.broadcasts.length; i++){
var broadcast = action.broadcasts[i]
if (!suppressed_broadcasts.includes(broadcast.id)){
store.dispatch(uiActions.createNotification(
broadcast.message,
'broadcast',
broadcast.id,
broadcast.title,
true
))
}
if (!suppressed_broadcasts.includes(broadcast.key)){
if (broadcast.message){
store.dispatch(uiActions.createNotification(
broadcast.message,
'broadcast',
(broadcast.key ? broadcast.key : null),
(broadcast.title ? broadcast.title : null),
true
))
}
}
}
next(action)

5
src/js/services/ui/reducer.js
View File

@ -723,11 +723,6 @@ export default function reducer(ui = {}, action){
return Object.assign({}, ui, {notifications: notifications})
case 'SUPPRESS_BROADCAST':
var suppressed_broadcasts = (typeof(ui.suppressed_broadcasts) !== 'undefined' ? ui.suppressed_broadcasts : [])
suppressed_broadcasts.push(action.key)
return Object.assign({}, ui, {suppressed_broadcasts: suppressed_broadcasts})