From a820738e347854aed7cdaa7758d9c0830df624e3 Mon Sep 17 00:00:00 2001 From: Rohith Sharma K S Date: Fri, 29 Jun 2018 10:21:25 -0700 Subject: [PATCH] YARN-8469. [UI2] URL needs to be trimmed to handle index.html redirection while accessing via knox. Contributed by Sunil Govindan. --- .../src/main/webapp/app/initializers/loader.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js index 6642869775..96c8fcfff9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js @@ -205,5 +205,13 @@ export default { const skipTrailingSlash = function(path) { path = path.replace('ui2/', ''); - return path.replace(/\/$/, ''); + path = path.replace(/\/$/, ''); + console.log('base url:' + path) + if(path.includes("redirect")) { + var to = path.lastIndexOf('/'); + to = to == -1 ? path.length : to + 1; + path = path.substring(0, to); + console.log('base url after redirect:' + path) + } + return path; };