Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/web-app-files/src/views/spaces/DriveResolver.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ onMounted(async () => {
field: 'publicLinkPermission',
value: publicSpace.publicLinkPermission
})
// a folder link has a file id of its own, a single file link doesn't
updateSpaceField<PublicSpaceResource>({
id: unref(space).id,
field: 'fileId',
value: publicSpace.fileId
})

// FIXME: check for type when server sends public-link-permission dav property
if (publicSpace.publicLinkPermission === SharePermissionBit.Create) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import DriveResolver from '../../../../src/views/spaces/DriveResolver.vue'
import { queryItemAsString, useDriveResolver, useRouteParam } from '@opencloud-eu/web-pkg'
import {
queryItemAsString,
useDriveResolver,
useRouteParam,
useSpacesStore
} from '@opencloud-eu/web-pkg'
import { computed, ref } from 'vue'
import { flushPromises } from '@vue/test-utils'
import { mock, mockDeep } from 'vitest-mock-extended'
import { ClientService } from '@opencloud-eu/web-pkg'
import { useGetMatchingSpace } from '@opencloud-eu/web-pkg'
Expand Down Expand Up @@ -72,6 +78,28 @@ describe('DriveResolver view', () => {
params: { token: space.id }
})
})
it('sets the real file id of a public folder link after a reload', async () => {
const space = mock<SpaceResource>({
id: 'token',
fileId: 'token',
getDriveAliasAndItem: vi.fn(),
driveType: 'public'
})
const clientService = mockDeep<ClientService>()
clientService.webdav.getFileInfo.mockResolvedValue(
mock<PublicSpaceResource>({ fileId: 'storage$space!folder', publicLinkPermission: 15 })
)
const { wrapper } = getMountedWrapper({ space, mocks: { $clientService: clientService } })
await flushPromises()

const { updateSpaceField } = useSpacesStore()
expect(updateSpaceField).toHaveBeenCalledWith({
id: 'token',
field: 'fileId',
value: 'storage$space!folder'
})
expect(wrapper.find('generic-space-stub').exists()).toBeTruthy()
})
it('redirects to personal space if user has access to the resource via their personal space', async () => {
const space = mock<SpaceResource>({
id: '1',
Expand Down
Loading