From ebc41c65b8ebca96bf4422376b8c0503cc600caf Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 10 Aug 2023 10:46:54 +0200
Subject: [PATCH 01/16] Implement file locking information

---
 .../web-app-files/src/components/FilesList/ResourceTable.vue  | 1 +
 packages/web-client/src/helpers/resource/functions.ts         | 1 +
 packages/web-client/src/webdav/constants/dav.ts               | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
index 07d667d8423..d8659eb64b6 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
@@ -74,6 +74,7 @@
           :class="{ 'resource-table-resource-cut': isResourceCut(item) }"
           @click="emitFileClick(item)"
         />
+        <span>{{ item.locked }}</span>
         <oc-button
           v-if="hasRenameAction(item)"
           class="resource-table-edit-name"
diff --git a/packages/web-client/src/helpers/resource/functions.ts b/packages/web-client/src/helpers/resource/functions.ts
index 84bb928a3d5..b5a96a896c3 100644
--- a/packages/web-client/src/helpers/resource/functions.ts
+++ b/packages/web-client/src/helpers/resource/functions.ts
@@ -98,6 +98,7 @@ export function buildResource(resource): Resource {
     webDavPath: resource.name,
     type: isFolder ? 'folder' : resource.type,
     isFolder,
+    locked: resource.fileInfo[DavProperty.LockDiscovery] || false,
     processing: resource.processing || false,
     mdate: resource.fileInfo[DavProperty.LastModifiedDate],
     size: isFolder
diff --git a/packages/web-client/src/webdav/constants/dav.ts b/packages/web-client/src/webdav/constants/dav.ts
index f1e6d718ec1..a8c3731c32a 100644
--- a/packages/web-client/src/webdav/constants/dav.ts
+++ b/packages/web-client/src/webdav/constants/dav.ts
@@ -27,6 +27,8 @@ export abstract class DavProperty {
   static readonly ETag: string = '{DAV:}getetag'
   static readonly MimeType: string = '{DAV:}getcontenttype'
   static readonly ResourceType: string = '{DAV:}resourcetype'
+  static readonly LockDiscovery: string = '{DAV:}lockdiscovery'
+  static readonly ActiveLock: string = '{DAV:}activelock'
   static readonly DownloadURL: string = '{http://owncloud.org/ns}downloadURL'
   static readonly Highlights: string = '{http://owncloud.org/ns}highlights'
 
@@ -58,6 +60,8 @@ export abstract class DavProperties {
     DavProperty.FileId,
     DavProperty.FileParent,
     DavProperty.Name,
+    DavProperty.LockDiscovery,
+    DavProperty.ActiveLock,
     DavProperty.OwnerId,
     DavProperty.OwnerDisplayName,
     DavProperty.ShareId,

From d0fbed7f5813a1c2ae30870783822a0bf5aaaed0 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 10 Aug 2023 15:39:04 +0200
Subject: [PATCH 02/16] Implement lock in files-table (ugly)

---
 .../src/components/FilesList/ResourceTable.vue       | 12 +++++++++++-
 .../web-client/src/helpers/resource/functions.ts     |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
index d8659eb64b6..e50ff5c961a 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
@@ -74,7 +74,6 @@
           :class="{ 'resource-table-resource-cut': isResourceCut(item) }"
           @click="emitFileClick(item)"
         />
-        <span>{{ item.locked }}</span>
         <oc-button
           v-if="hasRenameAction(item)"
           class="resource-table-edit-name"
@@ -149,6 +148,9 @@
         :indicators="item.indicators"
       />
     </template>
+    <template #locked="{ item }">
+      <oc-icon v-if="item.locked" name="lock" size="small" class="oc-flex oc-flex-right" />
+    </template>
     <template #sdate="{ item }">
       <span
         v-oc-tooltip="formatDate(item.sdate)"
@@ -568,6 +570,14 @@ export default defineComponent({
             wrap: 'nowrap',
             width: 'shrink'
           },
+          {
+            name: 'locked',
+            title: this.$gettext('Locked'),
+            type: 'slot',
+            alignH: 'right',
+            wrap: 'nowrap',
+            width: 'shrink'
+          },
           {
             name: 'size',
             title: this.$gettext('Size'),
diff --git a/packages/web-client/src/helpers/resource/functions.ts b/packages/web-client/src/helpers/resource/functions.ts
index b5a96a896c3..99c075cd2c5 100644
--- a/packages/web-client/src/helpers/resource/functions.ts
+++ b/packages/web-client/src/helpers/resource/functions.ts
@@ -98,7 +98,7 @@ export function buildResource(resource): Resource {
     webDavPath: resource.name,
     type: isFolder ? 'folder' : resource.type,
     isFolder,
-    locked: resource.fileInfo[DavProperty.LockDiscovery] || false,
+    locked: resource.fileInfo[DavProperty.LockDiscovery] ? true : false,
     processing: resource.processing || false,
     mdate: resource.fileInfo[DavProperty.LastModifiedDate],
     size: isFolder

From 3d0f85eb71c07b361d1666b447b928a7af31eeaf Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 18 Aug 2023 15:14:57 +0200
Subject: [PATCH 03/16] Implement lock owner in buildResource

---
 packages/web-client/src/helpers/resource/functions.ts | 9 ++++++++-
 packages/web-client/src/webdav/constants/dav.ts       | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/web-client/src/helpers/resource/functions.ts b/packages/web-client/src/helpers/resource/functions.ts
index 99c075cd2c5..9b748364600 100644
--- a/packages/web-client/src/helpers/resource/functions.ts
+++ b/packages/web-client/src/helpers/resource/functions.ts
@@ -85,6 +85,12 @@ export function buildResource(resource): Resource {
   if (!resourcePath.startsWith('/')) {
     resourcePath = `/${resourcePath}`
   }
+
+  const lock = resource.fileInfo[DavProperty.LockDiscovery]
+  let activeLock
+  if (lock) {
+    activeLock = lock[DavProperty.ActiveLock]
+  }
   const id = resource.fileInfo[DavProperty.FileId]
   const r = {
     id,
@@ -98,7 +104,8 @@ export function buildResource(resource): Resource {
     webDavPath: resource.name,
     type: isFolder ? 'folder' : resource.type,
     isFolder,
-    locked: resource.fileInfo[DavProperty.LockDiscovery] ? true : false,
+    locked: activeLock ? true : false,
+    lockOwner: activeLock ? activeLock[DavProperty.LockOwner] : '',
     processing: resource.processing || false,
     mdate: resource.fileInfo[DavProperty.LastModifiedDate],
     size: isFolder
diff --git a/packages/web-client/src/webdav/constants/dav.ts b/packages/web-client/src/webdav/constants/dav.ts
index a8c3731c32a..d84d60d8737 100644
--- a/packages/web-client/src/webdav/constants/dav.ts
+++ b/packages/web-client/src/webdav/constants/dav.ts
@@ -28,6 +28,7 @@ export abstract class DavProperty {
   static readonly MimeType: string = '{DAV:}getcontenttype'
   static readonly ResourceType: string = '{DAV:}resourcetype'
   static readonly LockDiscovery: string = '{DAV:}lockdiscovery'
+  static readonly LockOwner: string = '{DAV:}owner'
   static readonly ActiveLock: string = '{DAV:}activelock'
   static readonly DownloadURL: string = '{http://owncloud.org/ns}downloadURL'
   static readonly Highlights: string = '{http://owncloud.org/ns}highlights'
@@ -62,6 +63,7 @@ export abstract class DavProperties {
     DavProperty.Name,
     DavProperty.LockDiscovery,
     DavProperty.ActiveLock,
+    DavProperty.LockOwner,
     DavProperty.OwnerId,
     DavProperty.OwnerDisplayName,
     DavProperty.ShareId,

From f6e3c82bdbaccbc20a914d0023c84ade868b3b2e Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 22 Aug 2023 12:40:07 +0200
Subject: [PATCH 04/16] Display lock owner

---
 .../SideBar/Details/FileDetails.vue           | 20 ++++++++++++++++++-
 .../web-client/src/helpers/resource/types.ts  |  1 +
 packages/web-runtime/package.json             |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index 6c09803c07b..0804b35a7f7 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -45,6 +45,12 @@
             <span v-else v-text="capitalizedTimestamp" />
           </td>
         </tr>
+        <tr v-if="showLockedBy">
+          <th scope="col" class="oc-pr-s oc-font-semibold" v-text="$gettext('Locked by')" />
+          <td>
+            <span v-text="lockedByDisplayName" />
+          </td>
+        </tr>
         <tr v-if="showSharedVia" data-testid="shared-via">
           <th scope="col" class="oc-pr-s oc-font-semibold" v-text="$gettext('Shared via')" />
           <td>
@@ -218,6 +224,7 @@ export default defineComponent({
   setup() {
     const store = useStore()
     const { $gettext } = useGettext()
+    const client = useClientService()
 
     const copiedDirect = ref(false)
     const copiedEos = ref(false)
@@ -234,6 +241,7 @@ export default defineComponent({
     const clientService = useClientService()
     const previewService = usePreviewService()
     const preview = ref(undefined)
+    const lockedByDisplayName = ref('')
 
     const directLink = computed(() => {
       return !unref(isPublicLinkContext)
@@ -293,6 +301,10 @@ export default defineComponent({
         )
       }
       await Promise.all(calls.map((p) => p.catch((e) => e)))
+      const lockedUserResult = await clientService.graphAuthenticated.users.getUser(
+        unref(resource).lockOwner.split('@')[0]
+      )
+      lockedByDisplayName.value = lockedUserResult?.data?.displayName
     }
 
     const isFolder = computed(() => {
@@ -326,6 +338,10 @@ export default defineComponent({
       )
     })
 
+    const showLockedBy = computed(() => {
+      return !!unref(resource).lockOwner
+    })
+
     watch(
       resource,
       () => {
@@ -354,7 +370,9 @@ export default defineComponent({
       hasTags: useCapabilityFilesTags(),
       isPreviewLoading,
       ancestorMetaData,
-      sharedAncestor
+      sharedAncestor,
+      showLockedBy,
+      lockedByDisplayName
     }
   },
   computed: {
diff --git a/packages/web-client/src/helpers/resource/types.ts b/packages/web-client/src/helpers/resource/types.ts
index 235624b199b..338dcadafcc 100644
--- a/packages/web-client/src/helpers/resource/types.ts
+++ b/packages/web-client/src/helpers/resource/types.ts
@@ -52,6 +52,7 @@ export interface Resource {
   status?: number
   processing?: boolean
   locked?: boolean
+  lockOwner?: string
   spaceRoles?: {
     [k: string]: SpaceRole[]
   }
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index a4f1c2cc066..fc4fcb207bd 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.7",
+    "owncloud-sdk": "3.1.0-alpha.8",
     "p-queue": "^6.6.2",
     "pinia": "^2.1.3",
     "portal-vue": "3.0.0",

From 3c7bb8fa5ffed91a5e80375407f301f59aa86e28 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 22 Aug 2023 12:41:02 +0200
Subject: [PATCH 05/16] remove lock column

---
 .../src/components/FilesList/ResourceTable.vue        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
index e50ff5c961a..07d667d8423 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
@@ -148,9 +148,6 @@
         :indicators="item.indicators"
       />
     </template>
-    <template #locked="{ item }">
-      <oc-icon v-if="item.locked" name="lock" size="small" class="oc-flex oc-flex-right" />
-    </template>
     <template #sdate="{ item }">
       <span
         v-oc-tooltip="formatDate(item.sdate)"
@@ -570,14 +567,6 @@ export default defineComponent({
             wrap: 'nowrap',
             width: 'shrink'
           },
-          {
-            name: 'locked',
-            title: this.$gettext('Locked'),
-            type: 'slot',
-            alignH: 'right',
-            wrap: 'nowrap',
-            width: 'shrink'
-          },
           {
             name: 'size',
             title: this.$gettext('Size'),

From 3fbdcdf2ca6748978cb3ce8ee124e6f1b24752b8 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 22 Aug 2023 12:43:59 +0200
Subject: [PATCH 06/16] Add changelog

---
 changelog/unreleased/enhancement-display-lock-information | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-display-lock-information

diff --git a/changelog/unreleased/enhancement-display-lock-information b/changelog/unreleased/enhancement-display-lock-information
new file mode 100644
index 00000000000..68ffd422a7d
--- /dev/null
+++ b/changelog/unreleased/enhancement-display-lock-information
@@ -0,0 +1,6 @@
+Enhancement: Display locking information
+
+We've added indicators and information in case a file is locked.
+
+https://github.com/owncloud/web/pull/9566
+https://github.com/owncloud/web/issues/6682

From 2e20f5291202893c7b3206d761c59869ad71c4a4 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 22 Aug 2023 16:33:18 +0200
Subject: [PATCH 07/16] Add tooltip to reflect status

---
 .../src/components/OcResource/OcResource.vue  | 14 ++++++++++++-
 .../src/components/OcTile/OcTile.vue          | 21 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index d065688b5b2..edd6c5cf37d 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -15,8 +15,9 @@
         class="oc-resource-thumbnail"
         width="40"
         height="40"
+        v-oc-tooltip="tooltipLabelIcon"
       />
-      <oc-resource-icon v-else :resource="resource">
+      <oc-resource-icon v-oc-tooltip="tooltipLabelIcon" v-else :resource="resource">
         <template v-if="showStatusIcon" #status>
           <oc-icon v-bind="statusIconAttrs" size="xsmall" />
         </template>
@@ -216,6 +217,17 @@ export default defineComponent({
       return this.resource.locked || this.resource.processing
     },
 
+    tooltipLabelIcon() {
+      if (this.resource.locked) {
+        return this.$gettext('This item is locked')
+      }
+
+      if (this.resource.processing) {
+        return this.$gettext('This item is processing')
+      }
+      return null
+    },
+
     statusIconAttrs() {
       if (this.resource.locked) {
         return {
diff --git a/packages/design-system/src/components/OcTile/OcTile.vue b/packages/design-system/src/components/OcTile/OcTile.vue
index 83816ff7321..202b4cf284a 100644
--- a/packages/design-system/src/components/OcTile/OcTile.vue
+++ b/packages/design-system/src/components/OcTile/OcTile.vue
@@ -25,7 +25,10 @@
       >
         <span v-text="$gettext('Disabled')" />
       </oc-tag>
-      <div class="oc-tile-card-preview oc-flex oc-flex-middle oc-flex-center">
+      <div
+        class="oc-tile-card-preview oc-flex oc-flex-middle oc-flex-center"
+        v-oc-tooltip="tooltipLabelIcon"
+      >
         <div class="oc-tile-card-hover"></div>
         <slot name="imageField" :item="resource">
           <oc-img v-if="resource.thumbnail" class="tile-preview" :src="resource.thumbnail" />
@@ -76,6 +79,7 @@ import OcResource from '../OcResource/OcResource.vue'
 import OcResourceIcon from '../OcResourceIcon/OcResourceIcon.vue'
 import OcResourceLink from '../OcResourceLink/OcResourceLink.vue'
 import OcTag from '../OcTag/OcTag.vue'
+import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   name: 'OcTile',
@@ -119,6 +123,7 @@ export default defineComponent({
   },
   emits: ['click', 'contextmenu'],
   setup(props) {
+    const { $gettext } = useGettext()
     const showStatusIcon = computed(() => {
       return props.resource.locked || props.resource.processing
     })
@@ -141,9 +146,21 @@ export default defineComponent({
       return {}
     })
 
+    const tooltipLabelIcon = computed(() => {
+      if (props.resource.locked) {
+        return $gettext('This item is locked')
+      }
+
+      if (props.resource.processing) {
+        return $gettext('This item is processing')
+      }
+      return null
+    })
+
     return {
       statusIconAttrs,
-      showStatusIcon
+      showStatusIcon,
+      tooltipLabelIcon
     }
   }
 })

From 80dff70af5dfbfb7ed79c4d9f697f6b54699c929 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 22 Aug 2023 16:35:35 +0200
Subject: [PATCH 08/16] Add aria label

---
 .../src/components/OcResource/OcResource.vue              | 8 +++++++-
 packages/design-system/src/components/OcTile/OcTile.vue   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index edd6c5cf37d..ebfa232a657 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -16,8 +16,14 @@
         width="40"
         height="40"
         v-oc-tooltip="tooltipLabelIcon"
+        :aria-label="tooltipLabelIcon"
       />
-      <oc-resource-icon v-oc-tooltip="tooltipLabelIcon" v-else :resource="resource">
+      <oc-resource-icon
+        v-oc-tooltip="tooltipLabelIcon"
+        :aria-label="tooltipLabelIcon"
+        v-else
+        :resource="resource"
+      >
         <template v-if="showStatusIcon" #status>
           <oc-icon v-bind="statusIconAttrs" size="xsmall" />
         </template>
diff --git a/packages/design-system/src/components/OcTile/OcTile.vue b/packages/design-system/src/components/OcTile/OcTile.vue
index 202b4cf284a..7da1ecff050 100644
--- a/packages/design-system/src/components/OcTile/OcTile.vue
+++ b/packages/design-system/src/components/OcTile/OcTile.vue
@@ -28,6 +28,7 @@
       <div
         class="oc-tile-card-preview oc-flex oc-flex-middle oc-flex-center"
         v-oc-tooltip="tooltipLabelIcon"
+        :aria-label="tooltipLabelIcon"
       >
         <div class="oc-tile-card-hover"></div>
         <slot name="imageField" :item="resource">

From f3cc1da73b931d950af7de96cbfcd518a24ac6bc Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 22 Aug 2023 16:41:14 +0200
Subject: [PATCH 09/16] Disable move, delete, rename for locked files

---
 .../src/composables/actions/files/useFileActionsDelete.ts     | 4 ++++
 .../src/composables/actions/files/useFileActionsMove.ts       | 4 ++++
 .../src/composables/actions/files/useFileActionsRename.ts     | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsDelete.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsDelete.ts
index b59c4ba438c..be4bba816cd 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsDelete.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsDelete.ts
@@ -86,6 +86,10 @@ export const useFileActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
           return false
         }
 
+        if (resources.length === 1 && resources[0].locked) {
+          return false
+        }
+
         if (isLocationCommonActive(router, 'files-common-search')) {
           return resources.some(
             (r) =>
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts
index 65d18bf4212..e02da7536ed 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts
@@ -53,6 +53,10 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
           return false
         }
 
+        if (resources.length === 1 && resources[0].locked) {
+          return false
+        }
+
         const moveDisabled = resources.some((resource) => {
           return canBeMoved(resource, store.getters['Files/currentFolder'].path) === false
         })
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 d374d8b6d16..858130ac6d8 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsRename.ts
@@ -240,6 +240,10 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
           return false
         }
 
+        if (resources.length === 1 && resources[0].locked) {
+          return false
+        }
+
         const renameDisabled = resources.some((resource) => {
           return !resource.canRename()
         })

From 6800f44209d46c383da873b90d573ddb2d06a793 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 23 Aug 2023 09:30:32 +0200
Subject: [PATCH 10/16] Address PR issues, add lock file

---
 .../src/components/OcResource/OcResource.vue          | 11 -----------
 pnpm-lock.yaml                                        | 10 +++++-----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index ebfa232a657..d49cfe7002d 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -227,10 +227,6 @@ export default defineComponent({
       if (this.resource.locked) {
         return this.$gettext('This item is locked')
       }
-
-      if (this.resource.processing) {
-        return this.$gettext('This item is processing')
-      }
       return null
     },
 
@@ -242,13 +238,6 @@ export default defineComponent({
         }
       }
 
-      if (this.resource.processing) {
-        return {
-          name: 'loop-right',
-          fillType: 'line'
-        }
-      }
-
       return {}
     }
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 04e8b0729a5..f32b11c10a5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 
 settings:
   autoInstallPeers: true
@@ -1034,8 +1034,8 @@ importers:
         specifier: ^2.1.0
         version: 2.1.0
       owncloud-sdk:
-        specifier: ~3.1.0-alpha.7
-        version: 3.1.0-alpha.7(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.8
+        version: 3.1.0-alpha.8(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
@@ -15964,8 +15964,8 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /owncloud-sdk@3.1.0-alpha.7(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-YNZrwY7yesiQBKu+4Z2JWR9r5LwtPHXuozlChOlOCMzw/FUI6e7koh9+WRrEwoRQZAnWVvtVCre+zUeJXXcqZw==}
+  /owncloud-sdk@3.1.0-alpha.8(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-qXUw9Y2qtxqAq93ERQVlAQtbD7qjyGwA8JEIt54PMqHvMv84DzB/JzuJtI04AP4arAepGNoH2EBHspCCixrAdA==}
     peerDependencies:
       axios: ^0.27.2
       cross-fetch: ^3.0.6

From c760572300bfc41e6e12795bb4414fb12659a377 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 23 Aug 2023 14:28:05 +0200
Subject: [PATCH 11/16] Remove lockowner from details (for now)

---
 .../SideBar/Details/FileDetails.vue           | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index 0804b35a7f7..543a592e540 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -45,12 +45,6 @@
             <span v-else v-text="capitalizedTimestamp" />
           </td>
         </tr>
-        <tr v-if="showLockedBy">
-          <th scope="col" class="oc-pr-s oc-font-semibold" v-text="$gettext('Locked by')" />
-          <td>
-            <span v-text="lockedByDisplayName" />
-          </td>
-        </tr>
         <tr v-if="showSharedVia" data-testid="shared-via">
           <th scope="col" class="oc-pr-s oc-font-semibold" v-text="$gettext('Shared via')" />
           <td>
@@ -241,7 +235,6 @@ export default defineComponent({
     const clientService = useClientService()
     const previewService = usePreviewService()
     const preview = ref(undefined)
-    const lockedByDisplayName = ref('')
 
     const directLink = computed(() => {
       return !unref(isPublicLinkContext)
@@ -301,10 +294,6 @@ export default defineComponent({
         )
       }
       await Promise.all(calls.map((p) => p.catch((e) => e)))
-      const lockedUserResult = await clientService.graphAuthenticated.users.getUser(
-        unref(resource).lockOwner.split('@')[0]
-      )
-      lockedByDisplayName.value = lockedUserResult?.data?.displayName
     }
 
     const isFolder = computed(() => {
@@ -338,10 +327,6 @@ export default defineComponent({
       )
     })
 
-    const showLockedBy = computed(() => {
-      return !!unref(resource).lockOwner
-    })
-
     watch(
       resource,
       () => {
@@ -370,9 +355,7 @@ export default defineComponent({
       hasTags: useCapabilityFilesTags(),
       isPreviewLoading,
       ancestorMetaData,
-      sharedAncestor,
-      showLockedBy,
-      lockedByDisplayName
+      sharedAncestor
     }
   },
   computed: {

From afa80385b5d600bb5b4e9d156038217025bce8a1 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 23 Aug 2023 14:29:38 +0200
Subject: [PATCH 12/16] Fix misreplaced code

---
 packages/design-system/src/components/OcTile/OcTile.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/design-system/src/components/OcTile/OcTile.vue b/packages/design-system/src/components/OcTile/OcTile.vue
index 7da1ecff050..cb977e6af17 100644
--- a/packages/design-system/src/components/OcTile/OcTile.vue
+++ b/packages/design-system/src/components/OcTile/OcTile.vue
@@ -151,9 +151,11 @@ export default defineComponent({
       if (props.resource.locked) {
         return $gettext('This item is locked')
       }
-
       if (props.resource.processing) {
-        return $gettext('This item is processing')
+        return {
+          name: 'loop-right',
+          fillType: 'line'
+        }
       }
       return null
     })

From 0a82e32d9e7bb52d2ff2677ade1fb4ba978c1cda Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 23 Aug 2023 14:33:30 +0200
Subject: [PATCH 13/16] Now i found the right code to remove

---
 .../design-system/src/components/OcResource/OcResource.vue  | 6 ++++++
 packages/design-system/src/components/OcTile/OcTile.vue     | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index d49cfe7002d..3cb006f96f8 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -237,6 +237,12 @@ export default defineComponent({
           fillType: 'fill'
         }
       }
+      if (this.resource.processing) {
+        return {
+          name: 'loop-right',
+          fillType: 'line'
+        }
+      }
 
       return {}
     }
diff --git a/packages/design-system/src/components/OcTile/OcTile.vue b/packages/design-system/src/components/OcTile/OcTile.vue
index cb977e6af17..669bbd7a8c9 100644
--- a/packages/design-system/src/components/OcTile/OcTile.vue
+++ b/packages/design-system/src/components/OcTile/OcTile.vue
@@ -151,12 +151,6 @@ export default defineComponent({
       if (props.resource.locked) {
         return $gettext('This item is locked')
       }
-      if (props.resource.processing) {
-        return {
-          name: 'loop-right',
-          fillType: 'line'
-        }
-      }
       return null
     })
 

From 511cd2e3935d1fdc1528a88574e9090255bbe009 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 23 Aug 2023 15:05:49 +0200
Subject: [PATCH 14/16] Add unittests

---
 .../actions/files/useFileActionsMove.ts       |  3 +
 .../files/useFileActionsDelete.spec.ts        |  5 ++
 .../actions/files/useFileActionsMove.spec.ts  | 87 +++++++++++++++++++
 .../files/useFileActionsRename.spec.ts        |  4 +
 4 files changed, 99 insertions(+)
 create mode 100644 packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts
index e02da7536ed..547ddfdd4ae 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsMove.ts
@@ -43,13 +43,16 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
           !isLocationPublicActive(router, 'files-public-link') &&
           !isLocationCommonActive(router, 'files-common-favorites')
         ) {
+          console.log('A')
           return false
         }
         if (resources.length === 0) {
+          console.log('B')
           return false
         }
 
         if (!store.getters['Files/currentFolder']) {
+          console.log('C')
           return false
         }
 
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
index 8ade25c7d7c..af3db7c95af 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
@@ -33,6 +33,11 @@ describe('delete', () => {
           resources: [{ canBeDeleted: () => false }] as Resource[],
           invalidLocation: false,
           expectedStatus: false
+        },
+        {
+          resources: [{ canBeDeleted: () => true, locked: true }] as Resource[],
+          invalidLocation: false,
+          expectedStatus: false
         }
       ])('should be set correctly', (inputData) => {
         const { wrapper } = getWrapper({
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
new file mode 100644
index 00000000000..5784aaab818
--- /dev/null
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
@@ -0,0 +1,87 @@
+import { mock, mockDeep } from 'jest-mock-extended'
+import { unref } from 'vue'
+import { useFileActionsMove } from 'web-app-files/src/composables'
+import { Resource, SpaceResource } from 'web-client/src'
+import { useStore } from 'web-pkg/src/composables'
+import {
+  RouteLocation,
+  createStore,
+  defaultComponentMocks,
+  defaultStoreMockOptions,
+  getComposableWrapper
+} from 'web-test-helpers/src'
+
+describe('move', () => {
+  describe('computed property "actions"', () => {
+    describe('move isEnabled property of returned element', () => {
+      it.each([
+        {
+          resources: [{ isReceivedShare: () => true, canBeDeleted: () => true }] as Resource[],
+          invalidLocation: false,
+          expectedStatus: true
+        },
+        {
+          resources: [
+            { isReceivedShare: () => true, canBeDeleted: () => true, locked: true }
+          ] as Resource[],
+          invalidLocation: false,
+          expectedStatus: false
+        }
+      ])('should be set correctly', (inputData) => {
+        const { wrapper } = getWrapper({
+          setup: () => {
+            const store = useStore()
+            const { actions } = useFileActionsMove({ store })
+
+            const resources = inputData.resources
+            expect(unref(actions)[0].isEnabled({ space: null, resources })).toBe(
+              inputData.expectedStatus
+            )
+          }
+        })
+      })
+    })
+  })
+})
+function getWrapper({
+  setup
+}: {
+  setup: (
+    instance: ReturnType<typeof useFileActionsMove>,
+    {
+      storeOptions
+    }: {
+      storeOptions: typeof defaultStoreMockOptions
+    }
+  ) => void
+}) {
+  const routeName = 'files-spaces-generic'
+  const mocks = {
+    ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: routeName }) }),
+    space: mockDeep<SpaceResource>({
+      webDavPath: 'irrelevant'
+    })
+  }
+
+  const storeOptions = {
+    ...defaultStoreMockOptions
+  }
+  storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => mocks.space)
+  const store = createStore(storeOptions)
+  return {
+    mocks,
+    storeOptions,
+    wrapper: getComposableWrapper(
+      () => {
+        const store = useStore()
+        const instance = useFileActionsMove({ store })
+        setup(instance, { storeOptions })
+      },
+      {
+        mocks,
+        provide: mocks,
+        store
+      }
+    )
+  }
+}
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 bf947934876..3e5fc6fc0e0 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
@@ -24,6 +24,10 @@ describe('rename', () => {
         {
           resources: [{ canRename: () => true }, { canRename: () => true }] as Resource[],
           expectedStatus: false
+        },
+        {
+          resources: [{ canRename: () => true, locked: true }] as Resource[],
+          expectedStatus: false
         }
       ])('should be set correctly', (inputData) => {
         const { wrapper } = getWrapper({

From 0dbaf999f8c54eb6e51eb3d51e3b0f67d3338248 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 23 Aug 2023 15:07:39 +0200
Subject: [PATCH 15/16] remove unused prop in test

---
 .../unit/composables/actions/files/useFileActionsMove.spec.ts   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
index 5784aaab818..b45e0312ad0 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
@@ -17,14 +17,12 @@ describe('move', () => {
       it.each([
         {
           resources: [{ isReceivedShare: () => true, canBeDeleted: () => true }] as Resource[],
-          invalidLocation: false,
           expectedStatus: true
         },
         {
           resources: [
             { isReceivedShare: () => true, canBeDeleted: () => true, locked: true }
           ] as Resource[],
-          invalidLocation: false,
           expectedStatus: false
         }
       ])('should be set correctly', (inputData) => {

From cc3532c2d763311d8ef3e64dc290e4c9d908a4d0 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 24 Aug 2023 09:07:07 +0200
Subject: [PATCH 16/16] Fix acceptance tests

---
 .../acceptance/features/webUIWebdavLockProtection/move.feature  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/acceptance/features/webUIWebdavLockProtection/move.feature b/tests/acceptance/features/webUIWebdavLockProtection/move.feature
index 8167ea0447c..2429c58fc96 100644
--- a/tests/acceptance/features/webUIWebdavLockProtection/move.feature
+++ b/tests/acceptance/features/webUIWebdavLockProtection/move.feature
@@ -56,5 +56,3 @@ Feature: Locks
     Then file "lorem.txt" should not be listed on the webUI
     Examples:
       | lockscope |
-      | exclusive |
-      | shared    |