Fix editor redirection [WIP]

app/controllers/admin/visualizations_controller.rb

@@ -89,21 +89,21 @@ class Admin::VisualizationsController < Admin::AdminController
     @google_maps_query_string = @visualization.user.google_maps_query_string
     @basemaps = @visualization.user.basemaps
 
-    if current_user.has_feature_flag?('static_editor') && !current_user.builder_enabled?
-      return render(file: 'public/static/show/index.html', layout: false)
-    end
-
     if table_action
       if current_user.builder_enabled? && @visualization.has_read_permission?(current_user)
         return redirect_to CartoDB.url(self, 'builder_dataset', { id: request.params[:id] }, current_user)
+      elsif current_user.has_feature_flag?('static_editor') && !current_user.builder_enabled?
+        return render(file: 'public/static/show/index.html', layout: false)
       elsif !@visualization.has_write_permission?(current_user)
         return redirect_to CartoDB.url(self, 'public_table_map', id: request.params[:id], redirected: true)
       end
+    elsif current_user.builder_enabled? && !@visualization.open_in_editor?
+      return redirect_to CartoDB.url(self, 'builder_visualization', { id: request.params[:id] }, current_user)
+    elsif current_user.has_feature_flag?('static_editor') && !current_user.builder_enabled?
+      return render(file: 'public/static/show/index.html', layout: false)
     elsif !@visualization.has_write_permission?(current_user)
       return redirect_to CartoDB.url(self, 'public_visualizations_public_map',
                                      id: request.params[:id], redirected: true)
-    elsif current_user.builder_enabled? && !@visualization.open_in_editor?
-      return redirect_to CartoDB.url(self, 'builder_visualization', { id: request.params[:id] }, current_user)
     end
 
     if @visualization.is_privacy_private? && @visualization.has_read_permission?(current_user)

lib/assets/javascripts/cartodb/public_map/index.js

@@ -141,7 +141,6 @@ function getDerivedVisualizations (vizdata, password) {
 }
 
 function showPublicVisualization (password) {
-  cdb.init(function () {
     var data = window.CartoConfig.data;
     var vizdata = window.CartoConfig.vizdata;
     var visualizations = window.CartoConfig.visualizations;
@@ -187,7 +186,6 @@ function showPublicVisualization (password) {
     });
 
     publicMapView.render();
-  });
 }
 
 var getConfig = function () {
@@ -203,5 +201,7 @@ var getConfig = function () {
 };
 
 $(function () {
-  getConfig();
+  cdb.init(function () {
+    getConfig();
+  });
 });

lib/assets/javascripts/cartodb/show/index.js

@@ -69,7 +69,7 @@ var getVisualization = function (data) {
     show_liked: true,
     show_stats: true,
     show_auth_tokens: true,
-    show_basemaps: true,
+    show_user_basemaps: true,
     privacy: 'PUBLIC'
   };
 

lib/assets/javascripts/cartodb/static.js

@@ -81,14 +81,12 @@ window.CartoConfig = window.CartoConfig || {};
     var vizID = UrlHelper.getVizID();
 
     client.getVisualization(vizID, params, function (err, response, data) {
-      var error;
-
       if (err) {
-        error = data.responseJSON;
+        console.error(err);
       } else {
         window.CartoConfig.vizdata = data;
-        getUserConfig();
       }
+      getUserConfig();
     });
   };
 

lib/build/files/js_files.js

@@ -407,6 +407,7 @@ var files = {
     'lib/assets/javascripts/cartodb/old_common/urls/dashboard_vis_url.js',
     'lib/assets/javascripts/cartodb/old_common/urls/**/*.js'
   ],
+
   show_deps_static: [
     'lib/assets/javascripts/cartodb/old_common/urls/url.js',
     'lib/assets/javascripts/cartodb/old_common/urls/utils.js',

lib/build/files/webpack_files.js

@@ -57,7 +57,7 @@ var files = {
         show_liked: true,
         show_stats: true,
         show_auth_tokens: true,
-        show_basemaps: true,
+        show_user_basemaps: true,
         privacy: 'PUBLIC'
       }
     }