SONAR-10374 Support pull request in the web app

11 files changed, 9 insertions, 32 deletions

diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/Activity.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/Activity.tsx
index ddba951e313..01d14bb1807 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/Activity.tsx
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/Activity.tsx
@@ -60,13 +60,13 @@ export default class Activity extends React.PureComponent<Props> {
   fetchHistory = () => {
     const { component } = this.props;
 
-    let graphMetrics = getDisplayedHistoryMetrics(getGraph(), getCustomGraph());
+    let graphMetrics: string[] = getDisplayedHistoryMetrics(getGraph(), getCustomGraph());
     if (!graphMetrics || graphMetrics.length <= 0) {
       graphMetrics = getDisplayedHistoryMetrics(DEFAULT_GRAPH, []);
     }
 
     this.setState({ loading: true });
-    return getAllTimeMachineData(component, graphMetrics).then(
+    return getAllTimeMachineData({ component, metrics: graphMetrics.join() }).then(
       timeMachine => {
         if (this.mounted) {
           const history: History = {};
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx
index 27d4e2d957b..aa0fd5f0a16 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx
@@ -81,7 +81,7 @@ export class App extends React.PureComponent<Props, State> {
   fetchData() {
     this.setState({ loading: true });
     Promise.all([
-      getMeasures(this.props.component.key, PORTFOLIO_METRICS),
+      getMeasures({ componentKey: this.props.component.key, metricKeys: PORTFOLIO_METRICS.join() }),
       getChildren(this.props.component.key, SUB_COMPONENTS_METRICS, { ps: 20, s: 'qualifier' })
     ]).then(
       ([measures, subComponents]) => {
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/Activity-test.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/Activity-test.tsx
index c8c2e81f295..0b5fb1f1584 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/Activity-test.tsx
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/Activity-test.tsx
@@ -67,5 +67,5 @@ it('renders', () => {
 
 it('fetches history', () => {
   mount(<Activity component="foo" metrics={{}} />);
-  expect(getAllTimeMachineData).toBeCalledWith('foo', ['coverage']);
+  expect(getAllTimeMachineData).toBeCalledWith({ component: 'foo', metrics: 'coverage' });
 });
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx
index 6cfe8d6890b..4abdc4e056b 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx
@@ -77,23 +77,11 @@ it('fetches measures and children components', () => {
   getMeasures.mockClear();
   getChildren.mockClear();
   mount(<App component={component} fetchMetrics={jest.fn()} metrics={{}} />);
-  expect(getMeasures).toBeCalledWith('foo', [
-    'projects',
-    'ncloc',
-    'ncloc_language_distribution',
-    'releasability_rating',
-    'releasability_effort',
-    'sqale_rating',
-    'maintainability_rating_effort',
-    'reliability_rating',
-    'reliability_rating_effort',
-    'security_rating',
-    'security_rating_effort',
-    'last_change_on_releasability_rating',
-    'last_change_on_maintainability_rating',
-    'last_change_on_security_rating',
-    'last_change_on_reliability_rating'
-  ]);
+  expect(getMeasures).toBeCalledWith({
+    componentKey: 'foo',
+    metricKeys:
+      'projects,ncloc,ncloc_language_distribution,releasability_rating,releasability_effort,sqale_rating,maintainability_rating_effort,reliability_rating,reliability_rating_effort,security_rating,security_rating_effort,last_change_on_releasability_rating,last_change_on_maintainability_rating,last_change_on_security_rating,last_change_on_reliability_rating'
+  });
   expect(getChildren).toBeCalledWith(
     'foo',
     [
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Effort-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Effort-test.tsx.snap
index 8918c9e4b99..b278210c01b 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Effort-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Effort-test.tsx.snap
@@ -16,7 +16,6 @@ exports[`renders 1`] = `
             Object {
               "pathname": "/component_measures",
               "query": Object {
-                "branch": undefined,
                 "id": "foo",
                 "metric": "security_rating",
               },
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/HistoryButtonLink-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/HistoryButtonLink-test.tsx.snap
index e62b2d558c6..8f25ec024e1 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/HistoryButtonLink-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/HistoryButtonLink-test.tsx.snap
@@ -9,7 +9,6 @@ exports[`renders 1`] = `
     Object {
       "pathname": "/project/activity",
       "query": Object {
-        "branch": undefined,
         "custom_metrics": "security_rating",
         "graph": "custom",
         "id": "foo",
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MainRating-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MainRating-test.tsx.snap
index d8cc0a6fd99..b90b5afa313 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MainRating-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MainRating-test.tsx.snap
@@ -9,7 +9,6 @@ exports[`renders 1`] = `
     Object {
       "pathname": "/component_measures",
       "query": Object {
-        "branch": undefined,
         "id": "foo",
         "metric": "security_rating",
         "view": "treemap",
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MeasuresButtonLink-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MeasuresButtonLink-test.tsx.snap
index a97849bb45e..b4afa69ade1 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MeasuresButtonLink-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/MeasuresButtonLink-test.tsx.snap
@@ -9,7 +9,6 @@ exports[`renders 1`] = `
     Object {
       "pathname": "/component_measures",
       "query": Object {
-        "branch": undefined,
         "id": "foo",
         "metric": "security_rating",
       },
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/ReleasabilityBox-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/ReleasabilityBox-test.tsx.snap
index c2120360b56..2401a4dc09b 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/ReleasabilityBox-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/ReleasabilityBox-test.tsx.snap
@@ -17,7 +17,6 @@ exports[`renders 1`] = `
       Object {
         "pathname": "/component_measures",
         "query": Object {
-          "branch": undefined,
           "id": "foo",
           "metric": "alert_status",
         },
@@ -41,7 +40,6 @@ exports[`renders 1`] = `
         Object {
           "pathname": "/component_measures",
           "query": Object {
-            "branch": undefined,
             "id": "foo",
             "metric": "alert_status",
           },
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Summary-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Summary-test.tsx.snap
index 149c818b286..5c828719017 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Summary-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/Summary-test.tsx.snap
@@ -24,7 +24,6 @@ exports[`renders 1`] = `
             Object {
               "pathname": "/component_measures",
               "query": Object {
-                "branch": undefined,
                 "id": "foo",
                 "metric": "projects",
               },
@@ -55,7 +54,6 @@ exports[`renders 1`] = `
             Object {
               "pathname": "/component_measures",
               "query": Object {
-                "branch": undefined,
                 "id": "foo",
                 "metric": "ncloc",
               },
diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/WorstProjects-test.tsx.snap b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/WorstProjects-test.tsx.snap
index 736ab248060..ceb66108e3c 100644
--- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/WorstProjects-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/__snapshots__/WorstProjects-test.tsx.snap
@@ -53,7 +53,6 @@ exports[`renders 1`] = `
               Object {
                 "pathname": "/dashboard",
                 "query": Object {
-                  "branch": undefined,
                   "id": "foo",
                 },
               }
@@ -141,7 +140,6 @@ exports[`renders 1`] = `
               Object {
                 "pathname": "/dashboard",
                 "query": Object {
-                  "branch": undefined,
                   "id": "barbar",
                 },
               }
@@ -229,7 +227,6 @@ exports[`renders 1`] = `
               Object {
                 "pathname": "/dashboard",
                 "query": Object {
-                  "branch": undefined,
                   "id": "bazbaz",
                 },
               }