This commit is contained in:
Virginie Ky 2019-07-17 10:29:15 +02:00
parent 4007579579
commit aa81ebf21e
2 changed files with 33 additions and 21 deletions

View File

@ -692,26 +692,23 @@ function appReducer(state = initialState, action) {
Map(initialState.get('newContentType')) Map(initialState.get('newContentType'))
) )
.update('shouldRefetchData', v => !v); .update('shouldRefetchData', v => !v);
case SUBMIT_TEMP_GROUP_SUCCEEDED: case SUBMIT_TEMP_GROUP_SUCCEEDED: {
const newGroup = state const newGroup = state
.get('newGroup') .get('newGroup')
.set('uid', state.getIn(['newGroup', 'name'])) .set('uid', state.getIn(['newGroup', 'name']))
.set('isTemporary', false); .set('isTemporary', false);
return (
state
// .update('isLoading', () => true)
.update('newGroup', () => Map(initialState.get('newGroup')))
.update('newGroupClone', () => Map(initialState.get('newGroup')))
.updateIn(['groups'], list =>
list
.map(obj => obj.set('isTemporary', false))
.sortBy(obj => obj.get('name'))
)
.updateIn(['modifiedDataGroup', newGroup.get('name')], () => newGroup)
.updateIn(['initialDataGroup', newGroup.get('name')], () => newGroup)
);
// .update('shouldRefetchData', v => !v); return state
.update('newGroup', () => Map(initialState.get('newGroup')))
.update('newGroupClone', () => Map(initialState.get('newGroup')))
.updateIn(['groups'], list =>
list
.map(obj => obj.set('isTemporary', false))
.sortBy(obj => obj.get('name'))
)
.updateIn(['modifiedDataGroup', newGroup.get('name')], () => newGroup)
.updateIn(['initialDataGroup', newGroup.get('name')], () => newGroup);
}
case UPDATE_TEMP_CONTENT_TYPE: case UPDATE_TEMP_CONTENT_TYPE:
return state return state
.updateIn( .updateIn(

View File

@ -180,14 +180,9 @@ export function* submitTempCT({
} }
/* istanbul ignore-next */ /* istanbul ignore-next */
export function* submitTempGroup({ body, context: { emitEvent } }) { export function* submitTempGroup({ context: { emitEvent } }) {
try { try {
emitEvent('willSaveGroup'); emitEvent('willSaveGroup');
const opts = { method: 'POST', body };
// yield call(request, getRequestUrl('groups'), opts, true);
emitEvent('didSaveGroup'); emitEvent('didSaveGroup');
yield put(submitTempGroupSucceeded()); yield put(submitTempGroupSucceeded());
} catch (error) { } catch (error) {
@ -200,6 +195,26 @@ export function* submitTempGroup({ body, context: { emitEvent } }) {
} }
} }
// TODO: uncomment when backend is available
// export function* submitTempGroup({ body, context: { emitEvent } }) {
// try {
// emitEvent('willSaveGroup');
// const opts = { method: 'POST', body };
// yield call(request, getRequestUrl('groups'), opts, true);
// emitEvent('didSaveGroup');
// yield put(submitTempGroupSucceeded());
// } catch (error) {
// const errorMessage = get(
// error,
// ['response', 'payload', 'message', '0', 'messages', '0', 'id'],
// 'notification.error'
// );
// strapi.notification.error(errorMessage);
// }
// }
// Individual exports for testing // Individual exports for testing
export default function* defaultSaga() { export default function* defaultSaga() {
try { try {