SONAR-8552 WS api/navigation/global returns the id instead of the url

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
index 2340b2f1e45c0030b733320f2e931a913afa7381..8cb8817e2b8eca6a301741db7cedf54017c874a6 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
@@ -98,8 +98,8 @@ public class GlobalNavigationAction implements NavigationWsAction {
     for (ViewProxy<Page> page : views.getPages(NavigationSection.HOME)) {
       if (page.isUserAuthorized()) {
         json.beginObject()
+          .prop("id", page.getId())
           .prop("name", page.getTitle())
-          .prop("url", page.isController() ? page.getId() : String.format("/plugins/home/%s", page.getId()))
           .endObject();
       }
     }

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
index 311f46af0320ff5fb014d2ec071e63be58612d79..79d5a430404b35ac51216ad060666f7aaee70edb 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
@@ -1,12 +1,12 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     }
   ],
   "settings": {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
index 58db73feb9e220c9690bcd3d6a8ec22c19ea96f9..4613abbff990b5279c545f034a97585bce0edb86 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
@@ -208,7 +208,7 @@ public class GlobalNavigationActionTest {
 
       @Override
       public String getId() {
-        return "/my_rails_app";
+        return "my_rails_app";
       }
     };
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json
index 019342bd220403edfd070ccb41939f31adfd4386..664b126985267618757df53c865c8bf1feadd62e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json
@@ -1,16 +1,16 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     },
     {
-      "name": "Admin Page",
-      "url": "/plugins/home/admin_page"
+      "id": "admin_page",
+      "name": "Admin Page"
     }
   ]
 }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json
index b2783b5e528598afff8dd18e05c031f496733224..ab7722b818d37c5a1c9e9e1dd37ebae28f9961e1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json
@@ -1,12 +1,12 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     }
   ]
 }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json
index b2783b5e528598afff8dd18e05c031f496733224..ab7722b818d37c5a1c9e9e1dd37ebae28f9961e1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json
@@ -1,12 +1,12 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     }
   ]
 }