Merge 1346

Hotfix: File download with encodedURL
BlueBrain · Jul 25, 2023 · 007d26e · 007d26e
2 parents 578e2f5 + 7a035ba
commit 007d26e
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 18 deletions.
diff --git a/src/shared/components/ImagePreview/ImagePreview.tsx b/src/shared/components/ImagePreview/ImagePreview.tsx
@@ -21,8 +21,9 @@ import {
   SortDescendingOutlined,
   DownloadOutlined,
 } from '@ant-design/icons';
-import { orderBy, isNil, create, isArray, isObject } from 'lodash';
+import { orderBy, isNil, isArray, isObject } from 'lodash';
 import { parseProjectUrl, parseResourceId } from '../Preview/Preview';
+import nexusUrlHardEncode from '../../utils/nexusEncode';
 
 import './ImagePreview.less';
 
@@ -114,7 +115,7 @@ const fetchImageResources = async ({
       const rawData = await nexus.File.get(
         orgLabel,
         projectLabel,
-        parseResourceId(contentUrl),
+        nexusUrlHardEncode(contentUrl),
         { as: 'blob' }
       );
       const blob = new Blob([rawData as string], {

diff --git a/src/shared/components/Preview/Preview.tsx b/src/shared/components/Preview/Preview.tsx
@@ -15,6 +15,7 @@ import useNotification from '../../hooks/useNotification';
 import TableViewerContainer from '../../containers/TableViewerContainer';
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store/reducers';
+import nexusUrlHardEncode from '../../utils/nexusEncode';
 
 export const parseResourceId = (url: string) => {
   const fileUrlPattern = /files\/([\w-]+)\/([\w-]+)\/(.*)/;
@@ -244,14 +245,14 @@ const Preview: React.FC<{
       contentUrl = url;
       options.rev = parseInt(rev, 10);
     }
+
     try {
       const rawData = await nexus.File.get(
         orgLabel,
         projectLabel,
-        encodeURIComponent(contentUrl),
+        nexusUrlHardEncode(contentUrl),
         options
       );
-
       downloadBlobHelper(rawData, asset.name);
     } catch (error) {
       notification.error({

diff --git a/src/shared/components/ResourceEditor/ResourcesLRUCache.ts b/src/shared/components/ResourceEditor/ResourcesLRUCache.ts
@@ -4,6 +4,16 @@ import LRUCache from 'lru-cache';
 
 // TODO: Use nexus.httpGet to prepare for using http cache headers
 // since the nexus SDK can not accept the headers as an argument
+
+const parseResourceId = (url: string) => {
+  const fileUrlPattern = /files\/([\w-]+)\/([\w-]+)\/(.*)/;
+  if (fileUrlPattern.test(url)) {
+    const [, , , resourceId] = url.match(fileUrlPattern) as string[];
+    return decodeURIComponent(resourceId.split('?rev=')[0]);
+  }
+  return decodeURIComponent(url);
+};
+
 const lookByProjectResolver = async ({
   nexus,
   apiEndpoint,
@@ -18,7 +28,9 @@ const lookByProjectResolver = async ({
   resourceId: string;
 }): Promise<Resource> => {
   return await nexus.httpGet({
-    path: `${apiEndpoint}/resolvers/${orgLabel}/${projectLabel}/_/${resourceId}`,
+    path: `${apiEndpoint}/resolvers/${orgLabel}/${projectLabel}/_/${encodeURIComponent(
+      parseResourceId(resourceId)
+    )}`,
   });
 };
 const lookBySearchApi = async ({
@@ -31,7 +43,9 @@ const lookBySearchApi = async ({
   resourceId: string;
 }): Promise<TPagedResources> => {
   return await nexus.httpGet({
-    path: `${apiEndpoint}/resources?locate=${resourceId}`,
+    path: `${apiEndpoint}/resources?locate=${encodeURIComponent(
+      parseResourceId(resourceId)
+    )}`,
   });
 };
 

diff --git a/src/shared/components/ResourceEditor/editorUtils.ts b/src/shared/components/ResourceEditor/editorUtils.ts
@@ -174,7 +174,7 @@ export async function editorLinkResolutionHandler({
         apiEndpoint,
         orgLabel,
         projectLabel,
-        resourceId: encodeURIComponent(url),
+        resourceId: url,
       },
     }));
   }

diff --git a/src/shared/components/ResourceEditor/useResolutionActions.tsx b/src/shared/components/ResourceEditor/useResolutionActions.tsx
@@ -15,6 +15,7 @@ import {
 import { parseResourceId } from '../Preview/Preview';
 import { download } from '../../utils/download';
 import { getDataExplorerResourceItemArray } from './editorUtils';
+import nexusUrlHardEncode from '../../utils/nexusEncode';
 
 const useResolvedLinkEditorPopover = () => {
   const nexus = useNexusContext();
@@ -76,7 +77,7 @@ const useResolvedLinkEditorPopover = () => {
       const data = await nexus.File.get(
         orgLabel,
         projectLabel,
-        encodeURIComponent(parseResourceId(resourceId)),
+        nexusUrlHardEncode(parseResourceId(resourceId)),
         { as: 'blob' }
       );
       return download(title, ext ?? 'json', data);

diff --git a/src/shared/containers/AnalysisPlugin/AnalysisPluginContainer.tsx b/src/shared/containers/AnalysisPlugin/AnalysisPluginContainer.tsx
@@ -29,7 +29,8 @@ import {
   AnalysisAssetSparqlQueryRowResult,
   ReportGeneration,
 } from '../../types/plugins/report';
-import useNotification from '../../../shared/hooks/useNotification';
+import useNotification from '../../hooks/useNotification';
+import nexusUrlHardEncode from '../../utils/nexusEncode';
 
 async function fetchImageObjectUrl(
   nexus: NexusClient,
@@ -41,7 +42,7 @@ async function fetchImageObjectUrl(
   const rawData = await nexus.File.get(
     orgLabel,
     projectLabel,
-    encodeURIComponent(imageResourceId),
+    nexusUrlHardEncode(imageResourceId),
     {
       as: 'blob',
     }

diff --git a/src/shared/containers/ResourceActionsContainer.tsx b/src/shared/containers/ResourceActionsContainer.tsx
@@ -154,12 +154,15 @@ const ResourceActionsContainer: React.FunctionComponent<{
     },
     downloadFile: async () => {
       try {
-        const data = await nexus.File.get(
-          orgLabel,
-          projectLabel,
-          parseResourceId(resource._self),
-          { as: 'blob' }
-        );
+        const data = await nexus.httpGet({
+          path: resource._self,
+          headers: {
+            Accept: 'application/json',
+          },
+          context: {
+            as: 'blob',
+          },
+        });
         return download(
           resource._filename || getResourceLabel(resource),
           resource._mediaType,

diff --git a/src/shared/containers/TableViewerContainer.tsx b/src/shared/containers/TableViewerContainer.tsx
@@ -5,7 +5,8 @@ import * as csvParser from 'csv-string';
 
 import TableViewer from '../components/TableViewer';
 import useNotification from '../hooks/useNotification';
-import { parseResourceId } from '../../shared/components/Preview/Preview';
+import { parseResourceId } from '../components/Preview/Preview';
+import nexusUrlHardEncode from '../utils/nexusEncode';
 
 const TableViewerContainer: React.FC<{
   resourceUrl: string;
@@ -27,7 +28,7 @@ const TableViewerContainer: React.FC<{
     await nexus.File.get(
       orgLabel,
       projectLabel,
-      encodeURIComponent(resourceId),
+      nexusUrlHardEncode(resourceId),
       {
         as: 'text',
       }

diff --git a/src/shared/utils/nexusEncode.ts b/src/shared/utils/nexusEncode.ts
@@ -0,0 +1,5 @@
+const nexusUrlHardEncode = (url: string): string => {
+  return encodeURIComponent(decodeURIComponent(url));
+};
+
+export default nexusUrlHardEncode;