Merge branch 'release-54.16.0'

actions/class.RdfController.php

@@ -985,6 +985,7 @@ public function moveResource()
             $this->validateInstanceRoot($id);
             $this->signatureValidator->checkSignature($data['signature'], $id);
             $this->validateMoveRequest();
+            $this->validateDestinationClass($destinationClassUri, $this->getResourceParentClass($id));
 
             $result = $this->getResourceTransfer()->transfer(
                 new ResourceTransferCommand(
@@ -1010,17 +1011,19 @@ public function moveResource()
                     ],
                 ]
             );
-        } catch (InvalidArgumentException $exception) {
-            $this->logError(
-                sprintf(
-                    'Error moving instance %s to %s: %s',
-                    $id ?? '',
-                    $destinationClassUri ?? '',
-                    $exception->getMessage() . ' - ' . $exception->getTraceAsString()
-                )
+        } catch (InvalidArgumentException $e) {
+            $this->returnJson(
+                [
+                    'success' => true,
+                    'data' => [
+                        'failed' => [
+                            'success' => false,
+                            'message' => $e->getMessage(),
+                        ],
+                    ],
+                ],
+                204
             );
-
-            $this->returnJsonError($e->getMessage());
         }
     }
 
@@ -1686,7 +1689,7 @@ private function validateDestinationClass($destinationUri, $currentClassUri)
     {
         $destinationClass = $this->getClass($destinationUri);
         if (empty($destinationUri) || $destinationUri === $currentClassUri || !$destinationClass->exists()) {
-            throw new InvalidArgumentException('Wrong destination class uri');
+            throw new InvalidArgumentException('The selected class already contains the resource');
         }
     }
 
@@ -1714,4 +1717,21 @@ private function getResourceTransfer(): ResourceTransferInterface
     {
         return $this->getPsrContainer()->get(ResourceTransferProxy::class);
     }
+
+    private function getResourceParentClass(string $id): string
+    {
+        $types = $this->getResource($id)->getTypes();
+        if (count($types) !== 1) {
+            throw new InvalidArgumentException('Resource has no class or resource types are ambiguous');
+        }
+
+        /** @var core_kernel_classes_Class $type */
+        $type = reset($types);
+
+        if (!($type instanceof core_kernel_classes_Class) && !$type->isClass()) {
+            throw new InvalidArgumentException('Type is not a class');
+        }
+
+        return $type->getUri();
+    }
 }

models/classes/http/LegacyController.php

@@ -112,7 +112,7 @@ public function getRequestParameter($name)
      *
      * @param string $paramName
      * @throws \common_exception_MissingParameter
-     * @return string
+     * @return string|array
      */
     protected function getRawParameter($paramName)
     {

views/js/layout/actions/common.js

@@ -770,7 +770,7 @@ define([
                                     });
 
                                     if (!success.length) {
-                                        feedback().error(__('Unable to move the resources'));
+                                        feedback().warning(__(failed.join(', ')));
                                     } else if (failed.length) {
                                         feedback().warning(
                                             __('Some resources have not been moved: %s', failed.join(', '))