Remove folderLink, merge with link

packages/web-pkg/src/components/FilesList/ResourceLink.vue

@@ -35,14 +35,6 @@ export default {
       required: false,
       default: null
     },
-    /**
-     * The resource folder link
-     */
-    folderLink: {
-      type: Object as PropType<RouteLocationRaw>,
-      required: false,
-      default: null
-    },
     /**
      * The resource to be displayed
      */
@@ -89,7 +81,7 @@ export default {
       }
 
       return {
-        to: this.link || this.folderLink
+        to: this.link
       }
     }
   },

packages/web-pkg/src/components/FilesList/ResourceListItem.vue

@@ -5,7 +5,6 @@
       :resource="resource"
       :link="link"
       :is-resource-clickable="isResourceClickable"
-      :folder-link="folderLink"
       class="oc-resource-link"
       @click="emitClick"
     >
@@ -31,7 +30,6 @@
         :resource="resource"
         :is-resource-clickable="isResourceClickable"
         :link="link"
-        :folder-link="folderLink"
         class="oc-text-overflow"
         @click="emitClick"
       >
@@ -100,14 +98,6 @@ export default defineComponent({
       required: false,
       default: null
     },
-    /**
-     * The resource folder link
-     */
-    folderLink: {
-      type: Object,
-      required: false,
-      default: null
-    },
     /**
      * Asserts whether the resource path should be displayed
      */
@@ -116,14 +106,6 @@ export default defineComponent({
       required: false,
       default: false
     },
-    /**
-     * The resource parent folder name to be displayed
-     */
-    parentFolderName: {
-      type: String,
-      required: false,
-      default: ''
-    },
     /**
      * The resource parent folder link path
      */
@@ -132,6 +114,14 @@ export default defineComponent({
       required: false,
       default: null
     },
+    /**
+     * The resource parent folder name to be displayed
+     */
+    parentFolderName: {
+      type: String,
+      required: false,
+      default: ''
+    },
     /**
      * The resource parent folder link path icon additional attributes
      */
@@ -179,13 +169,12 @@ export default defineComponent({
       return this.parentFolderName
     },
     parentFolderComponentType() {
-      return this.parentFolderLink !== null ? 'router-link' : 'span'
+      return this.parentFolderLink ? 'router-link' : 'span'
     },
 
     parentFolderStyle() {
-      const hasLinkTarget = this.parentFolderLink !== null
       return {
-        cursor: hasLinkTarget ? 'pointer' : 'default'
+        cursor: this.parentFolderLink ? 'pointer' : 'default'
       }
     },
 

packages/web-pkg/src/components/FilesList/ResourceTable.vue

@@ -76,7 +76,6 @@
           :is-extension-displayed="areFileExtensionsShown"
           :is-resource-clickable="isResourceClickable(item)"
           :link="getResourceLink(item)"
-          :folder-link="getFolderLink(item)"
           :parent-folder-link="getParentFolderLink(item)"
           :parent-folder-link-icon-additional-attributes="
             getParentFolderLinkIconAdditionalAttributes(item)
@@ -513,6 +512,7 @@ export default defineComponent({
     const capabilityStore = useCapabilityStore()
     const { getMatchingSpace } = useGetMatchingSpace()
     const { canBeOpenedWithSecureView } = useCanBeOpenedWithSecureView()
+    const { getFolderLink } = useFolderLink()
     const {
       isLocationPicker,
       isFilePicker,
@@ -595,6 +595,10 @@ export default defineComponent({
     }
 
     const getResourceLink = (resource: Resource) => {
+      if (resource.isFolder) {
+        return getFolderLink(resource)
+      }
+
       let space = props.space
       if (!space) {
         space = getMatchingSpace(resource)

packages/web-pkg/src/components/FilesList/ResourceTile.vue

@@ -13,7 +13,6 @@
       class="oc-card-media-top oc-flex oc-flex-center oc-flex-middle oc-m-rm"
       :resource="resource"
       :link="resourceRoute"
-      :folder-link="resourceFolderRoute"
       :is-resource-clickable="isResourceClickable"
       tabindex="-1"
       @click="$emit('click')"
@@ -62,7 +61,6 @@
             :is-extension-displayed="isExtensionDisplayed"
             :is-resource-clickable="isResourceClickable"
             :link="resourceRoute"
-            :folder-link="resourceFolderRoute"
             @click="$emit('click')"
           />
         </div>
@@ -106,11 +104,8 @@ export default defineComponent({
     },
     resourceRoute: {
       type: Object as PropType<RouteLocationRaw>,
-      default: () => ({})
-    },
-    resourceFolderRoute: {
-      type: Object,
-      default: () => ({})
+      required: false,
+      default: null
     },
     isResourceSelected: {
       type: Boolean,

packages/web-pkg/src/components/FilesList/ResourceTiles.vue

@@ -44,7 +44,6 @@
           :ref="(el) => (tileRefs.tiles[resource.id] = el as ResourceTileRef)"
           :resource="resource"
           :resource-route="getRoute(resource)"
-          :resource-folder-route="getFolderRoute(resource)"
           :is-resource-selected="isResourceSelected(resource)"
           :is-resource-clickable="isResourceClickable(resource)"
           :is-resource-disabled="isResourceDisabled(resource)"
@@ -260,19 +259,6 @@ export default defineComponent({
     )
 
     const getRoute = (resource: Resource) => {
-      let space = props.space
-      if (!space) {
-        space = getMatchingSpace(resource)
-      }
-
-      const action = getDefaultAction({ resources: [resource], space })
-      if (!action?.route) {
-        return null
-      }
-
-      return action.route({ space, resources: [resource] })
-    }
-    const getFolderRoute = (resource: Resource) => {
       if (isSpaceResource(resource)) {
         return resource.disabled
           ? { path: '#' }
@@ -284,19 +270,27 @@ export default defineComponent({
               })
             )
       }
-      if (resource.type === 'folder') {
+
+      if (resource.isFolder) {
         return resourceRouteResolver.createFolderLink({
           path: resource.path,
           fileId: resource.fileId,
           resource: resource
         })
       }
 
-      return {
-        path: ''
+      let space = props.space
+      if (!space) {
+        space = getMatchingSpace(resource)
+      }
+
+      const action = getDefaultAction({ resources: [resource], space })
+      if (!action?.route) {
+        return null
       }
-    }
 
+      return action.route({ space, resources: [resource] })
+    }
     const emitTileClick = (resource: Resource) => {
       if (unref(isEmbedModeEnabled) && unref(isFilePicker)) {
         return postMessage<Resource>(
@@ -569,7 +563,6 @@ export default defineComponent({
       areFileExtensionsShown,
       emitTileClick,
       getRoute,
-      getFolderRoute,
       showContextMenuOnBtnClick,
       showContextMenu,
       tileRefs,

packages/web-pkg/src/components/Search/ResourcePreview.vue

@@ -3,7 +3,7 @@
     :resource="resource"
     :path-prefix="pathPrefix"
     :is-path-displayed="true"
-    :folder-link="folderLink"
+    :link="resourceLink"
     :is-extension-displayed="areFileExtensionsShown"
     :parent-folder-link-icon-additional-attributes="parentFolderLinkIconAdditionalAttributes"
     :parent-folder-name="parentFolderName"
@@ -49,6 +49,8 @@ export default defineComponent({
   setup(props) {
     const { triggerDefaultAction } = useFileActions()
     const { getMatchingSpace } = useGetMatchingSpace()
+    const { getDefaultAction } = useFileActions()
+
     const {
       getPathPrefix,
       getParentFolderName,
@@ -101,15 +103,29 @@ export default defineComponent({
       }
     })
 
+    const resourceLink = computed(() => {
+      if (unref(resource).isFolder) {
+        return getFolderLink(unref(resource))
+      }
+
+      const action = getDefaultAction({ resources: [unref(resource)], space: unref(space) })
+
+      if (!action?.route) {
+        return null
+      }
+
+      return action.route({ space: unref(space), resources: [unref(resource)] })
+    })
+
     return {
       configOptions,
       space,
       previewData,
       resource,
       resourceDisabled,
       resourceClicked,
+      resourceLink,
       parentFolderLink: getParentFolderLink(unref(resource)),
-      folderLink: getFolderLink(unref(resource)),
       pathPrefix: getPathPrefix(unref(resource)),
       parentFolderName: getParentFolderName(unref(resource)),
       parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(

packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceTile.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`OcTile component > renders default space correctly 1`] = `
 "<div class="oc-tile-card oc-card oc-card-default oc-rounded">
-  <resource-link-stub resource="[object Object]" link="[object Object]" folderlink="[object Object]" isresourceclickable="true" class="oc-card-media-top oc-flex oc-flex-center oc-flex-middle oc-m-rm" tabindex="-1">
+  <resource-link-stub resource="[object Object]" isresourceclickable="true" class="oc-card-media-top oc-flex oc-flex-center oc-flex-middle oc-m-rm" tabindex="-1">
     <div class="oc-tile-card-selection"></div>
     <!--v-if-->
     <div class="oc-tile-card-preview oc-flex oc-flex-middle oc-flex-center">
@@ -13,7 +13,7 @@ exports[`OcTile component > renders default space correctly 1`] = `
   <div class="oc-card-body oc-p-s">
     <div class="oc-flex oc-flex-between oc-flex-middle">
       <div class="oc-flex oc-flex-middle oc-text-truncate resource-name-wrapper">
-        <resource-list-item-stub resource="[object Object]" pathprefix="" link="[object Object]" folderlink="[object Object]" ispathdisplayed="false" parentfoldername="" parentfolderlinkiconadditionalattributes="[object Object]" isextensiondisplayed="true" isthumbnaildisplayed="true" isicondisplayed="false" isresourceclickable="true"></resource-list-item-stub>
+        <resource-list-item-stub resource="[object Object]" pathprefix="" ispathdisplayed="false" parentfoldername="" parentfolderlinkiconadditionalattributes="[object Object]" isextensiondisplayed="true" isthumbnaildisplayed="true" isicondisplayed="false" isresourceclickable="true"></resource-list-item-stub>
       </div>
       <div class="oc-flex oc-flex-middle">
         <!-- Slot for indicators !-->
@@ -28,7 +28,7 @@ exports[`OcTile component > renders default space correctly 1`] = `
 
 exports[`OcTile component > renders disabled space correctly 1`] = `
 "<div class="oc-tile-card oc-card oc-card-default oc-rounded oc-tile-card-disabled">
-  <resource-link-stub resource="[object Object]" link="[object Object]" folderlink="[object Object]" isresourceclickable="true" class="oc-card-media-top oc-flex oc-flex-center oc-flex-middle oc-m-rm" tabindex="-1">
+  <resource-link-stub resource="[object Object]" isresourceclickable="true" class="oc-card-media-top oc-flex oc-flex-center oc-flex-middle oc-m-rm" tabindex="-1">
     <div class="oc-tile-card-selection"></div>
     <!--v-if-->
     <div class="oc-tile-card-preview oc-flex oc-flex-middle oc-flex-center">
@@ -39,7 +39,7 @@ exports[`OcTile component > renders disabled space correctly 1`] = `
   <div class="oc-card-body oc-p-s">
     <div class="oc-flex oc-flex-between oc-flex-middle">
       <div class="oc-flex oc-flex-middle oc-text-truncate resource-name-wrapper">
-        <resource-list-item-stub resource="[object Object]" pathprefix="" link="[object Object]" folderlink="[object Object]" ispathdisplayed="false" parentfoldername="" parentfolderlinkiconadditionalattributes="[object Object]" isextensiondisplayed="true" isthumbnaildisplayed="true" isicondisplayed="false" isresourceclickable="true"></resource-list-item-stub>
+        <resource-list-item-stub resource="[object Object]" pathprefix="" ispathdisplayed="false" parentfoldername="" parentfolderlinkiconadditionalattributes="[object Object]" isextensiondisplayed="true" isthumbnaildisplayed="true" isicondisplayed="false" isresourceclickable="true"></resource-list-item-stub>
       </div>
       <div class="oc-flex oc-flex-middle">
         <!-- Slot for indicators !-->

packages/web-pkg/tests/unit/components/Search/__snapshots__/ResourcePreview.spec.ts.snap

@@ -1,3 +1,3 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Preview component > should render preview component 1`] = `"<resource-list-item-stub resource="[object Object]" pathprefix="Spaces/New space" folderlink="[object Object]" ispathdisplayed="true" parentfoldername="New space" parentfolderlink="[object Object]" parentfolderlinkiconadditionalattributes="[object Object]" isextensiondisplayed="true" isthumbnaildisplayed="true" isicondisplayed="true" isresourceclickable="true"></resource-list-item-stub>"`;
+exports[`Preview component > should render preview component 1`] = `"<resource-list-item-stub resource="[object Object]" pathprefix="Spaces/New space" ispathdisplayed="true" parentfolderlink="[object Object]" parentfoldername="New space" parentfolderlinkiconadditionalattributes="[object Object]" isextensiondisplayed="true" isthumbnaildisplayed="true" isicondisplayed="true" isresourceclickable="true"></resource-list-item-stub>"`;

packages/web-runtime/src/components/UploadInfo.vue

@@ -120,7 +120,7 @@
               :is-path-displayed="true"
               :is-resource-clickable="isResourceClickable(item)"
               :parent-folder-name="parentFolderName(item)"
-              :folder-link="folderLink(item)"
+              :link="resourceLink(item)"
               :parent-folder-link="parentFolderLink(item)"
             />
             <span v-else class="oc-flex oc-flex-middle oc-text-truncate">
@@ -551,7 +551,7 @@ export default defineComponent({
     isResourceClickable(file: UploadResult) {
       return file.isFolder === true
     },
-    folderLink(file: UploadResult) {
+    resourceLink(file: UploadResult) {
       if (!file.isFolder) {
         return {}
       }