Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #1195 : added task functionality #1196

Merged
merged 2 commits into from
Oct 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions web/client/actions/__tests__/tasks-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/**
* Copyright 2015, GeoSolutions Sas.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

var expect = require('expect');
var {
taskSuccess,
taskStarted,
taskError,
TASK_STARTED,
TASK_SUCCESS,
TASK_ERROR
} = require('../tasks');

describe('Test correctness of the tasks actions', () => {
it('test taskSuccess action', () => {
let result = {value: "true"};
let name = "myName";
let actionPayload = null;
const retVal = taskSuccess(result, name, actionPayload);
expect(retVal).toExist();
expect(retVal.type).toBe(TASK_SUCCESS);
expect(retVal.result).toBe(result);
expect(retVal.name).toBe(name);
expect(retVal.actionPayload).toBe(null);
});

it('test taskError action', () => {
let error = {value: "true"};
let name = "myName";
let actionPayload = null;
const retVal = taskError(error, name, actionPayload);
expect(retVal).toExist();
expect(retVal.type).toBe(TASK_ERROR);
expect(retVal.error).toBe(error);
expect(retVal.name).toBe(name);
expect(retVal.actionPayload).toBe(null);
});


it('test taskStarted action', () => {
let name = "myName";
const retVal = taskStarted(name);
expect(retVal).toExist();
expect(retVal.type).toBe(TASK_STARTED);
expect(retVal.name).toBe(name);
});
});
49 changes: 49 additions & 0 deletions web/client/actions/tasks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/**
* Copyright 2016, GeoSolutions Sas.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/
const TASK_STARTED = 'TASK_STARTED';
const TASK_SUCCESS = 'TASK_SUCCESS';
const TASK_ERROR = 'TASK_ERROR';

function taskSuccess(result, name, actionPayload) {
return {
type: TASK_SUCCESS,
result,
name,
actionPayload
};
}

function taskStarted(name) {
return {
type: TASK_STARTED,
name
};
}

function taskError(error, name, actionPayload) {
return {
type: TASK_ERROR,
error,
name,
actionPayload
};
}

function startTask(task, taskPayload, name, actionPayload) {
return (dispatch) => {
dispatch(taskStarted(name));
task(taskPayload, (result) => {
dispatch(taskSuccess(result, name, actionPayload));
}, (error) => {
dispatch(taskError(error, name, actionPayload));
});
};
}


module.exports = {TASK_STARTED, TASK_SUCCESS, TASK_ERROR, startTask, taskSuccess, taskError, taskStarted};
62 changes: 62 additions & 0 deletions web/client/reducers/__tests__/tasks-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/**
* Copyright 2016, GeoSolutions Sas.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/
var expect = require('expect');

var {TASK_STARTED, TASK_SUCCESS, TASK_ERROR } = require('../../actions/tasks');
var tasks = require('../tasks');

describe('Test the tasks reducer', () => {

it('test tasks started', () => {
let name = 'started';
let testAction = {
type: TASK_STARTED,
name: name
};
let state = tasks({}, testAction);
expect(state).toExist();

expect(state[name].running).toBe(true);
});

it('test tasks success', () => {
let result = {value: "true"};
let actionPayload = null;

let name = 'started';
let testAction = {
type: TASK_SUCCESS,
name,
result,
actionPayload
};
let state = tasks({}, testAction);
expect(state[name].name).toBe(name);
expect(state[name].actionPayload).toBe(actionPayload);
expect(state[name].result).toBe(result);
});

it('test task error', () => {
let name = 'started';
let error = {value: "true"};
let actionPayload = null;

let testAction = {
type: TASK_ERROR,
name: name,
error,
actionPayload
};

let state = tasks({}, testAction);
expect(state[name].name).toBe(name);
expect(state[name].actionPayload).toBe(actionPayload);
expect(state[name].error).toBe(error);
});

});
48 changes: 48 additions & 0 deletions web/client/reducers/tasks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* Copyright 2016, GeoSolutions Sas.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

var { TASK_STARTED, TASK_SUCCESS, TASK_ERROR } = require('../actions/tasks');
var assign = require('object-assign');

function tasks(state = {}, action) {
switch (action.type) {
case TASK_STARTED: {
return assign({}, state, {
[action.name]: {
running: true
}
});
}
case TASK_SUCCESS: {
return assign({}, state, {
[action.name]: {
actionPayload: action.actionPayload,
name: action.name,
result: action.result,
running: false,
success: true
}
});
}
case TASK_ERROR: {
return assign({}, state, {
[action.name]: {
actionPayload: action.actionPayload,
error: action.error,
name: action.name,
running: false,
success: false
}
});
}
default:
return state;
}
}

module.exports = tasks;