X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e68d8abe7f6809ffe2eb3c1a9cbe9ab1af8d4c59..5a2f4597393f94b9fa7984f4445d4b599c139f27:/src/views-components/context-menu/actions/helpers.ts diff --git a/src/views-components/context-menu/actions/helpers.ts b/src/views-components/context-menu/actions/helpers.ts index 261f5a87..f196074d 100644 --- a/src/views-components/context-menu/actions/helpers.ts +++ b/src/views-components/context-menu/actions/helpers.ts @@ -2,7 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { extractUuidKind, ResourceKind } from "~/models/resource"; +import { REDIRECT_TO_DOWNLOAD_KEY, REDIRECT_TO_PREVIEW_KEY } from "common/redirect-to"; +import { extractUuidKind, ResourceKind } from "models/resource"; export const sanitizeToken = (href: string, tokenAsQueryParam = true): string => { const [prefix, suffix] = href.split('/t='); @@ -13,11 +14,12 @@ export const sanitizeToken = (href: string, tokenAsQueryParam = true): string => return `${[prefix, ...rest].join('/')}${tokenAsQueryParam ? `${sep}api_token=${token}` : ''}`; }; -export const getClipboardUrl = (href: string, shouldSanitizeToken = true): string => { +export const getClipboardUrl = (href: string, shouldSanitizeToken = true, inline = false): string => { const { origin } = window.location; const url = shouldSanitizeToken ? sanitizeToken(href, false) : href; + const redirectKey = inline ? REDIRECT_TO_PREVIEW_KEY : REDIRECT_TO_DOWNLOAD_KEY; - return shouldSanitizeToken ? `${origin}?redirectTo=${url}` : `${origin}${url}`; + return shouldSanitizeToken ? `${origin}?${redirectKey}=${url}` : `${origin}${url}`; }; export const getInlineFileUrl = (url: string, keepWebSvcUrl: string, keepWebInlineSvcUrl: string): string => { @@ -43,4 +45,11 @@ export const getInlineFileUrl = (url: string, keepWebSvcUrl: string, keepWebInli inlineUrl = inlineUrl.replace(`/c=${collMatch[1]}`, ''); } return inlineUrl; -}; \ No newline at end of file +}; + +export const isInlineFileUrlSafe = (url: string, keepWebSvcUrl: string, keepWebInlineSvcUrl: string): boolean => { + let inlineUrl = keepWebInlineSvcUrl !== "" + ? url.replace(keepWebSvcUrl, keepWebInlineSvcUrl) + : url; + return inlineUrl.indexOf('*.') > -1; +}