fix variable name in error object

owncloud · Feb 10, 2022 · 6a02019 · 6a02019
1 parent 2146660
commit 6a02019
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/changelog/unreleased/bugfix-error-message-move b/changelog/unreleased/bugfix-error-message-move
@@ -0,0 +1,5 @@
+Bugfix: Failed move by drag 'n drop don't show the resource name in the error
+
+We fixed the error message when moving an item via drag-and-drop failed, not it shows the correct name of the item.
+
+https://github.com/owncloud/web/issues/6412
diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
@@ -312,7 +312,7 @@ export default {
             if (exists) {
               const message = this.$gettext('Resource with name %{name} already exists')
               errors.push({
-                resource: resource.name,
+                resourceName: resource.name,
                 message: this.$gettextInterpolate(message, { name: resource.name }, true)
               })
               return

diff --git a/packages/web-app-files/tests/unit/views/Personal.spec.js b/packages/web-app-files/tests/unit/views/Personal.spec.js
@@ -105,10 +105,16 @@ describe('Personal view', () => {
         .spyOn(Personal.methods, 'fetchResources')
         .mockResolvedValueOnce([resourceDocumentsFolder])
       const spyOnMoveFiles = jest.spyOn(localVue.prototype.$client.files, 'move')
+      //
 
       const wrapper = createWrapper([resourceDocumentsFolder])
+      const spyOnshowMessage = jest.spyOn(wrapper.vm, 'showMessage')
       await wrapper.vm.fileDropped(resourcePdfsFolder.id)
       expect(spyOnMoveFiles).not.toBeCalled()
+      expect(spyOnshowMessage).toBeCalledWith({
+        status: 'danger',
+        title: 'Failed to move "Documents"'
+      })
 
       spyOnMoveFiles.mockReset()
       spyOnGetFolderItems.mockReset()