From 662d5a3105f45f073a30bc8aa2e7cb95c669f30b Mon Sep 17 00:00:00 2001
From: Jan <jackermann@owncloud.com>
Date: Mon, 17 Jul 2023 15:58:45 +0200
Subject: [PATCH 1/7] Add dismiss button to oc-notification-message (#9421)

* Add dismiss button to oc-notification-message

* Add changelog item
---
 ...button-to-oc-notification-message-component |  8 ++++++++
 .../OcNotificationMessage.vue                  | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 packages/design-system/changelog/unreleased/enhancement-add-dismiss-button-to-oc-notification-message-component

diff --git a/packages/design-system/changelog/unreleased/enhancement-add-dismiss-button-to-oc-notification-message-component b/packages/design-system/changelog/unreleased/enhancement-add-dismiss-button-to-oc-notification-message-component
new file mode 100644
index 00000000000..fdac647d414
--- /dev/null
+++ b/packages/design-system/changelog/unreleased/enhancement-add-dismiss-button-to-oc-notification-message-component
@@ -0,0 +1,8 @@
+Enhancement: Add dismiss button to OcNotificationsMessage component
+
+We've added added dismiss button to the OcNotificationsMessage component,
+which closes the open notification immediately.
+
+https://github.com/owncloud/web/pull/9421
+https://github.com/owncloud/web/issues/9420
+
diff --git a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
index 8e375299ee4..b2f00588c48 100644
--- a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
+++ b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
@@ -4,11 +4,16 @@
     :class="classes"
   >
     <div class="oc-flex oc-flex-wrap oc-flex-middle oc-flex-1" :role="role" :aria-live="ariaLive">
-      <div class="oc-flex oc-flex-middle">
-        <oc-icon :variation="iconVariation" name="information" fill-type="line" class="oc-mr-s" />
-        <div class="oc-notification-message-title">
-          {{ title }}
+      <div class="oc-flex oc-flex-middle oc-flex-between oc-width-1-1">
+        <div class="oc-flex">
+          <oc-icon :variation="iconVariation" name="information" fill-type="line" class="oc-mr-s" />
+          <div class="oc-notification-message-title">
+            {{ title }}
+          </div>
         </div>
+        <oc-button class="oc-mr-s" appearance="raw" @click="close"
+          ><oc-icon name="close"
+        /></oc-button>
       </div>
       <div
         v-if="message"
@@ -22,6 +27,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import OcIcon from '../OcIcon/OcIcon.vue'
+import OcButton from '../OcButton/OcButton.vue'
 
 /**
  * Notifications are used to inform users about errors, warnings and as confirmations for their actions.
@@ -31,7 +37,8 @@ export default defineComponent({
   status: 'ready',
   release: '1.0.0',
   components: {
-    OcIcon
+    OcIcon,
+    OcButton
   },
   props: {
     /**
@@ -114,7 +121,6 @@ export default defineComponent({
 <style lang="scss">
 .oc-notification-message {
   background-color: var(--oc-color-background-default) !important;
-  cursor: pointer;
   margin-top: var(--oc-space-small);
   position: relative;
   word-break: break-word;

From 3fb79243ea0ec17a4d9079e7fde50d9fbc1ce5c8 Mon Sep 17 00:00:00 2001
From: Jan <jackermann@owncloud.com>
Date: Tue, 18 Jul 2023 15:34:44 +0200
Subject: [PATCH 2/7] add error log component (#9426)

* add error description to oc-notification-message

* Enhancemnets

* Add new component

* Fix description

* Fix position

* Add changelog item

* Fix typo

* Fix

* Align title icon center on y axis

* Prettify

* Add missing export

* Add remove test code

* add unit test

* Fix tests

* Enhance label

* Fix tests

* Fix tests
---
 .../enhancement-add-oc-error-log-component    |  8 ++
 .../src/components/OcErrorLog/OcErrorLog.vue  | 95 +++++++++++++++++++
 .../OcNotificationMessage.spec.ts             | 34 ++++++-
 .../OcNotificationMessage.vue                 | 55 ++++++++---
 .../design-system/src/components/index.ts     |  1 +
 5 files changed, 178 insertions(+), 15 deletions(-)
 create mode 100644 packages/design-system/changelog/unreleased/enhancement-add-oc-error-log-component
 create mode 100644 packages/design-system/src/components/OcErrorLog/OcErrorLog.vue

diff --git a/packages/design-system/changelog/unreleased/enhancement-add-oc-error-log-component b/packages/design-system/changelog/unreleased/enhancement-add-oc-error-log-component
new file mode 100644
index 00000000000..6a48c6d38e1
--- /dev/null
+++ b/packages/design-system/changelog/unreleased/enhancement-add-oc-error-log-component
@@ -0,0 +1,8 @@
+Enhancement: Add OcErrorLog component
+
+We've added the new OcErrorLog component and integrated it into the OcNotificationMessage component,
+to display an error log and allow the user to copy it's content if the OcNotificationMessage
+is used to show errors.
+
+https://github.com/owncloud/web/pull/9426
+
diff --git a/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue b/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue
new file mode 100644
index 00000000000..7b333cbabb5
--- /dev/null
+++ b/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="oc-error-log">
+    <oc-textarea
+      class="oc-error-log-textarea oc-mt-s oc-text-small"
+      :label="contentLabel"
+      :model-value="content"
+      rows="4"
+      readonly
+    />
+    <div class="oc-flex oc-flex-between oc-mt-s">
+      <div class="oc-flex">
+        <div class="oc-flex oc-flex-middle" v-if="showCopied">
+          <oc-icon variation="success" name="checkbox-circle" />
+          <p class="oc-error-log-content-copied oc-ml-s oc-my-rm" v-text="$gettext('Copied')" />
+        </div>
+      </div>
+      <oc-button
+        size="small"
+        variation="primary"
+        appearance="filled"
+        v-text="$gettext('Copy')"
+        @click="copyContentToClipboard"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref } from 'vue'
+
+import { useGettext } from 'vue3-gettext'
+
+export default defineComponent({
+  name: 'OcErrorLog',
+  status: 'ready',
+  release: '2.0.0',
+
+  props: {
+    /**
+     * Content to be displayed
+     */
+    content: {
+      type: String,
+      required: true
+    }
+  },
+  setup(props) {
+    const { $gettext } = useGettext()
+    const showCopied = ref(false)
+
+    const contentLabel = computed(() => {
+      return $gettext(
+        'Copy the following information and pass them to technical support to troubleshoot the problem:'
+      )
+    })
+
+    const copyContentToClipboard = () => {
+      navigator.clipboard.writeText(props.content)
+      showCopied.value = true
+      setTimeout(() => (showCopied.value = false), 500)
+    }
+
+    return {
+      contentLabel,
+      showCopied,
+      copyContentToClipboard
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+.oc-error-log {
+  &-textarea {
+    resize: none;
+
+    label {
+      color: var(--oc-color-text-muted);
+    }
+  }
+
+  &-content-copied {
+    color: var(--oc-color-swatch-success-default);
+  }
+}
+</style>
+
+<docs>
+Component to display error log.
+```js
+<oc-error-log>
+  <oc-error-log content="X-REQUEST-ID: 123456789" />
+</oc-error-log>
+```
+</docs>
diff --git a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.spec.ts b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.spec.ts
index 55a33eed664..44f9c16703a 100644
--- a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.spec.ts
+++ b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.spec.ts
@@ -1,5 +1,5 @@
 import OcNotificationMessage from './OcNotificationMessage.vue'
-import { shallowMount } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 jest.useFakeTimers()
 
 describe('OcNotificationMessage', () => {
@@ -68,6 +68,26 @@ describe('OcNotificationMessage', () => {
     })
   })
 
+  describe('errorLogContent prop', () => {
+    it('should render OcErrorLogComponent, if errorLogContent is provided', async () => {
+      const wrapper = getWrapper({ errorLogContent: 'X-REQUEST-ID: 1234' })
+      const errorLogToggleButtonEl = wrapper.find(selectors.errorLogToggleButton)
+
+      expect(errorLogToggleButtonEl.exists()).toBeTruthy()
+      await errorLogToggleButtonEl.trigger('click')
+
+      const errorLogEl = wrapper.find(selectors.errorLog)
+      expect(errorLogEl.exists()).toBeTruthy()
+    })
+
+    it('should not render OcErrorLogComponent, if errorLogContent is not provided', () => {
+      const wrapper = getWrapper()
+      const errorLogToggleButtonEl = wrapper.find(selectors.errorLogToggleButton)
+
+      expect(errorLogToggleButtonEl.exists()).toBeFalsy()
+    })
+  })
+
   it('should emit close after set timout', () => {
     const wrapper = getWrapper({ timeout: 1 })
 
@@ -79,14 +99,22 @@ describe('OcNotificationMessage', () => {
   const selectors = {
     messageTitle: '.oc-notification-message-title',
     messageContent: '.oc-notification-message-content',
-    messageWrapper: '.oc-notification-message div'
+    messageWrapper: '.oc-notification-message div',
+    errorLog: '.oc-error-log',
+    errorLogToggleButton: '.oc-notification-message-error-log-toggle-button'
   }
 
   function getWrapper(props = {}) {
-    return shallowMount(OcNotificationMessage, {
+    return mount(OcNotificationMessage, {
       props: {
         ...props,
         title: 'Test passed'
+      },
+      global: {
+        stubs: {
+          'oc-icon': true
+        },
+        plugins: defaultPlugins()
       }
     })
   }
diff --git a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
index b2f00588c48..f6d84eb7acc 100644
--- a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
+++ b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
@@ -5,29 +5,42 @@
   >
     <div class="oc-flex oc-flex-wrap oc-flex-middle oc-flex-1" :role="role" :aria-live="ariaLive">
       <div class="oc-flex oc-flex-middle oc-flex-between oc-width-1-1">
-        <div class="oc-flex">
+        <div class="oc-flex oc-flex-middle">
           <oc-icon :variation="iconVariation" name="information" fill-type="line" class="oc-mr-s" />
           <div class="oc-notification-message-title">
             {{ title }}
           </div>
         </div>
-        <oc-button class="oc-mr-s" appearance="raw" @click="close"
-          ><oc-icon name="close"
-        /></oc-button>
+        <oc-button appearance="raw" @click="close"><oc-icon name="close" /></oc-button>
       </div>
-      <div
-        v-if="message"
-        class="oc-text-muted oc-width-1-1 oc-notification-message-content oc-mt-s oc-pl-s oc-ml-l"
-      >
-        {{ message }}
+      <div class="oc-width-1-1">
+        <div class="oc-flex oc-flex-between oc-width-1-1 oc-mt-s">
+          <span
+            v-if="message"
+            class="oc-notification-message-content oc-text-muted oc-mr-s"
+            v-text="message"
+          />
+          <oc-button
+            v-if="errorLogContent"
+            class="oc-notification-message-error-log-toggle-button"
+            gap-size="none"
+            appearance="raw"
+            @click="showErrorLog = !showErrorLog"
+          >
+            <span v-text="$gettext('Details')"></span>
+            <oc-icon :name="showErrorLog ? 'arrow-up-s' : 'arrow-down-s'" />
+          </oc-button>
+        </div>
+        <oc-error-log v-if="showErrorLog" class="oc-mt-l" :content="errorLogContent" />
       </div>
     </div>
   </div>
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue'
+import { defineComponent, ref } from 'vue'
 import OcIcon from '../OcIcon/OcIcon.vue'
 import OcButton from '../OcButton/OcButton.vue'
+import OcErrorLog from '../OcErrorLog/OcErrorLog.vue'
 
 /**
  * Notifications are used to inform users about errors, warnings and as confirmations for their actions.
@@ -37,9 +50,17 @@ export default defineComponent({
   status: 'ready',
   release: '1.0.0',
   components: {
+    OcErrorLog,
     OcIcon,
     OcButton
   },
+  setup: function () {
+    const showErrorLog = ref(false)
+
+    return {
+      showErrorLog
+    }
+  },
   props: {
     /**
      * Notification messages are sub components of the oc-notifications component.
@@ -67,8 +88,14 @@ export default defineComponent({
      */
     message: {
       type: String,
-      required: false,
-      default: null
+      required: false
+    },
+    /**
+     * The error log content that will be displayed in notification
+     */
+    errorLogContent: {
+      type: String,
+      required: false
     },
     /**
      * Number of seconds the message shows. It will disappear after this time.
@@ -128,6 +155,10 @@ export default defineComponent({
   &-title {
     font-size: 1.15rem;
   }
+
+  &-error-log-toggle-button {
+    word-break: keep-all;
+  }
 }
 </style>
 
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index 5f365930c51..3dd0a404b66 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -55,3 +55,4 @@ export { default as OcTag } from './OcTag/OcTag.vue'
 export { default as OcTextarea } from './OcTextarea/OcTextarea.vue'
 export { default as OcTextInput } from './OcTextInput/OcTextInput.vue'
 export { default as OcTile } from './OcTile/OcTile.vue'
+export { default as OcErrorLog } from './OcErrorLog/OcErrorLog.vue'

From 96c206812ebbb9312afbf8c7970b21edeb80cd26 Mon Sep 17 00:00:00 2001
From: Jan <jackermann@owncloud.com>
Date: Wed, 19 Jul 2023 13:14:19 +0200
Subject: [PATCH 3/7] Add error log to upload service (#9436)

* Add error log to upload service

* Add changelog item

* Rm not needed surrounding div

* add computed

* Fix styling

* Fix spacing
---
 ...enhancement-add-error-log-to-upload-dialog |  9 +++++
 .../OcNotificationMessage.vue                 |  2 +-
 .../web-runtime/src/components/UploadInfo.vue | 33 +++++++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-add-error-log-to-upload-dialog

diff --git a/changelog/unreleased/enhancement-add-error-log-to-upload-dialog b/changelog/unreleased/enhancement-add-error-log-to-upload-dialog
new file mode 100644
index 00000000000..23443261193
--- /dev/null
+++ b/changelog/unreleased/enhancement-add-error-log-to-upload-dialog
@@ -0,0 +1,9 @@
+Enhancement: Add error log to upload dialog
+
+We've added a error log to the upload dialog, so if an upload fails the user can copy the log and might hand
+it over to their admin.
+
+https://github.com/owncloud/web/pull/9436
+https://github.com/owncloud/web/pull/9426
+https://github.com/owncloud/web/issues/9430
+
diff --git a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
index f6d84eb7acc..a2d5e4bad70 100644
--- a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
+++ b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
@@ -31,7 +31,7 @@
             <oc-icon :name="showErrorLog ? 'arrow-up-s' : 'arrow-down-s'" />
           </oc-button>
         </div>
-        <oc-error-log v-if="showErrorLog" class="oc-mt-l" :content="errorLogContent" />
+        <oc-error-log v-if="showErrorLog" class="oc-mt-m" :content="errorLogContent" />
       </div>
     </div>
   </div>
diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
index f6fa29ba1a5..871b0c8383c 100644
--- a/packages/web-runtime/src/components/UploadInfo.vue
+++ b/packages/web-runtime/src/components/UploadInfo.vue
@@ -81,7 +81,7 @@
         </oc-button>
       </div>
     </div>
-    <div v-if="runningUploads" class="upload-info-progress oc-mx-m oc-pb-m oc-mt-s">
+    <div v-if="runningUploads" class="upload-info-progress oc-mx-m oc-pb-m oc-mt-s oc-text">
       <oc-progress
         :value="totalProgress"
         :max="100"
@@ -89,7 +89,11 @@
         :indeterminate="!filesInProgressCount"
       />
     </div>
-    <div v-if="infoExpanded" class="upload-info-items oc-px-m oc-pb-m">
+    <div
+      v-if="infoExpanded"
+      class="upload-info-items oc-px-m oc-pb-m"
+      :class="{ 'has-errors': showErrorLog }"
+    >
       <ul class="oc-list">
         <li
           v-for="(item, idx) in uploads"
@@ -141,6 +145,11 @@
         </li>
       </ul>
     </div>
+    <oc-error-log
+      v-if="showErrorLog"
+      class="upload-info-error-log oc-pt-m oc-pb-m oc-px-m"
+      :content="uploadErrorLogContent"
+    />
   </div>
 </template>
 
@@ -252,6 +261,22 @@ export default defineComponent({
     },
     uploadsPausable() {
       return this.$uppyService.tusActive()
+    },
+    showErrorLog() {
+      return this.infoExpanded && this.uploadErrorLogContent
+    },
+    uploadErrorLogContent() {
+      const requestIds = Object.values(this.errors).reduce((acc: Array<string>, error: any) => {
+        const requestId = error.originalRequest?._headers?.['X-Request-ID']
+
+        if (requestId) {
+          acc.push(requestId)
+        }
+
+        return acc
+      }, []) as Array<any>
+
+      return requestIds.map((item) => `X-Request-Id: ${item}`).join('\r\n')
     }
   },
   created() {
@@ -657,6 +682,10 @@ export default defineComponent({
     overflow-y: auto;
   }
 
+  .upload-info-items.has-errors {
+    max-height: calc(50vh - 100px) !important;
+  }
+
   .upload-info-danger {
     color: var(--oc-color-swatch-danger-default);
   }

From da8e960849cf8392503574d42fe9639db140d99e Mon Sep 17 00:00:00 2001
From: Jan <jackermann@owncloud.com>
Date: Thu, 20 Jul 2023 06:51:27 +0200
Subject: [PATCH 4/7] Add showErrorMessage store action (#9448)

* Add showErrorMessage store action

* fix

* fix unit tests

* lint

* Fix unit tests

* Apply to ConflictDialog

* fix unit tests

* Fix interface not fullfilled

* Fix

* Fix error message don't disappear automatially

* Reintroduce title testing

* Clear error messages

* Fix clearErrorMessage selector

* Fix synthax

* Kick wait for closing error automatically

* adjust line numbers
---
 .../src/components/OcErrorLog/OcErrorLog.vue  |  4 +--
 .../OcNotificationMessage.vue                 | 27 +++++++++++--------
 .../general/useGeneralActionsResetLogo.ts     |  5 ++--
 .../general/useGeneralActionsUploadLogo.ts    | 10 +++----
 .../actions/groups/useGroupActionsDelete.ts   |  2 +-
 .../actions/users/useUserActionsDelete.ts     |  2 +-
 .../src/views/Groups.vue                      | 12 ++++-----
 .../src/views/Users.vue                       | 27 ++++++++-----------
 .../useGeneralActionsResetLogo.spec.ts        |  2 +-
 .../useGeneralActionsUploadLogo.spec.ts       |  4 +--
 .../tests/unit/views/Groups.spec.ts           |  8 +++---
 .../tests/unit/views/Users.spec.ts            |  8 +++---
 packages/web-app-draw-io/src/App.vue          |  8 +++---
 packages/web-app-files/src/HandleUpload.ts    |  5 ++--
 .../src/components/AppBar/CreateSpace.vue     | 13 ++++++---
 .../InviteCollaboratorForm.vue                |  7 +++--
 .../SideBar/Shares/Collaborators/ListItem.vue | 17 +++++-------
 .../components/SideBar/Shares/FileLinks.vue   | 17 +++++-------
 .../components/SideBar/Shares/FileShares.vue  | 17 +++++-------
 .../SideBar/Shares/SpaceMembers.vue           |  7 +++--
 .../src/components/SideBar/TagsPanel.vue      |  5 ++--
 .../files/useFileActionsAcceptShare.ts        |  5 ++--
 .../files/useFileActionsCreateNewFile.ts      | 10 +++----
 .../files/useFileActionsCreateNewFolder.ts    |  5 ++--
 .../useFileActionsCreateSpaceFromResource.ts  |  5 ++--
 .../files/useFileActionsDeclineShare.ts       |  5 ++--
 .../files/useFileActionsDownloadArchive.ts    |  5 ++--
 .../files/useFileActionsEmptyTrashBin.ts      |  5 ++--
 .../actions/files/useFileActionsFavorite.ts   |  5 ++--
 .../actions/files/useFileActionsPaste.ts      |  1 +
 .../actions/files/useFileActionsRename.ts     |  5 ++--
 .../actions/files/useFileActionsRestore.ts    |  6 ++---
 .../actions/files/useFileActionsSetImage.ts   |  5 ++--
 .../helpers/useFileActionsDeleteResources.ts  |  5 ++--
 .../spaces/useSpaceActionsUploadImage.ts      | 10 +++----
 .../src/helpers/resource/actions/transfer.ts  | 18 +++++++++----
 .../src/helpers/resource/actions/upload.ts    |  1 +
 .../conflictHandling/conflictDialog.ts        |  1 +
 packages/web-app-files/src/quickActions.ts    |  5 ++--
 packages/web-app-files/src/store/actions.ts   |  7 ++---
 .../src/views/spaces/GenericSpace.vue         |  3 ++-
 .../components/AppBar/CreateSpace.spec.ts     |  8 +-----
 .../Shares/Collaborators/ListItem.spec.ts     |  8 +++---
 .../SideBar/Shares/FileShares.spec.ts         |  4 +--
 .../SideBar/Shares/SpaceMembers.spec.ts       |  4 +--
 .../unit/components/SideBar/TagsPanel.spec.ts |  2 +-
 .../files/useFileActionsCreateNewFile.spec.ts |  5 ++--
 .../useFileActionsCreateNewFolder.spec.ts     |  5 ++--
 .../files/useFileActionsEmptyTrashBin.spec.ts |  2 +-
 .../files/useFileActionsRename.spec.ts        |  2 +-
 .../files/useFileActionsRestore.spec.ts       |  4 +--
 .../files/useFileActionsSetImage.spec.ts      |  2 +-
 .../spaces/useSpaceActionsUploadImage.spec.ts |  4 +--
 .../conflictHandling/conflictDialog.spec.ts   | 10 ++++++-
 .../resource/resourcesTransfer.spec.ts        |  4 +++
 packages/web-app-text-editor/src/App.vue      |  5 ++--
 .../src/components/Spaces/QuotaModal.vue      |  2 +-
 .../components/Spaces/ReadmeContentModal.vue  |  7 +++--
 .../actions/files/useFileActionsSetReadme.ts  |  5 ++--
 .../actions/spaces/useSpaceActionsDelete.ts   |  5 ++--
 .../actions/spaces/useSpaceActionsDisable.ts  |  5 ++--
 .../spaces/useSpaceActionsEditDescription.ts  |  5 ++--
 .../actions/spaces/useSpaceActionsRename.ts   |  5 ++--
 .../actions/spaces/useSpaceActionsRestore.ts  |  5 ++--
 .../composables/download/useDownloadFile.ts   |  7 ++---
 .../unit/components/Spaces/QuotaModal.spec.ts |  2 +-
 .../Spaces/ReadmeContentModal.spec.ts         |  4 +--
 .../files/useFileActionsSetReadme.spec.ts     |  5 +---
 .../spaces/useSpaceActionsDelete.spec.ts      |  2 +-
 .../spaces/useSpaceActionsDisable.spec.ts     |  2 +-
 .../useSpaceActionsEditDescription.spec.ts    |  2 +-
 .../spaces/useSpaceActionsRename.spec.ts      |  2 +-
 .../spaces/useSpaceActionsRestore.spec.ts     |  2 +-
 .../src/components/Account/GdprExport.vue     |  5 ++--
 .../web-runtime/src/components/MessageBar.vue |  2 ++
 packages/web-runtime/src/pages/account.vue    | 27 ++++++++-----------
 packages/web-runtime/src/store/app.ts         |  6 +++++
 .../tests/unit/pages/account.spec.ts          |  9 +++----
 .../mocks/store/defaultStoreMockOptions.ts    |  1 +
 ...-failures-with-ocis-server-ocis-storage.md |  6 ++---
 .../webUIFavorites/favoritesFile.feature      |  2 ++
 .../webUIFavorites/unfavoriteFile.feature     |  2 ++
 .../features/webUIFiles/download.feature      |  5 ++--
 .../features/webUIFilesCopy/copy.feature      |  1 +
 .../webUIMoveFilesFolders/moveFolders.feature |  1 +
 .../webUIRenameFiles/renameFiles.feature      |  1 +
 .../webUIRenameFolders/renameFolders.feature  |  1 +
 .../shareWithUsers.feature                    |  2 ++
 .../shareWithUsers.feature                    |  2 ++
 tests/acceptance/pageObjects/webPage.js       |  3 ++-
 .../stepDefinitions/generalContext.js         | 10 -------
 91 files changed, 260 insertions(+), 281 deletions(-)

diff --git a/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue b/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue
index 7b333cbabb5..440eaa76a17 100644
--- a/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue
+++ b/packages/design-system/src/components/OcErrorLog/OcErrorLog.vue
@@ -9,7 +9,7 @@
     />
     <div class="oc-flex oc-flex-between oc-mt-s">
       <div class="oc-flex">
-        <div class="oc-flex oc-flex-middle" v-if="showCopied">
+        <div v-if="showCopied" class="oc-flex oc-flex-middle">
           <oc-icon variation="success" name="checkbox-circle" />
           <p class="oc-error-log-content-copied oc-ml-s oc-my-rm" v-text="$gettext('Copied')" />
         </div>
@@ -18,8 +18,8 @@
         size="small"
         variation="primary"
         appearance="filled"
-        v-text="$gettext('Copy')"
         @click="copyContentToClipboard"
+        v-text="$gettext('Copy')"
       />
     </div>
   </div>
diff --git a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
index a2d5e4bad70..fe9586da950 100644
--- a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
+++ b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
@@ -11,7 +11,9 @@
             {{ title }}
           </div>
         </div>
-        <oc-button appearance="raw" @click="close"><oc-icon name="close" /></oc-button>
+        <oc-button appearance="raw" @click="close" :aria-label="$gettext('Close')"
+          ><oc-icon name="close"
+        /></oc-button>
       </div>
       <div class="oc-width-1-1">
         <div class="oc-flex oc-flex-between oc-width-1-1 oc-mt-s">
@@ -54,13 +56,6 @@ export default defineComponent({
     OcIcon,
     OcButton
   },
-  setup: function () {
-    const showErrorLog = ref(false)
-
-    return {
-      showErrorLog
-    }
-  },
   props: {
     /**
      * Notification messages are sub components of the oc-notifications component.
@@ -99,6 +94,7 @@ export default defineComponent({
     },
     /**
      * Number of seconds the message shows. It will disappear after this time.
+     * If set to 0, message won't disappear automatically.
      */
     timeout: {
       type: Number,
@@ -108,6 +104,13 @@ export default defineComponent({
     }
   },
   emits: ['close'],
+  setup: function () {
+    const showErrorLog = ref(false)
+
+    return {
+      showErrorLog
+    }
+  },
   computed: {
     classes() {
       return `oc-notification-message-${this.status}`
@@ -129,9 +132,11 @@ export default defineComponent({
     /**
      * Notification will be destroyed if timeout is set
      */
-    setTimeout(() => {
-      this.close()
-    }, this.timeout * 1000)
+    if (this.timeout !== 0) {
+      setTimeout(() => {
+        this.close()
+      }, this.timeout * 1000)
+    }
   },
   methods: {
     close() {
diff --git a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
index 5665dc1dcba..c8d6e95e319 100644
--- a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
@@ -23,9 +23,8 @@ export const useGeneralActionsResetLogo = ({ store }: { store?: Store<any> }) =>
       }, 1000)
     } catch (e) {
       console.error(e)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to reset logo'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to reset logo')
       })
     }
   }
diff --git a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
index 1190d5a8bd5..2b850694e97 100644
--- a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
@@ -26,9 +26,8 @@ export const useGeneralActionsUploadLogo = ({
     }
 
     if (!supportedLogoMimeTypes.includes(file.type)) {
-      return store.dispatch('showMessage', {
-        title: $gettext('The file type is unsupported'),
-        status: 'danger'
+      return store.dispatch('showErrorMessage', {
+        title: $gettext('The file type is unsupported')
       })
     }
 
@@ -49,9 +48,8 @@ export const useGeneralActionsUploadLogo = ({
       }, 1000)
     } catch (e) {
       console.error(e)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to upload logo'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to upload logo')
       })
     }
   }
diff --git a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
index 7aadcbb8c7f..30ef3fad438 100644
--- a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
@@ -45,7 +45,7 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
               { groupCount: failed.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title, status: 'danger' })
+      store.dispatch('showErrorMessage', { title })
     }
 
     store.dispatch('hideModal')
diff --git a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
index 31c3096fe82..a7adccc7284 100644
--- a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
@@ -44,7 +44,7 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
               { userCount: failed.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title, status: 'danger' })
+      store.dispatch('showErrorMessage', { title })
     }
 
     store.dispatch('hideModal')
diff --git a/packages/web-app-admin-settings/src/views/Groups.vue b/packages/web-app-admin-settings/src/views/Groups.vue
index 4e77c4b703d..f0c30e40b75 100644
--- a/packages/web-app-admin-settings/src/views/Groups.vue
+++ b/packages/web-app-admin-settings/src/views/Groups.vue
@@ -211,7 +211,7 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
 
     selectGroups(groups) {
       this.selectedGroups = [...groups]
@@ -240,9 +240,8 @@ export default defineComponent({
         this.groups.push({ ...response?.data, members: [] })
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to create group'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to create group')
         })
       }
     },
