Add import route and construct sharing url (#452)

VEuPathDB · Sep 8, 2023 · 6b78ea4 · 6b78ea4
1 parent be4c719
commit 6b78ea4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/packages/libs/eda/src/lib/map/MapVeuContainer.tsx b/packages/libs/eda/src/lib/map/MapVeuContainer.tsx
@@ -24,6 +24,7 @@ import './MapVEu.scss';
 import { SiteInformationProps } from '.';
 import { StudyList } from './StudyList';
 import { PublicAnalysesRoute } from '../workspace/PublicAnalysesRoute';
+import { ImportAnalysis } from '../workspace/ImportAnalysis';
 
 interface Props {
   edaServiceUrl: string;
@@ -78,6 +79,22 @@ export function MapVeuContainer(mapVeuContainerProps: Props) {
           />
         )}
       />
+      <Route
+        exact
+        path={`${path}/:analysisId/import`}
+        render={(
+          props: RouteComponentProps<{
+            analysisId: string;
+          }>
+        ) => {
+          return (
+            <ImportAnalysis
+              {...props.match.params}
+              analysisClient={analysisClient}
+            />
+          );
+        }}
+      />
       <Route
         path={[`${path}/:studyId/new`, `${path}/:studyId/:analysisId`]}
         render={(

diff --git a/packages/libs/eda/src/lib/map/analysis/MapAnalysis.tsx b/packages/libs/eda/src/lib/map/analysis/MapAnalysis.tsx
@@ -238,11 +238,12 @@ function MapAnalysisImpl(props: ImplProps) {
   const {
     appState,
     analysisState,
+    analysisId,
     setViewport,
     setActiveVisualizationId,
     setBoundsZoomLevel,
     setSubsetVariableAndEntity,
-    sharingUrl,
+    // sharingUrl,
     setIsSubsetPanelOpen = () => {},
     setActiveMarkerConfigurationType,
     setMarkerConfigurations,
@@ -259,6 +260,11 @@ function MapAnalysisImpl(props: ImplProps) {
   const downloadClient = useDownloadClient();
   const subsettingClient = useSubsettingClient();
   const geoConfig = geoConfigs[0];
+  const history = useHistory();
+
+  // FIXME use the sharingUrl prop to construct this
+  const sharingUrl = new URL(`../${analysisId}/import`, window.location.href)
+    .href;
 
   const getDefaultVariableDescriptor = useGetDefaultVariableDescriptor();
 
@@ -547,7 +553,6 @@ function MapAnalysisImpl(props: ImplProps) {
     return !user.isGuest;
   });
 
-  const history = useHistory();
   function showLoginForm() {
     const currentUrl = window.location.href;
     const loginUrl = `${props.siteInformationProps.loginUrl}?destination=${currentUrl}`;