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
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import {
formatFileSize,
useClientService,
useDownloadFile,
useMessages,
useResourcesStore
} from '@opencloud-eu/web-pkg'
import { computed, inject, Ref, unref } from 'vue'
Expand All @@ -78,6 +79,8 @@ const { isReadOnly = false } = defineProps<{

const clientService = useClientService()
const language = useGettext()
const { $gettext } = language
const { showErrorMessage } = useMessages()
const { downloadFile } = useDownloadFile({ clientService })
const { updateResourceField } = useResourcesStore()

Expand All @@ -98,7 +101,13 @@ const isRevertible = computed(() => {
})

const revertToVersion = async (version: Resource) => {
await clientService.webdav.restoreFileVersion(unref(space), unref(resource), version.name)
try {
await clientService.webdav.restoreFileVersion(unref(space), unref(resource), version.name)
} catch (e) {
console.error(e)
showErrorMessage({ title: $gettext('Failed to restore version'), errors: [e] })
return
}
const restoredResource = await clientService.webdav.getFileInfo(unref(space), unref(resource))

const fieldsToUpdate = ['size', 'mdate'] as const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import { mock, mockDeep } from 'vitest-mock-extended'
import { GraphSharePermission, Resource, SpaceResource } from '@opencloud-eu/web-client'
import { ProjectSpaceResource, ShareSpaceResource } from '@opencloud-eu/web-client'
import { defaultPlugins, mount, shallowMount } from '@opencloud-eu/web-test-helpers'
import { useDownloadFile, useResourcesStore } from '@opencloud-eu/web-pkg'
import { useDownloadFile, useMessages, useResourcesStore } from '@opencloud-eu/web-pkg'
import { computed } from 'vue'
import { flushPromises } from '@vue/test-utils'

vi.mock('@opencloud-eu/web-pkg', async (importOriginal) => ({
...(await importOriginal<any>()),
Expand Down Expand Up @@ -143,6 +144,25 @@ describe('FileVersions', () => {

expect(updateResourceField).toHaveBeenCalledTimes(2)
})
it('shows an error message and does not update the resource when restoring fails', async () => {
vi.spyOn(console, 'error').mockImplementation(() => undefined)
const { wrapper, mocks } = getMountedWrapper()
const error = new Error('locked')
mocks.$clientService.webdav.restoreFileVersion.mockRejectedValue(error)
const revertVersionButton = wrapper.findAll(selectors.revertVersionButton)
const { updateResourceField } = useResourcesStore()
const { showErrorMessage } = useMessages()

await revertVersionButton.at(0).trigger('click')
await flushPromises()

expect(showErrorMessage).toHaveBeenCalledWith({
title: 'Failed to restore version',
errors: [error]
})
expect(mocks.$clientService.webdav.getFileInfo).not.toHaveBeenCalled()
expect(updateResourceField).not.toHaveBeenCalled()
})
it('restores the version via the file id', async () => {
const resource = mock<Resource>({
id: 'share-jail-id',
Expand Down
Loading