diff --git a/frontend/app/components/Session_/Issues/IssueForm.js b/frontend/app/components/Session_/Issues/IssueForm.js index 365c367d9..81dda0504 100644 --- a/frontend/app/components/Session_/Issues/IssueForm.js +++ b/frontend/app/components/Session_/Issues/IssueForm.js @@ -7,7 +7,8 @@ import { addActivity, init, edit, fetchAssignments, fetchMeta } from 'Duck/assig const SelectedValue = ({ icon, text }) => { return(
- + {/* */} + { icon } { text }
) @@ -52,8 +53,9 @@ class IssueForm extends React.PureComponent { const { creating, projects, users, issueTypes, instance, closeHandler, metaLoading } = this.props; const projectOptions = projects.map(({name, id}) => ({text: name, value: id })).toArray(); const userOptions = users.map(({name, id}) => ({text: name, value: id })).toArray(); - const issueTypeOptions = issueTypes.map(({name, id, iconUrl }) => { - return {text: name, value: id, iconUrl, icon: } + + const issueTypeOptions = issueTypes.map(({name, id, iconUrl, color }) => { + return {text: name, value: id, iconUrl, color } }).toArray(); const selectedIssueType = issueTypes.filter(issue => issue.id == instance.issueType).first(); @@ -80,6 +82,7 @@ class IssueForm extends React.PureComponent { { {/* */} {/* */}
- + { typeIcon } + {/* */} { issue.id } {/*
{ '@ 00:13 Secs'}
*/} { assignee && diff --git a/frontend/app/components/Session_/Issues/IssueListItem.js b/frontend/app/components/Session_/Issues/IssueListItem.js index 9145ffaa5..51b5bb25c 100644 --- a/frontend/app/components/Session_/Issues/IssueListItem.js +++ b/frontend/app/components/Session_/Issues/IssueListItem.js @@ -11,7 +11,8 @@ const IssueListItem = ({ issue, onClick, icon, user, active }) => { >
- + { icon } + {/* */} { issue.id }
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 ? + : +
, + }), })