Fix webDavPath construction for space image and readme (#7017)

Fix webDavPath construction for space image and readme Needs to be a prefix match since the URL has the spaceId as nodeId in the URL (uniform 3-part id syntax) but the space id we maintain internally is 2-part.
owncloud · May 20, 2022 · 9b15875 · 9b15875
1 parent 1f2108f
commit 9b15875
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/changelog/unreleased/bugfix-space-special-files b/changelog/unreleased/bugfix-space-special-files
@@ -0,0 +1,5 @@
+Bugfix: Cover image and readme in spaces
+
+The URL construction for cover image and readme of a space was wrong and led to both not being shown. This has been fixed by making the URL construction more reliable regarding different ID formats.
+
+https://github.com/owncloud/web/pull/7017
diff --git a/packages/web-app-files/src/views/spaces/Project.vue b/packages/web-app-files/src/views/spaces/Project.vue
@@ -259,14 +259,20 @@ export default defineComponent({
     },
     'space.spaceImageData': {
       handler: function (val) {
-        if (!val) return
+        if (!val) {
+          return
+        }
         const webDavPathComponents = this.space.spaceImageData.webDavUrl.split('/')
+        const idComponent = webDavPathComponents.find((c) => c.startsWith(this.space.id))
+        if (!idComponent) {
+          return
+        }
         const path = webDavPathComponents
-          .slice(webDavPathComponents.indexOf(this.space.id) + 1)
+          .slice(webDavPathComponents.indexOf(idComponent) + 1)
           .join('/')
 
         this.$client.files
-          .fileInfo(buildWebDavSpacesPath(this.space.id, decodeURIComponent(path)))
+          .fileInfo(buildWebDavSpacesPath(idComponent, decodeURIComponent(path)))
           .then((data) => {
             const resource = buildResource(data)
             loadPreview({
@@ -289,12 +295,16 @@ export default defineComponent({
           return
         }
         const webDavPathComponents = this.space.spaceReadmeData.webDavUrl.split('/')
+        const idComponent = webDavPathComponents.find((c) => c.startsWith(this.space.id))
+        if (!idComponent) {
+          return
+        }
         const path = webDavPathComponents
-          .slice(webDavPathComponents.indexOf(this.space.id) + 1)
+          .slice(webDavPathComponents.indexOf(idComponent) + 1)
           .join('/')
 
         this.$client.files
-          .getFileContents(buildWebDavSpacesPath(this.space.id, decodeURIComponent(path)))
+          .getFileContents(buildWebDavSpacesPath(idComponent, decodeURIComponent(path)))
           .then((fileContents) => {
             if (this.markdownResizeObserver && this.$refs.markdownContainer) {
               this.markdownResizeObserver.unobserve(this.$refs.markdownContainer)

diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -207,12 +207,16 @@ export default defineComponent({
           }
 
           const webDavPathComponents = space.spaceImageData.webDavUrl.split('/')
+          const idComponent = webDavPathComponents.find((c) => c.startsWith(space.id))
+          if (!idComponent) {
+            return
+          }
           const path = webDavPathComponents
-            .slice(webDavPathComponents.indexOf(space.id) + 1)
+            .slice(webDavPathComponents.indexOf(idComponent) + 1)
             .join('/')
 
           this.$client.files
-            .fileInfo(buildWebDavSpacesPath(space.id, decodeURIComponent(path)))
+            .fileInfo(buildWebDavSpacesPath(idComponent, decodeURIComponent(path)))
             .then((fileInfo) => {
               const resource = buildResource(fileInfo)
               loadPreview({

diff --git a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
@@ -64,12 +64,12 @@ const spaceMocks = {
     special: [
       {
         specialFolder: { name: 'readme' },
-        webDavUrl: '/',
+        webDavUrl: 'https://owncloud.test/dav/spaces/1/readme.md',
         file: { mimeType: 'text/plain' }
       },
       {
         specialFolder: { name: 'image' },
-        webDavUrl: '/',
+        webDavUrl: 'https://owncloud.test/dav/spaces/1/image.png',
         file: { mimeType: 'image/png' }
       }
     ]