X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/35ce0164f3863e7117fade1319ed3c2789bc216a..409e53a945f68678eb37dd09c8dc2ad6343d236a:/src/views-components/context-menu/actions/collection-file-viewer-action.tsx diff --git a/src/views-components/context-menu/actions/collection-file-viewer-action.tsx b/src/views-components/context-menu/actions/collection-file-viewer-action.tsx index f75da23869..aba355346b 100644 --- a/src/views-components/context-menu/actions/collection-file-viewer-action.tsx +++ b/src/views-components/context-menu/actions/collection-file-viewer-action.tsx @@ -7,23 +7,28 @@ import { RootState } from "../../../store/store"; import { FileViewerAction } from '~/views-components/context-menu/actions/file-viewer-action'; import { getNodeValue } from "~/models/tree"; import { ContextMenuKind } from '~/views-components/context-menu/context-menu'; +import { getInlineFileUrl, 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) { + const fileUrl = sanitizeToken(getInlineFileUrl( + file.url, + state.auth.config.keepWebServiceUrl, + state.auth.config.keepWebInlineServiceUrl), true); return { - href: file.url.replace(state.auth.config.keepWebServiceUrl, state.auth.config.keepWebInlineServiceUrl), + href: fileUrl, kind: 'file', currentCollectionUuid }; } - } else { - return; } - return; + return {}; }; export const CollectionFileViewerAction = connect(mapStateToProps)(FileViewerAction);