From 04a8b0f54078465e416fa82418600a719da2bc59 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 22 Jul 2016 16:49:53 +0200 Subject: [PATCH] SONAR-7933 Drop dashboards from api/navigation/component --- .../ui/ws/ComponentNavigationAction.java | 23 ------------- .../ui/ws/ComponentNavigationActionTest.java | 32 ------------------- .../admin_with_extensions.json | 1 - .../breadcrumbs.json | 1 - .../no_snapshot.json | 1 - .../no_snapshot_user_favourite.json | 1 - .../on_module.json | 1 - .../quality_profile_admin.json | 1 - .../with_admin_rights.json | 1 - .../with_all_properties.json | 1 - .../with_dashboards.json | 2 +- .../with_extensions.json | 1 - .../with_snapshot_and_connected_user.json | 1 - 13 files changed, 1 insertion(+), 66 deletions(-) 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 a3ea8cdc170..f7aca74f29e 100644 --- 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 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 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 94de7d1cea7..ad7cb0c8ee8 100644 --- 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 cddceb00943..329c923f30c 100644 --- 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 61593d8cacd..c0b1fa23a6e 100644 --- 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 0aa0d5825e6..897600a6b5c 100644 --- 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 1f3d471aab6..119f86af877 100644 --- 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 5c3fa71c716..19646c8fa00 100644 --- 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 987d7c1d2cb..3e6474a4420 100644 --- 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 9cc9467afec..e60ff54767d 100644 --- 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 d48abffd64d..2352e48e484 100644 --- 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 2d54fcd3085..a582f0f6ddd 100644 --- 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 9f3096391a8..b28f5586817 100644 --- 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 c877f79a564..7af8830a799 100644 --- 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", -- 2.39.5