Skip to content

Commit

Permalink
Merge branch 'master' of github.com:CartoDB/cartodb into 3902-Organiz…
Browse files Browse the repository at this point in the history 
…ation_user_signup

Conflicts:
	config/routes.rb
	package.json
  • Loading branch information
@juanignaciosl
juanignaciosl committed Jun 24, 2015
2 parents 6ee48bf + 84d9120 commit 7750c0b
Show file tree
Hide file tree
Showing 18 changed files with 1,576 additions and 1,704 deletions.
10 changes: 9 additions & 1 deletion app/assets/stylesheets/editor/custom_basemap_dialog.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,12 @@
right: 14px;
z-index: 2;
&:hover { cursor: pointer }
}
}


// WMS panel view
.WMSSSelectLayer-Filter {
width: 900px;
margin:auto;
z-index: 0;
}
28 changes: 3 additions & 25 deletions app/controllers/api/json/overlays_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,9 @@
class Api::Json::OverlaysController < Api::ApplicationController
include CartoDB

ssl_required :index, :show, :create, :update, :destroy
before_filter :check_owner_by_vis, only: [ :index, :create ]
before_filter :check_owner_by_id, only: [ :show, :update, :destroy ]

def index
# TODO: PATCH
vis_id = params.fetch('visualization_id')
vis_id, schema = table_and_schema_from(vis_id)

vis, = locator.get(vis_id, CartoDB.extract_subdomain(request))
visualization_id = vis.id
collection = Overlay::Collection.new(
visualization_id: visualization_id,
).fetch
render_jsonp(collection)
rescue KeyError
head :not_found
end
ssl_required :create, :update, :destroy
before_filter :check_owner_by_vis, only: [ :create ]
before_filter :check_owner_by_id, only: [ :update, :destroy ]

