X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/53347c91f7168053224aed479c8f21e75e78893d..9ee35a64c605f116aec71f78c65b54730d6e1076:/src/views-components/context-menu/actions/download-collection-file-action.tsx diff --git a/src/views-components/context-menu/actions/download-collection-file-action.tsx b/src/views-components/context-menu/actions/download-collection-file-action.tsx index aadc1d11..e1986d3c 100644 --- a/src/views-components/context-menu/actions/download-collection-file-action.tsx +++ b/src/views-components/context-menu/actions/download-collection-file-action.tsx @@ -6,19 +6,20 @@ import { connect } from "react-redux"; import { RootState } from "../../../store/store"; import { DownloadAction } from "./download-action"; import { getNodeValue } from "../../../models/tree"; -import { CollectionFileType } from "../../../models/collection-file"; import { ContextMenuKind } from '../context-menu'; import { filterCollectionFilesBySelection } from "~/store/collection-panel/collection-panel-files/collection-panel-files-state"; +import { sanitizeToken } from "./helpers"; const mapStateToProps = (state: RootState) => { const { resource } = state.contextMenu; const currentCollectionUuid = state.collectionPanel.item ? state.collectionPanel.item.uuid : ''; - if (resource && resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM) { + if (resource && ( + resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM || + resource.menuKind === ContextMenuKind.READONLY_COLLECTION_FILES_ITEM)) { const file = getNodeValue(resource.uuid)(state.collectionPanelFiles); if (file) { return { - href: file.url, - download: file.type === CollectionFileType.DIRECTORY ? undefined : file.name, + href: sanitizeToken(file.url, true), kind: 'file', currentCollectionUuid }; @@ -27,7 +28,6 @@ const mapStateToProps = (state: RootState) => { const files = filterCollectionFilesBySelection(state.collectionPanelFiles, true); return { href: files.map(file => file.url), - download: files.map(file => file.name), kind: 'files', currentCollectionUuid };