@@ -266,9 +265,8 @@ export default defineComponent({
         return updatedGroup
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to edit group'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to edit group')
         })
       }
     }
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index b739651a1e1..75206b984fa 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -526,9 +526,8 @@ export default defineComponent({
         addToGroupsModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        await store.dispatch('showMessage', {
-          title: $gettext('Failed add users to group'),
-          status: 'danger'
+        await store.dispatch('showErrorMessage', {
+          title: $gettext('Failed add users to group')
         })
       }
     }
@@ -560,9 +559,8 @@ export default defineComponent({
         removeFromGroupsModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        await store.dispatch('showMessage', {
-          title: $gettext('Failed remove users from group'),
-          status: 'danger'
+        await store.dispatch('showErrorMessage', {
+          title: $gettext('Failed remove users from group')
         })
       }
     }
@@ -589,9 +587,8 @@ export default defineComponent({
         editLoginModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        return store.dispatch('showMessage', {
-          title: $gettext('Failed to edit login'),
-          status: 'danger'
+        return store.dispatch('showErrorMessage', {
+          title: $gettext('Failed to edit login')
         })
       }
     }
@@ -685,7 +682,7 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapMutations('runtime/spaces', ['UPDATE_SPACE_FIELD']),
 
     selectUsers(users) {
@@ -719,9 +716,8 @@ export default defineComponent({
         })
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to create user'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to create user')
         })
       }
     },
@@ -768,9 +764,8 @@ export default defineComponent({
         return updatedUser
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to edit user'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to edit user')
         })
       }
     },
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts
index 89e1155d616..b7f6a13d949 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts
@@ -35,7 +35,7 @@ describe('resetLogo', () => {
           await unref(actions)[0].handler()
           jest.runAllTimers()
           expect(router.go).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts
index f9b1d6288c5..a13a5b45232 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts
@@ -43,7 +43,7 @@ describe('uploadImage', () => {
           } as unknown as InputEvent)
           jest.runAllTimers()
           expect(router.go).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -58,7 +58,7 @@ describe('uploadImage', () => {
             }
           } as unknown as InputEvent)
           expect(clientService.httpAuthenticated.post).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
index ee8e45c00ab..b2dadf8c9ba 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
@@ -40,11 +40,11 @@ describe('Groups view', () => {
         mockAxiosReject()
       )
       const { wrapper } = getWrapper({ clientService })
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       const toggleCreateGroupModalStub = jest.spyOn(wrapper.vm, 'toggleCreateGroupModal')
       await wrapper.vm.createGroup({ displayName: 'admins' })
 
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
       expect(toggleCreateGroupModalStub).toHaveBeenCalledTimes(0)
     })
   })
@@ -78,10 +78,10 @@ describe('Groups view', () => {
       const clientService = getClientServiceMock()
       clientService.graphAuthenticated.groups.editGroup.mockImplementation(() => mockAxiosReject())
       const { wrapper } = getWrapper({ clientService })
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       await wrapper.vm.editGroup({})
 
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
     })
   })
 
diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
index 19e01e23ca1..92b76cab6d0 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -160,11 +160,11 @@ describe('Users view', () => {
       const clientService = getClientService()
       clientService.graphAuthenticated.users.createUser.mockImplementation(() => mockAxiosReject())
       const { wrapper } = getMountedWrapper({ clientService })
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       const toggleCreateUserModalStub = jest.spyOn(wrapper.vm, 'toggleCreateUserModal')
       await wrapper.vm.createUser({ displayName: 'jana' })
 
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
       expect(toggleCreateUserModalStub).toHaveBeenCalledTimes(0)
     })
   })
@@ -281,14 +281,14 @@ describe('Users view', () => {
       const clientService = getClientService()
       clientService.graphAuthenticated.users.editUser.mockImplementation(() => mockAxiosReject())
       const { wrapper } = getMountedWrapper({ clientService })
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
 
       await wrapper.vm.loadResourcesTask.last
       await wrapper.vm.editUser({
         editUser: {}
       })
 
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
     })
   })
 
