Skip to content

Commit e547dde

Browse files
author
William Hou
committed
fix disasters ui notifications
1 parent 4a329a9 commit e547dde

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

SingularityUI/app/actions/api/base.es6

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ export function buildApiAction(actionName, opts = {}, keyFunc = undefined) {
8989
return Promise.resolve();
9090
}
9191
if (response.headers.get('Content-Type') === 'application/json') {
92+
// void response cannot be parsed as JSON
93+
if (response.headers.get('Content-Length') === '0') {
94+
return Promise.resolve();
95+
}
96+
9297
return response.json();
9398
}
9499
return response.text();

SingularityUI/app/components/disasters/LiveConfiguration.jsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ function mapDispatchToProps(dispatch) {
8484
return {
8585
enableRackSensitivity: () => dispatch(EnableRackSensitivity.trigger()).then(() => {
8686
Messenger().info({
87-
message: `Enabled rack sensitivity.`
87+
message: `Enabled rack sensitivity.`,
88+
hideAfter: 5,
8889
});
8990
}),
9091
disableRackSensitivity: () => dispatch(DisableRackSensitivity.trigger()).then(() => {
9192
Messenger().info({
92-
message: `Disabled rack sensitivity.`
93+
message: `Disabled rack sensitivity.`,
94+
hideAfter: 5,
9395
});
9496
}),
9597
overridePlacementStrategy: strategy => dispatch(OverridePlacementStrategy.trigger(strategy)).then(() => {
@@ -98,7 +100,8 @@ function mapDispatchToProps(dispatch) {
98100
: `Cleared default placement strategy override`;
99101

100102
Messenger().info({
101-
message
103+
message,
104+
hideAfter: 5,
102105
});
103106
}),
104107
}

SingularityUI/app/reducers/api/index.es6

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'underscore';
22
import { combineReducers } from 'redux';
3+
import Messenger from 'messenger';
34
import buildApiActionReducer from './base';
45
import buildKeyedApiActionReducer from './keyed';
56

0 commit comments

Comments
 (0)