Merge pull request #16908 from craftcms/feature/cms-1373-warn-when-moving-large-asset-folders

Feature/cms 1373 warn when moving large asset folders

Author: brandonkelly

CHANGELOG-WIP.md

@@ -1,6 +1,8 @@
 # Release Notes for Craft CMS 4.15 (WIP)
 
 ### Content Management
+- The Assets index page now prompts for confirmation when moving more than 50 assets, or assets totalling more than 50MB, at once. ([#16908](https://github.com/craftcms/cms/pull/16908))
+- The success notification displayed after an asset move now includes an “Undo” button, if less than 50 assets/50MB were involved in the move. ([#16908](https://github.com/craftcms/cms/pull/16908))
 - Window scrolling is now blocked when a modal window is open. ([#16768](https://github.com/craftcms/cms/pull/16768))
 
 ### Administration

src/controllers/AssetsController.php

@@ -11,6 +11,8 @@
 use craft\assetpreviews\Image as ImagePreview;
 use craft\base\Element;
 use craft\base\LocalFsInterface;
+use craft\db\Query;
+use craft\db\Table;
 use craft\elements\Asset;
 use craft\elements\conditions\ElementCondition;
 use craft\errors\AssetException;
@@ -1348,4 +1350,48 @@ public function actionGenerateFallbackTransform(string $transform): Response
                 'inline' => true,
             ]);
     }
+
+    /**
+     * Returns the total number of assets, and their total file size, based on their IDs and/or folder IDs.
+     *
+     * @return Response
+     * @throws BadRequestHttpException
+     * @since 4.15.0
+     */
+    public function actionMoveInfo(): Response
+    {
+        $this->requireCpRequest();
+        $this->requirePostRequest();
+
+        $folderIds = Craft::$app->getRequest()->getBodyParam('folderIds', []);
+        $assetIds = Craft::$app->getRequest()->getBodyParam('assetIds', []);
+
+        if (!empty($folderIds)) {
+            // Add descendant folders
+            $assetsService = Craft::$app->getAssets();
+            foreach ($folderIds as $folderId) {
+                $folder = $assetsService->getFolderById($folderId);
+                if (!$folder) {
+                    throw new BadRequestHttpException("Invalid folder ID: $folderId");
+                }
+                $descendants = $assetsService->getAllDescendantFolders($folder);
+                array_push($folderIds, ...array_keys($descendants));
+            }
+        }
+
+        $query = (new Query())
+            ->from(Table::ASSETS)
+            ->where([
+                'or',
+                ['id' => $assetIds],
+                ['folderId' => array_unique($folderIds)],
+            ]);
+        $count = (int)$query->count();
+        $totalSize = (int)$query->sum('[[size]]');
+
+        return $this->asJson([
+            'count' => $count,
+            'totalSize' => $totalSize,
+        ]);
+    }
 }

src/elements/actions/MoveAssets.php

@@ -83,19 +83,24 @@ public function getTriggerHtml(): ?string
           defaultSource: Craft.elementIndex.sourceKey,
           defaultSourcePath: Craft.elementIndex.sourcePath,
         },
-        onSelect: ([targetFolder]) => {
+        onSelect: async ([targetFolder]) => {
           const mover = new Craft.AssetMover();
-          mover.moveFolders(selectedFolderIds, targetFolder.folderId).then((totalFoldersMoved) => {
-            mover.moveAssets(selectedAssetIds, targetFolder.folderId).then((totalAssetsMoved) => {
-              const totalItemsMoved = totalFoldersMoved + totalAssetsMoved;
-              if (totalItemsMoved) {
-                Craft.cp.displayNotice(Craft.t('app', '{totalItems, plural, =1{Item} other{Items}} moved.', {
-                  totalItems: totalItemsMoved,
-                }));
-                Craft.elementIndex.updateElements(true);
-              }
-            });
-          });
+          const moveParams = await mover.getMoveParams(selectedFolderIds, selectedAssetIds);
+          if (!moveParams.proceed) {
+            return;
+          }
+          const totalFoldersMoved = await mover.moveFolders(selectedFolderIds, targetFolder.folderId, Craft.elementIndex.currentFolderId);
+          const totalAssetsMoved = await mover.moveAssets(selectedAssetIds, targetFolder.folderId, Craft.elementIndex.currentFolderId);
+          const totalItemsMoved = totalFoldersMoved + totalAssetsMoved;
+          if (totalItemsMoved) {
+            mover.successNotice(
+              moveParams,
+              Craft.t('app', '{totalItems, plural, =1{Item} other{Items}} moved.', {
+                totalItems: totalItemsMoved,
+              })
+            );
+            Craft.elementIndex.updateElements(true);
+          }
         },
       });
     },

src/services/Assets.php

@@ -485,7 +485,7 @@ public function findFolders(mixed $criteria = []): array
      * @param string $orderBy
      * @param bool $withParent Whether the parent folder should be included in the results
      * @param bool $asTree Whether the folders should be returned hierarchically
