Fix bad urls that didn't work with a context

diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
index aa7fa92452a2d0bd48631e5c239c373534d2de20..883c106f6469b2b246c4ac39bf11cb51d778e11a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
@@ -28,7 +28,7 @@ import QualifierIcon from '../../../components/icons-components/QualifierIcon';
 import TreeMap from '../../../components/charts/TreeMap';
 import { translate, translateWithParameters, getLocalizedMetricName } from '../../../helpers/l10n';
 import { formatMeasure, isDiffMetric } from '../../../helpers/measures';
-import { getComponentUrl } from '../../../helpers/urls';
+import { getProjectUrl } from '../../../helpers/urls';
 /*:: import type { Metric } from '../../../store/metrics/actions'; */
 /*:: import type { ComponentEnhanced } from '../types'; */
 /*:: import type { TreeMapItem } from '../../../components/charts/TreeMap'; */
@@ -94,7 +94,7 @@ export default class TreeMapView extends React.PureComponent {
             sizeValue
           ),
           label: component.name,
-          link: getComponentUrl(component.refKey || component.key, branch)
+          link: getProjectUrl(component.refKey || component.key, branch)
         };
       })
       .filter(Boolean);

diff --git a/server/sonar-web/src/main/js/apps/maintenance/main-view.js b/server/sonar-web/src/main/js/apps/maintenance/main-view.js
index 26ed8f944baa5f21eb185602fd1d205e17ca9085..d3bf4f8c64c994005654cfc8d72c04a38a1bb90f 100644 (file)
--- a/server/sonar-web/src/main/js/apps/maintenance/main-view.js
+++ b/server/sonar-web/src/main/js/apps/maintenance/main-view.js
@@ -82,7 +82,7 @@ export default Marionette.ItemView.extend({
 
   loadPreviousPage() {
     setInterval(() => {
-      window.location = window.baseUrl + (this.options.returnTo || '/');
+      window.location = this.options.returnTo || window.baseUrl;
     }, 2500);
   },
 

diff --git a/server/sonar-web/src/main/js/helpers/urls.ts b/server/sonar-web/src/main/js/helpers/urls.ts
index b125e48533d9507122c11590a20ba21c2df19597..91c5bc35d353e1c509da6decdb79e65f7e419c82 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/urls.ts
+++ b/server/sonar-web/src/main/js/helpers/urls.ts
@@ -37,20 +37,21 @@ export function getBaseUrl(): string {
 
 /**
  * Generate URL for a component's home page
+ * Deprecated : use getProjectUrl
  */
 export function getComponentUrl(componentKey: string, branch?: string): string {
   const branchQuery = branch ? `&branch=${encodeURIComponent(branch)}` : '';
   return getBaseUrl() + '/dashboard?id=' + encodeURIComponent(componentKey) + branchQuery;
 }
 
-export function getComponentBackgroundTaskUrl(componentKey: string): string {
-  return getBaseUrl() + '/project/background_tasks?id=' + encodeURIComponent(componentKey);
-}
-
 export function getProjectUrl(key: string, branch?: string): Location {
   return { pathname: '/dashboard', query: { id: key, branch } };
 }
 
+export function getComponentBackgroundTaskUrl(componentKey: string): Location {
+  return { pathname: '/project/background_tasks', query: { id: componentKey } };
+}
+
 export function getProjectBranchUrl(key: string, branch: Branch): Location {
   if (isShortLivingBranch(branch)) {
     return {
@@ -168,10 +169,6 @@ export function getDeprecatedActiveRulesUrl(query = {}, organization?: string |
   return getRulesUrl({ ...query, ...baseQuery }, organization);
 }
 
-export function getProjectsUrl(): string {
-  return getBaseUrl() + '/projects';
-}
-
 export function getMarkdownHelpUrl(): string {
   return getBaseUrl() + '/markdown/help';
 }