SONAR-7288 Use api/favorites/remove in the UI

diff --git a/server/sonar-web/src/main/js/api/favorites.js b/server/sonar-web/src/main/js/api/favorites.js
index 7b87df6ea42bc79c8a9cd3da47eb615178816bcb..2226739945706e556494455242646b7ce112f179 100644 (file)
--- a/server/sonar-web/src/main/js/api/favorites.js
+++ b/server/sonar-web/src/main/js/api/favorites.js
@@ -18,17 +18,16 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 /* @flow */
-import { post, requestDelete, getJSON } from '../helpers/request';
+import { post, getJSON } from '../helpers/request';
 
 export const getFavorites = (): Promise<Object> => (
     getJSON('/api/favourites')
 );
 
 export function addFavorite (component: string) {
-  return post('/api/favorites/add', { component});
+  return post('/api/favorites/add', { component });
 }
 
-export function removeFavorite (componentKey: string) {
-  const url = '/api/favourites/' + encodeURIComponent(componentKey);
-  return requestDelete(url);
+export function removeFavorite (component: string) {
+  return post('/api/favorites/remove', { component });
 }

diff --git a/server/sonar-web/src/main/js/components/source-viewer/header.js b/server/sonar-web/src/main/js/components/source-viewer/header.js
index be78f9e41bf3dbebcb78fbb9049c4e4cd3594ef2..b632622917bb1a063e271be8228669449dd4c906 100644 (file)
--- a/server/sonar-web/src/main/js/components/source-viewer/header.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/header.js
@@ -25,7 +25,6 @@ import MoreActionsView from './more-actions';
 import MeasuresOverlay from './measures-overlay';
 import Template from './templates/source-viewer-header.hbs';
 
-const API_FAVOURITE: string = window.baseUrl + '/api/favourites';
 const API_FAVORITE: string = window.baseUrl + '/api/favorites';
 
 export default Marionette.ItemView.extend({
@@ -43,8 +42,11 @@ export default Marionette.ItemView.extend({
     const that = this;
     if (this.model.get('fav')) {
       $.ajax({
-        url: API_FAVOURITE + '/' + this.model.get('key'),
-        type: 'DELETE'
+        url: API_FAVORITE + '/remove',
+        type: 'POST',
+        data: {
+          component: this.model.get('key')
+        }
       }).done(function () {
         that.model.set('fav', false);
         that.render();

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb
index 57051ad1b373de043f41af67226602da25d8d4b0..c1c3984b02704d27eaa2501e23bb1e235d3d410a 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb
@@ -36,15 +36,6 @@ class Api::FavouritesController < Api::ApiController
     end
   end
 
-  #
-  # DELETE /api/favourites/<key>
-  # curl -X DELETE  http://localhost:9000/api/favourites/org.apache.struts:struts -v -u admin:admin
-  #
-  def destroy
-    ok=current_user.delete_favourite(params[:id])
-    render_success(ok ? "Favourite deleted" : "Favourite not found")
-  end
-
   def favourites_to_json(favourites=[])
     json=[]
     favourites.each do |f|