Skip to content

issue 1355 fixed: Error displayed when user quickly deletes items fro… #25

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

Merged
merged 1 commit into from
Sep 29, 2018
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
4 changes: 4 additions & 0 deletions __tests__/__snapshots__/index.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Object {
"addUserTrait": [Function],
"deleteUserTrait": [Function],
"getAllUserTraits": [Function],
"modifyUserTraitInit": [Function],
"updateUserTrait": [Function],
},
"smp": Object {
Expand Down Expand Up @@ -197,14 +198,17 @@ Object {
"countReset": [Function],
"debug": [Function],
"dir": [Function],
"dirxml": [Function],
"error": [Function],
"group": [Function],
"groupCollapsed": [Function],
"groupEnd": [Function],
"info": [Function],
"log": [Function],
"table": [Function],
"time": [Function],
"timeEnd": [Function],
"timeLog": [Function],
"trace": [Function],
"warn": [Function],
},
Expand Down
2 changes: 2 additions & 0 deletions src/actions/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

import { createActions } from 'redux-actions';
import _ from 'lodash';
import { getService } from '../services/user-traits';

/**
Expand Down Expand Up @@ -66,5 +67,6 @@ export default createActions({
ADD_USER_TRAIT: addUserTrait,
DELETE_USER_TRAIT: deleteUserTrait,
UPDATE_USER_TRAIT: updateUserTrait,
MODIFY_USER_TRAIT_INIT: _.noop,
},
});
32 changes: 29 additions & 3 deletions src/reducers/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ function onGetAllUserTraits(state, { error, payload }) {
};
}

/**
* Handles SETTINGS/MODIFY_USER_TRAIT_INIT action.
* @param {Object} state *
* @return {Object} New state.
*/
function onModifyUserTraitInit(state) {
return {
...state,
traitRequestCount: state.traitRequestCount + 1,
};
}

/**
* Handles SETTINGS/ADD_USER_TRAIT action.
* @param {Object} state
Expand All @@ -39,12 +51,16 @@ function onAddUserTrait(state, { error, payload }) {
if (error) {
logger.error('Failed to add user trait', payload);
fireErrorMessage('Failed to add user trait', '');
return state;
return {
...state,
traitRequestCount: state.traitRequestCount - 1,
};
}
const newData = payload.result[0];
return {
...state,
userTraits: [...state.userTraits, newData],
traitRequestCount: state.traitRequestCount - 1,
};
}

Expand All @@ -58,7 +74,10 @@ function onUpdateUserTrait(state, { error, payload }) {
if (error) {
logger.error('Failed to update user trait', payload);
fireErrorMessage('Failed to update user trait', '');
return state;
return {
...state,
traitRequestCount: state.traitRequestCount - 1,
};
}
const newData = payload.result[0];
const newUserTraits = state.userTraits.filter(trait => trait.traitId !== payload.traitId);
Expand All @@ -67,6 +86,7 @@ function onUpdateUserTrait(state, { error, payload }) {
return {
...state,
userTraits: newUserTraits,
traitRequestCount: state.traitRequestCount - 1,
};
}

Expand All @@ -80,12 +100,16 @@ function onDeleteUserTrait(state, { error, payload }) {
if (error) {
logger.error('Failed to delete user trait', payload);
fireErrorMessage('Failed to delete user trait', '');
return state;
return {
...state,
traitRequestCount: state.traitRequestCount - 1,
};
}
const newUserTraits = state.userTraits.filter(trait => trait.traitId !== payload.traitId);
return {
...state,
userTraits: newUserTraits,
traitRequestCount: state.traitRequestCount - 1,
};
}

Expand All @@ -96,11 +120,13 @@ function onDeleteUserTrait(state, { error, payload }) {
* @return {Function} userTraits reducer.
*/
function create(initialState = {
traitRequestCount: 0,
userTraits: [],
}) {
const a = actions.settings;
return handleActions({
[a.getAllUserTraits]: onGetAllUserTraits,
[a.modifyUserTraitInit]: onModifyUserTraitInit,
[a.addUserTrait]: onAddUserTrait,
[a.deleteUserTrait]: onDeleteUserTrait,
[a.updateUserTrait]: onUpdateUserTrait,
Expand Down