toggleNotification -> markNotificationsRead

This commit is contained in:
Lachlan Kermode
2018-12-05 11:27:33 +00:00
parent 3d09eb4543
commit eeb242ef87
4 changed files with 8 additions and 23 deletions

View File

@@ -123,9 +123,7 @@ class Dashboard extends React.Component {
<Notification
isNotification={this.props.ui.flags.isNotification}
notifications={this.props.domain.notifications}
onToggle={() => {
this.props.actions.toggleNotifications();
}}
onToggle={this.props.actions.markNotificationsRead}
/>
<LoadingOverlay
ui={this.props.ui.flags.isFetchingDomain}

View File

@@ -43,8 +43,8 @@ export default class Notification extends React.Component{
}
render() {
if (this.props.isNotification) {
const notificationsToRender = this.props.notifications.filter(n => !('isRead' in n && n.isRead))
if (notificationsToRender.length > 0) {
return (
<div className={`notification-wrapper`}>
{this.props.notifications.map((notification) => {

View File

@@ -39,28 +39,16 @@ function toggleInfoPopup(uiState, action) {
}
}
function toggleNotifications(uiState, action) {
return {
...uiState,
flags: {
...uiState.flags,
isNotification: !uiState.flags.isNotification
}
}
}
function ui(uiState = initial.ui, action) {
switch (action.type) {
case TOGGLE_FETCHING_DOMAIN:
return toggleFetchingDomain(uiState, action);
return toggleFetchingDomain(uiState, action)
case TOGGLE_FETCHING_SOURCES:
return toggleFetchingSources(uiState, action);
return toggleFetchingSources(uiState, action)
case TOGGLE_INFOPOPUP:
return toggleInfoPopup(uiState, action);
case TOGGLE_NOTIFICATIONS:
return toggleNotifications(uiState, action);
return toggleInfoPopup(uiState, action)
default:
return uiState;
return uiState
}
}

View File

@@ -142,8 +142,7 @@ const initial = {
isFetchingSources: false,
isCardstack: true,
isInfopopup: false,
isNotification: true
isInfopopup: false
},
tools: {
formatter: d3.timeFormat("%d %b, %H:%M"),