[full-ci] Resolve internal/private links on shares

changelog/unreleased/enhancement-internal-links

@@ -1,8 +1,8 @@
 Enhancement: Resolve internal links
 
 Public links with the role "internal" can now be resolved.
-Note: Internal links to shares can not be resolved as of now. This will follow in a subsequent PR.
 
-https://github.com/owncloud/web/pull/7405
 https://github.com/owncloud/web/issues/7304
 https://github.com/owncloud/web/issues/6844
+https://github.com/owncloud/web/pull/7405
+https://github.com/owncloud/web/pull/7769

changelog/unreleased/enhancement-private-links

@@ -1,7 +1,7 @@
 Enhancement: Resolve private links
 
 Private links can now be resolved.
-Note: Private links to shares in oCIS can not be resolved as of now. This will follow in a subsequent PR.
 
-https://github.com/owncloud/web/pull/7405
 https://github.com/owncloud/web/issues/7707
+https://github.com/owncloud/web/pull/7405
+https://github.com/owncloud/web/pull/7769

packages/web-app-files/src/helpers/resource/resource.ts

@@ -1,11 +1,19 @@
 import { Resource } from 'web-client'
 import fileExtensions from '../extensions/fileExtensions'
 
-export const extractStorageId = (id?: string): string => {
+const extractIdSegment = (id: string, index: number): string => {
   if (!id || typeof id !== 'string') {
     return ''
   }
-  return id.indexOf('!') >= 0 ? id.split('!')[0] : ''
+  return id.indexOf('!') >= 0 ? id.split('!')[index] : ''
+}
+
+export const extractStorageId = (id?: string): string => {
+  return extractIdSegment(id, 0)
+}
+
+export const extractNodeId = (id?: string): string => {
+  return extractIdSegment(id, 1)
 }
 
 export const extractNameWithoutExtension = (resource?: Resource): string => {

packages/web-app-files/src/helpers/resources.ts

@@ -14,7 +14,7 @@ import {
   spaceRoleManager,
   spaceRoleViewer
 } from 'web-client/src/helpers/share'
-import { extractExtensionFromFile, extractStorageId } from './resource'
+import { extractExtensionFromFile, extractNodeId, extractStorageId } from './resource'
 import { buildWebDavSpacesPath, extractDomSelector } from 'web-client/src/helpers/resource'
 import { Resource, SpaceResource, SHARE_JAIL_ID } from 'web-client/src/helpers'
 import { urlJoin } from 'web-pkg/src/utils'
@@ -44,7 +44,7 @@ export function buildResource(resource): Resource {
   }
 
   const id = resource.fileInfo[DavProperty.FileId]
-  return {
+  const r = {
     id,
     fileId: id,
     storageId: extractStorageId(id),
@@ -106,6 +106,12 @@ export function buildResource(resource): Resource {
     },
     getDomSelector: () => extractDomSelector(id)
   }
+  Object.defineProperty(r, 'nodeId', {
+    get() {
+      return extractNodeId(this.id)
+    }
+  })
+  return r
 }
 
 export function buildWebDavPublicPath(publicLinkToken, path = '') {

packages/web-client/src/helpers/resource/types.ts

@@ -6,6 +6,7 @@ export interface Resource {
   fileId?: string
   parentFolderId?: string
   storageId?: string
+  readonly nodeId?: string
   name?: string
   path: string
   webDavPath?: string

packages/web-client/src/helpers/space/functions.ts

@@ -5,6 +5,7 @@ import { PublicSpaceResource, ShareSpaceResource, SpaceResource, SHARE_JAIL_ID }
 import { DavProperty } from 'web-pkg/src/constants'
 import { buildWebDavPublicPath } from 'files/src/helpers/resources'
 import { urlJoin } from 'web-pkg/src/utils'
+import { extractNodeId } from 'files/src/helpers/resource'
 
 export function buildPublicSpaceResource(data): PublicSpaceResource {
   const publicLinkPassword = data.publicLinkPassword
@@ -94,7 +95,7 @@ export function buildSpace(data): SpaceResource {
   })
   const webDavUrl = urlJoin(data.serverUrl, 'remote.php/dav', webDavPath)
 
-  return {
+  const s = {
     id: data.id,
     fileId: data.id,
     storageId: data.id,
@@ -125,6 +126,7 @@ export function buildSpace(data): SpaceResource {
     ownerDisplayName: '',
     ownerId: data.owner?.user?.id,
     disabled,
+    root: data.root,
     spaceQuota: data.quota,
     spaceRoles,
     spaceImageData,
@@ -197,4 +199,10 @@ export function buildSpace(data): SpaceResource {
       return urlJoin(this.webDavUrl, resource.path)
     }
   }
+  Object.defineProperty(s, 'nodeId', {
+    get() {
+      return extractNodeId(this.id)
+    }
+  })
+  return s
 }

packages/web-client/src/helpers/space/types.ts

@@ -10,9 +10,21 @@ import { Resource } from '../resource'
 
 export const SHARE_JAIL_ID = 'a0ca6a90-a365-4782-871e-d44447bbc668'
 
+export interface SpaceResourceRemoteItem {
+  id: string
+  name: string
+}
+
+export interface SpaceResourceRoot {
+  id: string
+  remoteItem: SpaceResourceRemoteItem
+  webDavUrl: string
+}
+
 export interface SpaceResource extends Resource {
   disabled?: boolean
   webDavUrl: string
+  root: SpaceResourceRoot
   getWebDavUrl(resource: Resource): string
   getDriveAliasAndItem(resource: Resource): string
 }
@@ -39,6 +51,15 @@ export const isShareSpaceResource = (resource: Resource): resource is ShareSpace
   return resource.driveType === 'share'
 }
 
+export interface MountPointSpaceResource extends SpaceResource {
+  __mountPointSpaceResource?: any
+}
+export const isMountPointSpaceResource = (
+  resource: Resource
+): resource is MountPointSpaceResource => {
+  return resource.driveType === 'mountpoint'
+}
+
 export interface PublicSpaceResource extends SpaceResource {
   publicLinkPassword?: string
   publicLinkItemType?: string