github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1346 from weaveworks/1335-nodes-with-a-slash

Browse Source 
Change url encoding to handle multiple slashes in node names
This commit is contained in:
Simon
2016-04-19 17:57:35 +02:00
parent 1edeb8d190 05c0d7e325
commit 693c40c22e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/app/scripts/utils/router-utils.js
View File

@@ -7,8 +7,17 @@ import AppStore from '../stores/app-store';
// page.js won't match the routes below if ":state" has a slash in it, so replace those before we
// load the state into the URL.
//
const SLASH = '/';
const SLASH_REPLACEMENT = '<SLASH>';
function encodeURL(url) {
return url.replace(new RegExp(SLASH, 'g'), SLASH_REPLACEMENT);
}
function decodeURL(url) {
return decodeURIComponent(url.replace(new RegExp(SLASH_REPLACEMENT, 'g'), SLASH));
}
function shouldReplaceState(prevState, nextState) {
// Opening a new terminal while an existing one is open.
const terminalToTerminal = (prevState.controlPipe && nextState.controlPipe);
@@ -20,12 +29,12 @@ function shouldReplaceState(prevState, nextState) {
export function updateRoute() {
const state = AppStore.getAppState();
const stateUrl = JSON.stringify(state).replace('/', SLASH_REPLACEMENT);
const stateUrl = encodeURL(JSON.stringify(state));
const dispatch = false;
const urlStateString = window.location.hash
.replace('#!/state/', '')
.replace('#!/', '') || '{}';
const prevState = JSON.parse(decodeURIComponent(urlStateString.replace(SLASH_REPLACEMENT, '/')));
const prevState = JSON.parse(decodeURL(urlStateString));
if (shouldReplaceState(prevState, state)) {
// Replace the top of the history rather than pushing on a new item.