Implement file locking information

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

packages/design-system/src/components/OcResource/OcResource.vue

@@ -15,8 +15,15 @@
         class="oc-resource-thumbnail"
         width="40"
         height="40"
+        v-oc-tooltip="tooltipLabelIcon"
+        :aria-label="tooltipLabelIcon"
       />
-      <oc-resource-icon 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>
@@ -216,6 +223,13 @@ export default defineComponent({
       return this.resource.locked || this.resource.processing
     },
 
+    tooltipLabelIcon() {
+      if (this.resource.locked) {
+        return this.$gettext('This item is locked')
+      }
+      return null
+    },
+
     statusIconAttrs() {
       if (this.resource.locked) {
         return {
@@ -224,13 +238,6 @@ export default defineComponent({
         }
       }
 
-      if (this.resource.processing) {
-        return {
-          name: 'loop-right',
-          fillType: 'line'
-        }
-      }
-
       return {}
     }
   },

packages/design-system/src/components/OcTile/OcTile.vue

@@ -25,7 +25,11 @@
       >
         <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"
+        :aria-label="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 +80,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 +124,7 @@ export default defineComponent({
   },
   emits: ['click', 'contextmenu'],
   setup(props) {
+    const { $gettext } = useGettext()
     const showStatusIcon = computed(() => {
       return props.resource.locked || props.resource.processing
     })
@@ -141,9 +147,23 @@ export default defineComponent({
       return {}
     })
 
+    const tooltipLabelIcon = computed(() => {
+      if (props.resource.locked) {
+        return $gettext('This item is locked')
+      }
+      if (props.resource.processing) {
+        return {
+          name: 'loop-right',
+          fillType: 'line'
+        }
+      }
+      return null
+    })
+
     return {
       statusIconAttrs,
-      showStatusIcon
+      showStatusIcon,
+      tooltipLabelIcon
     }
   }
 })

packages/web-app-files/src/components/SideBar/Details/FileDetails.vue

@@ -218,6 +218,7 @@ export default defineComponent({
   setup() {
     const store = useStore()
     const { $gettext } = useGettext()
+    const client = useClientService()
 
     const copiedDirect = ref(false)
     const copiedEos = ref(false)

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) =>

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
         })

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()
         })

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,6 +104,8 @@ export function buildResource(resource): Resource {
     webDavPath: resource.name,
     type: isFolder ? 'folder' : resource.type,
     isFolder,
+    locked: activeLock ? true : false,
+    lockOwner: activeLock ? activeLock[DavProperty.LockOwner] : '',
     processing: resource.processing || false,
     mdate: resource.fileInfo[DavProperty.LastModifiedDate],
     size: isFolder

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[]
   }

packages/web-client/src/webdav/constants/dav.ts

@@ -27,6 +27,9 @@ 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 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'
 
@@ -58,6 +61,9 @@ export abstract class DavProperties {
     DavProperty.FileId,
     DavProperty.FileParent,
     DavProperty.Name,
+    DavProperty.LockDiscovery,
+    DavProperty.ActiveLock,
+    DavProperty.LockOwner,
     DavProperty.OwnerId,
     DavProperty.OwnerDisplayName,
     DavProperty.ShareId,

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",