diff --git a/changelog/unreleased/enhancement-shares-overview b/changelog/unreleased/enhancement-shares-overview new file mode 100644 index 00000000000..e89d42f142a --- /dev/null +++ b/changelog/unreleased/enhancement-shares-overview @@ -0,0 +1,7 @@ +Enhancement: Shares overview + +We've merged the three shares navigation items into one central "Shares" item, +with a toggle to switch between the three different kinds of shares (incoming, outgoing, links). + +https://github.com/owncloud/web/issues/6440 +https://github.com/owncloud/web/pull/6512 diff --git a/packages/web-app-files/src/components/AppBar/AppBar.vue b/packages/web-app-files/src/components/AppBar/AppBar.vue index 94e2a4be13d..e920951e75b 100644 --- a/packages/web-app-files/src/components/AppBar/AppBar.vue +++ b/packages/web-app-files/src/components/AppBar/AppBar.vue @@ -11,18 +11,22 @@ @progress="onFileProgress" />
@@ -57,13 +60,18 @@ import MixinFileActions from '../../mixins/fileActions' import { buildResource, buildWebDavFilesPath, buildWebDavSpacesPath } from '../../helpers/resources' import { bus } from 'web-pkg/src/instance' import { DavProperties } from 'web-pkg/src/constants' -import { isLocationPublicActive, isLocationSpacesActive } from '../../router' +import { + isLocationPublicActive, + isLocationSharesActive, + isLocationSpacesActive +} from '../../router' import { useActiveLocation } from '../../composables' import BatchActions from './SelectedResources/BatchActions.vue' import ContextActions from '../FilesList/ContextActions.vue' import CreateAndUpload from './CreateAndUpload.vue' import FileDrop from './Upload/FileDrop.vue' +import SharesNavigation from './SharesNavigation.vue' import SizeInfo from './SelectedResources/SizeInfo.vue' import ViewOptions from './ViewOptions.vue' @@ -73,12 +81,14 @@ export default { ContextActions, CreateAndUpload, FileDrop, + SharesNavigation, SizeInfo, ViewOptions }, mixins: [Mixins, MixinFileActions], setup() { return { + isLocationSharesActive: useActiveLocation(isLocationSharesActive), isPersonalLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-personal-home'), isPublicLocation: useActiveLocation(isLocationPublicActive, 'files-public-files'), isSpacesProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects'), diff --git a/packages/web-app-files/src/components/AppBar/SharesNavigation.vue b/packages/web-app-files/src/components/AppBar/SharesNavigation.vue new file mode 100644 index 00000000000..115fa07ed60 --- /dev/null +++ b/packages/web-app-files/src/components/AppBar/SharesNavigation.vue @@ -0,0 +1,64 @@ + +