Merge pull request #43150 from nextcloud/backport/43148/stable28

[stable28] Update `@nextcloud/dialogs` to 5.1.1

apps/files/src/actions/moveOrCopyAction.ts

@@ -29,7 +29,7 @@ import type { MoveCopyResult } from './moveOrCopyActionUtils'
 import { AxiosError } from 'axios'
 import { basename, join } from 'path'
 import { emit } from '@nextcloud/event-bus'
-import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
+import { FilePickerClosed, getFilePickerBuilder, showError } from '@nextcloud/dialogs'
 import { Permission, FileAction, FileType, NodeStatus, davGetClient, davRootPath, davResultToNode, davGetDefaultPropfind } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import Vue from 'vue'
@@ -232,7 +232,11 @@ const openFilePickerForAction = async (action: MoveCopyAction, dir = '/', nodes:
 		const picker = filePicker.build()
 		picker.pick().catch((error) => {
 			logger.debug(error as Error)
-			reject(new Error(t('files', 'Cancelled move or copy operation')))
+			if (error instanceof FilePickerClosed) {
+				reject(new Error(t('files', 'Cancelled move or copy operation')))
+			} else {
+				reject(new Error(t('files', 'Move or copy operation failed')))
+			}
 		})
 	})
 }

cypress/e2e/files/files_copy-move.cy.ts

@@ -47,6 +47,9 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		cy.login(currentUser)
 		cy.visit('/apps/files')
 
