feat: add insufficient quota info to file copy (#11699)

* feat: add insufficient quota info to file copy --------- Co-authored-by: Jan Ackermann <[email protected]>
owncloud · Oct 2, 2024 · 4d2cd6c · 4d2cd6c
1 parent b2004f6
commit 4d2cd6c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/packages/web-app-files/src/HandleUpload.ts b/packages/web-app-files/src/HandleUpload.ts
@@ -250,9 +250,9 @@ export class HandleUpload extends BasePlugin {
         }
 
         this.messageStore.showErrorMessage({
-          title: $gettext('Not enough quota'),
+          title: $gettext('Insufficient quota'),
           desc: $gettext(
-            'There is not enough quota on %{spaceName}, you need additional %{missingSpace} to upload these files',
+            'Insufficient quota on %{spaceName}. You need additional %{missingSpace} to upload these files',
             {
               spaceName,
               missingSpace: filesize<FileSizeOptionsString>(

diff --git a/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue b/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
@@ -385,7 +385,7 @@ export default defineComponent({
             if (space) {
               errorPopup(
                 new HttpError(
-                  $gettext('There is not enough quota on "%{spaceName}" to save this file', {
+                  $gettext('Insufficient quota on "%{spaceName}" to save this file', {
                     spaceName: space.name
                   }),
                   e.response
@@ -394,7 +394,7 @@ export default defineComponent({
               break
             }
             errorPopup(
-              new HttpError($gettext('There is not enough quota to save this file'), e.response)
+              new HttpError($gettext('Insufficient quota for saving this file'), e.response)
             )
             break
           default:

diff --git a/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
@@ -7,6 +7,7 @@ import type { ClientService } from '../../../services'
 import { useMessages } from '../../../composables'
 import { Ref, unref } from 'vue'
 import type { Language } from 'vue3-gettext'
+import { HttpError } from '@ownclouders/web-client'
 
 export class ResourceTransfer extends ConflictDialog {
   constructor(
@@ -90,8 +91,16 @@ export class ResourceTransfer extends ConflictDialog {
           ? this.$gettext('Failed to copy "%{name}"', { name: errors[0]?.resourceName }, true)
           : this.$gettext('Failed to move "%{name}"', { name: errors[0]?.resourceName }, true)
     }
+    let description = ''
+    if (errors.some(({ error }) => error instanceof HttpError && error.statusCode === 507)) {
+      description = this.$gettext('Insufficient quota')
+    }
     const messageStore = useMessages()
-    messageStore.showErrorMessage({ title, errors: errors.map(({ error }) => error) })
+    messageStore.showErrorMessage({
+      title,
+      ...(description && { desc: description }),
+      errors: errors.map(({ error }) => error)
+    })
   }
 
   /**

diff --git a/tests/e2e/cucumber/features/smoke/upload.feature b/tests/e2e/cucumber/features/smoke/upload.feature
@@ -41,8 +41,8 @@ Feature: Upload
       | simple.pdf     |
       | testavatar.jpg |
     And "Alice" tries to upload the following resource
-      | resource      | error            |
-      | lorem-big.txt | Not enough quota |
+      | resource      | error              |
+      | lorem-big.txt | Insufficient quota |
     And "Alice" downloads the following resources using the sidebar panel
       | resource      | type   |
       | PARENT        | folder |