Fix: Url path, Navbar render

Fix url path construction for API calls, NavBar render method lacking 'key' attribute for rendered children
cagedtornado · May 3, 2018 · c45833f · c45833f
1 parent c4c1d8b
commit c45833f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/components/NavBar.js b/src/components/NavBar.js
@@ -55,7 +55,7 @@ class NavBar extends Component {
             <DropdownMenu>
               {this.props.applications
                 .filter(app => app !== "*")
-                .map(app => <DropdownItem onClick={() => this._onAppSelect(app)}>{app}</DropdownItem>)}
+                .map(app => <DropdownItem key={app} onClick={() => this._onAppSelect(app)}>{app}</DropdownItem>)}
               <DropdownItem divider />
               <DropdownItem onClick={() => this._onAppSelect("*")}>All Applications</DropdownItem>
             </DropdownMenu>

diff --git a/src/utils/CentralConfigAPIUtils.js b/src/utils/CentralConfigAPIUtils.js
@@ -9,14 +9,25 @@ class CentralConfigAPIUtils {
 
     constructor()
     {
-        this.baseUrl = "";
+        let baseUrl = "";
+
+        //  If our current url contains /ui assume we're running
+        //  as part of a centralconfig service
+        //  Strip the /ui off to get the base url:
+        if(window.location.href.includes("/ui"))
+        {
+            baseUrl = window.location.href.substring(0, window.location.href.indexOf("/ui"));
+        }
+
+        this.baseUrl = baseUrl;
 
 		//	Do a 'truthy' check to see if the config item is set
 		//	Confused?  See https://stackoverflow.com/a/5515349/19020
 		if(appconfig.serviceBaseHostPort)
 		{
 			this.baseUrl = `//${appconfig.serviceBaseHostPort}`;
-		}
+        }
+
     }
 
     //	Gets all configuration items from the server