[Training] fixes form redirections

claroline · Mar 24, 2021 · 8244488 · 8244488
1 parent 6e02804
commit 8244488
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/plugin/cursus/Resources/modules/course/components/sessions.jsx b/src/plugin/cursus/Resources/modules/course/components/sessions.jsx
@@ -7,6 +7,7 @@ import {Button} from '#/main/app/action/components/button'
 import {MODAL_BUTTON} from '#/main/app/buttons'
 
 import {Course as CourseTypes} from '#/plugin/cursus/prop-types'
+import {route} from '#/plugin/cursus/routing'
 import {MODAL_SESSION_FORM} from '#/plugin/cursus/session/modals/parameters'
 import {SessionList} from '#/plugin/cursus/session/components/list'
 import {selectors} from '#/plugin/cursus/tools/trainings/catalog/store/selectors'
@@ -70,7 +71,11 @@ const CourseSessions = (props) =>
         label={trans('add_session', {}, 'cursus')}
         modal={[MODAL_SESSION_FORM, {
           course: props.course,
-          onSave: () => props.reload(props.course.slug)
+          onSave: (newSession) => {
+            // open created session, but let user on sessions list to allow multiples creations
+            props.history.push(route(props.path, props.course, newSession)+'/sessions')
+            props.reload(props.course.slug)
+          }
         }]}
         primary={true}
       />
@@ -79,6 +84,9 @@ const CourseSessions = (props) =>
 
 CourseSessions.propTypes = {
   path: T.string.isRequired,
+  history: T.shape({
+    push: T.func.isRequired
+  }).isRequired,
   course: T.shape(
     CourseTypes.propTypes
   ).isRequired,

diff --git a/src/plugin/cursus/Resources/modules/course/containers/sessions.jsx b/src/plugin/cursus/Resources/modules/course/containers/sessions.jsx
@@ -1,16 +1,20 @@
 import {connect} from 'react-redux'
 
+import {withRouter} from '#/main/app/router'
+
 import {actions} from '#/plugin/cursus/tools/trainings/catalog/store'
 import {CourseSessions as CourseSessionsComponent} from '#/plugin/cursus/course/components/sessions'
 
-const CourseSessions = connect(
-  null,
-  (dispatch) => ({
-    reload(courseSlug) {
-      dispatch(actions.open(courseSlug, true))
-    }
-  })
-)(CourseSessionsComponent)
+const CourseSessions = withRouter(
+  connect(
+    null,
+    (dispatch) => ({
+      reload(courseSlug) {
+        return dispatch(actions.open(courseSlug, true))
+      }
+    })
+  )(CourseSessionsComponent)
+)
 
 export {
   CourseSessions

diff --git a/src/plugin/cursus/Resources/modules/tools/trainings/catalog/components/form.jsx b/src/plugin/cursus/Resources/modules/tools/trainings/catalog/components/form.jsx
@@ -34,6 +34,7 @@ const CatalogForm = (props) => {
         course={props.course}
       >
         <CourseForm
+          path={props.path}
           name={selectors.FORM_NAME}
         />
       </CoursePage>