Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix sidebar loading for the current folder #7527

Merged
merged 1 commit into from
Aug 25, 2022
Merged

Fix sidebar loading for the current folder #7527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-sidebar-for-current-folder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Sidebar for current folder

We've fixed a bug where the right sidebar for the current folder could not be opened when another resource was selected.

https://github.com/owncloud/web/issues/7519
https://github.com/owncloud/web/pull/7527
6 changes: 4 additions & 2 deletions packages/web-app-files/src/mixins/actions/showDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mapActions } from 'vuex'
import { mapActions, mapMutations } from 'vuex'
import { isLocationTrashActive } from '../../router'
import isFilesAppActive from './helpers/isFilesAppActive'

Expand Down Expand Up @@ -36,8 +36,10 @@ export default {
},
methods: {
...mapActions('Files/sidebar', { openSidebar: 'open' }),
...mapMutations('Files', ['SET_FILE_SELECTION']),

async $_showDetails_trigger() {
async $_showDetails_trigger({ resources }) {
this.SET_FILE_SELECTION(resources)
await this.openSidebar()
}
}
Expand Down
4 changes: 4 additions & 0 deletions packages/web-app-files/src/mixins/actions/showShares.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import quickActions, { canShare } from '../../quickActions'
import { isLocationSharesActive, isLocationTrashActive } from '../../router'
import { ShareStatus } from 'web-client/src/helpers/share'
import isFilesAppActive from './helpers/isFilesAppActive'
import { mapMutations } from 'vuex'

export default {
mixins: [isFilesAppActive],
Expand Down Expand Up @@ -43,7 +44,10 @@ export default {
}
},
methods: {
...mapMutations('Files', ['SET_FILE_SELECTION']),

async $_showShares_trigger({ resources }) {
this.SET_FILE_SELECTION(resources)
await this.$store.dispatch('Files/sidebar/openWithPanel', 'sharing-item#peopleShares')
}
}
Expand Down