diff --git a/packages/web-app-draw-io/src/App.vue b/packages/web-app-draw-io/src/App.vue
index a8f2242e5b7..fc4ae5c3a35 100644
--- a/packages/web-app-draw-io/src/App.vue
+++ b/packages/web-app-draw-io/src/App.vue
@@ -83,12 +83,12 @@ export default defineComponent({
     window.removeEventListener('message', this.handleMessage)
   },
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
+
     errorPopup(error) {
-      this.showMessage({
+      this.showErrorMessage({
         title: this.$gettext('An error occurred'),
-        desc: error,
-        status: 'danger'
+        desc: error
       })
     },
     successPopup(msg) {
diff --git a/packages/web-app-files/src/HandleUpload.ts b/packages/web-app-files/src/HandleUpload.ts
index 0ff77af81a3..64e5df154fe 100644
--- a/packages/web-app-files/src/HandleUpload.ts
+++ b/packages/web-app-files/src/HandleUpload.ts
@@ -236,7 +236,7 @@ export class HandleUpload extends BasePlugin {
           spaceName = $gettext('Personal')
         }
 
-        this.store.dispatch('showMessage', {
+        this.store.dispatch('showErrorMessage', {
           title: $gettext('Not enough quota'),
           desc: $gettext(
             'There is not enough quota on %{spaceName}, you need additional %{missingSpace} to upload these files',
@@ -244,8 +244,7 @@ export class HandleUpload extends BasePlugin {
               spaceName,
               missingSpace: filesize((space.spaceQuota.remaining - uploadSize) * -1)
             }
-          ),
-          status: 'danger'
+          )
         })
 
         quotaExceeded = true
diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
index 258b285ff78..6039ca81495 100644
--- a/packages/web-app-files/src/components/AppBar/CreateSpace.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -29,7 +29,13 @@ export default defineComponent({
     return { clientService, createSpace, checkSpaceNameModalInput, loadingService }
   },
   methods: {
-    ...mapActions(['showMessage', 'createModal', 'hideModal', 'setModalInputErrorMessage']),
+    ...mapActions([
+      'showMessage',
+      'showErrorMessage',
+      'createModal',
+      'hideModal',
+      'setModalInputErrorMessage'
+    ]),
     ...mapMutations('runtime/spaces', ['UPSERT_SPACE']),
     ...mapMutations('Files', ['UPSERT_RESOURCE', 'UPDATE_RESOURCE_FIELD']),
 
@@ -61,9 +67,8 @@ export default defineComponent({
         })
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Creating space failed…'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Creating space failed…')
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 0d19f0f2b31..120758078d8 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -187,7 +187,7 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapActions('Files', ['addShare']),
     ...mapActions('runtime/spaces', ['addSpaceMember']),
 
@@ -351,11 +351,10 @@ export default defineComponent({
         this.showMessage({ title: this.$gettext('Share was added successfully') })
       }
       errors.forEach((e) => {
-        this.showMessage({
+        this.showErrorMessage({
           title: this.$gettext('Failed to add share for %{displayName}', {
             displayName: e.displayName
-          }),
-          status: 'danger'
+          })
         })
       })
 
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index 1e21f9c10dc..d4894512537 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -373,7 +373,7 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapActions('Files', ['changeShare']),
     ...mapActions('runtime/spaces', ['changeSpaceMember']),
 
@@ -394,9 +394,8 @@ export default defineComponent({
         this.saveShareChanges({ role, permissions, expirationDate })
       } catch (e) {
         console.error(e)
-        this.showMessage({
-          title: this.$gettext('Failed to apply new permissions'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to apply new permissions')
         })
       }
     },
@@ -408,9 +407,8 @@ export default defineComponent({
         this.saveShareChanges({ role, permissions, expirationDate })
       } catch (e) {
         console.error(e)
-        this.showMessage({
-          title: this.$gettext('Failed to apply expiration date'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to apply expiration date')
         })
       }
     },
@@ -437,9 +435,8 @@ export default defineComponent({
         this.showMessage({ title: this.$gettext('Share successfully changed') })
       } catch (e) {
         console.error(e)
-        this.showMessage({
-          title: this.$gettext('Error while editing the share.'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Error while editing the share.')
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index 3f8d7c5cc80..7f1717ef9f4 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -346,7 +346,7 @@ export default defineComponent({
   },
   methods: {
     ...mapActions('Files', ['addLink', 'updateLink', 'removeLink']),
-    ...mapActions(['showMessage', 'createModal', 'hideModal']),
+    ...mapActions(['showMessage', 'showErrorMessage', 'createModal', 'hideModal']),
     ...mapMutations('Files', ['REMOVE_FILES']),
 
     toggleLinkListCollapsed() {
@@ -479,9 +479,8 @@ export default defineComponent({
       } catch (e) {
         onError(e)
         console.error(e)
-        this.showMessage({
-          title: this.$gettext('Failed to create link'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to create link')
         })
         return
       }
@@ -501,9 +500,8 @@ export default defineComponent({
       } catch (e) {
         onError(e)
         console.error(e)
-        this.showMessage({
-          title: this.$gettext('Failed to update link'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to update link')
         })
         return
       }
@@ -559,9 +557,8 @@ export default defineComponent({
         }
       } catch (e) {
         console.error(e)
-        this.showMessage({
-          title: this.$gettext('Failed to delete link'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to delete link')
         })
       }
     },
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 3073dcd140f..9a17d43043a 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -272,7 +272,7 @@ export default defineComponent({
   },
   methods: {
     ...mapActions('Files', ['deleteShare', 'addShare']),
-    ...mapActions(['createModal', 'hideModal', 'showMessage']),
+    ...mapActions(['createModal', 'hideModal', 'showMessage', 'showErrorMessage']),
     ...mapMutations('Files', ['REMOVE_FILES']),
 
     getDeniedShare(collaborator: Share): Share {
@@ -376,9 +376,8 @@ export default defineComponent({
           })
         } catch (e) {
           console.error(e)
-          this.showMessage({
-            title: this.$gettext('Failed to deny access'),
-            status: 'danger'
+          this.showErrorMessage({
+            title: this.$gettext('Failed to deny access')
           })
         }
       } else {
@@ -398,9 +397,8 @@ export default defineComponent({
           })
         } catch (e) {
           console.error(e)
-          this.showMessage({
-            title: this.$gettext('Failed to grant access'),
-            status: 'danger'
+          this.showErrorMessage({
+            title: this.$gettext('Failed to grant access')
           })
         }
       }
@@ -449,9 +447,8 @@ export default defineComponent({
         }
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to remove share'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to remove share')
         })
       }
     },
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
index 143949ef0cd..4752e4a1915 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -141,7 +141,7 @@ export default defineComponent({
   },
   methods: {
     ...mapActions('runtime/spaces', ['deleteSpaceMember']),
-    ...mapActions(['createModal', 'hideModal', 'showMessage']),
+    ...mapActions(['createModal', 'hideModal', 'showMessage', 'showErrorMessage']),
 
     filter(collection, term) {
       if (!(term || '').trim()) {
@@ -209,9 +209,8 @@ export default defineComponent({
         }
       } catch (error) {
         console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to remove share'),
-          status: 'danger'
+        this.showErrorMessage({
+          title: this.$gettext('Failed to remove share')
         })
       } finally {
         this.hideModal()
diff --git a/packages/web-app-files/src/components/SideBar/TagsPanel.vue b/packages/web-app-files/src/components/SideBar/TagsPanel.vue
index 03bfc476e53..f5d014a842c 100644
--- a/packages/web-app-files/src/components/SideBar/TagsPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/TagsPanel.vue
@@ -151,9 +151,8 @@ export default defineComponent({
         eventBus.publish('sidebar.entity.saved')
       } catch (e) {
         console.error(e)
-        store.dispatch('showMessage', {
-          title: $gettext('Failed to edit tags'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Failed to edit tags')
         })
       }
     }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
index 56a3fa9186c..7999205d175 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
@@ -69,13 +69,12 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
       return
     }
 
-    store.dispatch('showMessage', {
+    store.dispatch('showErrorMessage', {
       title: $ngettext(
         'Failed to accept the selected share.',
         'Failed to accept selected shares.',
         resources.length
-      ),
-      status: 'danger'
+      )
     })
   }
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index b733655239e..93f128d52d3 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -103,9 +103,8 @@ export const useFileActionsCreateNewFile = ({
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to create file'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to create file')
       })
     }
   }
@@ -150,9 +149,8 @@ export const useFileActionsCreateNewFile = ({
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to create file'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to create file')
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 40d826ec289..d1ee6f33a84 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -74,9 +74,8 @@ export const useFileActionsCreateNewFolder = ({
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to create folder'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to create folder')
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
index 40333955efa..f918f2f984c 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
@@ -47,9 +47,8 @@ export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showMessage', {
-        title: $gettext('Creating space failed…'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Creating space failed…')
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts
index 65ae1daec96..7fd764e1f53 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts
@@ -73,13 +73,12 @@ export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {
       return
     }
 
-    store.dispatch('showMessage', {
+    store.dispatch('showErrorMessage', {
       title: $ngettext(
         'Failed to decline the selected share',
         'Failed to decline selected shares',
         resources.length
-      ),
-      status: 'danger'
+      )
     })
   }
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts
index 3a5caae656c..3455344b803 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts
@@ -56,13 +56,12 @@ export const useFileActionsDownloadArchive = ({ store }: { store?: Store<any> }
       })
       .catch((e) => {
         console.error(e)
-        store.dispatch('showMessage', {
+        store.dispatch('showErrorMessage', {
           title: $ngettext(
             'Failed to download the selected folder.', // on single selection only available for folders
             'Failed to download the selected files.', // on multi selection available for files+folders
             resources.length
-          ),
-          status: 'danger'
+          )
         })
       })
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
index 87079580e99..41d96fc8a9e 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -39,12 +39,11 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
       })
       .catch((error) => {
         console.error(error)
-        store.dispatch('showMessage', {
+        store.dispatch('showErrorMessage', {
           title: $pgettext(
             'Error message in case emptying trash bin fails',
             'Failed to empty trash bin'
-          ),
-          status: 'danger'
+          )
         })
       })
       .finally(() => {
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts
index 75a6c7b7db8..7855d94b7bb 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts
@@ -28,9 +28,8 @@ export const useFileActionsFavorite = ({ store }: { store?: Store<any> } = {}) =
       .catch(() => {
         const translated = $gettext('Failed to change favorite state of "%{file}"')
         const title = $gettextInterpolate(translated, { file: resources[0].name }, true)
-        store.dispatch('showMessage', {
-          title: title,
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: title
         })
       })
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsPaste.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsPaste.ts
index a0cd440299e..49f167012b1 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsPaste.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsPaste.ts
@@ -64,6 +64,7 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
             createModal: (...args) => store.dispatch('createModal', ...args),
             hideModal: (...args) => store.dispatch('hideModal', ...args),
             showMessage: (...args) => store.dispatch('showMessage', ...args),
+            showErrorMessage: (...args) => store.dispatch('showErrorMessage', ...args),
             $gettext,
             $gettextInterpolate,
             $ngettext
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
index ee7bba8b3d8..0b360bc73b7 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
@@ -143,9 +143,8 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
         translated = $gettext('Failed to rename "%{file}" to "%{newName}" - the file is locked')
       }
       const title = $gettextInterpolate(translated, { file: resource.name, newName }, true)
-      store.dispatch('showMessage', {
-        title,
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts
index 14db06b8cef..be3c73a0b22 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts
@@ -97,6 +97,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
         (...args) => store.dispatch('createModal', ...args),
         (...args) => store.dispatch('hideModal', ...args),
         (...args) => store.dispatch('showMessage', ...args),
+        (...args) => store.dispatch('showErrorMessage', ...args),
         $gettext,
         $ngettext,
         $gettextInterpolate
@@ -207,9 +208,8 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
         translated = $gettext('Failed to restore %{resourceCount} files')
         translateParams.resourceCount = failedResources.length
       }
-      store.dispatch('showMessage', {
-        title: $gettextInterpolate(translated, translateParams, true),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettextInterpolate(translated, translateParams, true)
       })
     }
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts
index e2063100794..923f9144655 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts
@@ -73,9 +73,8 @@ export const useFileActionsSetImage = ({ store }: { store?: Store<any> } = {}) =
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to set space image'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to set space image')
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts b/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts
index 4e0ae7d4b94..00acbaf0a1e 100644
--- a/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts
+++ b/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts
@@ -147,9 +147,8 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
 
         console.error(error)
         const translated = $gettext('Failed to delete "%{file}"')
-        store.dispatch('showMessage', {
-          title: $gettextInterpolate(translated, { file: resource.name }, true),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettextInterpolate(translated, { file: resource.name }, true)
         })
       })
   }
diff --git a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
index 6f47210376b..7051d2b711c 100644
--- a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
+++ b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
@@ -44,9 +44,8 @@ export const useSpaceActionsUploadImage = ({
     }
 
     if (!previewService.isMimetypeSupported(file.type, true)) {
-      return store.dispatch('showMessage', {
-        title: $gettext('The file type is unsupported'),
-        status: 'danger'
+      return store.dispatch('showErrorMessage', {
+        title: $gettext('The file type is unsupported')
       })
     }
 
@@ -93,9 +92,8 @@ export const useSpaceActionsUploadImage = ({
         })
         .catch((error) => {
           console.error(error)
-          store.dispatch('showMessage', {
-            title: $gettext('Failed to upload space image'),
-            status: 'danger'
+          store.dispatch('showErrorMessage', {
+            title: $gettext('Failed to upload space image')
           })
         })
     })
diff --git a/packages/web-app-files/src/helpers/resource/actions/transfer.ts b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
index 505001e5bca..6747ff87ca2 100644
--- a/packages/web-app-files/src/helpers/resource/actions/transfer.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
@@ -22,11 +22,20 @@ export class ResourceTransfer extends ConflictDialog {
     createModal: (modal: object) => void,
     hideModal: () => void,
     showMessage: (data: object) => void,
+    showErrorMessage: (data: object) => void,
     $gettext: (msg: string) => string,
     $ngettext: (msgid: string, plural: string, n: number) => string,
     $gettextInterpolate: (msg: string, context: object, disableHtmlEscaping?: boolean) => string
   ) {
-    super(createModal, hideModal, showMessage, $gettext, $ngettext, $gettextInterpolate)
+    super(
+      createModal,
+      hideModal,
+      showMessage,
+      showErrorMessage,
+      $gettext,
+      $ngettext,
+      $gettextInterpolate
+    )
   }
 
   hasRecursion(): boolean {
@@ -45,7 +54,7 @@ export class ResourceTransfer extends ConflictDialog {
       "You can't paste the selected files at this location because you can't paste an item into itself.",
       count
     )
-    this.showMessage({ title, status: 'danger' })
+    this.showErrorMessage({ title })
   }
 
   showResultMessage(errors, movedResources: Array<Resource>, transferType: TransferType) {
@@ -89,9 +98,8 @@ export class ResourceTransfer extends ConflictDialog {
         true
       )
     }
-    this.showMessage({
-      title,
-      status: 'danger'
+    this.showErrorMessage({
+      title
     })
   }
 
diff --git a/packages/web-app-files/src/helpers/resource/actions/upload.ts b/packages/web-app-files/src/helpers/resource/actions/upload.ts
index 5c09cfdf4b1..3f15c2894b1 100644
--- a/packages/web-app-files/src/helpers/resource/actions/upload.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/upload.ts
@@ -19,6 +19,7 @@ export class ResourceConflict extends ConflictDialog {
       (modal) => store.dispatch('createModal', modal),
       () => store.dispatch('hideModal'),
       (msg) => store.dispatch('showMessage', msg),
+      (msg) => store.dispatch('showErrorMessage', msg),
       $gettext,
       $ngettext,
       $gettextInterpolate
diff --git a/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts b/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts
index b2b2648d133..a08e9b9bcd4 100644
--- a/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts
+++ b/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts
@@ -13,6 +13,7 @@ export class ConflictDialog {
     protected createModal: (modal: object) => void,
     protected hideModal: () => void,
     protected showMessage: (data: object) => void,
+    protected showErrorMessage: (data: object) => void,
     protected $gettext: (msg: string) => string,
     protected $ngettext: (msgid: string, plural: string, n: number) => string,
     protected $gettextInterpolate: (
diff --git a/packages/web-app-files/src/quickActions.ts b/packages/web-app-files/src/quickActions.ts
index 3ac6837b6ca..a2e01d0d08a 100644
--- a/packages/web-app-files/src/quickActions.ts
+++ b/packages/web-app-files/src/quickActions.ts
@@ -31,9 +31,8 @@ export function showQuickLinkPasswordModal({ $gettext, store }, onConfirm) {
     onCancel: () => store.dispatch('hideModal'),
     onConfirm: async (password) => {
       if (!password || password.trim() === '') {
-        store.dispatch('showMessage', {
-          title: $gettext('Password cannot be empty'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Password cannot be empty')
         })
       } else {
         await store.dispatch('hideModal')
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index aae24fb4ddf..2197c271c34 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -81,6 +81,7 @@ export default {
       createModal,
       hideModal,
       showMessage,
+      showErrorMessage,
       $gettext,
       $gettextInterpolate,
       $ngettext,
@@ -98,6 +99,7 @@ export default {
       createModal,
       hideModal,
       showMessage,
+      showErrorMessage,
       $gettext,
       $ngettext,
       $gettextInterpolate
@@ -200,10 +202,9 @@ export default {
           }
           const title = $gettextInterpolate(translated, { file: file.name }, true)
           context.dispatch(
-            'showMessage',
+            'showErrorMessage',
             {
-              title: title,
-              status: 'danger'
+              title: title
             },
             { root: true }
           )
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 82e4261d962..c78e5f29311 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -576,7 +576,7 @@ export default defineComponent({
 
   methods: {
     ...mapActions('Files', ['loadPreview']),
-    ...mapActions(['showMessage', 'createModal', 'hideModal']),
+    ...mapActions(['showMessage', 'showErrorMessage', 'createModal', 'hideModal']),
     ...mapMutations('Files', ['REMOVE_FILES', 'REMOVE_FILES_FROM_SEARCHED', 'RESET_SELECTION']),
 
     async fileDropped(fileTarget) {
@@ -624,6 +624,7 @@ export default defineComponent({
         this.createModal,
         this.hideModal,
         this.showMessage,
+        this.showErrorMessage,
         this.$gettext,
         this.$ngettext,
         this.$gettextInterpolate
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
index d930f85c038..eccece06db3 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
@@ -42,13 +42,7 @@ describe('CreateSpace component', () => {
       const graphMock = mocks.$clientService.graphAuthenticated
       graphMock.drives.createDrive.mockRejectedValue({})
       await wrapper.vm.addNewSpace('New space')
-      expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          status: 'danger',
-          title: 'Creating space failed…'
-        })
-      )
+      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
     })
   })
 })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts
index a3be52af27b..0bedb7068fd 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts
@@ -138,13 +138,13 @@ describe('Collaborator ListItem component', () => {
         throw new Error()
       })
       const changeShareStub = jest.spyOn(wrapper.vm, 'changeShare')
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       ;(wrapper.findComponent<any>('role-dropdown-stub').vm as any).$emit('optionChange', {
         role: peopleRoleViewerFile,
         permissions: [SharePermissions.read]
       })
       expect(changeShareStub).not.toHaveBeenCalled()
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
     })
   })
   describe('change expiration date', () => {
@@ -163,12 +163,12 @@ describe('Collaborator ListItem component', () => {
         throw new Error()
       })
       const changeShareStub = jest.spyOn(wrapper.vm, 'changeShare')
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       ;(wrapper.findComponent<any>('edit-dropdown-stub').vm as any).$emit('expirationDateChanged', {
         shareExpirationChanged: new Date()
       })
       expect(changeShareStub).not.toHaveBeenCalled()
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
     })
   })
 })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
index d4e1e2f3105..1601d993bd3 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
@@ -163,10 +163,10 @@ describe('FileShares', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const { wrapper } = getWrapper()
       jest.spyOn(wrapper.vm, 'deleteShare').mockRejectedValue(new Error())
-      const showMessageSpy = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageSpy = jest.spyOn(wrapper.vm, 'showErrorMessage')
       const share = mock<Share>()
       await wrapper.vm.$_ocCollaborators_deleteShare(share)
-      expect(showMessageSpy).toHaveBeenCalled()
+      expect(showErrorMessageSpy).toHaveBeenCalled()
     })
     it('removes file when the last share on the "Shared with others"-page has been removed', async () => {
       const { wrapper } = getWrapper({
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts
index 9b3b9d2b594..a21c4c0b3a2 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts
@@ -121,10 +121,10 @@ describe('SpaceMembers', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const wrapper = getWrapper()
       jest.spyOn(wrapper.vm, 'deleteSpaceMember').mockRejectedValue(new Error())
-      const showMessageSpy = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageSpy = jest.spyOn(wrapper.vm, 'showErrorMessage')
       const share = mock<Share>()
       await wrapper.vm.$_ocCollaborators_deleteShare(share)
-      expect(showMessageSpy).toHaveBeenCalled()
+      expect(showErrorMessageSpy).toHaveBeenCalled()
     })
     it('redirects to the "files-spaces-projects"-page when the current user has been removed', async () => {
       const user = mock<User>({ id: memberMocks.manager.collaborator.name })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/TagsPanel.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/TagsPanel.spec.ts
index 8c166f5a93a..17ddd068ace 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/TagsPanel.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/TagsPanel.spec.ts
@@ -122,7 +122,7 @@ describe('Tags Panel', () => {
     await wrapper.vm.save()
     expect(assignTagsStub).toHaveBeenCalled()
     expect(eventStub).not.toHaveBeenCalled()
-    expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+    expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
   })
 
   it('does not accept tags consisting of blanks only', () => {
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 0f85509e96c..a5741b57f4e 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -60,11 +60,10 @@ describe('useFileActionsCreateNewFile', () => {
         setup: async ({ addNewFile }, { storeOptions }) => {
           await addNewFile('myfolder', null)
           await nextTick()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledWith(
             expect.anything(),
             expect.objectContaining({
-              title: 'Failed to create file',
-              status: 'danger'
+              title: 'Failed to create file'
             })
           )
           consoleErrorMock.mockRestore()
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index 4d7a5eb21d5..d7389c65eba 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -58,11 +58,10 @@ describe('useFileActionsCreateNewFolder', () => {
         setup: async ({ addNewFolder }, { storeOptions }) => {
           await addNewFolder('myfolder')
           await nextTick()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledWith(
             expect.anything(),
             expect.objectContaining({
-              title: 'Failed to create folder',
-              status: 'danger'
+              title: 'Failed to create folder'
             })
           )
           consoleErrorMock.mockRestore()
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
index 93a014121fa..d40b601f97b 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
@@ -72,7 +72,7 @@ describe('emptyTrashBin', () => {
         setup: async ({ emptyTrashBin }, { space, storeOptions }) => {
           await emptyTrashBin({ space })
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRename.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
index f15d0d6c6b3..bf947934876 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
@@ -150,7 +150,7 @@ describe('rename', () => {
           await nextTick()
           await nextTick()
           expect(storeOptions.actions.hideModal).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
index 583aa0affb8..fd853f692d6 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
@@ -102,11 +102,11 @@ describe('restore', () => {
       const { wrapper } = getWrapper({
         resolveClearTrashBin: false,
         setup: async ({ actions }) => {
-          const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+          const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
           const removeFilesFromTrashbinStub = jest.spyOn(wrapper.vm, 'removeFilesFromTrashbin')
           await wrapper.vm.$_restore_restoreResources([{ id: '1', path: '/1' }], [])
 
-          expect(showMessageStub).toHaveBeenCalledTimes(1)
+          expect(showErrorMessageStub).toHaveBeenCalledTimes(1)
           expect(removeFilesFromTrashbinStub).toHaveBeenCalledTimes(0)
         }
       })
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
index 4b697c9bad6..6bab128a9aa 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
@@ -130,7 +130,7 @@ describe('setImage', () => {
               }
             ] as Resource[]
           })
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts b/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
index 7106dcf4590..ee41fc16647 100644
--- a/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
@@ -39,7 +39,7 @@ describe('uploadImage', () => {
       })
     })
 
-    it('should show message on error', () => {
+    it('should show showErrorMessage on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
         setup: async ({ uploadImageSpace }, { storeOptions, clientService }) => {
@@ -53,7 +53,7 @@ describe('uploadImage', () => {
             }
           })
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-files/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts
index a2997b9660f..affcc422767 100644
--- a/packages/web-app-files/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts
+++ b/packages/web-app-files/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts
@@ -3,7 +3,15 @@ import { Resource } from 'web-client'
 import { ConflictDialog, ResolveConflict } from 'web-app-files/src/helpers/resource'
 
 const getConflictDialogInstance = ({ createModal = jest.fn() } = {}) => {
-  return new ConflictDialog(createModal, jest.fn(), jest.fn(), jest.fn(), jest.fn(), jest.fn())
+  return new ConflictDialog(
+    createModal,
+    jest.fn(),
+    jest.fn(),
+    jest.fn(),
+    jest.fn(),
+    jest.fn(),
+    jest.fn()
+  )
 }
 
 describe('conflict dialog', () => {
diff --git a/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
index 0dae7862a73..e785dc86d82 100644
--- a/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
+++ b/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
@@ -72,6 +72,7 @@ describe('resourcesTransfer', () => {
       jest.fn(),
       jest.fn(),
       jest.fn(),
+      jest.fn(),
       jest.fn()
     )
     const result = await resourcesTransfer.perform(TransferType.COPY)
@@ -101,6 +102,7 @@ describe('resourcesTransfer', () => {
           jest.fn(),
           jest.fn(),
           jest.fn(),
+          jest.fn(),
           jest.fn()
         )
         const movedResources = await resourcesTransfer.perform(action)
@@ -141,6 +143,7 @@ describe('resourcesTransfer', () => {
       jest.fn(),
       jest.fn(),
       jest.fn(),
+      jest.fn(),
       jest.fn()
     )
     resourcesTransfer.resolveFileExists = jest
@@ -171,6 +174,7 @@ describe('resourcesTransfer', () => {
       jest.fn(),
       jest.fn(),
       jest.fn(),
+      jest.fn(),
       jest.fn()
     )
     const namingClash = await resourcesTransfer.isOverwritingParentFolder(
diff --git a/packages/web-app-text-editor/src/App.vue b/packages/web-app-text-editor/src/App.vue
index aa2cacc54e6..e6f1152d4ba 100644
--- a/packages/web-app-text-editor/src/App.vue
+++ b/packages/web-app-text-editor/src/App.vue
@@ -99,10 +99,9 @@ export default defineComponent({
     let autosaveIntervalId = null
 
     const errorPopup = (error) => {
-      store.dispatch('showMessage', {
+      store.dispatch('showErrorMessage', {
         title: $gettext('An error occurred'),
-        desc: error,
-        status: 'danger'
+        desc: error
       })
     }
 
diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
index 45f3906931b..129bc68a8da 100644
--- a/packages/web-pkg/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -189,7 +189,7 @@ export default defineComponent({
       const errors = results.filter((r) => r.status === 'rejected')
       if (errors.length) {
         errors.forEach(console.error)
-        store.dispatch('showMessage', { title: getErrorMessage(errors.length) })
+        store.dispatch('showErrorMessage', { title: getErrorMessage(errors.length) })
       }
 
       props.cancel()
diff --git a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
index 857351b0b5a..d62912aea05 100644
--- a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
+++ b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
@@ -54,7 +54,7 @@ export default defineComponent({
     this.readmeContent = await this.$client.files.getFileContents(decodeURI(path))
   },
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapMutations('Files', ['UPDATE_RESOURCE_FIELD']),
 
     editReadme() {
@@ -76,9 +76,8 @@ export default defineComponent({
         })
         .catch((error) => {
           console.error(error)
-          this.showMessage({
-            title: this.$gettext('Failed to edit space description'),
-            status: 'danger'
+          this.showErrorMessage({
+            title: this.$gettext('Failed to edit space description')
           })
         })
     }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
index 4e8ff0fefb5..222ebbf51db 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
@@ -50,9 +50,8 @@ export const useFileActionsSetReadme = ({ store }: { store?: Store<any> } = {})
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showMessage', {
-        title: $gettext('Failed to set space description'),
-        status: 'danger'
+      store.dispatch('showErrorMessage', {
+        title: $gettext('Failed to set space description')
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
index be9f1d50c74..acfe10f6d48 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
@@ -37,11 +37,10 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
         })
         .catch((error) => {
           console.error(error)
-          store.dispatch('showMessage', {
+          store.dispatch('showErrorMessage', {
             title: $gettext('Failed to delete space %{spaceName}', {
               spaceName: space.name
-            }),
-            status: 'danger'
+            })
           })
         })
       requests.push(request)
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
index 01e20f58645..9b96090024a 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
@@ -42,11 +42,10 @@ export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) =
         })
         .catch((error) => {
           console.error(error)
-          store.dispatch('showMessage', {
+          store.dispatch('showErrorMessage', {
             title: $gettext('Failed to disable space %{spaceName}', {
               spaceName: space.name
-            }),
-            status: 'danger'
+            })
           })
         })
       requests.push(request)
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
index 84ac07146f7..4ac6147d37b 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
@@ -34,9 +34,8 @@ export const useSpaceActionsEditDescription = ({ store }: { store?: Store<any> }
       })
       .catch((error) => {
         console.error(error)
-        store.dispatch('showMessage', {
-          title: $gettext('Failed to change space subtitle'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Failed to change space subtitle')
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
index f68109dab09..876bb44b6b9 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
@@ -35,9 +35,8 @@ export const useSpaceActionsRename = ({ store }: { store?: Store<any> } = {}) =>
       })
       .catch((error) => {
         console.error(error)
-        store.dispatch('showMessage', {
-          title: $gettext('Failed to rename space'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Failed to rename space')
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
index 9fdcd21bcee..f36a2f1d590 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
@@ -46,11 +46,10 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
         })
         .catch((error) => {
           console.error(error)
-          store.dispatch('showMessage', {
+          store.dispatch('showErrorMessage', {
             title: $gettext('Failed to restore space %{spaceName}', {
               spaceName: space.name
-            }),
-            status: 'danger'
+            })
           })
         })
       requests.push(request)
diff --git a/packages/web-pkg/src/composables/download/useDownloadFile.ts b/packages/web-pkg/src/composables/download/useDownloadFile.ts
index cfe461fb5d5..05efa51ac89 100644
--- a/packages/web-pkg/src/composables/download/useDownloadFile.ts
+++ b/packages/web-pkg/src/composables/download/useDownloadFile.ts
@@ -48,13 +48,10 @@ export const useDownloadFile = () => {
       } catch (e) {
         console.error(e)
       }
-      store.dispatch('showMessage', {
+      store.dispatch('showErrorMessage', {
         title: $gettext('Download failed'),
         desc: $gettext('File could not be located'),
-        status: 'danger',
-        autoClose: {
-          enabled: true
-        }
+        status: 'danger'
       })
       return
     }
diff --git a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
index 3443e59840d..3defe1ee569 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
@@ -42,7 +42,7 @@ describe('QuotaModal', () => {
       expect(
         storeOptions.modules.runtime.modules.spaces.mutations.UPDATE_SPACE_FIELD
       ).toHaveBeenCalledTimes(0)
-      expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
     })
   })
 })
diff --git a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
index c18ecc4ce1f..d4598affdc3 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
@@ -25,10 +25,10 @@ describe('ReadmeContentModal', () => {
     it('should show message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const { wrapper } = getWrapper(false)
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       await wrapper.vm.editReadme()
 
-      expect(showMessageStub).toHaveBeenCalledTimes(1)
+      expect(showErrorMessageStub).toHaveBeenCalledTimes(1)
     })
   })
 })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
index d9054eb379a..38dd191722c 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
@@ -128,10 +128,7 @@ describe('setReadme', () => {
           })
 
           await nextTick()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
-            expect.anything(),
-            expect.objectContaining({ status: 'danger' })
-          )
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
index 2613388c59c..819d6bd395a 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
@@ -109,7 +109,7 @@ describe('delete', () => {
           clientService.graphAuthenticated.drives.deleteDrive.mockRejectedValue(new Error())
           await deleteSpaces([mock<SpaceResource>({ id: 1, canBeDeleted: () => true })])
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
index 3bb8441dcd9..6d8eff835d1 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
@@ -106,7 +106,7 @@ describe('disable', () => {
           clientService.graphAuthenticated.drives.deleteDrive.mockRejectedValue(new Error())
           await disableSpaces([mock<SpaceResource>({ id: 1, canDisable: () => true })])
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts
index 7e16362d1d0..f5289373a57 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts
@@ -52,7 +52,7 @@ describe('editDescription', () => {
           clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
           await editDescriptionSpace(mock<SpaceResource>(), 'doesntmatter')
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts
index 47096a0aa83..169cfda484b 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts
@@ -54,7 +54,7 @@ describe('rename', () => {
           clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
           await renameSpace(1, 'renamed space')
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts
index 799668ffec4..a6df3cee281 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts
@@ -107,7 +107,7 @@ describe('restore', () => {
           clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
           await restoreSpaces([mock<SpaceResource>({ id: 1, canRestore: () => true })])
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-runtime/src/components/Account/GdprExport.vue b/packages/web-runtime/src/components/Account/GdprExport.vue
index 731556a35a2..20d60187c8a 100644
--- a/packages/web-runtime/src/components/Account/GdprExport.vue
+++ b/packages/web-runtime/src/components/Account/GdprExport.vue
@@ -101,9 +101,8 @@ export default defineComponent({
           title: $gettext('GDPR export has been requested')
         })
       } catch (e) {
-        return store.dispatch('showMessage', {
-          title: $gettext('GDPR export could not be requested. Please contact an administrator.'),
-          status: 'danger'
+        return store.dispatch('showErrorMessage', {
+          title: $gettext('GDPR export could not be requested. Please contact an administrator.')
         })
       }
     }
diff --git a/packages/web-runtime/src/components/MessageBar.vue b/packages/web-runtime/src/components/MessageBar.vue
index 5054ee23b0f..6a8f60729a2 100644
--- a/packages/web-runtime/src/components/MessageBar.vue
+++ b/packages/web-runtime/src/components/MessageBar.vue
@@ -6,6 +6,8 @@
       :title="item.title"
       :message="item.desc"
       :status="item.status"
+      :timeout="item.timeout"
+      :error-log-content="item.errorLogContent"
       @close="deleteMessage(item)"
     />
   </oc-notifications>
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index 3a33d9c4403..f54ced208c9 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -187,9 +187,8 @@ export default defineComponent({
         valuesList.value = values || []
       } catch (e) {
         console.error(e)
-        store.dispatch('showMessage', {
-          title: $gettext('Unable to load account data…'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Unable to load account data…')
         })
         valuesList.value = []
       }
@@ -203,9 +202,8 @@ export default defineComponent({
         accountBundle.value = bundles?.find((b) => b.extension === 'ocis-accounts')
       } catch (e) {
         console.error(e)
-        store.dispatch('showMessage', {
-          title: $gettext('Unable to load account data…'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Unable to load account data…')
         })
         accountBundle.value = undefined
       }
@@ -314,9 +312,8 @@ export default defineComponent({
         })
       } catch (e) {
         console.error(e)
-        store.dispatch('showMessage', {
-          title: $gettext('Saving language failed…'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Saving language failed…')
         })
       }
     }
@@ -333,9 +330,8 @@ export default defineComponent({
         })
       } catch (e) {
         console.error(e)
-        store.dispatch('showMessage', {
-          title: $gettext('Unable to save email notifications preference…'),
-          status: 'danger'
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Unable to save email notifications preference…')
         })
       }
     }
@@ -394,7 +390,7 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions(['showMessage']),
+    ...mapActions(['showMessage', 'showErrorMessage']),
     showEditPasswordModal() {
       this.editPasswordModalOpen = true
     },
@@ -412,9 +408,8 @@ export default defineComponent({
         })
         .catch((error) => {
           console.error(error)
-          this.showMessage({
-            title: this.$gettext('Failed to change password'),
-            status: 'danger'
+          this.showErrorMessage({
+            title: this.$gettext('Failed to change password')
           })
         })
     }
diff --git a/packages/web-runtime/src/store/app.ts b/packages/web-runtime/src/store/app.ts
index de507e4434f..00d365c96df 100644
--- a/packages/web-runtime/src/store/app.ts
+++ b/packages/web-runtime/src/store/app.ts
@@ -4,6 +4,12 @@ const state = {
 }
 
 const actions = {
+  showErrorMessage({ commit }, message) {
+    message.status = message.status || 'danger'
+    message.timeout = message.timeout || 0
+
+    commit('ENQUEUE_MESSAGE', message)
+  },
   showMessage({ commit }, message) {
     commit('ENQUEUE_MESSAGE', message)
   },
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.ts b/packages/web-runtime/tests/unit/pages/account.spec.ts
index cc2c8528aae..6dee46ece5d 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/account.spec.ts
@@ -156,9 +156,9 @@ describe('account page', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const { wrapper, mocks } = getWrapper()
       mocks.$clientService.graphAuthenticated.users.changeOwnPassword.mockRejectedValue(new Error())
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
       await wrapper.vm.editPassword('password', 'newPassword')
-      expect(showMessageStub).toHaveBeenCalled()
+      expect(showErrorMessageStub).toHaveBeenCalled()
     })
   })
 
@@ -225,10 +225,7 @@ describe('account page', () => {
 
       mocks.$clientService.httpAuthenticated.post.mockImplementation(() => mockAxiosReject('err'))
       await wrapper.vm.updateDisableEmailNotifications(true)
-      expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({ status: 'danger' })
-      )
+      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
     })
   })
 })
diff --git a/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts b/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
index 09d3df9ada3..e05906d7416 100644
--- a/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
+++ b/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
@@ -44,6 +44,7 @@ export const defaultStoreMockOptions = {
     toggleModalConfirmButton: jest.fn(),
     setModalConfirmButtonDisabled: jest.fn(),
     showMessage: jest.fn(),
+    showErrorMessage: jest.fn(),
     deleteNotification: jest.fn(),
     loadTheme: jest.fn(),
     setModalInputErrorMessage: jest.fn(),
diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
index 0801e4ead29..5f935c4d04e 100644
--- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
+++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -22,7 +22,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIFavorites/favoritesFile.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/favoritesFile.feature#L73)
 -   [webUIFavorites/favoritesFile.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/favoritesFile.feature#L80)
 -   [webUIFavorites/favoritesFile.feature:105](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/favoritesFile.feature#L105)
--   [webUIFavorites/favoritesFile.feature:124](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/favoritesFile.feature#L124)
+-   [webUIFavorites/favoritesFile.feature:126](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/favoritesFile.feature#L126)
 -   [webUIFavorites/unfavoriteFile.feature:12](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L12)
 -   [webUIFavorites/unfavoriteFile.feature:33](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L33)
 -   [webUIFavorites/unfavoriteFile.feature:54](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L54)
@@ -32,7 +32,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIResharing1/reshareUsers.feature:177](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L177)
 
 ### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256)
--   [webUIRenameFiles/renameFiles.feature:226](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L226)
+-   [webUIRenameFiles/renameFiles.feature:227](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L227)
 
 ### [Cannot create users with special characters](https://github.com/owncloud/ocis/issues/1417)
 -   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L37)
@@ -111,7 +111,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 ### [Favorites deactivated in ocis temporarily](https://github.com/owncloud/ocis/issues/1228)
 -   [webUIFilesDetails/fileDetails.feature:47](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L47)
 -   [webUIFilesDetails/fileDetails.feature:67](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L67)
--   [webUIRenameFiles/renameFiles.feature:249](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L249)
+-   [webUIRenameFiles/renameFiles.feature:250](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L250)
 
 ### [PROPFIND to sub-folder of a shared resources with same name gives 404](https://github.com/owncloud/ocis/issues/3859)
 -   [webUISharingAcceptShares/acceptShares.feature:240](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L240)
diff --git a/tests/acceptance/features/webUIFavorites/favoritesFile.feature b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
index ad742681404..14698b3b44f 100644
--- a/tests/acceptance/features/webUIFavorites/favoritesFile.feature
+++ b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
@@ -112,10 +112,12 @@ Feature: Mark file as favorite
       | simple-folder |
     When the user marks file "lorem.txt" as favorite using the webUI
     Then the "error" message with header 'Failed to change favorite state of "lorem.txt"' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And file "lorem.txt" should not be marked as favorite on the webUI
     When the user clears all error message from the webUI
     And the user marks folder "simple-folder" as favorite using the webUI
     Then the "error" message with header 'Failed to change favorite state of "simple-folder"' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And folder "simple-folder" should not be marked as favorite on the webUI
     And as "Alice" file "lorem.txt" should not exist in the server
     And as "Alice" folder "simple-folder" should not exist in the server
diff --git a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
index f788e524324..a3ffaa502e8 100644
--- a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
+++ b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
@@ -110,10 +110,12 @@ Feature: Unmark file/folder as favorite
       | simple-folder |
     When the user unmarks the favorited file "lorem.txt" using the webUI
     Then the "error" message with header 'Failed to change favorite state of "lorem.txt"' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And file "lorem.txt" should be marked as favorite on the webUI
     When the user clears all error message from the webUI
     And the user unmarks the favorited folder "simple-folder" using the webUI
     Then the "error" message with header 'Failed to change favorite state of "simple-folder"' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And folder "simple-folder" should be marked as favorite on the webUI
     And as "Alice" file "lorem.txt" should not exist in the server
     And as "Alice" folder "simple-folder" should not exist in the server
diff --git a/tests/acceptance/features/webUIFiles/download.feature b/tests/acceptance/features/webUIFiles/download.feature
index 0482cbd9d92..5b6a5a9a058 100644
--- a/tests/acceptance/features/webUIFiles/download.feature
+++ b/tests/acceptance/features/webUIFiles/download.feature
@@ -14,8 +14,9 @@ Feature: download files
       | name      |
       | lorem.txt |
     When the user downloads file "lorem.txt" using the webUI
-    Then the "error" message with header 'Download failed' should be displayed on the webUI
-    When the user reloads the current page of the webUI
+    Then  the "error" message with header 'Download failed' should be displayed on the webUI
+    When the user clears all error message from the webUI
+    And the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And as "Alice" file "lorem.txt" should not exist in the server
 
diff --git a/tests/acceptance/features/webUIFilesCopy/copy.feature b/tests/acceptance/features/webUIFilesCopy/copy.feature
index 36e89b03342..7d21e476b47 100644
--- a/tests/acceptance/features/webUIFilesCopy/copy.feature
+++ b/tests/acceptance/features/webUIFilesCopy/copy.feature
@@ -114,6 +114,7 @@ Feature: copy files and folders
     And user "Alice" has logged in using the webUI
     When the user tries to copy folder "simple-empty-folder" into folder "simple-empty-folder" using the webUI
     Then the "error" message with header "You can't paste the selected file at this location because you can't paste an item into itself." should be displayed on the webUI
+    And the user clears all error message from the webUI
     And as "Alice" file "simple-empty-folder/simple-empty-folder" should not exist in the server
 
 
diff --git a/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature b/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature
index 9a5db02976c..a9d2d03602a 100644
--- a/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature
+++ b/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature
@@ -82,6 +82,7 @@ Feature: move folders
     Given user "Alice" has logged in using the webUI
     When the user tries to move folder "simple-empty-folder" into folder "simple-empty-folder" using the webUI
     Then the "error" message with header "You can't paste the selected file at this location because you can't paste an item into itself." should be displayed on the webUI
+    And the user clears all error message from the webUI
     And as "Alice" folder "simple-empty-folder/simple-empty-folder" should not exist in the server
 
 
diff --git a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
index 7ffff920b6e..08eb8ca3c8e 100644
--- a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
+++ b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
@@ -114,6 +114,7 @@ Feature: rename files
     Given user "Alice" has logged in using the webUI
     When the user tries to rename file "data.zip" to "<filename>" using the webUI
     Then the "error" message with header 'Failed to rename "data.zip" to "<filename>"' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And file "data.zip" should be listed on the webUI
     And file "<filename>" should not be listed on the webUI
     Examples:
diff --git a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
index 8fcedfcdd97..5af551ce981 100644
--- a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
+++ b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
@@ -105,6 +105,7 @@ Feature: rename folders
     Given user "Alice" has logged in using the webUI
     When the user tries to rename folder <from_name> to <to_name> using the webUI
     Then the "error" message with header '<alert_message>' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And folder "simple-folder" should be listed on the webUI
     Examples:
       | from_name       | to_name           | alert_message                                         |
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index b4c0be462bd..00d10eefe09 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -163,10 +163,12 @@ Feature: Sharing files and folders with internal users
       | simple-folder |
     When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI
     Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And user "Brian Murphy" should not be listed in the collaborators list on the webUI
     When the user clears all error message from the webUI
     And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI
     Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And user "Brian Murphy" should not be listed in the collaborators list on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
index 2a0642e28a5..5a168a5a140 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
@@ -160,10 +160,12 @@ Feature: Sharing files and folders with internal users
       | simple-folder |
     When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI
     Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And user "UserTwo" should not be listed in the collaborators list on the webUI
     When the user clears all error message from the webUI
     And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI
     Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    And the user clears all error message from the webUI
     And user "UserTwo" should not be listed in the collaborators list on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
diff --git a/tests/acceptance/pageObjects/webPage.js b/tests/acceptance/pageObjects/webPage.js
index e81cee91714..d5574daf2bc 100644
--- a/tests/acceptance/pageObjects/webPage.js
+++ b/tests/acceptance/pageObjects/webPage.js
@@ -235,7 +235,8 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     clearErrorMessage: {
-      selector: '//div[contains(@class, "oc-alert")]/button[contains(@aria-label, "Close")]',
+      selector:
+        '//*[contains(@class, "oc-notification-message-danger")]//button[contains(@aria-label, "Close")]',
       locateStrategy: 'xpath'
     },
     notificationBell: {
diff --git a/tests/acceptance/stepDefinitions/generalContext.js b/tests/acceptance/stepDefinitions/generalContext.js
index 2b3f34c789f..b38718320a6 100644
--- a/tests/acceptance/stepDefinitions/generalContext.js
+++ b/tests/acceptance/stepDefinitions/generalContext.js
@@ -77,16 +77,6 @@ Then(
   async function (type, message) {
     const text = await client.page.webPage().getDisplayedMessage(type, true)
     assert.strictEqual(text, message)
-
-    const element =
-      type === 'error'
-        ? '@errorMessage'
-        : type === 'modal error'
-        ? '@modalErrorMessage'
-        : '@message'
-    if (type === 'error') {
-      return await client.page.webPage().waitForElementNotPresent(element)
-    }
   }
 )
 

From 9585b0be73c8a148f1c956062b8bdf3b704dddb5 Mon Sep 17 00:00:00 2001
From: Jan <jackermann@owncloud.com>
Date: Mon, 24 Jul 2023 15:21:06 +0200
Subject: [PATCH 5/7] Show error log in graph requests (#9466)

* Show error log in graph requests

* Add more

* Fix

* Reformat

* Fix

* Access response headers

* Fix bug

* Fix bug
---
 .../general/useGeneralActionsResetLogo.ts       |  3 ++-
 .../general/useGeneralActionsUploadLogo.ts      |  3 ++-
 .../web-app-admin-settings/src/views/Groups.vue |  6 ++++--
 .../web-app-admin-settings/src/views/Users.vue  | 15 ++++++++++-----
 packages/web-app-draw-io/src/App.vue            |  3 ++-
 .../src/components/AppBar/CreateSpace.vue       |  3 ++-
 .../InviteCollaboratorForm.vue                  |  3 ++-
 .../SideBar/Shares/Collaborators/ListItem.vue   |  9 ++++++---
 .../src/components/SideBar/Shares/FileLinks.vue |  9 ++++++---
 .../components/SideBar/Shares/FileShares.vue    |  9 ++++++---
 .../components/SideBar/Shares/SpaceMembers.vue  |  3 ++-
 .../src/components/SideBar/TagsPanel.vue        |  3 ++-
 .../files/useFileActionsCreateNewFile.ts        |  6 ++++--
 .../files/useFileActionsCreateNewFolder.ts      |  3 ++-
 .../useFileActionsCreateSpaceFromResource.ts    |  3 ++-
 .../files/useFileActionsDownloadArchive.ts      |  3 ++-
 .../files/useFileActionsEmptyTrashBin.ts        |  3 ++-
 .../actions/files/useFileActionsFavorite.ts     |  5 +++--
 .../actions/files/useFileActionsRename.ts       |  3 ++-
 .../actions/files/useFileActionsSetImage.ts     |  3 ++-
 .../helpers/useFileActionsDeleteResources.ts    |  3 ++-
 .../spaces/useSpaceActionsUploadImage.ts        |  3 ++-
 packages/web-app-text-editor/src/App.vue        |  3 ++-
 .../components/Spaces/ReadmeContentModal.vue    |  3 ++-
 .../actions/files/useFileActionsSetReadme.ts    |  3 ++-
 .../actions/spaces/useSpaceActionsDelete.ts     |  3 ++-
 .../actions/spaces/useSpaceActionsDisable.ts    |  3 ++-
 .../spaces/useSpaceActionsEditDescription.ts    |  3 ++-
 .../actions/spaces/useSpaceActionsRename.ts     |  3 ++-
 .../actions/spaces/useSpaceActionsRestore.ts    |  3 ++-
 .../src/components/Account/GdprExport.vue       |  3 ++-
 .../web-runtime/src/layouts/Application.vue     |  2 +-
 packages/web-runtime/src/pages/account.vue      | 15 ++++++++++-----
 packages/web-runtime/src/store/app.ts           | 17 +++++++++++++++++
 34 files changed, 115 insertions(+), 50 deletions(-)

diff --git a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
index c8d6e95e319..98d485f4ab2 100644
--- a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
@@ -24,7 +24,8 @@ export const useGeneralActionsResetLogo = ({ store }: { store?: Store<any> }) =>
     } catch (e) {
       console.error(e)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to reset logo')
+        title: $gettext('Failed to reset logo'),
+        error: e
       })
     }
   }
diff --git a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
index 2b850694e97..a6301b19689 100644
--- a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
@@ -49,7 +49,8 @@ export const useGeneralActionsUploadLogo = ({
     } catch (e) {
       console.error(e)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to upload logo')
+        title: $gettext('Failed to upload logo'),
+        error: e
       })
     }
   }
diff --git a/packages/web-app-admin-settings/src/views/Groups.vue b/packages/web-app-admin-settings/src/views/Groups.vue
index f0c30e40b75..3ab69dbbf0b 100644
--- a/packages/web-app-admin-settings/src/views/Groups.vue
+++ b/packages/web-app-admin-settings/src/views/Groups.vue
@@ -241,7 +241,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Failed to create group')
+          title: this.$gettext('Failed to create group'),
+          error
         })
       }
     },
@@ -266,7 +267,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Failed to edit group')
+          title: this.$gettext('Failed to edit group'),
+          error
         })
       }
     }
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 75206b984fa..8334367b250 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -527,7 +527,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         await store.dispatch('showErrorMessage', {
-          title: $gettext('Failed add users to group')
+          title: $gettext('Failed add users to group'),
+          error: e
         })
       }
     }
@@ -560,7 +561,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         await store.dispatch('showErrorMessage', {
-          title: $gettext('Failed remove users from group')
+          title: $gettext('Failed remove users from group'),
+          error: e
         })
       }
     }
@@ -588,7 +590,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         return store.dispatch('showErrorMessage', {
-          title: $gettext('Failed to edit login')
+          title: $gettext('Failed to edit login'),
+          error: e
         })
       }
     }
@@ -717,7 +720,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Failed to create user')
+          title: this.$gettext('Failed to create user'),
+          error
         })
       }
     },
@@ -765,7 +769,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Failed to edit user')
+          title: this.$gettext('Failed to edit user'),
+          error
         })
       }
     },
diff --git a/packages/web-app-draw-io/src/App.vue b/packages/web-app-draw-io/src/App.vue
index fc4ae5c3a35..2ca688cc5c4 100644
--- a/packages/web-app-draw-io/src/App.vue
+++ b/packages/web-app-draw-io/src/App.vue
@@ -88,7 +88,8 @@ export default defineComponent({
     errorPopup(error) {
       this.showErrorMessage({
         title: this.$gettext('An error occurred'),
-        desc: error
+        desc: error,
+        error
       })
     },
     successPopup(msg) {
diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
index 6039ca81495..0b391edf04a 100644
--- a/packages/web-app-files/src/components/AppBar/CreateSpace.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -68,7 +68,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Creating space failed…')
+          title: this.$gettext('Creating space failed…'),
+          error
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 120758078d8..769c8b54c5c 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -354,7 +354,8 @@ export default defineComponent({
         this.showErrorMessage({
           title: this.$gettext('Failed to add share for %{displayName}', {
             displayName: e.displayName
-          })
+          }),
+          error: e
         })
       })
 
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index d4894512537..ab679a5b471 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -395,7 +395,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         this.showErrorMessage({
-          title: this.$gettext('Failed to apply new permissions')
+          title: this.$gettext('Failed to apply new permissions'),
+          error: e
         })
       }
     },
@@ -408,7 +409,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         this.showErrorMessage({
-          title: this.$gettext('Failed to apply expiration date')
+          title: this.$gettext('Failed to apply expiration date'),
+          error: e
         })
       }
     },
@@ -436,7 +438,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         this.showErrorMessage({
-          title: this.$gettext('Error while editing the share.')
+          title: this.$gettext('Error while editing the share.'),
+          error: e
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index 7f1717ef9f4..0adad067537 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -480,7 +480,8 @@ export default defineComponent({
         onError(e)
         console.error(e)
         this.showErrorMessage({
-          title: this.$gettext('Failed to create link')
+          title: this.$gettext('Failed to create link'),
+          error: e
         })
         return
       }
@@ -501,7 +502,8 @@ export default defineComponent({
         onError(e)
         console.error(e)
         this.showErrorMessage({
-          title: this.$gettext('Failed to update link')
+          title: this.$gettext('Failed to update link'),
+          error: e
         })
         return
       }
@@ -558,7 +560,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         this.showErrorMessage({
-          title: this.$gettext('Failed to delete link')
+          title: this.$gettext('Failed to delete link'),
+          error: e
         })
       }
     },
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 9a17d43043a..b344036b24a 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -377,7 +377,8 @@ export default defineComponent({
         } catch (e) {
           console.error(e)
           this.showErrorMessage({
-            title: this.$gettext('Failed to deny access')
+            title: this.$gettext('Failed to deny access'),
+            error: e
           })
         }
       } else {
@@ -398,7 +399,8 @@ export default defineComponent({
         } catch (e) {
           console.error(e)
           this.showErrorMessage({
-            title: this.$gettext('Failed to grant access')
+            title: this.$gettext('Failed to grant access'),
+            error: e
           })
         }
       }
@@ -448,7 +450,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Failed to remove share')
+          title: this.$gettext('Failed to remove share'),
+          error
         })
       }
     },
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
index 4752e4a1915..b56e304b931 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -210,7 +210,8 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
         this.showErrorMessage({
-          title: this.$gettext('Failed to remove share')
+          title: this.$gettext('Failed to remove share'),
+          error
         })
       } finally {
         this.hideModal()
diff --git a/packages/web-app-files/src/components/SideBar/TagsPanel.vue b/packages/web-app-files/src/components/SideBar/TagsPanel.vue
index f5d014a842c..a21c049c1d6 100644
--- a/packages/web-app-files/src/components/SideBar/TagsPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/TagsPanel.vue
@@ -152,7 +152,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Failed to edit tags')
+          title: $gettext('Failed to edit tags'),
+          error: e
         })
       }
     }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 93f128d52d3..cbaaabc44c7 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -104,7 +104,8 @@ export const useFileActionsCreateNewFile = ({
     } catch (error) {
       console.error(error)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to create file')
+        title: $gettext('Failed to create file'),
+        error
       })
     }
   }
@@ -150,7 +151,8 @@ export const useFileActionsCreateNewFile = ({
     } catch (error) {
       console.error(error)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to create file')
+        title: $gettext('Failed to create file'),
+        error
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index d1ee6f33a84..54685c927b8 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -75,7 +75,8 @@ export const useFileActionsCreateNewFolder = ({
     } catch (error) {
       console.error(error)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to create folder')
+        title: $gettext('Failed to create folder'),
+        error
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
index f918f2f984c..f177e0f43c9 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
@@ -48,7 +48,8 @@ export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store
     } catch (error) {
       console.error(error)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Creating space failed…')
+        title: $gettext('Creating space failed…'),
+        error
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts
index 3455344b803..0fc05aa9cbd 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsDownloadArchive.ts
@@ -61,7 +61,8 @@ export const useFileActionsDownloadArchive = ({ store }: { store?: Store<any> }
             'Failed to download the selected folder.', // on single selection only available for folders
             'Failed to download the selected files.', // on multi selection available for files+folders
             resources.length
-          )
+          ),
+          error: e
         })
       })
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
index 41d96fc8a9e..49db54035f0 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -43,7 +43,8 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
           title: $pgettext(
             'Error message in case emptying trash bin fails',
             'Failed to empty trash bin'
-          )
+          ),
+          error
         })
       })
       .finally(() => {
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts
index 7855d94b7bb..320c14f6f42 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsFavorite.ts
@@ -25,11 +25,12 @@ export const useFileActionsFavorite = ({ store }: { store?: Store<any> } = {}) =
         client: clientService.owncloudSdk,
         file: resources[0]
       })
-      .catch(() => {
+      .catch((error) => {
         const translated = $gettext('Failed to change favorite state of "%{file}"')
         const title = $gettextInterpolate(translated, { file: resources[0].name }, true)
         store.dispatch('showErrorMessage', {
-          title: title
+          title: title,
+          error
         })
       })
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
index 0b360bc73b7..56e35637342 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
@@ -144,7 +144,8 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
       }
       const title = $gettextInterpolate(translated, { file: resource.name, newName }, true)
       store.dispatch('showErrorMessage', {
-        title
+        title,
+        error
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts
index 923f9144655..32cf96151bb 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsSetImage.ts
@@ -74,7 +74,8 @@ export const useFileActionsSetImage = ({ store }: { store?: Store<any> } = {}) =
     } catch (error) {
       console.error(error)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to set space image')
+        title: $gettext('Failed to set space image'),
+        error
       })
     }
   }
diff --git a/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts b/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts
index 00acbaf0a1e..63b7d3516e4 100644
--- a/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts
+++ b/packages/web-app-files/src/composables/actions/helpers/useFileActionsDeleteResources.ts
@@ -148,7 +148,8 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
         console.error(error)
         const translated = $gettext('Failed to delete "%{file}"')
         store.dispatch('showErrorMessage', {
-          title: $gettextInterpolate(translated, { file: resource.name }, true)
+          title: $gettextInterpolate(translated, { file: resource.name }, true),
+          error
         })
       })
   }
diff --git a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
index 7051d2b711c..a8bf29ea2ec 100644
--- a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
+++ b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
@@ -93,7 +93,8 @@ export const useSpaceActionsUploadImage = ({
         .catch((error) => {
           console.error(error)
           store.dispatch('showErrorMessage', {
-            title: $gettext('Failed to upload space image')
+            title: $gettext('Failed to upload space image'),
+            error
           })
         })
     })
diff --git a/packages/web-app-text-editor/src/App.vue b/packages/web-app-text-editor/src/App.vue
index e6f1152d4ba..00d79391dd7 100644
--- a/packages/web-app-text-editor/src/App.vue
+++ b/packages/web-app-text-editor/src/App.vue
@@ -101,7 +101,8 @@ export default defineComponent({
     const errorPopup = (error) => {
       store.dispatch('showErrorMessage', {
         title: $gettext('An error occurred'),
-        desc: error
+        desc: error,
+        error
       })
     }
 
diff --git a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
index d62912aea05..3b1c06eb392 100644
--- a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
+++ b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
@@ -77,7 +77,8 @@ export default defineComponent({
         .catch((error) => {
           console.error(error)
           this.showErrorMessage({
-            title: this.$gettext('Failed to edit space description')
+            title: this.$gettext('Failed to edit space description'),
+            error
           })
         })
     }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
index 222ebbf51db..728a002d268 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
@@ -51,7 +51,8 @@ export const useFileActionsSetReadme = ({ store }: { store?: Store<any> } = {})
     } catch (error) {
       console.error(error)
       store.dispatch('showErrorMessage', {
-        title: $gettext('Failed to set space description')
+        title: $gettext('Failed to set space description'),
+        error
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
index acfe10f6d48..c530b234082 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
@@ -40,7 +40,8 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
           store.dispatch('showErrorMessage', {
             title: $gettext('Failed to delete space %{spaceName}', {
               spaceName: space.name
-            })
+            }),
+            error
           })
         })
       requests.push(request)
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
index 9b96090024a..7195bba66ac 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
@@ -45,7 +45,8 @@ export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) =
           store.dispatch('showErrorMessage', {
             title: $gettext('Failed to disable space %{spaceName}', {
               spaceName: space.name
-            })
+            }),
+            error
           })
         })
       requests.push(request)
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
index 4ac6147d37b..8a3d78cd265 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
@@ -35,7 +35,8 @@ export const useSpaceActionsEditDescription = ({ store }: { store?: Store<any> }
       .catch((error) => {
         console.error(error)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Failed to change space subtitle')
+          title: $gettext('Failed to change space subtitle'),
+          error
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
index 876bb44b6b9..ad13ca304e3 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
@@ -36,7 +36,8 @@ export const useSpaceActionsRename = ({ store }: { store?: Store<any> } = {}) =>
       .catch((error) => {
         console.error(error)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Failed to rename space')
+          title: $gettext('Failed to rename space'),
+          error
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
index f36a2f1d590..47cb528c88b 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
@@ -49,7 +49,8 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
           store.dispatch('showErrorMessage', {
             title: $gettext('Failed to restore space %{spaceName}', {
               spaceName: space.name
-            })
+            }),
+            error
           })
         })
       requests.push(request)
diff --git a/packages/web-runtime/src/components/Account/GdprExport.vue b/packages/web-runtime/src/components/Account/GdprExport.vue
index 20d60187c8a..dbb667adcb7 100644
--- a/packages/web-runtime/src/components/Account/GdprExport.vue
+++ b/packages/web-runtime/src/components/Account/GdprExport.vue
@@ -102,7 +102,8 @@ export default defineComponent({
         })
       } catch (e) {
         return store.dispatch('showErrorMessage', {
-          title: $gettext('GDPR export could not be requested. Please contact an administrator.')
+          title: $gettext('GDPR export could not be requested. Please contact an administrator.'),
+          error: e
         })
       }
     }
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index a91cb8e1231..2d3777902e3 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -242,7 +242,7 @@ export default defineComponent({
     position: absolute;
     right: 20px;
     bottom: 20px;
-    z-index: 1040;
+    z-index: calc(var(--oc-z-index-modal) + 1);
 
     @media (max-width: 640px) {
       left: 0;
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index f54ced208c9..a8c3f96cfdd 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -188,7 +188,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Unable to load account data…')
+          title: $gettext('Unable to load account data…'),
+          error: e
         })
         valuesList.value = []
       }
@@ -203,7 +204,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Unable to load account data…')
+          title: $gettext('Unable to load account data…'),
+          error: e
         })
         accountBundle.value = undefined
       }
@@ -313,7 +315,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Saving language failed…')
+          title: $gettext('Saving language failed…'),
+          error: e
         })
       }
     }
@@ -331,7 +334,8 @@ export default defineComponent({
       } catch (e) {
         console.error(e)
         store.dispatch('showErrorMessage', {
-          title: $gettext('Unable to save email notifications preference…')
+          title: $gettext('Unable to save email notifications preference…'),
+          error: e
         })
       }
     }
@@ -409,7 +413,8 @@ export default defineComponent({
         .catch((error) => {
           console.error(error)
           this.showErrorMessage({
-            title: this.$gettext('Failed to change password')
+            title: this.$gettext('Failed to change password'),
+            error
           })
         })
     }
diff --git a/packages/web-runtime/src/store/app.ts b/packages/web-runtime/src/store/app.ts
index 00d365c96df..ec70b6966cf 100644
--- a/packages/web-runtime/src/store/app.ts
+++ b/packages/web-runtime/src/store/app.ts
@@ -1,3 +1,5 @@
+import { AxiosError } from 'axios'
+
 const state = {
   messages: [],
   quickActions: {}
@@ -5,9 +7,24 @@ const state = {
 
 const actions = {
   showErrorMessage({ commit }, message) {
+    const getXRequestID = (error: AxiosError): string => {
+      if (!error) {
+        return
+      }
+      if (error.response?.headers?.['x-request-id']) {
+        return error.response.headers['x-request-id']
+      }
+    }
     message.status = message.status || 'danger'
     message.timeout = message.timeout || 0
 
+    if (message.error) {
+      const xRequestID = getXRequestID(message.error)
+      if (xRequestID) {
+        message.errorLogContent = `X-Request-ID: ${xRequestID}`
+      }
+    }
+
     commit('ENQUEUE_MESSAGE', message)
   },
   showMessage({ commit }, message) {

From 71641e0afe1d2db3c95873aeec6cb5390de4fa6a Mon Sep 17 00:00:00 2001
From: Jan <j.ackermann91@gmail.com>
Date: Tue, 25 Jul 2023 14:28:32 +0200
Subject: [PATCH 6/7] errorLog: Handle multiple errors (graph) (#9474)

---
 .../actions/groups/useGroupActionsDelete.ts   |  12 +-
 .../actions/users/useUserActionsDelete.ts     |  12 +-
 .../src/views/Users.vue                       | 257 +++++++++++++-----
 .../tests/unit/views/Users.spec.ts            |   4 +-
 .../files/useFileActionsAcceptShare.ts        |   3 +-
 .../files/useFileActionsDeclineShare.ts       |   3 +-
 packages/web-app-files/src/store/actions.ts   |   3 +-
 .../src/components/Spaces/QuotaModal.vue      |  12 +-
 .../actions/spaces/useSpaceActionsDelete.ts   |  78 +++---
 .../actions/spaces/useSpaceActionsDisable.ts  | 101 ++++---
 .../actions/spaces/useSpaceActionsRestore.ts  |  73 +++--
 packages/web-runtime/src/store/app.ts         |  21 +-
 12 files changed, 392 insertions(+), 187 deletions(-)

diff --git a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
index 30ef3fad438..a61489625ab 100644
--- a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue'
 import { Store } from 'vuex'
-import { eventBus } from 'web-pkg'
+import { eventBus, useLoadingService } from 'web-pkg'
 import { useClientService, useStore } from 'web-pkg/src/composables'
 import { GroupAction, GroupActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
@@ -9,12 +9,15 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
   store = store || useStore()
   const { $gettext, $ngettext } = useGettext()
   const clientService = useClientService()
+  const loadingService = useLoadingService()
 
   const deleteGroups = async (groups) => {
     const graphClient = clientService.graphAuthenticated
     const promises = groups.map((group) => graphClient.groups.deleteGroup(group.id))
 
-    const results = await Promise.allSettled(promises)
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
+    })
 
     const succeeded = results.filter((r) => r.status === 'fulfilled')
     if (succeeded.length) {
@@ -45,7 +48,10 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
               { groupCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', { title })
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
     }
 
     store.dispatch('hideModal')
diff --git a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
index a7adccc7284..2d0842be1cd 100644
--- a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
@@ -1,6 +1,6 @@
 import { computed, unref } from 'vue'
 import { Store } from 'vuex'
-import { eventBus, useCapabilityDeleteUsersDisabled } from 'web-pkg'
+import { eventBus, useCapabilityDeleteUsersDisabled, useLoadingService } from 'web-pkg'
 import { useClientService, useStore } from 'web-pkg/src/composables'
 import { UserAction, UserActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
@@ -9,11 +9,14 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
   store = store || useStore()
   const { $gettext, $ngettext } = useGettext()
   const clientService = useClientService()
+  const loadingService = useLoadingService()
 
   const deleteUsers = async (users) => {
     const graphClient = clientService.graphAuthenticated
     const promises = users.map((user) => graphClient.users.deleteUser(user.id))
-    const results = await Promise.allSettled(promises)
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
+    })
 
     const succeeded = results.filter((r) => r.status === 'fulfilled')
     if (succeeded.length) {
@@ -44,7 +47,10 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
               { userCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', { title })
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
     }
 
     store.dispatch('hideModal')
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 8334367b250..2fb8f290bad 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -363,7 +363,9 @@ export default defineComponent({
       sideBarLoading.value = true
       // Load additional user data
       const requests = unref(selectedUsers).map((user) => loadAdditionalUserDataTask.perform(user))
-      const results = await Promise.allSettled<Array<unknown>>(requests)
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled<Array<unknown>>(requests)
+      })
       const failedRequests = results.filter((result) => result.status === 'rejected')
       if (failedRequests.length > 0) {
         console.debug('Failed to load additional user data', failedRequests)
@@ -500,70 +502,163 @@ export default defineComponent({
     }
 
     const addUsersToGroups = async ({ users: affectedUsers, groups: groupsToAdd }) => {
-      try {
-        const client = clientService.graphAuthenticated
-        const usersToFetch = []
-        const addUsersToGroupsRequests = []
-        groupsToAdd.reduce((acc, group) => {
-          for (const user of affectedUsers) {
-            if (!user.memberOf.find((userGroup) => userGroup.id === group.id)) {
-              acc.push(client.groups.addMember(group.id, user.id, configurationManager.serverUrl))
-              if (!usersToFetch.includes(user.id)) {
-                usersToFetch.push(user.id)
-              }
+      const client = clientService.graphAuthenticated
+      const usersToFetch = []
+      const promises = groupsToAdd.reduce((acc, group) => {
+        for (const user of affectedUsers) {
+          if (!user.memberOf.find((userGroup) => userGroup.id === group.id)) {
+            acc.push(client.groups.addMember(group.id, user.id, configurationManager.serverUrl))
+            if (!usersToFetch.includes(user.id)) {
+              usersToFetch.push(user.id)
             }
           }
-          return acc
-        }, addUsersToGroupsRequests)
-        const usersResponse = await loadingService.addTask(async () => {
-          await Promise.all(addUsersToGroupsRequests)
-          return Promise.all(usersToFetch.map((userId) => client.users.getUser(userId)))
+        }
+        return acc
+      }, [])
+      if (!promises.length) {
+        const title = $ngettext(
+          'Group assignment already added',
+          'Group assignments already added',
+          affectedUsers.length * groupsToAdd.length
+        )
+        store.dispatch('showMessage', { title })
+        addToGroupsModalIsOpen.value = false
+        return
+      }
+
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled(promises)
+      })
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled')
+      if (succeeded.length) {
+        const title =
+          succeeded.length === 1 && groupsToAdd.length === 1 && affectedUsers.length === 1
+            ? $gettext('Group assignment "%{group}" was added successfully', {
+                group: groupsToAdd[0].displayName
+              })
+            : $ngettext(
+                '%{groupAssignmentCount} group assignment was added successfully',
+                '%{groupAssignmentCount} group assignments were added successfully',
+                succeeded.length,
+                { groupAssignmentCount: succeeded.length.toString() },
+                true
+              )
+        store.dispatch('showMessage', { title })
+      }
+
+      const failed = results.filter((r) => r.status === 'rejected')
+      if (failed.length) {
+        failed.forEach(console.error)
+
+        const title =
+          failed.length === 1 && groupsToAdd.length === 1 && affectedUsers.length === 1
+            ? $gettext('Failed to add group assignment "%{group}"', {
+                group: groupsToAdd[0].displayName
+              })
+            : $ngettext(
+                'Failed to add %{groupAssignmentCount} group assignment',
+                'Failed to add %{groupAssignmentCount} group assignments',
+                failed.length,
+                { groupAssignmentCount: failed.length.toString() },
+                true
+              )
+        store.dispatch('showErrorMessage', {
+          title,
+          errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
+      }
+
+      addToGroupsModalIsOpen.value = false
+
+      try {
+        const usersResponse = await Promise.all(
+          usersToFetch.map((userId) => client.users.getUser(userId))
+        )
         updateLocalUsers(usersResponse.map((r) => r.data))
-        await store.dispatch('showMessage', {
-          title: $gettext('Users were added to groups successfully')
-        })
-        addToGroupsModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        await store.dispatch('showErrorMessage', {
-          title: $gettext('Failed add users to group'),
-          error: e
-        })
       }
     }
 
     const removeUsersFromGroups = async ({ users: affectedUsers, groups: groupsToRemove }) => {
-      try {
-        const client = clientService.graphAuthenticated
-        const usersToFetch = []
-        const removeUsersToGroupsRequests = []
-        groupsToRemove.reduce((acc, group) => {
-          for (const user of affectedUsers) {
-            if (user.memberOf.find((userGroup) => userGroup.id === group.id)) {
-              acc.push(client.groups.deleteMember(group.id, user.id))
-              if (!usersToFetch.includes(user.id)) {
-                usersToFetch.push(user.id)
-              }
+      const client = clientService.graphAuthenticated
+      const usersToFetch = []
+      const promises = groupsToRemove.reduce((acc, group) => {
+        for (const user of affectedUsers) {
+          if (user.memberOf.find((userGroup) => userGroup.id === group.id)) {
+            acc.push(client.groups.deleteMember(group.id, user.id))
+            if (!usersToFetch.includes(user.id)) {
+              usersToFetch.push(user.id)
             }
           }
-          return acc
-        }, removeUsersToGroupsRequests)
-        const usersResponse = await loadingService.addTask(async () => {
-          await Promise.all(removeUsersToGroupsRequests)
-          return Promise.all(usersToFetch.map((userId) => client.users.getUser(userId)))
+        }
+        return acc
+      }, [])
+
+      if (!promises.length) {
+        const title = $ngettext(
+          'Group assignment already removed',
+          'Group assignments already removed',
+          affectedUsers.length * groupsToRemove.length
+        )
+        store.dispatch('showMessage', { title })
+        removeFromGroupsModalIsOpen.value = false
+        return
+      }
+
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled(promises)
+      })
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled')
+      if (succeeded.length) {
+        const title =
+          succeeded.length === 1 && groupsToRemove.length === 1 && affectedUsers.length === 1
+            ? $gettext('Group assignment "%{group}" was deleted successfully', {
+                group: groupsToRemove[0].displayName
+              })
+            : $ngettext(
+                '%{groupAssignmentCount} group assignment was deleted successfully',
+                '%{groupAssignmentCount} group assignments were deleted successfully',
+                succeeded.length,
+                { groupAssignmentCount: succeeded.length.toString() },
+                true
+              )
+        store.dispatch('showMessage', { title })
+      }
+
+      const failed = results.filter((r) => r.status === 'rejected')
+      if (failed.length) {
+        failed.forEach(console.error)
+
+        const title =
+          failed.length === 1 && groupsToRemove.length === 1 && affectedUsers.length === 1
+            ? $gettext('Failed to delete group assignment "%{group}"', {
+                group: groupsToRemove[0].displayName
+              })
+            : $ngettext(
+                'Failed to delete %{groupAssignmentCount} group assignment',
+                'Failed to delete %{groupAssignmentCount} group assignments',
+                failed.length,
+                { groupAssignmentCount: failed.length.toString() },
+                true
+              )
+        store.dispatch('showErrorMessage', {
+          title,
+          errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
+      }
+
+      removeFromGroupsModalIsOpen.value = false
+
+      try {
+        const usersResponse = await Promise.all(
+          usersToFetch.map((userId) => client.users.getUser(userId))
+        )
         updateLocalUsers(usersResponse.map((r) => r.data))
-        await store.dispatch('showMessage', {
-          title: $gettext('Users were removed from groups successfully')
-        })
-        removeFromGroupsModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        await store.dispatch('showErrorMessage', {
-          title: $gettext('Failed remove users from group'),
-          error: e
-        })
       }
     }
 
@@ -574,25 +669,63 @@ export default defineComponent({
       users: User[]
       value: boolean
     }) => {
+      affectedUsers = affectedUsers.filter(({ id }) => store.getters.user.uuid !== id)
+      const client = clientService.graphAuthenticated
+      const promises = affectedUsers.map((u) =>
+        client.users.editUser(u.id, { accountEnabled: value })
+      )
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled(promises)
+      })
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled') as any
+      if (succeeded.length) {
+        const title =
+          succeeded.length === 1 && affectedUsers.length === 1
+            ? $gettext('Login for user "%{user}" was edited successfully', {
+                user: affectedUsers[0].displayName
+              })
+            : $ngettext(
+                '%{userCount} user login was edited successfully',
+                '%{userCount} users logins edited successfully',
+                succeeded.length,
+                { userCount: succeeded.length.toString() },
+                true
+              )
+        store.dispatch('showMessage', { title })
+      }
+
+      const failed = results.filter((r) => r.status === 'rejected')
+      if (failed.length) {
+        failed.forEach(console.error)
+
+        const title =
+          failed.length === 1 && affectedUsers.length === 1
+            ? $gettext('Failed edit login for user "%{user}"', {
+                user: affectedUsers[0].displayName
+              })
+            : $ngettext(
+                'Failed to edit %{userCount} user login',
+                'Failed to edit %{userCount} user logins',
+                failed.length,
+                { userCount: failed.length.toString() },
+                true
+              )
+        store.dispatch('showErrorMessage', {
+          title,
+          errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+        })
+      }
+
+      editLoginModalIsOpen.value = false
+
       try {
-        affectedUsers = affectedUsers.filter(({ id }) => store.getters.user.uuid !== id)
-        const client = clientService.graphAuthenticated
-        const promises = affectedUsers.map((u) =>
-          client.users.editUser(u.id, { accountEnabled: value })
-        )
         const usersResponse = await loadingService.addTask(async () => {
-          await Promise.all(promises)
-          return Promise.all(affectedUsers.map((u) => client.users.getUser(u.id)))
+          return Promise.all(succeeded.map(({ value }) => client.users.getUser(value.data.id)))
         })
         updateLocalUsers(usersResponse.map((r) => r.data))
-        await store.dispatch('showMessage', { title: $gettext('Login was edited successfully') })
-        editLoginModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        return store.dispatch('showErrorMessage', {
-          title: $gettext('Failed to edit login'),
-          error: e
-        })
       }
     }
 
diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
index 92b76cab6d0..0c738143e4a 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -77,13 +77,15 @@ const getClientService = () => {
   clientService.graphAuthenticated.users.getUser.mockResolvedValue(
     mock<AxiosResponse>({ data: getDefaultUser() })
   )
+  clientService.graphAuthenticated.users.editUser.mockResolvedValue(
+    mock<AxiosResponse>({ data: getDefaultUser() })
+  )
   clientService.graphAuthenticated.groups.listGroups.mockResolvedValue(
     mock<AxiosResponse>({ data: { value: [] } })
   )
   clientService.graphAuthenticated.applications.listApplications.mockResolvedValue(
     mock<AxiosResponse>({ data: { value: getDefaultApplications() } })
   )
-
   return clientService
 }
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
index 7999205d175..545c7b33f07 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
@@ -74,7 +74,8 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
         'Failed to accept the selected share.',
         'Failed to accept selected shares.',
         resources.length
-      )
+      ),
+      errors
     })
   }
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts
index 7fd764e1f53..ae6e9e77cb8 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsDeclineShare.ts
@@ -78,7 +78,8 @@ export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {
         'Failed to decline the selected share',
         'Failed to decline selected shares',
         resources.length
-      )
+      ),
+      errors
     })
   }
 
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index 2197c271c34..41a74c02b6d 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -204,7 +204,8 @@ export default {
           context.dispatch(
             'showErrorMessage',
             {
-              title: title
+              title: title,
+              error
             },
             { root: true }
           )
diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
index 129bc68a8da..cb6753e3fdc 100644
--- a/packages/web-pkg/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -35,7 +35,7 @@ import { useGettext } from 'vue3-gettext'
 import QuotaSelect from 'web-pkg/src/components/QuotaSelect.vue'
 import { SpaceResource } from 'web-client/src'
 import { eventBus, useClientService, useRouter } from 'web-pkg/src'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore, useLoadingService } from 'web-pkg/src/composables'
 import { Drive } from 'web-client/src/generated'
 
 export default defineComponent({
@@ -77,6 +77,7 @@ export default defineComponent({
     const store = useStore()
     const { $gettext, $ngettext } = useGettext()
     const clientService = useClientService()
+    const loadingService = useLoadingService()
     const router = useRouter()
     const selectedOption = ref(0)
 
@@ -181,7 +182,9 @@ export default defineComponent({
           value: driveData.quota
         })
       })
-      const results = await Promise.allSettled<Array<unknown>>(requests)
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled<Array<unknown>>(requests)
+      })
       const succeeded = results.filter((r) => r.status === 'fulfilled')
       if (succeeded.length) {
         store.dispatch('showMessage', { title: getSuccessMessage(succeeded.length) })
@@ -189,7 +192,10 @@ export default defineComponent({
       const errors = results.filter((r) => r.status === 'rejected')
       if (errors.length) {
         errors.forEach(console.error)
-        store.dispatch('showErrorMessage', { title: getErrorMessage(errors.length) })
+        store.dispatch('showErrorMessage', {
+          title: getErrorMessage(errors.length),
+          errors: (errors as PromiseRejectedResult[]).map((f) => f.reason)
+        })
       }
 
       props.cancel()
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
index c530b234082..55415bff5a1 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
@@ -1,7 +1,7 @@
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { SpaceResource } from 'web-client/src'
-import { useClientService, useRoute } from 'web-pkg/src/composables'
+import { useClientService, useLoadingService, useRoute } from 'web-pkg/src/composables'
 import { eventBus } from 'web-pkg/src/services'
 import { useAbility } from '../../ability'
 import { useStore } from '../../store'
@@ -13,54 +13,70 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
   const { $gettext, $ngettext } = useGettext()
   const ability = useAbility()
   const clientService = useClientService()
+  const loadingService = useLoadingService()
   const route = useRoute()
 
   const filterResourcesToDelete = (resources: SpaceResource[]) => {
     return resources.filter((r) => r.canBeDeleted({ user: store.getters.user, ability }))
   }
 
-  const deleteSpaces = (spaces: SpaceResource[]) => {
-    const requests = []
-    const graphClient = clientService.graphAuthenticated
-    spaces.forEach((space) => {
-      const request = graphClient.drives
+  const deleteSpaces = async (spaces: SpaceResource[]) => {
+    const client = clientService.graphAuthenticated
+    const promises = spaces.map((space) =>
+      client.drives
         .deleteDrive(space.id.toString(), '', {
           headers: {
             Purge: 'T'
           }
         })
         .then(() => {
-          store.dispatch('hideModal')
           store.commit('Files/REMOVE_FILES', [{ id: space.id }])
           store.commit('runtime/spaces/REMOVE_SPACE', { id: space.id })
           return true
         })
-        .catch((error) => {
-          console.error(error)
-          store.dispatch('showErrorMessage', {
-            title: $gettext('Failed to delete space %{spaceName}', {
-              spaceName: space.name
-            }),
-            error
-          })
-        })
-      requests.push(request)
+    )
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
     })
-    return Promise.all(requests).then((result: boolean[]) => {
-      if (result.filter(Boolean).length) {
-        store.dispatch('showMessage', {
-          title: $ngettext(
-            'Space was deleted successfully',
-            'Spaces were deleted successfully',
-            result.filter(Boolean).length
-          )
-        })
-      }
+    const succeeded = results.filter((r) => r.status === 'fulfilled')
+    if (succeeded.length) {
+      const title =
+        succeeded.length === 1 && spaces.length === 1
+          ? $gettext('Space "%{space}" was deleted successfully', { space: spaces[0].name })
+          : $ngettext(
+              '%{spaceCount} space was deleted successfully',
+              '%{spaceCount} spaces were deleted successfully',
+              succeeded.length,
+              { spaceCount: succeeded.length.toString() },
+              true
+            )
+      store.dispatch('showMessage', { title })
+    }
 
-      if (unref(route).name === 'admin-settings-spaces') {
-        eventBus.publish('app.admin-settings.list.load')
-      }
-    })
+    const failed = results.filter((r) => r.status === 'rejected')
+    if (failed.length) {
+      failed.forEach(console.error)
+
+      const title =
+        failed.length === 1 && spaces.length === 1
+          ? $gettext('Failed to delete space "%{space}"', { space: spaces[0].name })
+          : $ngettext(
+              'Failed to delete %{spaceCount} space',
+              'Failed to delete %{spaceCount} spaces',
+              failed.length,
+              { spaceCount: failed.length.toString() },
+              true
+            )
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
+    }
+
+    store.dispatch('hideModal')
+    if (unref(route).name === 'admin-settings-spaces') {
+      eventBus.publish('app.admin-settings.list.load')
+    }
   }
 
   const handler = ({ resources }: SpaceActionOptions) => {
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
index 7195bba66ac..2dd865cbf01 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
@@ -5,7 +5,7 @@ import { useGettext } from 'vue3-gettext'
 import { useRoute, useRouter } from '../../router'
 import { useStore } from '../../store'
 import { useAbility } from '../../ability'
-import { useClientService } from 'web-pkg/src/composables'
+import { useClientService, useLoadingService } from 'web-pkg/src/composables'
 import { Store } from 'vuex'
 
 export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) => {
@@ -15,57 +15,72 @@ export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) =
   const clientService = useClientService()
   const route = useRoute()
   const router = useRouter()
+  const loadingService = useLoadingService()
 
   const filterResourcesToDisable = (resources): SpaceResource[] => {
     return resources.filter((r) => r.canDisable({ user: store.getters.user, ability }))
   }
 
-  const disableSpaces = (spaces: SpaceResource[]) => {
-    const requests = []
-    const graphClient = clientService.graphAuthenticated
+  const disableSpaces = async (spaces: SpaceResource[]) => {
     const currentRoute = unref(route)
-    spaces.forEach((space) => {
-      const request = graphClient.drives
-        .deleteDrive(space.id.toString())
-        .then(() => {
-          store.dispatch('hideModal')
-          if (currentRoute.name === 'admin-settings-spaces') {
-            space.disabled = true
-            space.spaceQuota = { total: space.spaceQuota.total }
-          }
-          store.commit('runtime/spaces/UPDATE_SPACE_FIELD', {
-            id: space.id,
-            field: 'disabled',
-            value: true
-          })
-          return true
-        })
-        .catch((error) => {
-          console.error(error)
-          store.dispatch('showErrorMessage', {
-            title: $gettext('Failed to disable space %{spaceName}', {
-              spaceName: space.name
-            }),
-            error
-          })
+
+    const client = clientService.graphAuthenticated
+    const promises = spaces.map((space) =>
+      client.drives.deleteDrive(space.id.toString()).then(() => {
+        if (currentRoute.name === 'files-spaces-generic') {
+          router.push({ name: 'files-spaces-projects' })
+        }
+        if (currentRoute.name === 'admin-settings-spaces') {
+          space.disabled = true
+          space.spaceQuota = { total: space.spaceQuota.total }
+        }
+        store.commit('runtime/spaces/UPDATE_SPACE_FIELD', {
+          id: space.id,
+          field: 'disabled',
+          value: true
         })
-      requests.push(request)
+        return true
+      })
+    )
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
     })
-    return Promise.all(requests).then((result: boolean[]) => {
-      if (result.filter(Boolean).length) {
-        store.dispatch('showMessage', {
-          title: $ngettext(
-            'Space was disabled successfully',
-            'Spaces were disabled successfully',
-            result.filter(Boolean).length
-          )
-        })
-      }
+    const succeeded = results.filter((r) => r.status === 'fulfilled')
+    if (succeeded.length) {
+      const title =
+        succeeded.length === 1 && spaces.length === 1
+          ? $gettext('Space "%{space}" was disabled successfully', { space: spaces[0].name })
+          : $ngettext(
+              '%{spaceCount} space was disabled successfully',
+              '%{spaceCount} spaces were disabled successfully',
+              succeeded.length,
+              { spaceCount: succeeded.length.toString() },
+              true
+            )
+      store.dispatch('showMessage', { title })
+    }
 
-      if (currentRoute.name === 'files-spaces-generic') {
-        return router.push({ name: 'files-spaces-projects' })
-      }
-    })
+    const failed = results.filter((r) => r.status === 'rejected')
+    if (failed.length) {
+      failed.forEach(console.error)
+
+      const title =
+        failed.length === 1 && spaces.length === 1
+          ? $gettext('Failed to disable space "%{space}"', { space: spaces[0].name })
+          : $ngettext(
+              'Failed to disable %{spaceCount} space',
+              'Failed to disable %{spaceCount} spaces',
+              failed.length,
+              { spaceCount: failed.length.toString() },
+              true
+            )
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
+    }
+
+    store.dispatch('hideModal')
   }
 
   const handler = ({ resources }: SpaceActionOptions) => {
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
index 47cb528c88b..4bef55058d0 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
@@ -3,7 +3,7 @@ import { computed, unref } from 'vue'
 import { Store } from 'vuex'
 import { SpaceAction, SpaceActionOptions } from '../types'
 import { useRoute } from '../../router'
-import { useAbility, useClientService, useStore } from 'web-pkg/src/composables'
+import { useAbility, useClientService, useLoadingService, useStore } from 'web-pkg/src/composables'
 import { useGettext } from 'vue3-gettext'
 
 export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) => {
@@ -11,17 +11,17 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
   const { $gettext, $ngettext } = useGettext()
   const ability = useAbility()
   const clientService = useClientService()
+  const loadingService = useLoadingService()
   const route = useRoute()
 
   const filterResourcesToRestore = (resources): SpaceResource[] => {
     return resources.filter((r) => r.canRestore({ user: store.getters.user, ability }))
   }
 
-  const restoreSpaces = (spaces: SpaceResource[]) => {
-    const requests = []
-    const graphClient = clientService.graphAuthenticated
-    spaces.forEach((space) => {
-      const request = graphClient.drives
+  const restoreSpaces = async (spaces: SpaceResource[]) => {
+    const client = clientService.graphAuthenticated
+    const promises = spaces.map((space) =>
+      client.drives
         .updateDrive(
           space.id.toString(),
           { name: space.name },
@@ -32,7 +32,6 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
           }
         )
         .then((updatedSpace) => {
-          store.dispatch('hideModal')
           if (unref(route).name === 'admin-settings-spaces') {
             space.disabled = false
             space.spaceQuota = updatedSpace.data.quota
@@ -44,28 +43,46 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
           })
           return true
         })
-        .catch((error) => {
-          console.error(error)
-          store.dispatch('showErrorMessage', {
-            title: $gettext('Failed to restore space %{spaceName}', {
-              spaceName: space.name
-            }),
-            error
-          })
-        })
-      requests.push(request)
-    })
-    return Promise.all(requests).then((result: boolean[]) => {
-      if (result.filter(Boolean).length) {
-        store.dispatch('showMessage', {
-          title: $ngettext(
-            'Space was enabled successfully',
-            'Spaces were enabled successfully',
-            result.filter(Boolean).length
-          )
-        })
-      }
+    )
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
     })
+    const succeeded = results.filter((r) => r.status === 'fulfilled')
+    if (succeeded.length) {
+      const title =
+        succeeded.length === 1 && spaces.length === 1
+          ? $gettext('Space "%{space}" was enabled successfully', { space: spaces[0].name })
+          : $ngettext(
+              '%{spaceCount} space was enabled successfully',
+              '%{spaceCount} spaces were enabled successfully',
+              succeeded.length,
+              { spaceCount: succeeded.length.toString() },
+              true
+            )
+      store.dispatch('showMessage', { title })
+    }
+
+    const failed = results.filter((r) => r.status === 'rejected')
+    if (failed.length) {
+      failed.forEach(console.error)
+
+      const title =
+        failed.length === 1 && spaces.length === 1
+          ? $gettext('Failed to enabled space "%{space}"', { space: spaces[0].name })
+          : $ngettext(
+              'Failed to enable %{spaceCount} space',
+              'Failed to enable %{spaceCount} spaces',
+              failed.length,
+              { spaceCount: failed.length.toString() },
+              true
+            )
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
+    }
+
+    store.dispatch('hideModal')
   }
 
   const handler = ({ resources }: SpaceActionOptions) => {
diff --git a/packages/web-runtime/src/store/app.ts b/packages/web-runtime/src/store/app.ts
index ec70b6966cf..16096a181d3 100644
--- a/packages/web-runtime/src/store/app.ts
+++ b/packages/web-runtime/src/store/app.ts
@@ -7,23 +7,24 @@ const state = {
 
 const actions = {
   showErrorMessage({ commit }, message) {
-    const getXRequestID = (error: AxiosError): string => {
-      if (!error) {
-        return
-      }
+    const getXRequestID = (error: AxiosError): string | null => {
       if (error.response?.headers?.['x-request-id']) {
         return error.response.headers['x-request-id']
       }
+      return null
     }
+
     message.status = message.status || 'danger'
     message.timeout = message.timeout || 0
+    message.errors = message.error ? [message.error] : message.errors || []
 
-    if (message.error) {
-      const xRequestID = getXRequestID(message.error)
-      if (xRequestID) {
-        message.errorLogContent = `X-Request-ID: ${xRequestID}`
-      }
-    }
+    const xRequestIds = message.errors
+      .map((error) => getXRequestID(error))
+      .filter((xRequestId) => xRequestId !== null)
+      .map((item) => `X-Request-Id: ${item}`)
+      .join('\r\n')
+
+    message.errorLogContent = xRequestIds
 
     commit('ENQUEUE_MESSAGE', message)
   },

From bce11d27f06a7d5a1d454b32598e27cfeea5582f Mon Sep 17 00:00:00 2001
From: Jan <j.ackermann91@gmail.com>
Date: Thu, 27 Jul 2023 12:59:38 +0200
Subject: [PATCH 7/7] Enable error log for ocs and webdav requests  (#9482)

---
 ...t-error-notifications-include-x-request-id | 11 ++++++
 .../OcNotificationMessage.vue                 | 36 +++++++++----------
 .../InviteCollaboratorForm.vue                |  4 +--
 .../actions/files/useFileActionsRestore.ts    |  5 ++-
 .../src/helpers/resource/actions/transfer.ts  |  3 +-
 .../web-app-files/src/helpers/share/link.ts   | 33 ++++++++++-------
 .../src/helpers/share/triggerShareAction.ts   |  3 +-
 .../composables/download/useDownloadFile.ts   | 22 +++++-------
 packages/web-pkg/src/errors/types.ts          |  8 +++++
 packages/web-pkg/src/services/archiver.ts     |  4 +--
 packages/web-runtime/package.json             |  2 +-
 packages/web-runtime/src/store/app.ts         | 17 +++++++--
 pnpm-lock.yaml                                | 34 +++++++++++++++---
 .../shareWithUsers.feature                    |  4 +--
 .../shareWithUsers.feature                    |  4 +--
 tests/acceptance/pageObjects/webPage.js       |  3 +-
 16 files changed, 127 insertions(+), 66 deletions(-)
 create mode 100644 changelog/enhancement-error-notifications-include-x-request-id

diff --git a/changelog/enhancement-error-notifications-include-x-request-id b/changelog/enhancement-error-notifications-include-x-request-id
new file mode 100644
index 00000000000..bc2ea93c9a3
--- /dev/null
+++ b/changelog/enhancement-error-notifications-include-x-request-id
@@ -0,0 +1,11 @@
+Enhancement: Error notifications include x-request-id
+
+We've added a details box for the notifications, that pop up if an operation (e.g upload, download, add a share) fails.
+This box contains the x-request-id and may help to debug the error on the server side.
+
+https://github.com/owncloud/web/pull/9482
+https://github.com/owncloud/web/pull/9474
+https://github.com/owncloud/web/pull/9466
+https://github.com/owncloud/web/pull/9448
+https://github.com/owncloud/web/pull/9426
+https://github.com/owncloud/web/issues/9449
diff --git a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
index fe9586da950..15ec854d055 100644
--- a/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
+++ b/packages/design-system/src/components/OcNotificationMessage/OcNotificationMessage.vue
@@ -15,26 +15,24 @@
           ><oc-icon name="close"
         /></oc-button>
       </div>
-      <div class="oc-width-1-1">
-        <div class="oc-flex oc-flex-between oc-width-1-1 oc-mt-s">
-          <span
-            v-if="message"
-            class="oc-notification-message-content oc-text-muted oc-mr-s"
-            v-text="message"
-          />
-          <oc-button
-            v-if="errorLogContent"
-            class="oc-notification-message-error-log-toggle-button"
-            gap-size="none"
-            appearance="raw"
-            @click="showErrorLog = !showErrorLog"
-          >
-            <span v-text="$gettext('Details')"></span>
-            <oc-icon :name="showErrorLog ? 'arrow-up-s' : 'arrow-down-s'" />
-          </oc-button>
-        </div>
-        <oc-error-log v-if="showErrorLog" class="oc-mt-m" :content="errorLogContent" />
+      <div v-if="message || errorLogContent" class="oc-flex oc-flex-between oc-width-1-1 oc-mt-s">
+        <span
+          v-if="message"
+          class="oc-notification-message-content oc-text-muted oc-mr-s"
+          v-text="message"
+        />
+        <oc-button
+          v-if="errorLogContent"
+          class="oc-notification-message-error-log-toggle-button"
+          gap-size="none"
+          appearance="raw"
+          @click="showErrorLog = !showErrorLog"
+        >
+          <span v-text="$gettext('Details')"></span>
+          <oc-icon :name="showErrorLog ? 'arrow-up-s' : 'arrow-down-s'" />
+        </oc-button>
       </div>
+      <oc-error-log v-if="showErrorLog" class="oc-mt-m" :content="errorLogContent" />
     </div>
   </div>
 </template>
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 769c8b54c5c..429fd5b4450 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -352,10 +352,10 @@ export default defineComponent({
       }
       errors.forEach((e) => {
         this.showErrorMessage({
-          title: this.$gettext('Failed to add share for %{displayName}', {
+          title: this.$gettext('Failed to add share for "%{displayName}"', {
             displayName: e.displayName
           }),
-          error: e
+          error: e.error
         })
       })
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts
index be3c73a0b22..59e2e52a6c3 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsRestore.ts
@@ -158,6 +158,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
   ) => {
     const restoredResources = []
     const failedResources = []
+    const errors = []
 
     let createdFolderPaths = []
     for (const [i, resource] of resources.entries()) {
@@ -174,6 +175,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
         restoredResources.push(resource)
       } catch (e) {
         console.error(e)
+        errors.push(e)
         failedResources.push(resource)
       } finally {
         setProgress({ total: resources.length, current: i + 1 })
@@ -209,7 +211,8 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
         translateParams.resourceCount = failedResources.length
       }
       store.dispatch('showErrorMessage', {
-        title: $gettextInterpolate(translated, translateParams, true)
+        title: $gettextInterpolate(translated, translateParams, true),
+        errors
       })
     }
 
diff --git a/packages/web-app-files/src/helpers/resource/actions/transfer.ts b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
index 6747ff87ca2..62785c0da0d 100644
--- a/packages/web-app-files/src/helpers/resource/actions/transfer.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
@@ -99,7 +99,8 @@ export class ResourceTransfer extends ConflictDialog {
       )
     }
     this.showErrorMessage({
-      title
+      title,
+      errors
     })
   }
 
diff --git a/packages/web-app-files/src/helpers/share/link.ts b/packages/web-app-files/src/helpers/share/link.ts
index 69705cf04d1..6f912eca3f9 100644
--- a/packages/web-app-files/src/helpers/share/link.ts
+++ b/packages/web-app-files/src/helpers/share/link.ts
@@ -68,19 +68,26 @@ export const createQuicklink = async (args: CreateQuicklink): Promise<Share> =>
 
   params.spaceRef = resource.fileId || resource.id
 
-  const link = await store.dispatch('Files/addLink', {
-    path: resource.path,
-    client: clientService.owncloudSdk,
-    params,
-    storageId: resource.fileId || resource.id
-  })
+  try {
+    const link = await store.dispatch('Files/addLink', {
+      path: resource.path,
+      client: clientService.owncloudSdk,
+      params,
+      storageId: resource.fileId || resource.id
+    })
+    const { copy } = useClipboard({ legacy: true })
+    copy(link.url)
 
-  const { copy } = useClipboard({ legacy: true })
-  copy(link.url)
+    await store.dispatch('showMessage', {
+      title: $gettext('The link has been copied to your clipboard.')
+    })
 
-  await store.dispatch('showMessage', {
-    title: $gettext('The link has been copied to your clipboard.')
-  })
-
-  return link
+    return link
+  } catch (e) {
+    console.error(e)
+    await store.dispatch('showErrorMessage', {
+      title: $gettext('Copy link failed'),
+      error: e
+    })
+  }
 }
diff --git a/packages/web-app-files/src/helpers/share/triggerShareAction.ts b/packages/web-app-files/src/helpers/share/triggerShareAction.ts
index 47f706df7c9..be537a83e28 100644
--- a/packages/web-app-files/src/helpers/share/triggerShareAction.ts
+++ b/packages/web-app-files/src/helpers/share/triggerShareAction.ts
@@ -1,5 +1,6 @@
 import { aggregateResourceShares } from '../resources'
 import { ShareStatus } from 'web-client/src/helpers/share/status'
+import { HttpError } from 'web-pkg/src/errors'
 
 export async function triggerShareAction(resource, status, hasReSharing, hasShareJail, $client) {
   const method = _getRequestMethod(status)
@@ -16,7 +17,7 @@ export async function triggerShareAction(resource, status, hasReSharing, hasShar
 
   // exit on failure
   if (response.status !== 200) {
-    throw new Error(response.statusText)
+    throw new HttpError(response.statusText, response)
   }
 
   // get updated share from response and transform & return it
diff --git a/packages/web-pkg/src/composables/download/useDownloadFile.ts b/packages/web-pkg/src/composables/download/useDownloadFile.ts
index 05efa51ac89..134abce8716 100644
--- a/packages/web-pkg/src/composables/download/useDownloadFile.ts
+++ b/packages/web-pkg/src/composables/download/useDownloadFile.ts
@@ -2,7 +2,6 @@ import { unref } from 'vue'
 import { usePublicLinkContext } from '../authContext'
 import { useClientService } from '../clientService'
 import { useStore } from '../store'
-import { v4 as uuidV4 } from 'uuid'
 import { triggerDownloadWithFilename } from 'web-pkg/src/helpers'
 import { useGettext } from 'vue3-gettext'
 import { useCapabilityCoreSupportUrlSigning } from '../capability'
@@ -19,8 +18,7 @@ export const useDownloadFile = () => {
     const isUserContext = store.getters['runtime/auth/isUserContextReady']
 
     // construct the url and headers
-    let url = null
-    let headers: Record<string, string> = { 'X-Request-ID': uuidV4() }
+    let url
     if (unref(isPublicLinkContext)) {
       url = file.downloadURL
     } else {
@@ -29,17 +27,13 @@ export const useDownloadFile = () => {
       } else {
         url = client.fileVersions.getFileVersionUrl(file.fileId, version)
       }
-      const accessToken = store.getters['runtime/auth/accessToken']
-      headers = { Authorization: 'Bearer ' + accessToken }
     }
 
     // download with signing enabled
     if (isUserContext && unref(isUrlSigningEnabled)) {
+      const httpClient = clientService.httpAuthenticated
       try {
-        const response = await fetch(url, {
-          method: 'HEAD',
-          headers
-        })
+        const response = await httpClient.head(url)
         if (response.status === 200) {
           const signedUrl = await client.signUrl(url)
           triggerDownloadWithFilename(signedUrl, file.name)
@@ -47,12 +41,12 @@ export const useDownloadFile = () => {
         }
       } catch (e) {
         console.error(e)
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Download failed'),
+          desc: $gettext('File could not be located'),
+          error: e
+        })
       }
-      store.dispatch('showErrorMessage', {
-        title: $gettext('Download failed'),
-        desc: $gettext('File could not be located'),
-        status: 'danger'
-      })
       return
     }
 
diff --git a/packages/web-pkg/src/errors/types.ts b/packages/web-pkg/src/errors/types.ts
index 9e9571a3690..92b34bb255f 100644
--- a/packages/web-pkg/src/errors/types.ts
+++ b/packages/web-pkg/src/errors/types.ts
@@ -18,3 +18,11 @@ export class RuntimeError extends Error {
 export class ApiError extends RuntimeError {
   name = 'ApiError'
 }
+
+export class HttpError extends Error {
+  public response: any
+  constructor(message, response) {
+    super(message)
+    this.response = response
+  }
+}
diff --git a/packages/web-pkg/src/services/archiver.ts b/packages/web-pkg/src/services/archiver.ts
index 62c43fa10aa..8e85d25d404 100644
--- a/packages/web-pkg/src/services/archiver.ts
+++ b/packages/web-pkg/src/services/archiver.ts
@@ -2,7 +2,7 @@
 import major from 'semver/functions/major'
 import rcompare from 'semver/functions/rcompare'
 
-import { RuntimeError } from 'web-pkg/src/errors'
+import { HttpError, RuntimeError } from 'web-pkg/src/errors'
 import { ClientService } from 'web-pkg/src/services'
 import { urlJoin } from 'web-client/src/utils'
 import { configurationManager } from 'web-pkg/src/configuration'
@@ -99,7 +99,7 @@ export class ArchiverService {
       triggerDownloadWithFilename(objectUrl, fileName)
       return url
     } catch (e) {
-      throw new RuntimeError('archive could not be fetched')
+      throw new HttpError('archive could not be fetched', e.response)
     }
   }
 
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index 58d2c068a71..ec75cfcb42d 100644
--- a/packages/web-runtime/package.json
+++ b/packages/web-runtime/package.json
@@ -27,7 +27,7 @@
     "luxon": "^2.4.0",
     "marked": "^4.0.12",
     "oidc-client-ts": "^2.1.0",
-    "owncloud-sdk": "~3.1.0-alpha.4",
+    "owncloud-sdk": "~3.1.0-alpha.6",
     "p-queue": "^6.6.2",
     "pinia": "^2.1.3",
     "portal-vue": "3.0.0",
diff --git a/packages/web-runtime/src/store/app.ts b/packages/web-runtime/src/store/app.ts
index 16096a181d3..7d211a4f90d 100644
--- a/packages/web-runtime/src/store/app.ts
+++ b/packages/web-runtime/src/store/app.ts
@@ -1,5 +1,3 @@
-import { AxiosError } from 'axios'
-
 const state = {
   messages: [],
   quickActions: {}
@@ -7,7 +5,20 @@ const state = {
 
 const actions = {
   showErrorMessage({ commit }, message) {
-    const getXRequestID = (error: AxiosError): string | null => {
+    const getXRequestID = (error: any): string | null => {
+      /**
+       * x-request-id response headers might be very nested in ownCloud SDK,
+       * only remove records if you are sure they aren't valid anymore
+       */
+      if (error.response?.res?.res?.headers?.['x-request-id']) {
+        return error.response.res.res.headers['x-request-id']
+      }
+      if (error.response?.headers?.map?.['x-request-id']) {
+        return error.response.headers.map['x-request-id']
+      }
+      if (error.response?.res?.headers?.['x-request-id']) {
+        return error.response.res.headers['x-request-id']
+      }
       if (error.response?.headers?.['x-request-id']) {
         return error.response.headers['x-request-id']
       }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9be646d4623..66d6e8e8789 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1025,8 +1025,8 @@ importers:
         specifier: ^2.1.0
         version: 2.1.0
       owncloud-sdk:
-        specifier: ~3.1.0-alpha.4
-        version: 3.1.0-alpha.4(axios@1.4.0)(cross-fetch@3.1.4)(promise@8.1.0)(qs@6.10.3)(utf8@3.0.0)(uuid@9.0.0)(webdav@4.10.0)(xml-js@1.6.11)
+        specifier: ~3.1.0-alpha.6
+        version: 3.1.0-alpha.6(axios@1.4.0)(cross-fetch@3.1.4)(promise@8.1.0)(qs@6.10.3)(utf8@3.0.0)(uuid@9.0.0)(webdav@4.10.0)(xml-js@1.6.11)
       p-queue:
         specifier: ^6.6.2
         version: 6.6.2
@@ -7381,6 +7381,7 @@ packages:
 
   /anymatch@2.0.0(supports-color@6.1.0):
     resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==}
+    requiresBuild: true
     dependencies:
       micromatch: 3.1.10(supports-color@6.1.0)
       normalize-path: 2.1.1
@@ -7571,6 +7572,7 @@ packages:
 
   /assert-never@1.2.1:
     resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
+    requiresBuild: true
 
   /assert-plus@1.0.0:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
@@ -7639,6 +7641,7 @@ packages:
 
   /async-each@1.0.3:
     resolution: {integrity: sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==}
+    requiresBuild: true
     dev: true
 
   /async-limiter@1.0.1:
@@ -8044,6 +8047,7 @@ packages:
   /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
+    requiresBuild: true
     dependencies:
       '@babel/types': 7.21.5
 
@@ -8107,6 +8111,7 @@ packages:
   /binary-extensions@1.13.1:
     resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
     dev: true
 
   /binary-extensions@2.2.0:
@@ -8636,6 +8641,7 @@ packages:
 
   /character-parser@2.2.0:
     resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==}
+    requiresBuild: true
     dependencies:
       is-regex: 1.1.4
 
@@ -9333,6 +9339,7 @@ packages:
 
   /constantinople@4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
+    requiresBuild: true
     dependencies:
       '@babel/parser': 7.21.8
       '@babel/types': 7.21.5
@@ -10473,6 +10480,7 @@ packages:
 
   /doctypes@1.1.0:
     resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
+    requiresBuild: true
 
   /dom-serializer@1.3.2:
     resolution: {integrity: sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==}
@@ -12919,6 +12927,7 @@ packages:
   /is-binary-path@1.0.1:
     resolution: {integrity: sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
     dependencies:
       binary-extensions: 1.13.1
     dev: true
@@ -13015,6 +13024,7 @@ packages:
 
   /is-expression@4.0.0:
     resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
+    requiresBuild: true
     dependencies:
       acorn: 7.4.1
       object-assign: 4.1.1
@@ -13055,6 +13065,7 @@ packages:
   /is-glob@3.1.0:
     resolution: {integrity: sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
     dependencies:
       is-extglob: 2.1.1
     dev: true
@@ -13159,6 +13170,7 @@ packages:
 
   /is-promise@2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
+    requiresBuild: true
 
   /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -14003,6 +14015,7 @@ packages:
 
   /js-stringify@1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
+    requiresBuild: true
 
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
@@ -14217,6 +14230,7 @@ packages:
 
   /jstransformer@1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
+    requiresBuild: true
     dependencies:
       is-promise: 2.2.2
       promise: 7.3.1
@@ -15567,6 +15581,7 @@ packages:
   /normalize-path@2.1.1:
     resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
     dependencies:
       remove-trailing-separator: 1.1.0
     dev: true
@@ -15940,8 +15955,8 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /owncloud-sdk@3.1.0-alpha.4(axios@1.4.0)(cross-fetch@3.1.4)(promise@8.1.0)(qs@6.10.3)(utf8@3.0.0)(uuid@9.0.0)(webdav@4.10.0)(xml-js@1.6.11):
-    resolution: {integrity: sha512-Z+ZKPhccB+BrPKqT5Lv8jwTl3zBtw8POgytPi5jByNQpPoU1JuQ9H32ysHa3yFU/rhIuYWWDBSHPlvw+nyIUlA==}
+  /owncloud-sdk@3.1.0-alpha.6(axios@1.4.0)(cross-fetch@3.1.4)(promise@8.1.0)(qs@6.10.3)(utf8@3.0.0)(uuid@9.0.0)(webdav@4.10.0)(xml-js@1.6.11):
+    resolution: {integrity: sha512-U079L2Bjfx9hi3d1+hapR8Umyoj/hY8QQhqiy+/J7shwPKHFRdzZoyJkTtL+zOwOjqFfBIOZYEvOWPY5+5k3HA==}
     peerDependencies:
       axios: ^0.27.2
       cross-fetch: ^3.0.6
@@ -16211,6 +16226,7 @@ packages:
 
   /path-dirname@1.0.2:
     resolution: {integrity: sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==}
+    requiresBuild: true
     dev: true
 
   /path-exists@3.0.0:
@@ -17091,6 +17107,7 @@ packages:
 
   /promise@7.3.1:
     resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
+    requiresBuild: true
     dependencies:
       asap: 2.0.6
 
@@ -17179,6 +17196,7 @@ packages:
 
   /pug-attrs@3.0.0:
     resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==}
+    requiresBuild: true
     dependencies:
       constantinople: 4.0.1
       js-stringify: 1.0.2
@@ -17198,6 +17216,7 @@ packages:
 
   /pug-error@2.0.0:
     resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==}
+    requiresBuild: true
 
   /pug-filters@4.0.0:
     resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==}
@@ -17243,6 +17262,7 @@ packages:
 
   /pug-walk@2.0.0:
     resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==}
+    requiresBuild: true
 
   /pug@3.0.2:
     resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==}
@@ -17755,6 +17775,7 @@ packages:
   /readdirp@2.2.1(supports-color@6.1.0):
     resolution: {integrity: sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==}
     engines: {node: '>=0.10'}
+    requiresBuild: true
     dependencies:
       graceful-fs: 4.2.10
       micromatch: 3.1.10(supports-color@6.1.0)
@@ -17999,6 +18020,7 @@ packages:
 
   /remove-trailing-separator@1.1.0:
     resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
+    requiresBuild: true
     dev: true
 
   /repeat-element@1.1.4:
@@ -19672,6 +19694,7 @@ packages:
 
   /token-stream@1.0.0:
     resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==}
+    requiresBuild: true
 
   /totalist@1.1.0:
     resolution: {integrity: sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==}
@@ -20126,6 +20149,7 @@ packages:
   /upath@1.2.0:
     resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==}
     engines: {node: '>=4'}
+    requiresBuild: true
     dev: true
 
   /update-browserslist-db@1.0.10(browserslist@4.21.4):
@@ -20451,6 +20475,7 @@ packages:
   /void-elements@3.1.0:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
 
   /vue-concurrency@4.0.1(vue@3.3.4):
     resolution: {integrity: sha512-gzZjC8o9EE1/d7OEndI0C8lO09nkLSbviT94/gQR372iLVbYKZiGto87upjV9TAHodTfzbBgjyQXH53AVI5ugA==}
@@ -21249,6 +21274,7 @@ packages:
   /with@7.0.2:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
+    requiresBuild: true
     dependencies:
       '@babel/parser': 7.21.8
       '@babel/types': 7.21.5
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 00d10eefe09..4177833c9d5 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -162,12 +162,12 @@ Feature: Sharing files and folders with internal users
       | lorem.txt     |
       | simple-folder |
     When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI
-    Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    Then the "error" message with header 'Failed to add share for "Brian Murphy"' should be displayed on the webUI
     And the user clears all error message from the webUI
     And user "Brian Murphy" should not be listed in the collaborators list on the webUI
     When the user clears all error message from the webUI
     And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI
-    Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    Then the "error" message with header 'Failed to add share for "Brian Murphy"' should be displayed on the webUI
     And the user clears all error message from the webUI
     And user "Brian Murphy" should not be listed in the collaborators list on the webUI
     When the user reloads the current page of the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
index 5a168a5a140..26d71546c11 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
@@ -159,12 +159,12 @@ Feature: Sharing files and folders with internal users
       | lorem.txt     |
       | simple-folder |
     When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI
-    Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    Then the "error" message with header 'Failed to add share for "Brian Murphy"' should be displayed on the webUI
     And the user clears all error message from the webUI
     And user "UserTwo" should not be listed in the collaborators list on the webUI
     When the user clears all error message from the webUI
     And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI
-    Then the "error" message with header 'Failed to add share for Brian Murphy' should be displayed on the webUI
+    Then the "error" message with header 'Failed to add share for "Brian Murphy"' should be displayed on the webUI
     And the user clears all error message from the webUI
     And user "UserTwo" should not be listed in the collaborators list on the webUI
     When the user reloads the current page of the webUI
diff --git a/tests/acceptance/pageObjects/webPage.js b/tests/acceptance/pageObjects/webPage.js
index d5574daf2bc..6e14904b5e5 100644
--- a/tests/acceptance/pageObjects/webPage.js
+++ b/tests/acceptance/pageObjects/webPage.js
@@ -231,7 +231,8 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     errorMessages: {
-      selector: '//*[contains(@class, "oc-notification-message-danger")]',
+      selector:
+        '//div[contains(@class, "oc-notification-message-danger")]//div[@class="oc-notification-message-title"]',
       locateStrategy: 'xpath'
     },
     clearErrorMessage: {