Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map
#	src/web/assets/cp/src/js/BaseElementIndex.js

Author: brandonkelly

CHANGELOG.md

@@ -8,6 +8,7 @@
 - The “Port” setting on the SMTP mailer transporter is no longer required. It will default to 465 or 25 depending on whether OpenSSL is installed.
 - Fixed field status badge styling in some contexts. ([#12403](https://github.com/craftcms/cms/issues/12403))
 - Fixed a bug where exporting elements with multiple field layouts as a CSV file using the “Expanded” export type would result in mismatched column values.
+- Fixed a bug where cancelling a conflicting volume folder move would result in the moved folder getting deleted.
 - Deprecated `craft\helpers\DateTimeHelper::timeZoneAbbreviation()`.
 - Deprecated `craft\helpers\DateTimeHelper::timeZoneOffset()`.
 

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

@@ -416,6 +416,7 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
 
       // Get the old folder IDs, and sort them so that we're moving the most-nested folders first
       var folderIds = [];
+      const folderIdsToDelete = [];
 
       for (var i = 0; i < this._folderDrag.$draggee.length; i++) {
         var $a = this._folderDrag.$draggee.eq(i).children('a'),
@@ -479,12 +480,12 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
 
           // Loop trough all the responses
           for (var i = 0; i < responseArray.length; i++) {
-            var data = responseArray[i];
+            const data = responseArray[i];
 
             // If successful and have data, then update
             if (data.success) {
               if (data.transferList) {
-                fileMoveList = data.transferList;
+                fileMoveList.push(...data.transferList);
               }
 
               if (data.newFolderId) {
@@ -493,6 +494,8 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
                   '/folder:' +
                   data.newFolderUid;
               }
+
+              folderIdsToDelete.push(data.request.params.folderId);
             }
 
             // Push prompt into prompt array
@@ -520,15 +523,17 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
               var params = {};
               // Loop trough all returned data and prepare a new request array
               for (var i = 0; i < returnData.length; i++) {
-                if (returnData[i].choice === 'cancel') {
+                const data = returnData[i];
+
+                if (data.choice === 'cancel') {
                   continue;
                 }
 
-                if (returnData[i].choice === 'replace') {
+                if (data.choice === 'replace') {
                   params.force = true;
                 }
 
-                if (returnData[i].choice === 'merge') {
+                if (data.choice === 'merge') {
                   params.merge = true;
                 }
 
@@ -545,7 +550,7 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
               if (newParameterArray.length === 0) {
                 this._performActualFolderMove(
                   fileMoveList,
-                  folderIds,
+                  folderIdsToDelete,
                   newSourceKey
                 );
               } else {
@@ -568,7 +573,7 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
           } else {
             this._performActualFolderMove(
               fileMoveList,
-              folderIds,
+              folderIdsToDelete,
               newSourceKey
             );
           }
@@ -604,6 +609,17 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
     this.progressBar.showProgressBar();
 
     var moveCallback = (folderDeleteList) => {
+      if (!folderDeleteList.length) {
+        this.setIndexAvailable();
+        this.progressBar.hideProgressBar();
+        this._folderDrag.returnHelpersToDraggees();
+        if (newSourceKey) {
+          this.setInstanceState('selectedSource', newSourceKey);
+        }
+        this.refreshSources();
+        return;
+      }
+
       // Delete the old folders
       var counter = 0;
       var limit = folderDeleteList.length;
@@ -617,7 +633,9 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
               this.setIndexAvailable();
               this.progressBar.hideProgressBar();
               this._folderDrag.returnHelpersToDraggees();
-              this.setInstanceState('selectedSource', newSourceKey);
+              if (newSourceKey) {
+                this.setInstanceState('selectedSource', newSourceKey);
+              }
               this.refreshSources();
             }
           }
@@ -1613,7 +1631,11 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
         data: parameters.params,
       })
         .then((response) => {
-          responseArray.push(response.data);
+          responseArray.push(
+            Object.assign({}, response.data, {
+              request: parameters,
+            })
+          );
         })
         .finally(() => {
           this.progressBar.incrementProcessedItemCount(1);

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

@@ -1940,6 +1940,7 @@ Craft.BaseElementIndex = Garnish.Base.extend(
       var $option = $(ev.selectedOption).addClass('sel');
       this.$siteMenuBtn.html($option.html());
       this._setSite($option.data('site-id'));
+      this.updateElements();
       this.onSelectSite();
     },
 
@@ -1977,8 +1978,6 @@ Craft.BaseElementIndex = Garnish.Base.extend(
           Craft.cp.setSiteId(siteId);
         }
 
-        // Update the elements
-        this.updateElements();
         this.updateFilterBtn();
       }
     },