Skip to content

Fixes #527: Allow suburl to map the application #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes #527: Allow suburl to map the application #528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ui/src/containers/cluster-nodes/cluster-nodes.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,25 @@ class clusterNodesController {
this.clusterName = $stateParams.clusterName;

// Try to get URL
// even if path is being forwared by a Apache / Nginx conf.
// even if path is being forwarded by a Apache / Nginx conf.
// i.e. http://my_site.com/my/custom/path is the root of the python app
console.log('---- window.location', window.location)
let baseUrl = window.location.href.split('/#!')[0];

if (/\:8080/.test(baseUrl)) baseUrl = 'http://localhost:5000';
let url = `${window.location.protocol}//${window.location.host}`;
let baseUrl = window.location.pathname
// console.log('---- baseUrl: ', baseUrl)

if (/\:8080/.test(url)) {
url = 'http://localhost:5000';
}

// Websockets do not work with relative paths, so get absolute and append the WS portion
// upgrade from HTTP to WS should be automatic
// baseUrl = baseUrl += `/ws/nodes/${this.clusterName}/nodes`;
baseUrl = baseUrl += `/ws`;
// console.log('---- baseUrl: ', baseUrl)
// url = url += `/ws/nodes/${this.clusterName}/nodes`;
url = url += `/ws`;
// console.log('---- url: ', url)

this.socket = io(baseUrl);
this.socket = io(url, { path: baseUrl+"socket.io" });
this.socket.on('connect', () => {
this.connected = true;
this.socket.emit('join', {"room_name": this.clusterName + "::nodes"});
Expand Down