zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#4166 rerouted and removed x_1 routes for viz and overlays

Browse Source
pull/4172/head
Kartones 9 years ago
parent c383e4db7f
commit 73b4bedd47
4 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File

40
config/routes.rb
Unescape View File

@ -263,17 +263,16 @@ CartoDB::Application.routes.draw do
end
# Remember to add routes to /lib/assets/javascript/cartodb/app.js -> applyPatchNewVisualizationUrl()
scope :module => 'carto/api', :format => :json do
# Visualizations
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz' => 'visualizations#index', as: :api_v1_1_visualizations_index
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:id' => 'visualizations#show', as: :api_v1_1_visualizations_show, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:id/likes' => 'visualizations#likes_count', as: :api_v1_1_visualizations_likes_count, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:id/likes/detailed' => 'visualizations#likes_list', as: :api_v1_1_visualizations_likes_list, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:id/like' => 'visualizations#is_liked', as: :api_v1_1_visualizations_is_liked, constraints: { id: /[^\/]+/ }
# V1 api/json calls
get '(/user/:user_domain)(/u/:user_domain)/api/v2_1/viz/:id/viz' => 'visualizations#vizjson2', as: :api_v2_1_visualizations_vizjson, constraints: { id: /[^\/]+/ }
# Visualizations
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz' => 'visualizations#index', as: :api_v1_visualizations_index
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id' => 'visualizations#show', as: :api_v1_visualizations_show, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/likes' => 'visualizations#likes_count', as: :api_v1_visualizations_likes_count, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/likes/detailed' => 'visualizations#likes_list', as: :api_v1_visualizations_likes_list, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/like' => 'visualizations#is_liked', as: :api_v1_visualizations_is_liked, constraints: { id: /[^\/]+/ }
# Tables
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/tables/:id' => 'tables#show', as: :api_v1_1_tables_show, constraints: { id: /[^\/]+/ }
@ -310,8 +309,8 @@ CartoDB::Application.routes.draw do
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/maps/:id' => 'maps#show', as: :api_v1_1_maps_show
# Overlays
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:visualization_id/overlays' => 'overlays#index', as: :api_v1_1_visualizations_overlays_index, constraints: { visualization_id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:visualization_id/overlays/:id' => 'overlays#show', as: :api_v1_1_visualizations_overlays_show, constraints: { visualization_id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays' => 'overlays#index', as: :api_v1_visualizations_overlays_index, constraints: { visualization_id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays/:id' => 'overlays#show', as: :api_v1_visualizations_overlays_show, constraints: { visualization_id: /[^\/]+/ }
# Synchronizations
# TODO: deprecated?
@ -321,7 +320,7 @@ CartoDB::Application.routes.draw do
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/synchronizations/:id/sync_now' => 'synchronizations#syncing?', as: :api_v1_1_synchronizations_syncing
# Watching
get '(/user/:user_domain)(/u/:user_domain)/api/v1_1/viz/:id/watching' => 'visualizations#list_watching', as: :api_v1_1_visualizations_notify_watching, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/watching' => 'visualizations#list_watching', as: :api_v1_visualizations_notify_watching, constraints: { id: /[^\/]+/ }
# Oembed
get '(/user/:user_domain)(/u/:user_domain)/api/v1/oembed' => 'oembed#show', as: :api_v1_oembed
@ -341,6 +340,14 @@ CartoDB::Application.routes.draw do
# Organization (new endpoint that deprecates old, unused one, so v1)
get '(/user/:user_domain)(/u/:user_domain)/api/v1/organization/:id/users' => 'organizations#users', as: :api_v1_organization_users, constraints: { id: /[^\/]+/ }
# V2 api/json calls
# Visualizations
get '(/user/:user_domain)(/u/:user_domain)/api/v2/viz/:id/viz' => 'visualizations#vizjson2', as: :api_v2_visualizations_vizjson, constraints: { id: /[^\/]+/ }
end
scope :module => 'api/json', :format => :json do
@ -416,24 +423,16 @@ CartoDB::Application.routes.draw do
put '(/user/:user_domain)(/u/:user_domain)/api/v1/geocodings/:id' => 'geocodings#update', as: :api_v1_geocodings_update
# Visualizations
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz' => 'visualizations#index', as: :api_v1_visualizations_index
post '(/user/:user_domain)(/u/:user_domain)/api/v1/viz' => 'visualizations#create', as: :api_v1_visualizations_create
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id' => 'visualizations#show', as: :api_v1_visualizations_show, constraints: { id: /[^\/]+/ }
put '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id' => 'visualizations#update', as: :api_v1_visualizations_update, constraints: { id: /[^\/]+/ }
delete '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id' => 'visualizations#destroy', as: :api_v1_visualizations_destroy, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays' => 'overlays#index', as: :api_v1_visualizations_overlays_index, constraints: { visualization_id: /[^\/]+/ }
post '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays' => 'overlays#create', as: :api_v1_visualizations_overlays_create, constraints: { visualization_id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays/:id' => 'overlays#show', as: :api_v1_visualizations_overlays_show, constraints: { visualization_id: /[^\/]+/ }
put '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays/:id' => 'overlays#update', as: :api_v1_visualizations_overlays_update, constraints: { visualization_id: /[^\/]+/ }
delete '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:visualization_id/overlays/:id' => 'overlays#destroy', as: :api_v1_visualizations_overlays_destroy, constraints: { visualization_id: /[^\/]+/ }
# TODO: deprecate?
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/watching' => 'visualizations#list_watching', as: :api_v1_visualizations_notify_watching, constraints: { id: /[^\/]+/ }
put '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/watching' => 'visualizations#notify_watching', as: :api_v1_visualizations_list_watching, constraints: { id: /[^\/]+/ }
put '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/next_id' => 'visualizations#set_next_id', as: :api_v1_visualizations_set_next_id, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/likes' => 'visualizations#likes_count', as: :api_v1_visualizations_likes_count, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/likes/detailed' => 'visualizations#likes_list', as: :api_v1_visualizations_likes_list, constraints: { id: /[^\/]+/ }
post '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/like' => 'visualizations#add_like', as: :api_v1_visualizations_add_like, constraints: { id: /[^\/]+/ }
get '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/like' => 'visualizations#is_liked', as: :api_v1_visualizations_is_liked, constraints: { id: /[^\/]+/ }
delete '(/user/:user_domain)(/u/:user_domain)/api/v1/viz/:id/like' => 'visualizations#remove_like', as: :api_v1_visualizations_remove_like, constraints: { id: /[^\/]+/ }
# Tags
@ -461,9 +460,6 @@ CartoDB::Application.routes.draw do
# V2
# --
# Visualizations
get '(/user/:user_domain)(/u/:user_domain)/api/v2/viz/:id/viz' => 'visualizations#vizjson2', as: :api_v2_visualizations_vizjson, constraints: { id: /[^\/]+/ }
# WMS
get '(/user/:user_domain)(/u/:user_domain)/api/v2/wms' => 'wms#proxy', as: :api_v2_wms_proxy

22
lib/assets/javascripts/cartodb/app.js
Unescape View File

@ -221,46 +221,38 @@ Backbone.saveAbort = function() {
};
// TODO: this routing code should be removed
function applyPatchNewVisualizationUrl() {
// collections only needs read method
cdb.config.setUrlVersion('visualizations', 'read', 'v1_1');
// models can have: read, update, delete and create
cdb.config.setUrlVersion('visualization', 'read', 'v1_1');
//cdb.config.setUrlVersion('visualization', 'update', 'v1_1');
cdb.config.setUrlVersion('like', 'read', 'v1_1');
cdb.config.setUrlVersion('vizjson', 'read', 'v2_1');
cdb.config.setUrlVersion('overlays', 'read', 'v1_1');
cdb.config.setUrlVersion('watching', 'read', 'v1_1');
}
function applyPatchNewTableUrls() {
cdb.config.setUrlVersion('table', 'read', 'v1_1');
cdb.config.setUrlVersion('record', 'read', 'v1_1');
cdb.config.setUrlVersion('column', 'read', 'v1_1');
}
// TODO: this routing code should be removed
function applyPatchNewSynchronizationUrls() {
cdb.config.setUrlVersion('synchronization', 'read', 'v1_1');
}
// TODO: this routing code should be removed
function applyPatchNewImportUrl() {
cdb.config.setUrlVersion('import', 'read', 'v1_1');
}
// TODO: this routing code should be removed
function applyPatchNewImportsServiceUrl() {
cdb.config.setUrlVersion('imports_service', 'read', 'v1_1');
}
// TODO: this routing code should be removed
function applyPatchNewGeocodingUrls() {
cdb.config.setUrlVersion('geocoding', 'read', 'v1_1');
}
// TODO: this routing code should be removed
function applyPatchNewLayerUrls() {
cdb.config.setUrlVersion('layer', 'read', 'v1_1');
}
// TODO: this routing code should be removed
function applyPatchNewAssetUrl() {
cdb.config.setUrlVersion('asset', 'read', 'v1_1');
}

3
lib/assets/javascripts/cartodb/dashboard/entry.js
Unescape View File

@ -31,9 +31,6 @@ $(function() {
var currentUser = new cdb.admin.User(window.user_data);
if (currentUser.featureEnabled('active_record_vis_endpoint')) {
applyPatchNewVisualizationUrl();
}
if (currentUser.featureEnabled('active_record_geocoding_endpoint')) {
applyPatchNewGeocodingUrls();
}

4
lib/assets/javascripts/cartodb/table/table.js
Unescape View File

@ -416,9 +416,7 @@ $(function() {
cdb.config.set('url_prefix', user_data.base_url);
var currentUser = new cdb.admin.User(window.user_data);
if (currentUser.featureEnabled('active_record_vis_endpoint')) {
applyPatchNewVisualizationUrl();
}
if (currentUser.featureEnabled('active_record_geocoding_endpoint')) {
applyPatchNewGeocodingUrls();
}

Write Preview
Loading…
Cancel
Save