Add space front page & bump SDK to v2.0.0

__mocks__/sdk.js

@@ -11,9 +11,26 @@ import { DateTime } from 'luxon'
 
 export default {
   files: {
-    list: (path = '/') => fixtureFiles[path],
+    list: (path = '/') => {
+      if (path.startsWith('/files/')) {
+        path = path.split('/').splice(3).join('/')
+        if (path === '') {
+          path = '/'
+        }
+      }
+
+      return fixtureFiles[path]
+    },
     getFavoriteFiles: () => fixtureFavoriteFiles,
-    fileInfo: (path) => fixtureFiles[path][0]
+    fileInfo: (path) => {
+      if (path.startsWith('/files/')) {
+        path = path.split('/').splice(3).join('/')
+        if (path === '') {
+          path = '/'
+        }
+      }
+      return fixtureFiles[path][0]
+    }
   },
   users: {
     getUser: (id) => fixtureUsers[id]

changelog/unreleased/enhancement-spaces-front-page

@@ -0,0 +1,6 @@
+Enhancement: Implement spaces front page
+
+Each space can now be entered from within the spaces list. The space front page will then display all the space contents, plus an image and a readme file if set. Basic actions like uploading files, creating folders, renaming resources, and more. were also implemented in the course of this.
+
+https://github.com/owncloud/web/pull/6287
+https://github.com/owncloud/web/issues/6271

changelog/unreleased/enhancement-update-sdk

@@ -1,6 +1,13 @@
 Enhancement: Update SDK
 
-We've updated the ownCloud SDK to version 1.1.2. As we've switched the SDK to semver only now there is no proper changelog available.
+We've updated the ownCloud SDK to version 2.0.0-alpha.2.
+
+- Change - Drop Internet Explorer support: https://github.com/owncloud/owncloud-sdk/pull/966
+- Change - Pass full file or directory path to methods of Files class: https://github.com/owncloud/owncloud-sdk/pull/971
+- Change - Remove webdav v1 api support: https://github.com/owncloud/owncloud-sdk/pull/962
+- Bugfix - Graceful reject for failing network request in OCS: https://github.com/owncloud/owncloud-sdk/pull/977
 
 https://github.com/owncloud/web/pull/6309
+https://github.com/owncloud/web/pull/6287
 https://github.com/owncloud/owncloud-sdk/releases/tag/v1.1.2
+https://github.com/owncloud/owncloud-sdk/releases/tag/v2.0.0-alpha.2

packages/web-app-files/package.json

@@ -5,7 +5,7 @@
   "license": "AGPL-3.0",
   "dependencies": {
     "copy-to-clipboard": "^3.3.1",
-    "semver": "^6.1.0",
+    "semver": "^7.3.5",
     "vue2-dropzone": "^3.6.0"
   },
   "devDependencies": {

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

@@ -125,7 +125,7 @@
           <size-info v-if="hasBulkActions && selectedFiles.length > 0" class="oc-mr oc-visible@l" />
           <batch-actions v-if="hasBulkActions" />
         </div>
-        <view-options />
+        <view-options v-if="!hideViewOptions" />
       </div>
     </div>
   </div>
@@ -137,7 +137,7 @@ import pathUtil from 'path'
 
 import Mixins from '../../mixins'
 import MixinFileActions, { EDITOR_MODE_CREATE } from '../../mixins/fileActions'
-import { buildResource } from '../../helpers/resources'
+import { buildResource, buildWebDavFilesPath, buildWebDavSpacesPath } from '../../helpers/resources'
 import { bus } from 'web-pkg/src/instance'
 import {
   isLocationActive,
@@ -169,7 +169,12 @@ export default {
   setup() {
     return {
       isPersonalLocation: watchActiveLocation(isLocationSpacesActive, 'files-spaces-personal-home'),
-      isPublicLocation: watchActiveLocation(isLocationPublicActive, 'files-public-files')
+      isPublicLocation: watchActiveLocation(isLocationPublicActive, 'files-public-files'),
+      isSpacesProjectsLocation: watchActiveLocation(
+        isLocationSpacesActive,
+        'files-spaces-projects'
+      ),
+      isSpacesProjectLocation: watchActiveLocation(isLocationSpacesActive, 'files-spaces-project')
     }
   },
   data: () => ({
@@ -247,18 +252,28 @@ export default {
     hasBulkActions() {
       return this.$route.meta.hasBulkActions === true
     },
+    hideViewOptions() {
+      return this.$route.meta.hideViewOptions === true
+    },
     pageTitle() {
       const title = this.$route.meta.title
       return this.$gettext(title)
     },
 
-    breadcrumbs() {
-      if (!(this.isPublicLocation || this.isPersonalLocation)) {
+    breadcrumbs: function () {
+      if (
+        !(
+          this.isPublicLocation ||
+          this.isPersonalLocation ||
+          this.isSpacesProjectsLocation ||
+          this.isSpacesProjectLocation
+        )
+      ) {
         return []
       }
 
       const { params: routeParams, path: routePath } = this.$route
-      const { item: requestedItemPath = '' } = routeParams
+      const requestedItemPath = routeParams.item || ''
       const basePaths =
         '/' +
         decodeURIComponent(routePath)
@@ -278,10 +293,25 @@ export default {
 
           if (i === rawItems.length - 1) {
             this.isPublicLocation && acc.shift()
-            acc.length &&
-              (acc[0].text = this.isPersonalLocation
-                ? this.$gettext('All files')
-                : this.$gettext('Public link'))
+
+            if (acc.length) {
+              if (this.isPersonalLocation) {
+                acc[0].text = this.$gettext('All files')
+              } else if (this.isSpacesProjectLocation || this.isSpacesProjectsLocation) {
+                acc[0] = {
+                  text: this.$gettext('Spaces'),
+                  to: '/files/spaces/projects'
+                }
+                if (this.$route.params.spaceId) {
+                  acc.splice(1, 0, {
+                    text: this.$route.params.spaceId,
+                    to: `/files/spaces/projects/${this.$route.params.spaceId}`
+                  })
+                }
+              } else {
+                acc[0].text = this.$gettext('Public link')
+              }
+            }
             acc.length && delete acc[acc.length - 1].to
           } else {
             delete acc[i].onClick
@@ -398,10 +428,15 @@ export default {
       this.fileFolderCreationLoading = true
 
       try {
-        const path = pathUtil.join(this.currentPath, folderName)
-
+        let path = pathUtil.join(this.currentPath, folderName)
         let resource
+
         if (this.isPersonalLocation) {
+          path = buildWebDavFilesPath(this.user.id, path)
+          await this.$client.files.createFolder(path)
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else if (this.isSpacesProjectLocation) {
+          path = buildWebDavSpacesPath(this.$route.params.spaceId, path)
           await this.$client.files.createFolder(path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
@@ -482,18 +517,17 @@ export default {
       this.fileFolderCreationLoading = true
 
       try {
-        const path = pathUtil.join(this.currentPath, fileName)
         let resource
+        let path = pathUtil.join(this.currentPath, fileName)
+
         if (this.isPersonalLocation) {
+          path = buildWebDavFilesPath(this.user.id, path)
+          await this.$client.files.putFileContents(path, '')
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else if (this.isSpacesProjectLocation) {
+          path = buildWebDavSpacesPath(this.$route.params.spaceId, path)
           await this.$client.files.putFileContents(path, '')
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
-        } else {
-          await this.$client.publicFiles.putFileContents(path, null, this.publicLinkPassword, '')
-          resource = await this.$client.publicFiles.getFileInfo(
-            path,
-            this.publicLinkPassword,
-            DavProperties.Default
-          )
         }
 
         if (this.newFileAction) {
@@ -647,16 +681,25 @@ export default {
 
         await this.$nextTick()
 
-        const path = pathUtil.join(this.currentPath, file)
-        let resource = this.isPersonalLocation
-          ? await this.$client.files.fileInfo(path, DavProperties.Default)
-          : await this.$client.publicFiles.getFileInfo(
-              path,
-              this.publicLinkPassword,
-              DavProperties.Default
-            )
+        let path = pathUtil.join(this.currentPath, file)
+        let resource
+
+        if (this.isPersonalLocation) {
+          path = buildWebDavFilesPath(this.user.id, path)
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else if (this.isSpacesProjectLocation) {
+          path = buildWebDavSpacesPath(this.$route.params.spaceId, path)
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else {
+          resource = await this.$client.publicFiles.getFileInfo(
+            path,
+            this.publicLinkPassword,
+            DavProperties.Default
+          )
+        }
 
         resource = buildResource(resource)
+
         this.UPSERT_RESOURCE(resource)
 
         if (this.isPersonalLocation) {

packages/web-app-files/src/components/AppBar/Upload/FileDrop.vue

@@ -52,6 +52,7 @@ export default {
   },
   computed: {
     ...mapState(['navigation']),
+    ...mapState(['user']),
     ...mapGetters('Files', ['dropzone']),
     sidebarStateClass() {
       return this.navigation.closed

packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue

@@ -19,6 +19,7 @@
 
 <script>
 import Mixins from '../../../mixins'
+import { mapState } from 'vuex'
 
 export default {
   mixins: [Mixins],
@@ -38,6 +39,9 @@ export default {
     },
     requestType: { type: String, default: 'PUT' }
   },
+  computed: {
+    ...mapState(['user'])
+  },
   methods: {
     triggerUpload() {
       this.$refs.input.click()

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

@@ -13,6 +13,15 @@
       </translate>
     </div>
     <div class="oc-mt-s">
+      <oc-button
+        v-if="showSpacesButton"
+        id="space-not-found-button-go-spaces"
+        type="router-link"
+        appearance="raw"
+        :to="spacesRoute"
+      >
+        <translate>Go to »Spaces Overview«</translate>
+      </oc-button>
       <oc-button
         v-if="showHomeButton"
         id="files-list-not-found-button-go-home"
@@ -53,12 +62,14 @@ export default {
     return {
       showPublicLinkButton: isLocationPublicActive(router, 'files-public-files'),
       showHomeButton: isLocationSpacesActive(router, 'files-spaces-personal-home'),
+      showSpacesButton: isLocationSpacesActive(router, 'files-spaces-project'),
       homeRoute: createLocationSpaces('files-spaces-personal-home', {
         params: { item: store.getters.homeFolder }
       }),
       publicLinkRoute: createLocationPublic('files-public-files', {
         params: { item: router.currentRoute.params?.item?.split('/')[0] }
-      })
+      }),
+      spacesRoute: createLocationSpaces('files-spaces-projects')
     }
   }
 }

packages/web-app-files/src/components/SideBar/FileInfo.vue

@@ -7,7 +7,7 @@
           :name="file.name"
           :extension="file.extension"
           :type="file.type"
-          :full-path="file.path"
+          :full-path="file.webDavPath"
           :is-path-displayed="false"
         />
       </h3>

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

@@ -296,11 +296,10 @@ export default {
         this.selectedFile = this.highlightedFile
         return
       }
-
       this.loading = true
       try {
         const item = await this.$client.files.fileInfo(
-          this.highlightedFile.path,
+          this.highlightedFile.webDavPath,
           DavProperties.Default
         )
 

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

@@ -10,6 +10,7 @@ interface PrivatePreviewBlobOptions {
   resource: {
     id: string
     path: string
+    webDavPath: string
     etag?: string
   }
   token: string
@@ -26,9 +27,8 @@ export const privatePreviewBlob = async (
 
   const url = [
     options.server,
-    'remote.php/dav/files/',
-    options.userId,
-    encodePath(options.resource.path),
+    'remote.php/dav',
+    encodePath(options.resource.webDavPath),
     '?',
     buildQueryString({
       etag: options.resource.etag,