From 1cbd06a5264b83da40e6d4a41e31762e5835feb6 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Tue, 18 Jul 2017 10:06:42 +0200
Subject: [PATCH] redirect /view to /portfolio

---
 .../js/app/components/nav/component/ComponentNavMenu.js    | 2 +-
 server/sonar-web/src/main/js/app/utils/startReactApp.js    | 7 ++++---
 .../sonar-web/src/main/js/apps/overview/components/App.js  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js
index b77945b4d47..e7f2ca6d463 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js
@@ -58,7 +58,7 @@ export default class ComponentNavMenu extends React.PureComponent {
   }
 
   renderDashboardLink() {
-    const pathname = this.isView() ? '/view' : '/dashboard';
+    const pathname = this.isView() ? '/portfolio' : '/dashboard';
     return (
       <li>
         <Link to={{ pathname, query: { id: this.props.component.key } }} activeClassName="active">
diff --git a/server/sonar-web/src/main/js/app/utils/startReactApp.js b/server/sonar-web/src/main/js/app/utils/startReactApp.js
index 41779d0b4ab..cda4a172b5e 100644
--- a/server/sonar-web/src/main/js/app/utils/startReactApp.js
+++ b/server/sonar-web/src/main/js/app/utils/startReactApp.js
@@ -118,7 +118,9 @@ const startReactApp = () => {
         <Redirect from="/component/index" to="/component" />
         <Redirect from="/component_issues" to="/project/issues" />
         <Redirect from="/dashboard/index" to="/dashboard" />
-        <Redirect from="/governance" to="/view" />
+        <Redirect from="/governance" to="/portfolio" />
+        <Redirect from="/view" to="/portfolio" />
+        <Redirect from="/extension/governance/governance" to="/portfolio" />
         <Redirect from="/extension/governance/portfolios" to="/portfolios" />
         <Redirect from="/profiles/index" to="/profiles" />
         <Redirect from="/quality_gates/index" to="/quality_gates" />
@@ -179,7 +181,6 @@ const startReactApp = () => {
                           component={ProjectAdminPageExtension}
                         />
                       </Route>
-                      <Redirect from="extension/governance/governance" to="/view" />
                       <Route
                         path="extension/:pluginKey/:extensionKey"
                         component={ProjectPageExtension}
@@ -190,7 +191,7 @@ const startReactApp = () => {
                       {projectAdminRoutes}
                     </Route>
                     <Route path="project_roles" childRoutes={projectPermissionsRoutes} />
-                    <Route path="view" component={ViewDashboard} />
+                    <Route path="portfolio" component={ViewDashboard} />
                   </Route>
 
                   <Route component={AdminContainer}>
diff --git a/server/sonar-web/src/main/js/apps/overview/components/App.js b/server/sonar-web/src/main/js/apps/overview/components/App.js
index a0aafc4c938..247a4d81704 100644
--- a/server/sonar-web/src/main/js/apps/overview/components/App.js
+++ b/server/sonar-web/src/main/js/apps/overview/components/App.js
@@ -42,7 +42,7 @@ class App extends React.PureComponent {
   componentDidMount() {
     if (['VW', 'SVW'].includes(this.props.component.qualifier)) {
       this.props.router.replace({
-        pathname: '/view',
+        pathname: '/portfolio',
         query: { id: this.props.component.key }
       });
     }
-- 
2.39.5