]> source.dussan.org Git - nextcloud-server.git/commitdiff
chore: Update `@nextcloud/dialogs` to 5.1.1
authorFerdinand Thiessen <opensource@fthiessen.de>
Fri, 26 Jan 2024 13:44:51 +0000 (14:44 +0100)
committerFerdinand Thiessen <opensource@fthiessen.de>
Sat, 27 Jan 2024 00:21:00 +0000 (01:21 +0100)
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
apps/files/src/actions/moveOrCopyAction.ts
package-lock.json
package.json

index a4e70caf37d11509c3cc093f6d6844baad3ccfef..7fa899dc7da59035afe3f26aff6c92dea01ad6b4 100644 (file)
@@ -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')))
+                       }
                })
        })
 }
index 22561e93cede947d8b8444a41357d76d9195b084..6be1515e3770a0a8127e8fe6290501c471c594e6 100644 (file)
@@ -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",
       }
     },
     "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",
         "@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"
index baa3398324f68c61fe969ed8e232cbfb29017c9f..24b72ce751d2b83aee6f3ad4683eb4e5ac5bda4d 100644 (file)
@@ -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",