Skip to content

feat: set view mode e.G tiles or table view globally, add condensed view to Spaces view #1306

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

Merged
kulmann merged 1 commit into from
Oct 6, 2025
Merged

feat: set view mode e.G tiles or table view globally, add condensed view to Spaces view #1306

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
5 changes: 4 additions & 1 deletion packages/web-app-files/src/composables/extensions/useFolderViews.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ export const useFolderViews = (): FolderViewExtension[] => {
{
id: 'com.github.opencloud-eu.web.files.folder-view.resource-table-condensed',
type: 'folderView',
extensionPointIds: [folderViewsFolderExtensionPoint.id],
extensionPointIds: [
folderViewsFolderExtensionPoint.id,
folderViewsProjectSpacesExtensionPoint.id
],
folderView: {
name: 'resource-table-condensed',
label: $gettext('Condensed table view'),
Expand Down
4 changes: 1 addition & 3 deletions packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
useSort,
SortDir,
SortField,
useRouteName,
useResourcesStore,
folderService
} from '@opencloud-eu/web-pkg'
Expand Down Expand Up @@ -72,9 +71,8 @@ export const useResourcesViewDefaults = <T extends Resource, TT, TU extends any[

const { refresh: refreshFileListHeaderPosition, y: fileListHeaderY } = useFileListHeaderPosition()

const currentRoute = useRouteName()
const currentViewModeQuery = useRouteQuery(
`${unref(currentRoute)}-${FolderViewModeConstants.queryName}`,
FolderViewModeConstants.queryName,
FolderViewModeConstants.defaultModeName
)
const currentViewMode = computed((): string => queryItemAsString(currentViewModeQuery.value))
Expand Down
15 changes: 3 additions & 12 deletions packages/web-app-files/src/views/spaces/Projects.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
:header-position="fileListHeaderY"
:is-side-bar-open="isSideBarOpen"
:view-size="viewSize"
:view-mode="viewMode"
v-bind="folderView.componentAttrs?.()"
@sort="handleSort"
@item-visible="loadPreview({ space: $event, resource: $event })"
Expand Down Expand Up @@ -146,7 +147,6 @@ import {
useResourcesStore,
useSpacesStore,
useExtensionRegistry,
queryItemAsString,
useLoadPreview
} from '@opencloud-eu/web-pkg'

Expand All @@ -155,9 +155,7 @@ import {
useAbility,
useClientService,
FolderViewModeConstants,
useRouteQueryPersisted,
useSort,
useRouteName,
usePagination,
useRouter,
useRoute,
Expand Down Expand Up @@ -216,6 +214,7 @@ const loadResourcesTask = useTask(function* (signal) {

const {
viewSize,
viewMode,
fileListHeaderY,
scrollToResourceFromRoute,
areResourcesLoading,
Expand Down Expand Up @@ -335,15 +334,7 @@ const viewModes = computed(() => {
]
})

const routeName = useRouteName()

const viewMode = useRouteQueryPersisted({
name: `${unref(routeName)}-${FolderViewModeConstants.queryName}`,
defaultValue: FolderViewModeConstants.name.tiles
})
const viewModeStr = computed(() => queryItemAsString(unref(viewMode)))

const { loadPreview } = useLoadPreview(viewModeStr)
const { loadPreview } = useLoadPreview(viewMode)

const keyActions = useKeyboardActions()
useKeyboardFileNavigation(keyActions, runtimeSpaces, viewMode)
Expand Down
1 change: 1 addition & 0 deletions packages/web-app-files/tests/unit/views/spaces/Projects.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ function getMountedWrapper({
})

vi.mocked(queryItemAsString).mockImplementation(() => includeDisabled.toString())
Copy link

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second mockImplementation call immediately overrides the first, making the includeDisabled.toString() return path untestable. If you intended different sequential return values, use mockImplementationOnce twice or mockReturnValueOnce chain; if not, remove the first line.

Suggested change
vi.mocked(queryItemAsString).mockImplementation(() => includeDisabled.toString())

Copilot uses AI. Check for mistakes.
vi.mocked(queryItemAsString).mockImplementation(() => 'resource-table')
Copy link

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The literal 'resource-table' should use the corresponding constant/enumeration (e.g. FolderViewModeConstants.name.table or similar) to prevent drift if the identifier changes. This keeps tests aligned with production definitions.

Copilot uses AI. Check for mistakes.

const extensions = [
{
Expand Down
4 changes: 1 addition & 3 deletions packages/web-pkg/src/components/ViewOptions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ import {
useActiveLocation,
useResourcesStore,
useRoute,
useRouteName,
useRouteQuery,
useRouteQueryPersisted,
useRouter,
Expand Down Expand Up @@ -232,9 +231,8 @@ export default defineComponent({
storagePrefix: props.perPageStoragePrefix
})

const routeName = useRouteName()
const viewModeQuery = useRouteQueryPersisted({
name: `${unref(routeName)}-${FolderViewModeConstants.queryName}`,
name: FolderViewModeConstants.queryName,
defaultValue: props.viewModeDefault
})

Expand Down