+		// intercept the move so we can wait for it
+		cy.intercept('COPY', /\/remote.php\/dav\/files\//).as('copyFile')
+
 		getRowForFile('original.txt').should('be.visible')
 		triggerActionForFile('original.txt', 'move-copy')
 
@@ -55,6 +58,9 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		// click copy
 		cy.get('.file-picker').contains('button', 'Copy to new-folder').should('be.visible').click()
 
+		// wait for copy to finish
+		cy.wait('@copyFile')
+
 		getRowForFile('new-folder').find('[data-cy-files-list-row-name-link]').click()
 
 		cy.url().should('contain', 'dir=/new-folder')
@@ -68,6 +74,9 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		cy.login(currentUser)
 		cy.visit('/apps/files')
 
+		// intercept the move so we can wait for it
+		cy.intercept('MOVE', /\/remote.php\/dav\/files\//).as('moveFile')
+
 		getRowForFile('original.txt').should('be.visible')
 		triggerActionForFile('original.txt', 'move-copy')
 
@@ -76,6 +85,9 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		// click copy
 		cy.get('.file-picker').contains('button', 'Move to new-folder').should('be.visible').click()
 
+		// wait for move to finish
+		cy.wait('@moveFile')
+
 		// wait until visible again
 		getRowForFile('new-folder').should('be.visible')
 		// original should be moved -> not exist anymore
@@ -94,7 +106,7 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		cy.login(currentUser)
 		cy.visit('/apps/files')
 
-		// intercept the copy so we can wait for it
+		// intercept the move so we can wait for it
 		cy.intercept('MOVE', /\/remote.php\/dav\/files\//).as('moveFile')
 
 		getRowForFile('original').should('be.visible')
@@ -124,6 +136,9 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		cy.login(currentUser)
 		cy.visit('/apps/files')
 
+		// intercept the move so we can wait for it
+		cy.intercept('MOVE', /\/remote.php\/dav\/files\//).as('moveFile')
+
 		getRowForFile('new-folder').should('be.visible').find('[data-cy-files-list-row-name-link]').click()
 		cy.url().should('contain', 'dir=/new-folder')
 
@@ -135,6 +150,9 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
 		// click move
 		cy.get('.file-picker').contains('button', 'Move').should('be.visible').click()
 
+		// wait for move to finish
+		cy.wait('@moveFile')
+
 		// wait until visible again
 		cy.get('main').contains('No files in here').should('be.visible')
 		// original should be moved -> not exist anymore

dist/4720-4720.js

@@ -0,0 +1,3 @@
+/*! For license information please see 4720-4720.js.LICENSE.txt */
+"use strict";(self.webpackChunknextcloud=self.webpackChunknextcloud||[]).push([[4720],{84720:(e,n,c)=>{c.d(n,{FilePickerVue:()=>s});const s=(0,c(20144).defineAsyncComponent)((()=>Promise.all([c.e(7874),c.e(9847)]).then(c.bind(c,94378))))}}]);
+//# sourceMappingURL=4720-4720.js.map?v=3579bbfdda4bbff89d5b

dist/4720-4720.js.map

@@ -1 +1 @@
-{"version":3,"file":"5076-5076.js?v=5df17ad2d937c26c5b50","mappings":";oIAsBA,MAAMA,GAAI,kCAAE,IAAM","sources":["webpack:///nextcloud/node_modules/@nextcloud/dialogs/dist/chunks/index-csK3cpe5.mjs"],"sourcesContent":["import { defineAsyncComponent as e } from \"vue\";\n/**\n * @copyright Copyright (c) 2023 Ferdinand Thiessen <opensource@fthiessen.de>\n *\n * @author Ferdinand Thiessen <opensource@fthiessen.de>\n *\n * @license AGPL-3.0-or-later\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the\n * License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU Affero General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with this program. If not, see <http://www.gnu.org/licenses/>.\n *\n */\nconst i = e(() => import(\"./FilePicker-j5uGgoIq.mjs\"));\nexport {\n  i as FilePickerVue\n};\n"],"names":["i"],"sourceRoot":""}
+{"version":3,"file":"4720-4720.js?v=3579bbfdda4bbff89d5b","mappings":";oIAsBA,MAAMA,GAAI,kCAAE,IAAM","sources":["webpack:///nextcloud/node_modules/@nextcloud/dialogs/dist/chunks/index-1zThpkd0.mjs"],"sourcesContent":["import { defineAsyncComponent as e } from \"vue\";\n/**\n * @copyright Copyright (c) 2023 Ferdinand Thiessen <opensource@fthiessen.de>\n *\n * @author Ferdinand Thiessen <opensource@fthiessen.de>\n *\n * @license AGPL-3.0-or-later\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the\n * License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU Affero General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with this program. If not, see <http://www.gnu.org/licenses/>.\n *\n */\nconst i = e(() => import(\"./FilePicker-cOp1W5mL.mjs\"));\nexport {\n  i as FilePickerVue\n};\n"],"names":["i"],"sourceRoot":""}

dist/5076-5076.js

@@ -1,3 +0,0 @@
-/*! For license information please see 5076-5076.js.LICENSE.txt */
-"use strict";(self.webpackChunknextcloud=self.webpackChunknextcloud||[]).push([[5076],{45076:(e,n,c)=>{c.d(n,{FilePickerVue:()=>s});const s=(0,c(20144).defineAsyncComponent)((()=>Promise.all([c.e(7874),c.e(1697)]).then(c.bind(c,544))))}}]);
-//# sourceMappingURL=5076-5076.js.map?v=5df17ad2d937c26c5b50

package-lock.json

@@ -18,7 +18,7 @@
         "@nextcloud/browserslist-config": "^3.0.0",
         "@nextcloud/calendar-availability-vue": "^2.0.1",
         "@nextcloud/capabilities": "^1.0.4",
-        "@nextcloud/dialogs": "^5.1.0",
+        "@nextcloud/dialogs": "^5.1.1",
         "@nextcloud/event-bus": "^3.1.0",
         "@nextcloud/files": "^3.1.0",
         "@nextcloud/initial-state": "^2.0.0",
@@ -3804,9 +3804,9 @@
       }
     },
     "node_modules/@nextcloud/dialogs": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-5.1.0.tgz",
-      "integrity": "sha512-SHoM9vasgzq4imnJjOROFVqJkr663ncsO8bRzgKdOpC6rC96wCEOID2+DXJmhq6tVpdHwsXjYNvBogWBwDaMJA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-5.1.1.tgz",
+      "integrity": "sha512-3jQdoI1Rw8eTt9bgIZYIkGGguwHYWhOMTMu+5QfX3FlvhI7Z086PKN1YSlLmudV9ZyXFuC5zp2o2FYjTvLcwQw==",
       "dependencies": {
         "@nextcloud/axios": "^2.4.0",
         "@nextcloud/event-bus": "^3.1.0",
@@ -3816,7 +3816,7 @@
         "@nextcloud/router": "^2.2.0",
         "@nextcloud/typings": "^1.7.0",
         "@types/toastify-js": "^1.12.3",
-        "@vueuse/core": "^10.7.1",
+        "@vueuse/core": "^10.7.2",
         "toastify-js": "^1.12.0",
         "vue-frag": "^1.4.3",
         "webdav": "^5.3.1"

package.json

@@ -45,7 +45,7 @@
     "@nextcloud/browserslist-config": "^3.0.0",
     "@nextcloud/calendar-availability-vue": "^2.0.1",
     "@nextcloud/capabilities": "^1.0.4",
-    "@nextcloud/dialogs": "^5.1.0",
+    "@nextcloud/dialogs": "^5.1.1",
     "@nextcloud/event-bus": "^3.1.0",
     "@nextcloud/files": "^3.1.0",
     "@nextcloud/initial-state": "^2.0.0",