def create
member_attributes = payload.merge(
Expand All @@ -39,13 +24,6 @@ def create
render_jsonp(member.attributes)
end

def show
member = Overlay::Member.new(id: params.fetch('id')).fetch
render_jsonp(member.attributes)
rescue KeyError
head :not_found
end

def update
member = Overlay::Member.new(id: params.fetch('id')).fetch
member.attributes = payload
Expand Down
193 changes: 7 additions & 186 deletions app/controllers/api/json/visualizations_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,13 @@
class Api::Json::VisualizationsController < Api::ApplicationController
include CartoDB

ssl_allowed :vizjson2, :notify_watching, :list_watching, :likes_count, :likes_list, :add_like, :is_liked,
:remove_like
ssl_required :index, :show, :create, :update, :destroy, :set_next_id unless Rails.env.development? || Rails.env.test?
skip_before_filter :api_authorization_required, only: [:vizjson2, :likes_count, :likes_list, :add_like,
:is_liked, :remove_like, :index]
before_filter :optional_api_authorization, only: [:likes_count, :likes_list, :add_like, :is_liked, :remove_like,
:index, :vizjson2]
before_filter :table_and_schema_from_params, only: [:show, :update, :destroy, :stats, :vizjson2,
:notify_watching, :list_watching, :likes_count, :likes_list,
:add_like, :is_liked, :remove_like, :set_next_id]

def index
current_user ? index_logged_in : index_not_logged_in
end
ssl_allowed :notify_watching, :list_watching, :add_like, :remove_like
ssl_required :create, :update, :destroy, :set_next_id unless Rails.env.development? || Rails.env.test?
skip_before_filter :api_authorization_required, only: [:add_like, :remove_like]
before_filter :optional_api_authorization, only: [:add_like, :remove_like]
before_filter :table_and_schema_from_params, only: [:update, :destroy, :stats,
:notify_watching, :list_watching,
:add_like, :remove_like, :set_next_id]

def create
vis_data = payload
Expand Down Expand Up @@ -125,15 +118,6 @@ def create
render_jsonp({ errors: { named_maps: exception } }, 400)
end

def show
vis, = locator.get(@table_id, CartoDB.extract_subdomain(request))
return(head 404) unless vis
return(head 403) unless vis.has_permission?(current_user, Visualization::Member::PERMISSION_READONLY)
render_jsonp(vis)
rescue KeyError
head(404)
end

def update
vis, = locator.get(@table_id, CartoDB.extract_subdomain(request))
return(head 404) unless vis
Expand Down Expand Up @@ -200,28 +184,6 @@ def destroy
render_jsonp({ errors: { named_maps: exception } }, 400)
end

def vizjson2
visualization, = locator.get(@table_id, CartoDB.extract_subdomain(request))
return(head 404) unless visualization
return(head 403) unless allow_vizjson_v2_for?(visualization)
set_vizjson_response_headers_for(visualization)
render_jsonp(visualization.to_vizjson({https_request: request.protocol == 'https://'}))
rescue KeyError => exception
render(text: exception.message, status: 403)
rescue CartoDB::NamedMapsWrapper::HTTPResponseError => exception
CartoDB.notify_exception(exception, { user: current_user, template_data: exception.template_data })
render_jsonp({ errors: { named_maps_api: "Communication error with tiler API. HTTP Code: #{exception.message}" } }, 400)
rescue CartoDB::NamedMapsWrapper::NamedMapDataError => exception
CartoDB.notify_exception(exception)
render_jsonp({ errors: { named_map: exception.message } }, 400)
rescue CartoDB::NamedMapsWrapper::NamedMapsDataError => exception
CartoDB.notify_exception(exception)
render_jsonp({ errors: { named_maps: exception.message } }, 400)
rescue => exception
CartoDB.notify_exception(exception)
raise exception
end

def notify_watching
vis = Visualization::Member.new(id: @table_id).fetch
return(head 403) unless vis.has_permission?(current_user, Visualization::Member::PERMISSION_READONLY)
Expand Down Expand Up @@ -270,36 +232,6 @@ def set_next_id
rescue
render_jsonp({ errors: ['Unknown error'] }, 400)
end

# Does not mandate a current_viewer except if vis is not public
def likes_count
vis = Visualization::Member.new(id: @table_id).fetch
if vis.privacy != Visualization::Member::PRIVACY_PUBLIC && vis.privacy != Visualization::Member::PRIVACY_LINK
raise KeyError if current_viewer.nil? || !vis.has_permission?(current_viewer, Visualization::Member::PERMISSION_READONLY)
end

render_jsonp({
id: vis.id,
likes: vis.likes.count
})
rescue KeyError => exception
render(text: exception.message, status: 403)
end

# Does not mandate a current_viewer except if vis is not public
def likes_list
vis = Visualization::Member.new(id: @table_id).fetch
if vis.privacy != Visualization::Member::PRIVACY_PUBLIC && vis.privacy != Visualization::Member::PRIVACY_LINK
raise KeyError if current_viewer.nil? || !vis.has_permission?(current_viewer, Visualization::Member::PERMISSION_READONLY)
end

render_jsonp({
id: vis.id,
likes: vis.likes.map { |like| {actor_id: like.actor } }
})
rescue KeyError => exception
render(text: exception.message, status: 403)
end

def add_like
return(head 403) unless current_viewer
Expand All @@ -322,31 +254,6 @@ def add_like
render(text: "You've already liked this visualization", status: 400)
end

def is_liked
if current_viewer
vis = Visualization::Member.new(id: @table_id).fetch
raise KeyError if vis.privacy != Visualization::Member::PRIVACY_PUBLIC &&
vis.privacy != Visualization::Member::PRIVACY_LINK &&
!vis.has_permission?(current_viewer, Visualization::Member::PERMISSION_READONLY)
render_jsonp({
id: vis.id,
likes: vis.likes.count,
liked: vis.liked_by?(current_viewer.id)
})
else
vis = Visualization::Member.new(id: @table_id).fetch
raise KeyError if vis.privacy != Visualization::Member::PRIVACY_PUBLIC &&
vis.privacy != Visualization::Member::PRIVACY_LINK
render_jsonp({
id: vis.id,
likes: vis.likes.count,
liked: false
})
end
rescue KeyError => exception
render(text: exception.message, status: 403)
end

def remove_like
return(head 403) unless current_viewer

Expand Down Expand Up @@ -452,92 +359,6 @@ def prepare_params_for_total_count(params)
end
end

def index_not_logged_in
public_visualizations = []
total_liked_entries = 0
total_shared_entries = 0
total_user_entries = 0
user = User.where(username: CartoDB.extract_subdomain(request)).first

unless user.nil?
filtered_params = params.dup.merge(scope_for(user))
filtered_params[:unauthenticated] = true

params_for_total_count = prepare_params_for_total_count(filtered_params)
total_user_entries = Visualization::Collection.new.count_total(params_for_total_count)

collection = Visualization::Collection.new.fetch(filtered_params)
public_visualizations = collection.map { |vis|
begin
vis.to_hash(
public_fields_only: true,
related: false,
table: vis.table
)
rescue => exception
puts exception.to_s + exception.backtrace.join("\n")
end
}.compact

total_liked_entries = collection.total_liked_entries(params_for_total_count[:type])
total_shared_entries = collection.total_shared_entries(params_for_total_count[:type])
end

response = {
visualizations: public_visualizations,
total_entries: public_visualizations.length,
total_user_entries: total_user_entries,
total_likes: total_liked_entries,
total_shared: total_shared_entries
}
render_jsonp(response)
end

def index_logged_in
users_cache = {}
filters = params.dup.merge(scope_for(current_user))

collection = Visualization::Collection.new.fetch(filters)

params_for_total_count = prepare_params_for_total_count(filters)
total_user_entries = Visualization::Collection.new.count_total(params_for_total_count)

table_data = collection.map { |vis|
if vis.table.nil?
nil
else
users_cache[vis.user_id] ||= vis.user
{
name: vis.table.name,
schema: users_cache[vis.user_id].database_schema
}
end
}.compact
synchronizations = synchronizations_by_table_name(table_data)
representation = collection.map { |vis|
begin
vis.to_hash(
related: false,
table_data: !(params[:table_data] =~ /false/),
user: current_user,
table: vis.table,
synchronization: synchronizations[vis.name]
)
rescue => exception
puts exception.to_s + exception.backtrace.join("\n")
end
}.compact

response = {
visualizations: representation,
total_entries: collection.total_entries,
total_user_entries: total_user_entries,
total_likes: collection.total_liked_entries(params_for_total_count[:type]),
total_shared: collection.total_shared_entries(params_for_total_count[:type])
}
render_jsonp(response)
end

# Need to always send request object to visualizations upon rendering their json
def render_jsonp(obj, status = 200, options = {})
super(obj, status, options.merge({request: request}))
Expand Down
21 changes: 9 additions & 12 deletions app/controllers/carto/api/visualizations_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
require_relative 'vizjson_presenter'
require_relative '../../../models/visualization/stats'
require_relative 'paged_searcher'
require_dependency 'carto/uuidhelper'

module Carto
module Api
class VisualizationsController < ::Api::ApplicationController
include VisualizationSearcher
include PagedSearcher
include Carto::UUIDHelper

ssl_required :index, :show
ssl_allowed :vizjson2, :likes_count, :likes_list, :is_liked, :list_watching
Expand All @@ -17,7 +19,7 @@ class VisualizationsController < ::Api::ApplicationController
before_filter :optional_api_authorization, only: [:index, :vizjson2, :is_liked]

before_filter :id_and_schema_from_params
before_filter :load_table, only: [:vizjson2]
before_filter :load_by_name_or_id, only: [:vizjson2]
before_filter :load_visualization, only: [:likes_count, :likes_list, :is_liked, :show, :stats, :list_watching]

def show
Expand Down Expand Up @@ -65,7 +67,7 @@ def is_liked
render_jsonp({
id: @visualization.id,
likes: @visualization.likes.count,
liked: @visualization.is_liked_by_user_id?(current_viewer.id)
liked: current_viewer ? @visualization.is_liked_by_user_id?(current_viewer.id) : false
})
end

Expand Down Expand Up @@ -96,20 +98,15 @@ def list_watching

private

def load_table
# TODO: refactor this for vizjson, that uses to look for a visualization, so it should come first
def load_by_name_or_id
@table = is_uuid?(@id) ? Carto::UserTable.where(id: @id).first : nil

@table = Carto::UserTable.where(id: @id).first
# TODO: id should _really_ contain either an id of a user_table or a visualization??
# Some tests fail if not, and older controller works that way, but...
# INFO: id should _really_ contain either an id of a user_table or a visualization, but for legacy reasons...
if @table
@visualization = @table.visualization
else
@table = Visualization.where(id: @id).first
@visualization = @table
# TODO: refactor load_table duplication
return render(text: 'Visualization does not exist', status: 404) if @visualization.nil?
return render(text: 'Visualization not viewable', status: 403) if !@visualization.is_viewable_by_user?(current_viewer)
load_visualization
@table = @visualization
end
end

Expand Down
Loading

0 comments on commit 7750c0b

Please sign in to comment.