From 2cbeb26eb4c15e35df3ff29b24c119bd2fa847a4 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Wed, 1 May 2019 13:28:18 -0400
Subject: [PATCH] Make sure our baseDirectory ends in a forward slash

---
 .../ohif-vtk-extension/src/ConnectedToolbarSection.js |  2 +-
 generateStaticSite.sh                                 | 11 -----------
 src/components/OHIFLogo/OHIFLogo.js                   |  2 +-
 src/connectedComponents/ConnectedPluginSwitch.js      |  2 +-
 src/connectedComponents/ToolbarRow.js                 |  2 +-
 src/utils/getDefaultToolbarButtons.js                 |  6 +++++-
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js b/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
index 202903a04..37adbf11d 100644
--- a/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
+++ b/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
@@ -3,7 +3,7 @@ import { ToolbarSection } from 'react-viewerbase';
 import OHIF from 'ohif-core';
 
 const { setToolActive } = OHIF.redux.actions;
-const Icons = `${window.config.routerBasename}icons.svg`;
+const Icons = `${window.config.routerBasename}/icons.svg`;
 
 const mapStateToProps = state => {
   const activeButton = state.tools.buttons.find(tool => tool.active === true);
diff --git a/generateStaticSite.sh b/generateStaticSite.sh
index c01d50020..6ad76a0f6 100755
--- a/generateStaticSite.sh
+++ b/generateStaticSite.sh
@@ -47,14 +47,3 @@ export ROOT_URL=$DEPLOY_PRIME_URL/demo
 mkdir ./docs/latest/_book/demo/
 yarn install
 yarn build:web:ci
-
-# OLD DEPLOY
-# cd example
-# yarn install
-# yarn run prepare
-# sed -i "s,http://localhost:5000,${ROOT_URL},g" index.html
-# sed -i 's,"routerBasename": "/","routerBasename": "/demo",g' index.html
-# rm -rf node_modules
-
-# NEW DEPLOY
-# cpx 'build/*' docs/latest/_book/demo --verbose
diff --git a/src/components/OHIFLogo/OHIFLogo.js b/src/components/OHIFLogo/OHIFLogo.js
index 2a35171da..abbb524f8 100644
--- a/src/components/OHIFLogo/OHIFLogo.js
+++ b/src/components/OHIFLogo/OHIFLogo.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import './OHIFLogo.css'
 
-const Icons = `${window.config.routerBasename}icons.svg`
+const Icons = `${window.config.routerBasename}/icons.svg`
 
 function OHIFLogo() {
   return (
diff --git a/src/connectedComponents/ConnectedPluginSwitch.js b/src/connectedComponents/ConnectedPluginSwitch.js
index 1a639351f..f22fb2787 100644
--- a/src/connectedComponents/ConnectedPluginSwitch.js
+++ b/src/connectedComponents/ConnectedPluginSwitch.js
@@ -36,7 +36,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
 
   // TODO: Do not display certain options if the current display set
   // cannot be displayed using these view types
-  const Icons = `${window.config.routerBasename}icons.svg`
+  const Icons = `${window.config.routerBasename}/icons.svg`
   const buttons = [
     {
       text: 'Acquired',
diff --git a/src/connectedComponents/ToolbarRow.js b/src/connectedComponents/ToolbarRow.js
index cd73397be..e7f57d65e 100644
--- a/src/connectedComponents/ToolbarRow.js
+++ b/src/connectedComponents/ToolbarRow.js
@@ -6,7 +6,7 @@ import ConnectedLayoutButton from './ConnectedLayoutButton'
 import ConnectedPluginSwitch from './ConnectedPluginSwitch.js'
 import './ToolbarRow.css'
 
-const Icons = `${window.config.routerBasename}icons.svg`
+const Icons = `${window.config.routerBasename}/icons.svg`
 
 class ToolbarRow extends Component {
   static propTypes = {
diff --git a/src/utils/getDefaultToolbarButtons.js b/src/utils/getDefaultToolbarButtons.js
index e171ddfec..657e057b7 100644
--- a/src/utils/getDefaultToolbarButtons.js
+++ b/src/utils/getDefaultToolbarButtons.js
@@ -4,7 +4,11 @@
  */
 export default function(baseDirectory = '/') {
   const iconsFileName = 'icons.svg'
-  const relativePathToIcons = `${baseDirectory}${iconsFileName}`
+  const sanitizedBaseDirectory =
+    baseDirectory[baseDirectory.length - 1] === '/'
+      ? baseDirectory
+      : `${baseDirectory}/`
+  const relativePathToIcons = `${sanitizedBaseDirectory}${iconsFileName}`
 
   return [
     {