-     * @return VolumeFolder[]
+     * @return array<int,VolumeFolder> The descendant folders, indexed by their IDs
      */
     public function getAllDescendantFolders(
         VolumeFolder $parentFolder,

src/translations/en/app.php

@@ -153,11 +153,13 @@
     'Are you sure you want to delete “{name}”?' => 'Are you sure you want to delete “{name}”?',
     'Are you sure you want to discard the pending project config YAML changes?' => 'Are you sure you want to discard the pending project config YAML changes?',
     'Are you sure you want to discard your changes?' => 'Are you sure you want to discard your changes?',
+    'Are you sure you want to move the selected items?' => 'Are you sure you want to move the selected items?',
     'Are you sure you want to permanently delete the selected {type}?' => 'Are you sure you want to permanently delete the selected {type}?',
     'Are you sure you want to release all jobs in the queue?' => 'Are you sure you want to release all jobs in the queue?',
     'Are you sure you want to release the job “{description}”?' => 'Are you sure you want to release the job “{description}”?',
     'Are you sure you want to restart the job “{description}”? Any progress could be lost.' => 'Are you sure you want to restart the job “{description}”? Any progress could be lost.',
     'Are you sure you want to transfer your license to this domain?' => 'Are you sure you want to transfer your license to this domain?',
+    'Are you sure you want to undo the move?' => 'Are you sure you want to undo the move?',
     'Are you sure you want to uninstall {plugin}? You will lose all of its associated data.' => 'Are you sure you want to uninstall {plugin}? You will lose all of its associated data.',
     'Area' => 'Area',
     'As currency values' => 'As currency values',
@@ -932,6 +934,7 @@
     'More…' => 'More…',
     'Move down' => 'Move down',
     'Move folder' => 'Move folder',
+    'Move reverted.' => 'Move reverted.',
     'Move to the left' => 'Move to the left',
     'Move to the right' => 'Move to the right',
     'Move to' => 'Move to',

src/web/assets/cp/CpAsset.php

@@ -129,7 +129,9 @@ private function _registerTranslations(View $view): void
             'Are you sure you want to delete this {type}?',
             'Are you sure you want to delete “{name}”?',
             'Are you sure you want to discard your changes?',
+            'Are you sure you want to move the selected items?',
             'Are you sure you want to transfer your license to this domain?',
+            'Are you sure you want to undo the move?',
             'Ascending',
             'Assets',
             'Breadcrumbs',
@@ -235,6 +237,7 @@ private function _registerTranslations(View $view): void
             'More…',
             'Move down',
             'Move folder',
+            'Move reverted.',
             'Move to the left',
             'Move to the right',
             'Move to',

src/web/assets/cp/dist/cp.js

@@ -89,7 +89,7 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend(
             Garnish.$bod.addClass('dragging');
             this.itemDrag.$draggee.closest('tr,li').addClass('draggee');
           },
-          onDragStop: () => {
+          onDragStop: async () => {
             Garnish.$bod.removeClass('dragging');
 
             const $draggee = this.itemDrag.$draggee;
@@ -115,30 +115,39 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend(
             });
 
             const mover = new Craft.AssetMover();
-            mover
-              .moveFolders(folderIds, targetFolderId)
-              .then((totalFoldersMoved) => {
-                mover
-                  .moveAssets(assetIds, targetFolderId)
-                  .then((totalAssetsMoved) => {
-                    const totalItemsMoved =
-                      totalFoldersMoved + totalAssetsMoved;
-                    if (totalItemsMoved) {
-                      Craft.cp.displayNotice(
-                        Craft.t(
-                          'app',
-                          '{totalItems, plural, =1{Item} other{Items}} moved.',
-                          {
-                            totalItems: totalItemsMoved,
-                          }
-                        )
-                      );
-                      Craft.elementIndex.updateElements(true);
-                    } else {
-                      $draggee.closest('tr,li').removeClass('draggee');
-                    }
-                  });
-              });
+
+            const moveParams = await mover.getMoveParams(folderIds, assetIds);
+            if (!moveParams.proceed) {
+              $draggee.closest('tr,li').removeClass('draggee');
+              return;
+            }
+
+            const totalFoldersMoved = await mover.moveFolders(
+              folderIds,
+              targetFolderId,
+              this.currentFolderId
+            );
+            const totalAssetsMoved = await mover.moveAssets(
+              assetIds,
+              targetFolderId,
+              this.currentFolderId
+            );
+            const totalItemsMoved = totalFoldersMoved + totalAssetsMoved;
+            if (totalItemsMoved) {
+              mover.successNotice(
+                moveParams,
+                Craft.t(
+                  'app',
+                  '{totalItems, plural, =1{Item} other{Items}} moved.',
+                  {
+                    totalItems: totalItemsMoved,
+                  }
+                )
+              );
+              Craft.elementIndex.updateElements(true);
+            } else {
+              $draggee.closest('tr,li').removeClass('draggee');
+            }
           },
         });