diff --git a/changelog/unreleased/enhancement-spaces-list b/changelog/unreleased/enhancement-spaces-list
new file mode 100644
index 00000000000..a5e96b57839
--- /dev/null
+++ b/changelog/unreleased/enhancement-spaces-list
@@ -0,0 +1,6 @@
+Enhancement: Implement spaces list
+
+We added a new route that lists all available spaces of type "project".
+
+https://github.com/owncloud/web/pull/6199
+https://github.com/owncloud/web/issues/6104
diff --git a/package.json b/package.json
index ebd1b842a5b..384f19ee463 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"packages/web-app-markdown-editor",
"packages/web-app-media-viewer",
"packages/web-app-search",
+ "packages/web-client",
"packages/web-pkg",
"packages/web-runtime"
],
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
index 47a8127afb3..ce198a51f8e 100644
--- a/packages/web-app-files/src/App.vue
+++ b/packages/web-app-files/src/App.vue
@@ -6,7 +6,7 @@
class="files-list-wrapper oc-width-expand"
@dragover="$_ocApp_dragOver"
>
-
+
@@ -55,6 +55,9 @@ export default {
},
showSidebar() {
return !this.sidebarClosed
+ },
+ hideAppBar() {
+ return this.$route.meta.hideAppBar === true
}
},
watch: {
diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js
index 6b61492a2de..48170c6f04a 100644
--- a/packages/web-app-files/src/index.js
+++ b/packages/web-app-files/src/index.js
@@ -9,6 +9,7 @@ import Personal from './views/Personal.vue'
import SharedWithMe from './views/SharedWithMe.vue'
import SharedWithOthers from './views/SharedWithOthers.vue'
import SharedViaLink from './views/SharedViaLink.vue'
+import SpaceProjects from './views/spaces/Projects.vue'
import Trashbin from './views/Trashbin.vue'
import translations from '../l10n/translations.json'
import quickActions from './quickActions'
@@ -39,7 +40,7 @@ const navItems = [
iconMaterial: appInfo.icon,
fillType: 'fill',
route: {
- path: `/${appInfo.id}/spaces/`
+ path: `/${appInfo.id}/spaces/personal/home`
}
},
{
@@ -77,6 +78,16 @@ const navItems = [
path: `/${appInfo.id}/shares/via-link`
}
},
+ {
+ name: $gettext('Spaces'),
+ iconMaterial: 'layout-grid',
+ route: {
+ path: `/${appInfo.id}/spaces/projects`
+ },
+ enabled(capabilities) {
+ return capabilities.spaces && capabilities.spaces.enabled === true
+ }
+ },
{
name: $gettext('Deleted files'),
iconMaterial: 'delete-bin-5',
@@ -105,6 +116,9 @@ export default {
SharedViaLink,
SharedWithMe,
SharedWithOthers,
+ Spaces: {
+ Projects: SpaceProjects
+ },
Trashbin
}),
navItems,
diff --git a/packages/web-app-files/src/router/router.ts b/packages/web-app-files/src/router/router.ts
index 29adb24ee00..10422cb9927 100644
--- a/packages/web-app-files/src/router/router.ts
+++ b/packages/web-app-files/src/router/router.ts
@@ -1,3 +1,5 @@
+import Vue, { ComponentOptions } from 'vue'
+
/**
* we need to inject the vue files into the route builders,
* this is because we also import the provided helpers from other js|ts files
@@ -5,16 +7,19 @@
* into js files which then again get imported by other vue files...
*/
export interface RouteComponents {
- App: any
- Favorites: any
- FilesDrop: any
- LocationPicker: any
- PrivateLink: any
- PublicFiles: any
- Personal: any
- PublicLink: any
- SharedWithMe: any
- SharedWithOthers: any
- SharedViaLink: any
- Trashbin: any
+ App: ComponentOptions
+ Favorites: ComponentOptions
+ FilesDrop: ComponentOptions
+ LocationPicker: ComponentOptions
+ PrivateLink: ComponentOptions
+ PublicFiles: ComponentOptions
+ Personal: ComponentOptions
+ PublicLink: ComponentOptions
+ SharedWithMe: ComponentOptions
+ SharedWithOthers: ComponentOptions
+ SharedViaLink: ComponentOptions
+ Spaces: {
+ Projects: ComponentOptions
+ }
+ Trashbin: ComponentOptions
}
diff --git a/packages/web-app-files/src/router/spaces.ts b/packages/web-app-files/src/router/spaces.ts
index d5072499f06..9f731fb44d5 100644
--- a/packages/web-app-files/src/router/spaces.ts
+++ b/packages/web-app-files/src/router/spaces.ts
@@ -2,38 +2,48 @@ import { Location, RouteConfig } from 'vue-router'
import { RouteComponents } from './router'
import { createLocation, isLocationActiveDirector, $gettext } from './utils'
-type shareTypes = 'files-spaces-personal-home'
+type spaceTypes = 'files-spaces-personal-home' | 'files-spaces-projects'
-export const createLocationSpaces = (name: shareTypes, location = {}): Location =>
+export const createLocationSpaces = (name: spaceTypes, location = {}): Location =>
createLocation(
name,
{
params: {
- storage: 'home',
- namespace: 'personal'
+ ...(name === 'files-spaces-personal-home' && { storage: 'home' })
}
},
location
)
-export const isLocationSpacesActive = isLocationActiveDirector(
- createLocationSpaces('files-spaces-personal-home')
+
+const locationSpacesProjects = createLocationSpaces('files-spaces-projects')
+const locationSpacesPersonalHome = createLocationSpaces('files-spaces-personal-home')
+
+export const isLocationSpacesActive = isLocationActiveDirector(
+ locationSpacesProjects,
+ locationSpacesPersonalHome
)
export const buildRoutes = (components: RouteComponents): RouteConfig[] => [
{
path: '/spaces',
- redirect: (to) => createLocationSpaces('files-spaces-personal-home', to)
- },
- {
- path: '/spaces/:namespace',
components: {
app: components.App
},
- redirect: (to) => createLocationSpaces('files-spaces-personal-home', to),
children: [
{
- name: createLocationSpaces('files-spaces-personal-home').name,
- path: ':storage/:item*',
+ path: 'projects',
+ name: locationSpacesProjects.name,
+ component: components.Spaces?.Projects,
+ meta: {
+ hideFilelistActions: true,
+ hasBulkActions: true,
+ hideAppBar: true,
+ title: $gettext('Spaces')
+ }
+ },
+ {
+ path: 'personal/:storage/:item*',
+ name: locationSpacesPersonalHome.name,
component: components.Personal,
meta: {
hasBulkActions: true,
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
new file mode 100644
index 00000000000..29cdc56be6a
--- /dev/null
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+ You don't have access to any spaces
+
+
+
+
+