ref: refactor nexusUrlHardEncode

BlueBrain · Jul 25, 2023 · 7a035ba · 7a035ba
1 parent 1aeacce
commit 7a035ba
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 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,
-        encodeURIComponent(decodeURIComponent(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-]+)\/(.*)/;
@@ -249,7 +250,7 @@ const Preview: React.FC<{
       const rawData = await nexus.File.get(
         orgLabel,
         projectLabel,
-        encodeURIComponent(decodeURIComponent(contentUrl)),
+        nexusUrlHardEncode(contentUrl),
         options
       );
       downloadBlobHelper(rawData, asset.name);

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(decodeURIComponent(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(decodeURIComponent(imageResourceId)),
+    nexusUrlHardEncode(imageResourceId),
     {
       as: 'blob',
     }

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(decodeURIComponent(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;