Add maps sharing prefix (#1050)

VEuPathDB · Apr 26, 2024 · 44e60b1 · 44e60b1
1 parent fa591ee
commit 44e60b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/libs/eda/src/lib/map/MapVeuContainer.tsx b/packages/libs/eda/src/lib/map/MapVeuContainer.tsx
@@ -34,7 +34,7 @@ interface Props {
   edaServiceUrl: string;
   singleAppMode?: string;
   siteInformationProps: SiteInformationProps;
-  sharingUrl: string;
+  sharingUrlPrefix?: string;
   showLinkToEda?: boolean;
 }
 
@@ -43,7 +43,7 @@ export function MapVeuContainer(mapVeuContainerProps: Props) {
     singleAppMode,
     siteInformationProps,
     edaServiceUrl,
-    sharingUrl,
+    sharingUrlPrefix,
     showLinkToEda,
   } = mapVeuContainerProps;
   const edaClient = useConfiguredSubsettingClient(edaServiceUrl);
@@ -152,7 +152,7 @@ export function MapVeuContainer(mapVeuContainerProps: Props) {
                 analysisId={routeProps.match.params.analysisId}
                 siteInformationProps={siteInformationProps}
                 studyId={routeProps.match.params.studyId}
-                sharingUrl={sharingUrl}
+                sharingUrlPrefix={sharingUrlPrefix}
                 showLinkToEda={showLinkToEda}
               />
             </EDAWorkspaceContainer>

diff --git a/packages/libs/eda/src/lib/map/analysis/MapAnalysis.tsx b/packages/libs/eda/src/lib/map/analysis/MapAnalysis.tsx
@@ -107,7 +107,7 @@ const mapStyle: React.CSSProperties = {
 
 interface Props {
   analysisId?: string;
-  sharingUrl: string;
+  sharingUrlPrefix?: string;
   singleAppMode?: string;
   studyId: string;
   siteInformationProps: SiteInformationProps;
@@ -215,7 +215,7 @@ function MapAnalysisImpl(props: ImplProps) {
     setViewport,
     setBoundsZoomLevel,
     setSubsetVariableAndEntity,
-    // sharingUrl,
+    sharingUrlPrefix,
     setIsSidePanelExpanded,
     setMarkerConfigurations,
     setActiveMarkerConfigurationType,
@@ -236,9 +236,12 @@ function MapAnalysisImpl(props: ImplProps) {
   const subsettingClient = useSubsettingClient();
   const history = useHistory();
 
-  // FIXME use the sharingUrl prop to construct this
-  const sharingUrl = new URL(`../${analysisId}/import`, window.location.href)
-    .href;
+  const sharingUrl = new URL(
+    sharingUrlPrefix
+      ? `${sharingUrlPrefix}/${analysisId}`
+      : `../${analysisId}/import`,
+    window.location.href
+  ).href;
 
   const getDefaultVariableDescriptor = useGetDefaultVariableDescriptor();
 

diff --git a/packages/libs/web-common/src/controllers/EdaMapController.tsx b/packages/libs/web-common/src/controllers/EdaMapController.tsx
@@ -20,13 +20,10 @@ export function EdaMapController() {
         siteInformationProps={{
           loginUrl: '/user/login',
           siteHomeUrl: webAppUrl,
-          // TODO Remove hardcoded logo after demo
-          // Hardcode veupathdb logo for now.
           siteLogoSrc: `${webAppUrl}/images/VEuPathDB/icons-footer/${projectId.toLowerCase()}.png`,
-          // siteLogoSrc: `${webAppUrl}/images/VEuPathDB/icons-footer/VEuPathDB.png`,
           siteName: projectConfig?.displayName ?? '',
         }}
-        sharingUrl={''}
+        sharingUrlPrefix={'/maps'}
         showLinkToEda={projectId === 'ClinEpiDB'}
       />
     </Suspense>