Merge pull request #7129 from christianbeeznest/fixes-updates191

Course: Fix course tool drag-and-drop ordering persistence

Author: christianbeeznest

assets/vue/services/courseService.js

@@ -73,10 +73,12 @@ export default {
    * @returns {Promise<Object>}
    */
   updateToolOrder: async (tool, newIndex, courseId, sessionId = 0) => {
-    const { data } = await api.post(`/course/${courseId}/home.json?sid=${sessionId}`, {
+    const payload = {
+      toolId: tool.iid,
       index: newIndex,
-      toolItem: tool,
-    })
+    }
+
+    const { data } = await api.post(`/course/${courseId}/home.json?sid=${sessionId}`, payload)
 
     return data
   },

assets/vue/views/course/CourseHome.vue

@@ -444,18 +444,14 @@ watch(isSorting, (isSortingEnabled) => {
 })
 
 async function updateDisplayOrder(htmlItem, newIndex) {
-  const tool = htmlItem.dataset.tool
-  let toolItem = null
-
-  if (typeof tools.value !== "undefined" && Array.isArray(tools.value)) {
-    const toolList = tools.value
-    toolItem = toolList.find((element) => element.title === tool)
-  } else {
-    console.error("Error: tools.value is undefined")
+  const toolTitle = htmlItem.dataset.tool
+  const toolItem = tools.value.find((element) => element.title === toolTitle)
+
+  if (!toolItem || !toolItem.iid) {
+    console.error("[CourseHome] Tool item or iid missing", toolItem)
     return
   }
 
-  console.log(toolItem, newIndex)
 
   // Send the updated values to the server
   await courseService.updateToolOrder(toolItem, newIndex, course.value.id, session.value?.id)

src/CoreBundle/Controller/CourseController.php

@@ -156,20 +156,27 @@ public function indexJson(
         EntityManagerInterface $em,
         AssetRepository $assetRepository
     ): Response {
-        $requestData = json_decode($request->getContent(), true);
-        // Sort behaviour
-        if (!empty($requestData) && isset($requestData['toolItem'])) {
-            $index = $requestData['index'];
-            $toolItem = $requestData['toolItem'];
-            $toolId = (int) $toolItem['iid'];
-
-            /** @var CTool $cTool */
-            $cTool = $em->find(CTool::class, $toolId);
-
-            if ($cTool) {
-                $cTool->setPosition($index + 1);
-                $em->persist($cTool);
-                $em->flush();
+        // Handle drag & drop sort for course tools
+        if ($request->isMethod('POST')) {
+            $requestData = json_decode($request->getContent() ?: '', true) ?? [];
+
+            if (isset($requestData['toolId'], $requestData['index'])) {
+                $course = $this->getCourse();
+                if (null === $course) {
+                    return $this->json(
+                        ['success' => false, 'message' => 'Course not found.'],
+                        Response::HTTP_BAD_REQUEST
+                    );
+                }
+
+                $sessionId = $this->getSessionId();
+                $toolId = (int) $requestData['toolId'];
+                $newIndex = (int) $requestData['index'];
+
+                $result = $this->reorderCourseTools($em, $course, $sessionId, $toolId, $newIndex);
+                $statusCode = $result['success'] ? Response::HTTP_OK : Response::HTTP_BAD_REQUEST;
+
+                return $this->json($result, $statusCode);
             }
         }
 
@@ -1317,4 +1324,103 @@ private function isUserEnrolledInAnySession(User $user, EntityManagerInterface $
 
         return $enrollmentCount > 0;
     }
+
+    /**
+     * Reorders all course tools for a given course / session after drag & drop.
+     *
+     * @return array<string, mixed>
+     */
+    private function reorderCourseTools(
+        EntityManagerInterface $em,
+        Course $course,
+        int $sessionId,
+        int $toolId,
+        int $newIndex
+    ): array {
+        if ($toolId <= 0) {
+            return [
+                'success' => false,
+                'message' => 'Invalid tool id.',
+            ];
+        }
+
+        /** @var CToolRepository $toolRepo */
+        $toolRepo = $em->getRepository(CTool::class);
+
+        // Load all tools for this course + (optional) session ordered by current position
+        $qb = $toolRepo->createQueryBuilder('t')
+            ->andWhere('t.course = :course')
+            ->setParameter('course', $course)
+            ->orderBy('t.position', 'ASC')
+            ->addOrderBy('t.iid', 'ASC');
+
+        if ($sessionId > 0) {
+            $qb
+                ->andWhere('IDENTITY(t.session) = :sessionId')
+                ->setParameter('sessionId', $sessionId);
+        } else {
+            $qb->andWhere('t.session IS NULL');
+        }
+
+        /** @var CTool[] $tools */
+        $tools = $qb->getQuery()->getResult();
+
+        if (0 === \count($tools)) {
+            return [
+                'success' => false,
+                'message' => 'No tools found for course / session.',
+            ];
+        }
+
+        // Build an array of IDs to manipulate positions easily
+        $ids = array_map(static fn (CTool $tool): int => $tool->getIid() ?? 0, $tools);
+
+        $currentIndex = array_search($toolId, $ids, true);
+        if (false === $currentIndex) {
+            return [
+                'success' => false,
+                'message' => 'Tool not found in current course / session.',
+            ];
+        }
+
+        // Clamp the new index into a valid range
+        $newIndex = max(0, min($newIndex, \count($tools) - 1));
+
+        if ($newIndex === $currentIndex) {
+            return [
+                'success' => true,
+                'unchanged' => true,
+                'from' => $currentIndex,
+                'to' => $newIndex,
+                'total' => \count($tools),
+            ];
+        }
+
+        // Move the ID in the array (remove at old index, insert at new index)
+        $idToMove = $ids[$currentIndex];
+        array_splice($ids, $currentIndex, 1);
+        array_splice($ids, $newIndex, 0, [$idToMove]);
+
+        // Rewrite all positions in DB using a simple DQL UPDATE per tool
+        // Positions will be 0-based: 0,1,2,...
+        foreach ($ids as $pos => $id) {
+            $em->createQueryBuilder()
+                ->update(CTool::class, 't')
+                ->set('t.position', ':pos')
+                ->where('t.iid = :iid')
+                ->setParameter('pos', $pos)
+                ->setParameter('iid', $id)
+                ->getQuery()
+                ->execute();
+        }
+
+        return [
+            'success' => true,
+            'from' => $currentIndex,
+            'to' => $newIndex,
+            'total' => \count($tools),
+            'courseId' => $course->getId(),
+            'sessionId' => $sessionId,
+        ];
+    }
 }