pr review 2

claroline · Sep 4, 2024 · feeb62a · feeb62a
1 parent 99668a7
commit feeb62a
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 51 deletions.
diff --git a/src/plugin/cursus/Controller/CourseController.php b/src/plugin/cursus/Controller/CourseController.php
@@ -106,37 +106,23 @@ protected function getDefaultHiddenFilters(): array
             }
         }
 
-        return $filters;
-    }
-
-    /**
-     * @Route("/", name="apiv2_cursus_course_list", methods={"GET"})
-     */
-    public function listAction(Request $request): JsonResponse
-    {
-        $params = $request->query->all();
-        $params['hiddenFilters'] = [
-            'archived' => false,
-        ];
+        $filters['archived'] = false;
 
-        return new JsonResponse(
-            $this->crud->list(Course::class, $params)
-        );
+        return $filters;
     }
 
     /**
      * @Route("/public", name="apiv2_cursus_course_list_public", methods={"GET"})
      */
     public function listPublicAction(Request $request): JsonResponse
     {
-        $params = $request->query->all();
-        $params['hiddenFilters'] = [
-            'public' => true,
-        ];
-
-        return new JsonResponse(
-            $this->crud->list(Course::class, $params)
-        );
+        return new JsonResponse($this->crud->list(
+            Course::class,
+            array_merge($request->query->all(), ['hiddenFilters' => array_merge($this->getDefaultHiddenFilters(), [
+                'public' => true,
+            ])]),
+            $this->getOptions()['list']
+        ));
     }
 
     /**

diff --git a/src/plugin/cursus/Resources/modules/course/components/type.jsx b/src/plugin/cursus/Resources/modules/course/components/type.jsx
@@ -33,8 +33,8 @@ const CreationType = (props) => {
                     if (props.modal) {
                       props.fadeModal()
                     }
-                    history.push(props.path + '/course/new')
-                    props.startCreation(null, CourseTypes.defaultProps, selected[0])
+                    history.push(props.path + '/new')
+                    props.openForm(null, CourseTypes.defaultProps, selected[0])
                   }
                 }
               )
@@ -58,8 +58,8 @@ const CreationType = (props) => {
                     if (props.modal) {
                       props.fadeModal()
                     }
-                    history.push(props.path + '/course/new')
-                    props.startCreation(null, CourseTypes.defaultProps, selected[0])
+                    history.push(props.path + '/new')
+                    props.openForm(null, CourseTypes.defaultProps, selected[0])
                   }
                 }
               )
@@ -76,8 +76,8 @@ const CreationType = (props) => {
               if (props.modal) {
                 props.fadeModal()
               }
-              history.push(props.path + '/course/new')
-              props.startCreation(null, CourseTypes.defaultProps)
+              history.push(props.path + '/new')
+              props.openForm(null, CourseTypes.defaultProps)
             }
           }
         }, {
@@ -118,11 +118,10 @@ const CreationType = (props) => {
 }
 
 CreationType.propTypes = {
-  startCreation: T.func,
-  create: T.func,
+  path: T.string.isRequired,
+  openForm: T.func.isRequired,
   reset: T.func,
   contextType: T.string,
-  path: T.string.isRequired,
   modal: T.bool,
   fadeModal: T.func
 }

diff --git a/src/plugin/cursus/Resources/modules/course/modals/creation/components/modal.jsx b/src/plugin/cursus/Resources/modules/course/modals/creation/components/modal.jsx
@@ -9,20 +9,27 @@ import {CreationType} from '#/plugin/cursus/course/components/type'
 
 const CreationModal = (props) =>
   <Modal
-    {...omit(props, 'create', 'startCreation')}
+    {...omit(props, 'openForm')}
     title={trans('new_course', {}, 'cursus')}
     subtitle={trans('')}
     centered={true}
     onExited={props.reset}
   >
     <div className="modal-body">
-      <CreationType {...props} modal={true}/>
+      <CreationType
+        path={props.path}
+        contextType={props.contextType}
+        openForm={props.openForm}
+        fadeModal={props.fadeModal}
+        modal={true}
+      />
     </div>
   </Modal>
 
 CreationModal.propTypes = {
-  startCreation: T.func.isRequired,
-  create: T.func.isRequired,
+  path: T.string.isRequired,
+  contextType: T.string.isRequired,
+  openForm: T.func.isRequired,
   reset: T.func.isRequired,
   fadeModal: T.func.isRequired
 }

diff --git a/src/plugin/cursus/Resources/modules/course/modals/creation/containers/modal.jsx b/src/plugin/cursus/Resources/modules/course/modals/creation/containers/modal.jsx
@@ -14,7 +14,7 @@ const CreationModal = withReducer(selectors.STORE_NAME, reducer)(
       contextType: toolSelectors.contextType(state)
     }),
     (dispatch) => ({
-      startCreation(slug, defaultProps, workspace) {
+      openForm(slug, defaultProps, workspace = null) {
         dispatch(courseActions.openForm(slug, defaultProps, workspace))
       },
       reset() {

diff --git a/src/plugin/cursus/Resources/modules/course/store/actions.js b/src/plugin/cursus/Resources/modules/course/store/actions.js
@@ -46,14 +46,18 @@ actions.openForm = (courseSlug = null, defaultProps = {}, workspace = null) => (
     return dispatch(formActions.resetForm(selectors.FORM_NAME, defaultProps, true))
   }
 
-  return dispatch({
-    [API_REQUEST]: {
-      url: ['apiv2_cursus_course_get', {field: 'slug', id: courseSlug}],
-      silent: true,
-      before: () => dispatch(formActions.resetForm(selectors.FORM_NAME, null, true)),
-      success: (data) => dispatch(formActions.resetForm(selectors.FORM_NAME, data))
-    }
-  })
+  if (courseSlug) {
+    return dispatch({
+      [API_REQUEST]: {
+        url: ['apiv2_cursus_course_get', {field: 'slug', id: courseSlug}],
+        silent: true,
+        before: () => dispatch(formActions.resetForm(selectors.FORM_NAME, null, true)),
+        success: (data) => dispatch(formActions.resetForm(selectors.FORM_NAME, data))
+      }
+    })
+  } else {
+    return dispatch(formActions.resetForm(selectors.FORM_NAME, defaultProps, true))
+  }
 }
 
 actions.openSession = (sessionId = null, force = false) => (dispatch, getState) => {

diff --git a/src/plugin/cursus/Resources/modules/tools/events/components/tool.jsx b/src/plugin/cursus/Resources/modules/tools/events/components/tool.jsx
@@ -78,7 +78,13 @@ const EventsTool = (props) =>
                 history={params.history}
               />)
           } else {
-            return (<EmptyCourse path={props.path} canEdit={props.canEdit} contextType={props.contextType} />)
+            return (
+              <EmptyCourse
+                path={props.path}
+                canEdit={props.canEdit}
+                contextType={props.contextType}
+              />
+            )
           }
         }
       }, {

diff --git a/src/plugin/cursus/Resources/modules/tools/trainings/catalog/components/list.jsx b/src/plugin/cursus/Resources/modules/tools/trainings/catalog/components/list.jsx
@@ -26,7 +26,7 @@ const CatalogList = (props) =>
         icon: 'fa fa-fw fa-plus',
         label: trans('add_course', {}, 'cursus'),
         modal: [MODAL_COURSE_TYPE_CREATION, {
-          path: props.path
+          path: props.path + '/course'
         }],
         group: trans('management'),
         displayed: props.canEdit,
@@ -40,8 +40,9 @@ const CatalogList = (props) =>
       url={['apiv2_cursus_course_list']}
     >
       <CreationType
-        path={props.path}
+        path={props.path + '/course'}
         contextType={props.contextType}
+        openForm={props.openForm}
       />
     </CourseList>
 
@@ -50,7 +51,8 @@ const CatalogList = (props) =>
 CatalogList.propTypes = {
   path: T.string.isRequired,
   canEdit: T.bool.isRequired,
-  contextType: T.string
+  contextType: T.string,
+  openForm: T.func.isRequired
 }
 
 export {

diff --git a/src/plugin/cursus/Resources/modules/tools/trainings/catalog/components/main.jsx b/src/plugin/cursus/Resources/modules/tools/trainings/catalog/components/main.jsx
@@ -21,6 +21,7 @@ const CatalogMain = (props) =>
             path={props.path}
             canEdit={props.canEdit}
             contextType={props.contextType}
+            openForm={props.openForm}
           />
         )
       }, {

diff --git a/src/plugin/cursus/Resources/modules/tools/trainings/catalog/containers/main.jsx b/src/plugin/cursus/Resources/modules/tools/trainings/catalog/containers/main.jsx
@@ -21,8 +21,8 @@ const CatalogMain = withReducer(courseSelectors.STORE_NAME, courseReducer)(
         open(slug) {
           dispatch(courseActions.open(slug))
         },
-        openForm(slug, defaultProps) {
-          dispatch(courseActions.openForm(slug, defaultProps))
+        openForm(slug, defaultProps, workspace = null) {
+          dispatch(courseActions.openForm(slug, defaultProps, workspace))
         }
       })
     )(CatalogMainComponent)