WIP new share urls

dev/docker/ocis.web.config.json

@@ -17,6 +17,10 @@
         "showAllOnLoad": true
       }
     },
+    "routing": {
+      "fullShareOwnerPaths": true,
+      "idBased": false
+    },
     "previewFileMimeTypes": [
       "image/gif",
       "image/png",

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

@@ -28,15 +28,8 @@
           :aria-current="getAriaCurrent(index)"
           :to="item.isTruncationPlaceholder ? lastHiddenItem.to : item.to"
         >
-          <span class="oc-breadcrumb-item-text">{{ item.text }}</span>
+          <span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">{{ item.text }}</span>
         </router-link>
-        <oc-icon
-          v-if="item.to"
-          color="var(--oc-color-text-default)"
-          name="arrow-right-s"
-          class="oc-mx-xs"
-          fill-type="line"
-        />
         <oc-button
           v-else-if="item.onClick"
           :aria-current="getAriaCurrent(index)"
@@ -47,6 +40,7 @@
           <span
             :class="[
               'oc-breadcrumb-item-text',
+              'oc-breadcrumb-item-navigable',
               {
                 'oc-breadcrumb-item-text-last': index === displayItems.length - 1
               }
@@ -61,6 +55,13 @@
           tabindex="-1"
           v-text="item.text"
         />
+        <oc-icon
+          v-if="index !== displayItems.length - 1"
+          color="var(--oc-color-text-default)"
+          name="arrow-right-s"
+          class="oc-mx-xs"
+          fill-type="line"
+        />
         <template v-if="showContextActions && index === displayItems.length - 1">
           <oc-button
             id="oc-breadcrumb-contextmenu-trigger"
@@ -84,7 +85,7 @@
       </li>
     </ol>
     <oc-button
-      v-if="displayItems.length > 1"
+      v-if="parentFolderTo && displayItems.length > 1"
       appearance="raw"
       type="router-link"
       :aria-label="$gettext('Navigate one level up')"
@@ -280,7 +281,7 @@ export default defineComponent({
       return [...props.items].reverse()[0]
     })
     const parentFolderTo = computed(() => {
-      return [...props.items].reverse()[1].to
+      return [...props.items].reverse()[1]?.to
     })
 
     const contextMenuLabel = computed(() => {
@@ -343,6 +344,10 @@ export default defineComponent({
     }
   }
 
+  &-item-navigable:hover {
+    text-decoration: underline;
+  }
+
   &-mobile-current,
   &-mobile-navigation {
     @media (min-width: $oc-breakpoint-small-default) {
@@ -380,12 +385,6 @@ export default defineComponent({
     > :last-child > span {
       color: var(--oc-color-text-default);
     }
-
-    > li a:hover,
-    > li span:not([aria-current='page']):not(.oc-icon):hover,
-    > li button:hover {
-      text-decoration: underline;
-    }
   }
 
   /* stylelint-disable */

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

@@ -52,7 +52,7 @@
           :name="resource.name"
           :extension="resource.extension"
           :type="resource.type"
-          :full-path="resource.path"
+          :full-path="resource.visiblePath"
           :is-path-displayed="isPathDisplayed"
           :is-extension-displayed="isExtensionDisplayed"
         />
@@ -67,7 +67,7 @@
           @click.stop="$emit('parentFolderClicked')"
         >
           <oc-icon v-bind="parentFolderLinkIconAttrs" />
-          <span class="text" v-text="parentFolder" />
+          <span class="text" v-text="parentFolderName" />
         </component>
       </div>
     </div>
@@ -102,51 +102,51 @@ export default defineComponent({
   },
   props: {
     /**
-     * The resource folder link
+     * The resource to be displayed
      */
-    folderLink: {
-      type: Object,
-      required: false,
-      default: null
+    resource: {
+      type: Object as PropType<Resource>,
+      required: true
     },
     /**
-     * The resource parent folder link path
+     * The resource folder link
      */
-    parentFolderLink: {
+    folderLink: {
       type: Object,
       required: false,
       default: null
     },
     /**
-     * The resource parent folder link path icon additional attributes
+     * Asserts whether the resource path should be displayed
      */
-    parentFolderLinkIconAdditionalAttributes: {
-      type: Object,
+    isPathDisplayed: {
+      type: Boolean,
       required: false,
-      default: () => {}
-    },
-    /**
-     * The resource to be displayed
-     */
-    resource: {
-      type: Object as PropType<Resource>,
-      required: true
+      default: false
     },
     /**
      * The resource parent folder name to be displayed
      */
-    parentFolderNameDefault: {
+    parentFolderName: {
       type: String,
       required: false,
       default: ''
     },
     /**
-     * Asserts whether the resource path should be displayed
+     * The resource parent folder link path
      */
-    isPathDisplayed: {
-      type: Boolean,
+    parentFolderLink: {
+      type: Object,
       required: false,
-      default: false
+      default: null
+    },
+    /**
+     * The resource parent folder link path icon additional attributes
+     */
+    parentFolderLinkIconAdditionalAttributes: {
+      type: Object,
+      required: false,
+      default: () => {}
     },
     /**
      * Asserts whether the resource extension should be displayed
@@ -187,11 +187,6 @@ export default defineComponent({
       return this.parentFolderLink !== null ? 'router-link' : 'span'
     },
 
-    parentFolder() {
-      const folder = path.basename(path.dirname(this.resource.path)).replace('.', '')
-      return folder !== '' ? folder : this.parentFolderNameDefault
-    },
-
     parentFolderStyle() {
       const hasLinkTarget = this.parentFolderLink !== null
       return {

packages/web-app-files/src/HandleUpload.ts

@@ -14,7 +14,7 @@ import { UppyService } from 'web-runtime/src/services/uppyService'
 import { ResourceConflict } from './helpers/resource'
 import { locationPublicLink } from './router/public'
 import { locationSpacesGeneric } from './router/spaces'
-import { isShareSpaceResource } from 'web-client/src/helpers'
+import { isPersonalSpaceResource, isShareSpaceResource } from 'web-client/src/helpers'
 import { ClientService } from 'web-pkg/types'
 
 export interface HandleUploadOptions {
@@ -201,7 +201,12 @@ export class HandleUpload extends BasePlugin {
         targetUploadSpace = this.spaces.find((space) => space.id === uppyResource.meta.spaceId)
       }
 
-      if (!targetUploadSpace || isShareSpaceResource(targetUploadSpace)) {
+      if (
+        !targetUploadSpace ||
+        isShareSpaceResource(targetUploadSpace) ||
+        (isPersonalSpaceResource(targetUploadSpace) &&
+          targetUploadSpace.ownerId !== this.store.getters.user.uuid)
+      ) {
         return acc
       }
 

packages/web-app-files/src/components/AppBar/CreateAndUpload.vue

@@ -188,7 +188,7 @@ import {
   watch,
   ref
 } from 'vue'
-import { useUpload } from 'web-runtime/src/composables/upload'
+import { UppyResource, useUpload } from 'web-runtime/src/composables/upload'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { Resource, SpaceResource, isShareSpaceResource } from 'web-client/src/helpers'
 import { useService } from 'web-pkg/src/composables/service'
@@ -321,27 +321,30 @@ export default defineComponent({
 
     const onUploadComplete = async (result) => {
       if (result.successful) {
-        const file = result.successful[0]
+        const file = result.successful[0] as UppyResource
 
         if (!file) {
           return
         }
 
         store.dispatch('hideModal')
-        const { spaceId, currentFolder, currentFolderId } = file.meta
-        if (!['public', 'share'].includes(file.meta.driveType)) {
-          if (unref(hasSpaces)) {
+        const { spaceId, currentFolder, currentFolderId, driveType } = file.meta
+        if (unref(hasSpaces)) {
+          const spaces = store.getters['runtime/spaces/spaces']
+          const user = store.getters['user']
+          const isOwnSpace = spaces.find((space) => space.id === spaceId)?.ownerId === user.uuid
+          if (driveType === 'project' || isOwnSpace) {
             const client = clientService.graphAuthenticated
             const driveResponse = await client.drives.getDrive(spaceId)
             store.commit('runtime/spaces/UPDATE_SPACE_FIELD', {
               id: driveResponse.data.id,
               field: 'spaceQuota',
               value: driveResponse.data.quota
             })
-          } else {
-            const user = await clientService.owncloudSdk.users.getUser(store.getters.user.id)
-            store.commit('SET_QUOTA', user.quota)
           }
+        } else {
+          const user = await clientService.owncloudSdk.users.getUser(store.getters.user.id)
+          store.commit('SET_QUOTA', user.quota)
         }
 
         const sameFolder =
@@ -408,7 +411,6 @@ export default defineComponent({
   computed: {
     ...mapGetters(['capabilities', 'configuration', 'newFileHandlers', 'user']),
     ...mapGetters('Files', ['files', 'selectedFiles', 'clipboardResources']),
-    ...mapGetters('runtime/ancestorMetaData', ['ancestorMetaData']),
     ...mapGetters('runtime/spaces', ['spaces']),
 
     showPasteHereButton() {

packages/web-app-files/src/components/FilesList/ResourceTable.vue

@@ -61,7 +61,7 @@
           :key="`${item.path}-${resourceDomSelector(item)}-${item.thumbnail}`"
           :resource="item"
           :is-path-displayed="arePathsDisplayed"
-          :parent-folder-name-default="getDefaultParentFolderName(item)"
+          :parent-folder-name="getParentFolderName(item)"
           :is-thumbnail-displayed="shouldDisplayThumbnails(item)"
           :is-icon-displayed="!$slots['image']"
           :is-extension-displayed="areFileExtensionsShown"
@@ -211,10 +211,16 @@
 <script lang="ts">
 import { defineComponent, PropType, computed, unref, ref, ComputedRef } from 'vue'
 import { mapGetters, mapActions, mapState } from 'vuex'
-import { basename, dirname } from 'path'
+import { dirname } from 'path'
 import { useWindowSize } from '@vueuse/core'
 import { Resource } from 'web-client'
-import { extractDomSelector, isProjectSpaceResource, SpaceResource } from 'web-client/src/helpers'
+import {
+  extractDomSelector,
+  extractParentFolderName,
+  isProjectSpaceResource,
+  isShareRoot,
+  SpaceResource
+} from 'web-client/src/helpers'
 import { ShareTypes } from 'web-client/src/helpers/share'
 
 import {
@@ -491,7 +497,7 @@ export default defineComponent({
     }
   },
   computed: {
-    ...mapGetters(['configuration']),
+    ...mapGetters(['configuration', 'user']),
     ...mapState('Files', [
       'areFileExtensionsShown',
       'latestSelectedId',
@@ -764,21 +770,21 @@ export default defineComponent({
     },
     folderLink(file: Resource) {
       return this.createFolderLink({
-        path: file.path,
+        path: file.visiblePath,
         fileId: file.fileId,
         resource: file
       })
     },
     parentFolderLink(file: Resource) {
-      if (file.shareId && file.path === '/') {
+      if (isShareRoot(file)) {
         return createLocationShares('files-shares-with-me')
       }
       if (isProjectSpaceResource(file)) {
         return createLocationSpaces('files-spaces-projects')
       }
 
       return this.createFolderLink({
-        path: dirname(file.path),
+        path: dirname(file.visiblePath),
         ...(file.parentFolderId && { fileId: file.parentFolderId }),
         resource: file
       })
@@ -967,7 +973,16 @@ export default defineComponent({
         ownerName: resource.owner[0].displayName
       })
     },
-    getDefaultParentFolderName(resource: Resource) {
+    getParentFolderName(resource: Resource) {
+      if (isShareRoot(resource)) {
+        return this.$gettext('Shared with me')
+      }
+
+      const parentFolder = extractParentFolderName(resource)
+      if (parentFolder) {
+        return parentFolder
+      }
+
       if (this.hasProjectSpaces) {
         if (isProjectSpaceResource(resource)) {
           return this.$gettext('Spaces')
@@ -982,13 +997,9 @@ export default defineComponent({
         return this.$gettext('All files and folders')
       }
 
-      if (resource.shareId) {
-        return resource.path === '/'
-          ? this.$gettext('Shared with me')
-          : basename(resource.shareRoot)
-      }
-
-      if (!this.getInternalSpace(resource.storageId)) {
+      const space = this.getInternalSpace(resource.storageId)
+      const isOwnPersonalSpace = space.ownerId === this.user.uuid
+      if (!isOwnPersonalSpace) {
         return this.$gettext('Shared with me')
       }