SONAR-7933 Drop dashboards from api/navigation/component

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
index a3ea8cdc1702ba2bc47ac2d1801dc9981d8b31ff..f7aca74f29e3bf1956db408460598594f5a6d4bc 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
@@ -46,8 +46,6 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.SnapshotDto;
-import org.sonar.db.dashboard.ActiveDashboardDao;
-import org.sonar.db.dashboard.DashboardDto;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.db.property.PropertyQuery;
 import org.sonar.server.ce.ws.ActivityAction;
@@ -63,8 +61,6 @@ public class ComponentNavigationAction implements NavigationWsAction {
 
   private static final String PARAM_COMPONENT_KEY = "componentKey";
 
-  private static final String ANONYMOUS = null;
-
   private static final String PROPERTY_COMPARABLE = "comparable";
   private static final String PROPERTY_CONFIGURABLE = "configurable";
   private static final String PROPERTY_HAS_ROLE_POLICY = "hasRolePolicy";
@@ -73,7 +69,6 @@ public class ComponentNavigationAction implements NavigationWsAction {
   private static final String PROPERTY_DELETABLE = "deletable";
 
   private final DbClient dbClient;
-  private final ActiveDashboardDao activeDashboardDao;
   private final Views views;
   private final I18n i18n;
   private final ResourceTypes resourceTypes;
@@ -83,7 +78,6 @@ public class ComponentNavigationAction implements NavigationWsAction {
   public ComponentNavigationAction(DbClient dbClient, Views views, I18n i18n, ResourceTypes resourceTypes, UserSession userSession,
     ComponentFinder componentFinder) {
     this.dbClient = dbClient;
-    this.activeDashboardDao = dbClient.activeDashboardDao();
     this.views = views;
     this.i18n = i18n;
     this.resourceTypes = resourceTypes;
@@ -146,12 +140,6 @@ public class ComponentNavigationAction implements NavigationWsAction {
       .prop("canBeFavorite", userSession.isLoggedIn())
       .prop("isFavorite", isFavourite(session, component, userSession));
 
-    List<DashboardDto> dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, userSession.getLogin());
-    if (dashboards.isEmpty()) {
-      dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, ANONYMOUS);
-    }
-    writeDashboards(json, dashboards);
-
     if (analysis != null) {
       json.prop("version", analysis.getVersion())
         .prop("snapshotDate", DateUtils.formatDateTime(new Date(analysis.getCreatedAt())));
@@ -201,17 +189,6 @@ public class ComponentNavigationAction implements NavigationWsAction {
     return componentKey;
   }
 
-  private static void writeDashboards(JsonWriter json, List<DashboardDto> dashboards) {
-    json.name("dashboards").beginArray();
-    for (DashboardDto dashboard : dashboards) {
-      json.beginObject()
-        .prop("key", dashboard.getId())
-        .prop("name", dashboard.getName())
-        .endObject();
-    }
-    json.endArray();
-  }
-
   private void writeConfiguration(JsonWriter json, ComponentDto component, UserSession userSession) {
     boolean isAdmin = userSession.hasComponentUuidPermission(UserRole.ADMIN, component.projectUuid());
     Locale locale = userSession.locale();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java
index 94de7d1cea70d6ef606a87163d3c35f134a4121b..ad7cb0c8ee8fff4768129d536302179d86d915b2 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java
@@ -47,8 +47,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.component.SnapshotTesting;
-import org.sonar.db.dashboard.ActiveDashboardDto;
-import org.sonar.db.dashboard.DashboardDto;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.exceptions.ForbiddenException;
@@ -161,36 +159,6 @@ public class ComponentNavigationActionTest {
     wsTester.newGetRequest("api/navigation", "component").setParam("componentKey", "polop").execute().assertJson(getClass(), "with_snapshot_and_connected_user.json");
   }
 
-  @Test
-  public void with_dashboards() throws Exception {
-    dbClient.componentDao().insert(dbTester.getSession(), ComponentTesting.newProjectDto("abcd")
-      .setKey("polop").setName("Polop"));
-    DashboardDto dashboard = new DashboardDto().setGlobal(false).setName("Anon Dashboard").setShared(true).setColumnLayout("100%");
-    dbClient.dashboardDao().insert(dashboard);
-    dbClient.activeDashboardDao().insert(new ActiveDashboardDto().setDashboardId(dashboard.getId()));
-    dbTester.getSession().commit();
-
-    userSessionRule.addProjectUuidPermissions(UserRole.USER, "abcd");
-
-    WsTester wsTester = newdWsTester();
-    wsTester.newGetRequest("api/navigation", "component").setParam("componentKey", "polop").execute().assertJson(getClass(), "with_dashboards.json");
-  }
-
-  @Test
-  public void with_default_dashboards() throws Exception {
-    dbClient.componentDao().insert(dbTester.getSession(), ComponentTesting.newProjectDto("abcd")
-      .setKey("polop").setName("Polop"));
-    DashboardDto dashboard = new DashboardDto().setGlobal(false).setName("Anon Dashboard").setShared(true).setColumnLayout("100%");
-    dbClient.dashboardDao().insert(dashboard);
-    dbClient.activeDashboardDao().insert(new ActiveDashboardDto().setDashboardId(dashboard.getId()));
-    dbTester.getSession().commit();
-
-    userSessionRule.login("obiwan").addProjectUuidPermissions(UserRole.USER, "abcd");
-
-    WsTester wsTester = newdWsTester();
-    wsTester.newGetRequest("api/navigation", "component").setParam("componentKey", "polop").execute().assertJson(getClass(), "with_default_dashboards.json");
-  }
-
   @Test
   public void with_extensions() throws Exception {
     ComponentDto project = ComponentTesting.newProjectDto("abcd")

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/admin_with_extensions.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/admin_with_extensions.json
index cddceb00943a42944b028e32e23f328acbd7dead..329c923f30c389ba50f8bed422164291218f111c 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/admin_with_extensions.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/admin_with_extensions.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": false,
   "isFavorite": false,
-  "dashboards": [],
   "extensions": [
     {
       "name": "First Page",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/breadcrumbs.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/breadcrumbs.json
index 61593d8cacd734bd03d27e6934c031367a84790d..c0b1fa23a6e441b1d12bc20dcd8605b24cdfcaf8 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/breadcrumbs.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/breadcrumbs.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": false,
   "isFavorite": false,
-  "dashboards": [],
   "breadcrumbs": [
     {
       "key": "polop",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot.json
index 0aa0d5825e601d0475d32fa326c9b30dc361a8bb..897600a6b5c5786f24e474179002ae36864e2049 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": false,
   "isFavorite": false,
-  "dashboards": [],
   "breadcrumbs": [
     {
       "key": "polop",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot_user_favourite.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot_user_favourite.json
index 1f3d471aab644eef37db9b9c671eadf7c845d2d0..119f86af8771a635a7065c3d2c4fbec0990087d6 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot_user_favourite.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/no_snapshot_user_favourite.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": true,
   "isFavorite": true,
-  "dashboards": [],
   "breadcrumbs": [
     {
       "key": "polop",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/on_module.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/on_module.json
index 5c3fa71c71607f14ad80e901800598b65ca3a213..19646c8fa0041cfe51f2c4d51da508198789464b 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/on_module.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/on_module.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": true,
   "isFavorite": false,
-  "dashboards": [],
   "configuration": {
     "showSettings": false,
     "showQualityProfiles": false,

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/quality_profile_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/quality_profile_admin.json
index 987d7c1d2cba913f65fb9d1196c1b46299655104..3e6474a44204506a19f66bce2c5db753356f996c 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/quality_profile_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/quality_profile_admin.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": true,
   "isFavorite": false,
-  "dashboards": [],
   "configuration": {
     "showSettings": false,
     "showQualityProfiles": true,

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_admin_rights.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_admin_rights.json
index 9cc9467afec4eefd5346543d10fde21b4f0e51c5..e60ff54767d98493ee3c364a83ee185b9f7810e0 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_admin_rights.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_admin_rights.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": true,
   "isFavorite": false,
-  "dashboards": [],
   "configuration": {
     "showSettings": false,
     "showQualityProfiles": true,

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_all_properties.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_all_properties.json
index d48abffd64d6d8e0d19a147e120443e1957d2f26..2352e48e4849e17ad0fbeb0750b330a2309956d1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_all_properties.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_all_properties.json
@@ -5,7 +5,6 @@
   "isComparable": true,
   "canBeFavorite": true,
   "isFavorite": false,
-  "dashboards": [],
   "configuration": {
     "showSettings": true,
     "showQualityProfiles": true,

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_dashboards.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_dashboards.json
index 2d54fcd30852b54ae9d027da3a39ff14b09f62fa..a582f0f6dddd89c0a73a8c91e366324ecda6d236 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_dashboards.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_dashboards.json
@@ -5,7 +5,7 @@
   "isComparable": false,
   "canBeFavorite": false,
   "isFavorite": false,
-  "dashboards": [
+  "dashboardws": [
     {
       "name": "Anon Dashboard"
     }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_extensions.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_extensions.json
index 9f3096391a8a057df289fdc7784b15f3eff01ec9..b28f558681718e7f65f719d3a14980e5f1545cd1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_extensions.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_extensions.json
@@ -5,7 +5,6 @@
   "isComparable": false,
   "canBeFavorite": false,
   "isFavorite": false,
-  "dashboards": [],
   "extensions": [
     {
       "name": "First Page",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_snapshot_and_connected_user.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_snapshot_and_connected_user.json
index c877f79a564628f817672e405b84fd50ae76ee81..7af8830a79915ee6b04a374ee0ee625185573d77 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_snapshot_and_connected_user.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentNavigationActionTest/with_snapshot_and_connected_user.json
@@ -7,7 +7,6 @@
   "isFavorite": false,
   "snapshotDate": "2015-04-22T11:44:00+0200",
   "version": "3.14",
-  "dashboards": [],
   "breadcrumbs": [
     {
       "key": "polop",