X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/936570facff4156f83d1b0fcbb0bedd1126efc03..074cc61145869165217e2d35a4b949f92a6829e7:/src/store/collections/collection-version-actions.ts diff --git a/src/store/collections/collection-version-actions.ts b/src/store/collections/collection-version-actions.ts index 5bf47497..7d2511ed 100644 --- a/src/store/collections/collection-version-actions.ts +++ b/src/store/collections/collection-version-actions.ts @@ -3,12 +3,14 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from "redux"; -import { RootState } from '~/store/store'; -import { ServiceRepository } from '~/services/services'; +import { RootState } from 'store/store'; +import { ServiceRepository } from 'services/services'; import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions"; import { resourcesActions } from "../resources/resources-actions"; import { navigateTo } from "../navigation/navigation-action"; import { dialogActions } from "../dialog/dialog-actions"; +import { getResource } from "store/resources/resources"; +import { CollectionResource } from "models/collection"; export const COLLECTION_RESTORE_VERSION_DIALOG = 'collectionRestoreVersionDialog'; @@ -28,9 +30,15 @@ export const openRestoreCollectionVersionDialog = (uuid: string) => export const restoreVersion = (resourceUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { try { - // Request que entire record because stored old versions usually - // don't include the manifest_text field. - const oldVersion = await services.collectionService.get(resourceUuid); + // Request the manifest text because stored old versions usually + // don't include them. + let oldVersion = getResource(resourceUuid)(getState().resources); + if (!oldVersion) { + oldVersion = await services.collectionService.get(resourceUuid); + } + const oldVersionManifest = await services.collectionService.get(resourceUuid, undefined, ['manifestText']); + oldVersion.manifestText = oldVersionManifest.manifestText; + const { uuid, version, ...rest} = oldVersion; const headVersion = await services.collectionService.update( oldVersion.currentVersionUuid,