PR review

claroline · Oct 3, 2024 · 3fbb198 · 3fbb198
1 parent eb14d0f
commit 3fbb198
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 37 deletions.
diff --git a/src/plugin/cursus/Controller/CourseController.php b/src/plugin/cursus/Controller/CourseController.php
@@ -147,22 +147,18 @@ public function listArchivedAction(Request $request): JsonResponse
     /**
      * @Route("/list/existing", name="list_existing", methods={"GET"})
      */
-    public function listExistingAction(Request $request): JsonResponse
+    public function listNoWorkspaceAction(Request $request): JsonResponse
     {
         $this->checkPermission('IS_AUTHENTICATED_FULLY', null, [], true);
 
         $filters = array_merge($request->query->all(), [
-            'hiddenFilters' => $this->getDefaultHiddenFilters(),
+            'hiddenFilters' => array_merge($this->getDefaultHiddenFilters(), [
+                'workspace' => null,
+            ]),
         ]);
 
         $list = $this->crud->list(Course::class, $filters, $this->getOptions()['list']);
 
-        $list['data'] = array_filter($list['data'], function (array $course) {
-            return is_null($course['workspace']);
-        });
-
-        sort($list['data']);
-
         return new JsonResponse($list);
     }
 
@@ -267,12 +263,12 @@ public function copyAction(Request $request): JsonResponse
     }
 
     /**
-     * @Route("/bind", name="bind_workspace", methods={"PATCH"})
+     * @Route("/{id}/bind", name="bind_workspace", methods={"PATCH"})
+     *
+     * @EXT\ParamConverter("course", class="Claroline\CursusBundle\Entity\Course", options={"mapping": {"id": "uuid"}})
      */
-    public function bindCourseToWorkspaceAction(Request $request): JsonResponse
+    public function bindCourseToWorkspaceAction(Course $course, Request $request): JsonResponse
     {
-        $processed = [];
-
         $this->om->startFlushSuite();
 
         $data = $this->decodeRequest($request);
@@ -281,26 +277,18 @@ public function bindCourseToWorkspaceAction(Request $request): JsonResponse
         $workspace = null;
 
         if ($workspaceData) {
-            $workspace = $this->om->getRepository(Workspace::class)->findOneBy(['uuid' => $data['workspace']['id']]);
+            $workspace = $this->om->getRepository(Workspace::class)->findOneBy(['uuid' => $workspaceData['id']]);
         }
 
-        /** @var Course[] $courses */
-        $courses = $this->om->getRepository(Course::class)->findBy([
-            'uuid' => $data['ids'],
-        ]);
-
-        foreach ($courses as $course) {
-            if ($this->authorization->isGranted('ADMINISTRATE', $course)) {
-                $course->setWorkspace($workspace);
-                $processed[] = $course;
-            }
+        if ($this->authorization->isGranted('ADMINISTRATE', $course)) {
+            $course->setWorkspace($workspace);
+        } else {
+            throw new AccessDeniedException();
         }
 
         $this->om->endFlushSuite();
 
-        return new JsonResponse(array_map(function (Course $course) {
-            return $this->serializer->serialize($course);
-        }, $processed));
+        return new JsonResponse($this->serializer->serialize($course));
     }
 
     /**

diff --git a/src/plugin/cursus/Finder/CourseFinder.php b/src/plugin/cursus/Finder/CourseFinder.php
@@ -49,6 +49,15 @@ public function configureQueryBuilder(QueryBuilder $qb, array $searches = [], ar
                     $qb->setParameter($filterName, $filterValue);
                     break;
 
+                case 'workspace':
+                    if (is_null($filterValue)) {
+                        $qb->andWhere('obj.workspace IS NULL');
+                    } else {
+                        $qb->andWhere('obj.workspace = :workspace');
+                        $qb->setParameter('workspace', $filterValue);
+                    }
+                    break;
+
                 default:
                     $this->setDefaults($qb, $filterName, $filterValue);
             }

diff --git a/src/plugin/cursus/Resources/modules/course/components/empty.jsx b/src/plugin/cursus/Resources/modules/course/components/empty.jsx
@@ -41,7 +41,7 @@ const EmptyCourse = (props) =>
 EmptyCourse.propTypes = {
   path: T.string.isRequired,
   canEdit: T.bool.isRequired,
-  contextId: T.string.isRequired
+  contextId: T.string
 }
 
 export {

diff --git a/src/plugin/cursus/Resources/modules/course/components/main.jsx b/src/plugin/cursus/Resources/modules/course/components/main.jsx
@@ -75,9 +75,9 @@ Course.propTypes = {
     SessionTypes.propTypes
   )),
   registrations: T.shape({
-    users: T.array.isRequired,
-    groups: T.array.isRequired,
-    pending: T.array.isRequired
+    users: T.array,
+    groups: T.array,
+    pending: T.array
   }),
   participantsView: T.string.isRequired,
   switchParticipantsView: T.func.isRequired,

diff --git a/src/plugin/cursus/Resources/modules/course/components/type.jsx b/src/plugin/cursus/Resources/modules/course/components/type.jsx
@@ -122,15 +122,14 @@ const CreationType = (props) => {
             type: MODAL_BUTTON,
             modal: [MODAL_TRAINING_COURSES, {
               url: ['apiv2_cursus_course_list_existing'],
-              selectAction: (selected) => ({
+              selectAction: (selectedCourses) => ({
                 type: ASYNC_BUTTON,
                 label: trans('bind', {}, 'actions'),
                 request: {
-                  url: url(['apiv2_cursus_course_bind_workspace']),
+                  url: url(['apiv2_cursus_course_bind_workspace', {id: (selectedCourses && selectedCourses.length > 0) ? selectedCourses[0].id : null}]),
                   request: {
                     method: 'PATCH',
                     body: JSON.stringify({
-                      ids: selected.map(course => course.id),
                       workspace: props.contextId
                     })
                   },
@@ -151,7 +150,7 @@ CreationType.propTypes = {
   openForm: T.func,
   reset: T.func,
   contextType: T.string,
-  contextId: T.object,
+  contextId: T.string,
   modal: T.bool,
   fadeModal: T.func
 }

diff --git a/src/plugin/cursus/Serializer/CourseSerializer.php b/src/plugin/cursus/Serializer/CourseSerializer.php
@@ -125,9 +125,6 @@ public function serialize(Course $course, array $options = []): array
                 'users' => $course->getMaxUsers(),
             ],
             'tags' => $this->serializeTags($course),
-            'workspace' => $course->getWorkspace() ?
-                $this->workspaceSerializer->serialize($course->getWorkspace(), [SerializerInterface::SERIALIZE_MINIMAL]) :
-                null,
         ];
 
         if (!in_array(SerializerInterface::SERIALIZE_TRANSFER, $options)) {
@@ -173,6 +170,9 @@ public function serialize(Course $course, array $options = []): array
                 'children' => array_map(function (Course $child) {
                     return $this->serialize($child, [SerializerInterface::SERIALIZE_MINIMAL]);
                 }, $course->getChildren()->toArray()),
+                'workspace' => $course->getWorkspace() ?
+                    $this->workspaceSerializer->serialize($course->getWorkspace(), [SerializerInterface::SERIALIZE_MINIMAL]) :
+                    null,
             ]);
         }