diff --git a/frontend/app/duck/assignments.js b/frontend/app/duck/assignments.js
index c6c7d3cda..b48e2ff45 100644
--- a/frontend/app/duck/assignments.js
+++ b/frontend/app/duck/assignments.js
@@ -5,6 +5,7 @@ import withRequestState, { RequestTypes } from './requestStateCreator';
import { createListUpdater, createItemInListUpdater } from './funcTools/tools';
import { editType, initType } from './funcTools/crud/types';
import { createInit, createEdit } from './funcTools/crud';
+import IssuesType from 'Types/issue/issuesType'
const idKey = 'id';
const name = 'assignment';
@@ -41,17 +42,20 @@ const reducer = (state = initialState, action = {}) => {
return state.mergeIn([ 'instance' ], action.instance);
case FETCH_PROJECTS.SUCCESS:
return state.set('projects', List(action.data)).set('projectsFetched', true);
- case FETCH_ASSIGNMENTS.SUCCESS:
- return state.set('list', List(action.data).map(Assignment));
+ case FETCH_ASSIGNMENTS.SUCCESS:
+ return state.set('list', List(action.data.issues).map(Assignment));
case FETCH_ASSIGNMENT.SUCCESS:
return state.set('activeIssue', Assignment({ ...action.data, users}));
case FETCH_META.SUCCESS:
- issueTypes = action.data.issueTypes;
+ issueTypes = List(action.data.issueTypes).map(IssuesType);
var issueTypeIcons = {}
- for (var i =0; i < issueTypes.length; i++) {
- issueTypeIcons[issueTypes[i].id] = issueTypes[i].iconUrl
- }
- return state.set('issueTypes', List(issueTypes))
+ // for (var i =0; i < issueTypes.length; i++) {
+ // issueTypeIcons[issueTypes[i].id] = issueTypes[i].iconUrl
+ // }
+ issueTypes.forEach(iss => {
+ issueTypeIcons[iss.id] = iss.iconUrl
+ })
+ return state.set('issueTypes', issueTypes)
.set('users', List(action.data.users))
.set('issueTypeIcons', issueTypeIcons)
case ADD_ACTIVITY.SUCCESS:
diff --git a/frontend/app/types/issue/issuesType.js b/frontend/app/types/issue/issuesType.js
index 1f0679d5a..c40864bea 100644
--- a/frontend/app/types/issue/issuesType.js
+++ b/frontend/app/types/issue/issuesType.js
@@ -2,7 +2,16 @@ import Record from 'Types/Record';
export default Record({
id: undefined,
+ color: undefined,
+ description: '',
name: undefined,
iconUrl: undefined
}, {
+ fromJS: ({ iconUrl, color, ...issueType }) => ({
+ ...issueType,
+ color,
+ iconUrl: iconUrl ?
+

:
+
,
+ }),
})