d1fea9ec0a
* Move notification texts to a slightly different layer (#4572) * Further Simplify/refactor the actions/notification layer (#4573) 1. Move the 'with-feedback' actions to a 'with-blocking-action' mixin which better describes what it does 2. Additional set of unit tests almost over the entire layer to prove things work/add confidence for further changes The multiple 'with-action' mixins used for every 'index/edit' combo are now reduced down to only contain the functionality related to their specific routes, i.e. where to redirect. The actual functionality to block and carry out the action and then notify are 'almost' split out so that their respective classes/objects do one thing and one thing 'well'. Mixins are chosen for the moment as the decoration approach used by mixins feels better than multiple levels of inheritence, but I would like to take this fuether in the future to a 'compositional' based approach. There is still possible further work to be done here, but I'm a lot happier now this is reduced down into separate parts.
49 lines
1.4 KiB
JavaScript
49 lines
1.4 KiB
JavaScript
import Service, { inject as service } from '@ember/service';
|
|
import { get, set } from '@ember/object';
|
|
import callableType from 'consul-ui/utils/callable-type';
|
|
|
|
const TYPE_SUCCESS = 'success';
|
|
const TYPE_ERROR = 'error';
|
|
const defaultStatus = function(type, obj) {
|
|
return type;
|
|
};
|
|
export default Service.extend({
|
|
notify: service('flashMessages'),
|
|
logger: service('logger'),
|
|
execute: function(handle, action, status = defaultStatus, controller) {
|
|
set(controller, 'isLoading', true);
|
|
const getAction = callableType(action);
|
|
const getStatus = callableType(status);
|
|
const notify = get(this, 'notify');
|
|
return (
|
|
handle()
|
|
//TODO: pass this through to getAction..
|
|
.then(target => {
|
|
notify.add({
|
|
type: getStatus(TYPE_SUCCESS),
|
|
// here..
|
|
action: getAction(),
|
|
});
|
|
})
|
|
.catch(e => {
|
|
get(this, 'logger').execute(e);
|
|
if (e.name === 'TransitionAborted') {
|
|
notify.add({
|
|
type: getStatus(TYPE_SUCCESS),
|
|
// and here
|
|
action: getAction(),
|
|
});
|
|
} else {
|
|
notify.add({
|
|
type: getStatus(TYPE_ERROR, e),
|
|
action: getAction(),
|
|
});
|
|
}
|
|
})
|
|
.finally(function() {
|
|
set(controller, 'isLoading', false);
|
|
})
|
|
);
|
|
},
|
|
});
|