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

[full-ci] Use SpaceNoSelection for spaces #8249

Merged
merged 3 commits into from
Jan 17, 2023
Merged

[full-ci] Use SpaceNoSelection for spaces #8249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d436b32
Use SpaceNoSelection for spaces
lookacat Jan 16, 2023
499b140
Add to changelog
lookacat Jan 16, 2023
f65fd3e
Update changelog
lookacat Jan 17, 2023
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
1 change: 1 addition & 0 deletions changelog/unreleased/enhancement-spaces-list-in-admin-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ https://github.com/owncloud/web/pull/8229
https://github.com/owncloud/web/pull/8231
https://github.com/owncloud/web/pull/8238
https://github.com/owncloud/web/pull/8234
https://github.com/owncloud/web/pull/8249
lookacat marked this conversation as resolved.
Show resolved Hide resolved
https://github.com/owncloud/web/issues/8219
21 changes: 19 additions & 2 deletions packages/web-app-files/src/fileSideBars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import TagsPanel from './components/SideBar/TagsPanel.vue'
import NoSelection from './components/SideBar/NoSelection.vue'
import SpaceActions from './components/SideBar/Actions/SpaceActions.vue'
import SpaceDetails from 'web-pkg/src/components/sideBar/Spaces/Details/SpaceDetails.vue'
import SpaceNoSelection from 'web-pkg/src/components/sideBar/Spaces/SpaceNoSelection.vue'
import {
isLocationTrashActive,
isLocationPublicActive,
Expand Down Expand Up @@ -41,14 +42,30 @@ const panelGenerators: (({
}) => Panel)[] = [
// We don't have file details in the trashbin, yet.
// Only allow `actions` panel on trashbin route for now.
({ rootFolder, highlightedFile }): Panel => ({
({ router, rootFolder, highlightedFile }): Panel => ({
app: 'no-selection',
icon: 'questionnaire-line',
title: $gettext('Details'),
component: NoSelection,
default: () => true,
get enabled() {
return !highlightedFile || (rootFolder && highlightedFile?.type !== 'space')
return (
!isLocationSpacesActive(router, 'files-spaces-projects') &&
(!highlightedFile || (rootFolder && highlightedFile?.type !== 'space'))
)
}
}),
({ router, rootFolder, highlightedFile }): Panel => ({
app: 'no-selection',
icon: 'questionnaire-line',
title: $gettext('Details'),
component: SpaceNoSelection,
default: () => true,
get enabled() {
return (
isLocationSpacesActive(router, 'files-spaces-projects') &&
(!highlightedFile || (rootFolder && highlightedFile?.type !== 'space'))
)
}
}),
({ router, multipleSelection, rootFolder, highlightedFile }) => ({
Expand Down